fix mergeconflicts

Browse source

...

This commit is contained in:

Milan* 2017-07-30 12:15:29 +02:00

parent 34075ee529 71dff2ac4a

commit 8a3f06a18f

47 changed files with 1139 additions and 330 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

mods/default/textures/default_book.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 201 B After Width:  |  Height:  |  Size: 255 B

BIN

mods/default/textures/default_book_written.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 228 B After Width:  |  Height:  |  Size: 282 B

BIN

mods/default/textures/default_bookshelf_slot.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 216 B After Width:  |  Height:  |  Size: 191 B

BIN

mods/default/textures/default_clay_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 158 B After Width:  |  Height:  |  Size: 160 B

BIN

mods/default/textures/default_mese_post_light_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 155 B After Width:  |  Height:  |  Size: 128 B