Merge remote-tracking branch 'origin/master'

Browse source

# Conflicts:
#	src/main/java/ru/betterend/recipe/CraftingRecipes.java

...

This commit is contained in:

Aleksey 2021-01-31 17:38:02 +03:00

parent 68636e2ecd 5475e514dc

commit 0334045204

14 changed files with 201 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

src/main/resources/assets/betterend/textures/block/charcoal_block.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 414 B