fix mergeconflicts

Browse source

...

This commit is contained in:

Milan* 2016-12-15 18:03:31 +00:00

parent 1cb367a2ac 55a16cd2c6

commit 960a9de9d8

188 changed files with 5137 additions and 1518 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_stem.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_acacia_leaves_simple.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_acacia_tree.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 682 B After Width:  |  Height:  |  Size: 579 B

BIN

mods/default/textures/default_acacia_tree_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 731 B After Width:  |  Height:  |  Size: 4.9 KiB

BIN

mods/default/textures/default_aspen_tree.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 695 B After Width:  |  Height:  |  Size: 4.3 KiB

BIN

mods/default/textures/default_aspen_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 373 B After Width:  |  Height:  |  Size: 3.9 KiB

BIN

mods/default/textures/default_bookshelf_slot.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_bush_stem.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coral_brown.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coral_orange.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coral_skeleton.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_desert_stone_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 527 B After Width:  |  Height:  |  Size: 4.3 KiB

BIN

mods/default/textures/default_desert_stone_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 552 B After Width:  |  Height:  |  Size: 4.3 KiB

BIN

mods/default/textures/default_fence_aspen_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 450 B After Width:  |  Height:  |  Size: 4.1 KiB

BIN

mods/default/textures/default_gravel.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 4.6 KiB

BIN

mods/default/textures/default_ice.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3 KiB After Width:  |  Height:  |  Size: 4 KiB

BIN

mods/default/textures/default_item_smoke.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_jungleleaves.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 184 B After Width:  |  Height:  |  Size: 425 B

BIN

mods/default/textures/default_jungleleaves_simple.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 430 B After Width:  |  Height:  |  Size: 417 B

BIN

mods/default/textures/default_jungletree.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 736 B After Width:  |  Height:  |  Size: 5.5 KiB

BIN

mods/default/textures/default_jungletree_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 823 B After Width:  |  Height:  |  Size: 5.1 KiB

BIN

mods/default/textures/default_key.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

mods/default/textures/default_key_skeleton.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3 KiB

BIN

mods/default/textures/default_lava.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 685 B After Width:  |  Height:  |  Size: 5.6 KiB

BIN

mods/default/textures/default_leaves.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 304 B After Width:  |  Height:  |  Size: 773 B

BIN

mods/default/textures/default_leaves_simple.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 817 B After Width:  |  Height:  |  Size: 838 B

BIN

mods/default/textures/default_meselamp.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 5 KiB

BIN

mods/default/textures/default_obsidian_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 336 B After Width:  |  Height:  |  Size: 3.8 KiB

BIN

mods/default/textures/default_pine_needles.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 203 B After Width:  |  Height:  |  Size: 391 B

BIN

mods/default/textures/default_rail.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 242 B

BIN

mods/default/textures/default_rail_crossing.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 262 B

BIN

mods/default/textures/default_rail_curved.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 241 B

BIN

mods/default/textures/default_rail_t_junction.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 247 B

BIN

mods/default/textures/default_sandstone_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 637 B After Width:  |  Height:  |  Size: 4.4 KiB

BIN

mods/default/textures/default_silver_sand.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4 KiB

BIN

mods/default/textures/default_snow.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_snow_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 376 B After Width:  |  Height:  |  Size: 3.4 KiB

BIN

mods/default/textures/default_snowball.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 183 B After Width:  |  Height:  |  Size: 3 KiB

BIN

mods/default/textures/default_stone_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 545 B After Width:  |  Height:  |  Size: 4.1 KiB