Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information