Tags: Timefall-Development/MCDungeonsWeapons
Tags
Merge pull request #5 from chronosacaria/Enchantment-Test Enchantment Integration Attempt
Merge pull request #5 from chronosacaria/Enchantment-Test Enchantment Integration Attempt
Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/chronosacaria/mcdw/weapons/Daggers.java # src/main/resources/assets/mcdw/textures/item/bows/green_menace.png # src/main/resources/data/mcdw/recipes/bow_hunters_promise.json # src/main/resources/data/mcdw/recipes/bow_masters_bow.json # src/main/resources/data/mcdw/recipes/bow_sabrewing.json # src/main/resources/data/mcdw/recipes/bow_soul_bow.json
Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/chronosacaria/mcdw/weapons/Daggers.java # src/main/resources/assets/mcdw/textures/item/bows/green_menace.png # src/main/resources/data/mcdw/recipes/bow_hunters_promise.json # src/main/resources/data/mcdw/recipes/bow_masters_bow.json # src/main/resources/data/mcdw/recipes/bow_sabrewing.json # src/main/resources/data/mcdw/recipes/bow_soul_bow.json
Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/chronosacaria/mcdw/weapons/Daggers.java # src/main/resources/assets/mcdw/textures/item/bows/green_menace.png # src/main/resources/data/mcdw/recipes/bow_hunters_promise.json # src/main/resources/data/mcdw/recipes/bow_masters_bow.json # src/main/resources/data/mcdw/recipes/bow_sabrewing.json # src/main/resources/data/mcdw/recipes/bow_soul_bow.json
Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/chronosacaria/mcdw/weapons/Daggers.java # src/main/resources/assets/mcdw/textures/item/bows/green_menace.png # src/main/resources/data/mcdw/recipes/bow_hunters_promise.json # src/main/resources/data/mcdw/recipes/bow_masters_bow.json # src/main/resources/data/mcdw/recipes/bow_sabrewing.json # src/main/resources/data/mcdw/recipes/bow_soul_bow.json
PreviousNext