Commit 7267da5
committed
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.json0 file changed
0 commit comments