Merge branch 'master' of https://github.com/Vazkii/Botania

Browse Source

...

This commit is contained in:

Lizbeth Rika committed 2015-04-30 19:03:26 +01:00

2 parents 2a34893c71 34182dbd70

commit dec6a1b9da

3 files changed

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

No files matched your search

src/main/resources/assets/botania/textures/model/crystalCube.png

BIN

Binary file not shown.

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

src/main/resources/assets/botania/textures/model/holyCloak.png

BIN

Binary file not shown.

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

src/main/resources/assets/botania/textures/model/unholyCloak.png

BIN

Binary file not shown.

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