fix mergeconflicts

Browse source

...

This commit is contained in:

Milan* 2017-05-22 09:30:22 +02:00

parent 56e4678f61 e523c3a296

commit 9052d3ae14

98 changed files with 2574 additions and 582 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_acacia_bush_sapling.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_aspen_leaves.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 761 B After Width:  |  Height:  |  Size: 873 B

BIN

mods/default/textures/default_bush_sapling.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_chest_inside.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_chest_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 422 B After Width:  |  Height:  |  Size: 423 B

BIN

mods/default/textures/default_mineral_tin.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_snow.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 522 B

BIN

mods/default/textures/default_tin_block.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_tin_ingot.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_tin_lump.png Normal file

View file

Binary file not shown.

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