Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# 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
chronosacaria committed Nov 5, 2020
2 parents 820cf84 + 07d79c1 commit 7267da5
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 7267da5

Please sign in to comment.