Merge remote-tracking branch 'joe-mojo/master', PR #974, Issue #973

Browse Source

...

This commit is contained in:

Aaron Griffith

2013-12-01 16:29:07 -05:00

parent 77e8c49b9f b2e0d6da28

commit 606d794948

5 changed files with 25 additions and 8 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

0

overviewer_core/data/textures/enderchest.png → overviewer_core/data/textures/ender.png

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

0

overviewer_core/data/textures/foliagecolor.png → overviewer_core/data/textures/foliage.png

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

0

overviewer_core/data/textures/grasscolor.png → overviewer_core/data/textures/grass.png

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

0

overviewer_core/data/textures/largechest.png → overviewer_core/data/textures/normal_double.png

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