Merge branch '1.12.2' into 1.12.2-dev

Browse Source

...

This commit is contained in:

Electroblob

2018-06-05 21:44:17 +01:00

parent dec5b1ac2c 9c1042f686

commit 438f5d7a2e

52 changed files with 1079 additions and 805 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

src/main/resources/assets/ebwizardry/textures/gui/logo.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 12 KiB After Width:  |  Height:  |  Size: 12 KiB