solve mergeconflicts

Browse source

* tmp drop farming+boats
    * correct tnt
    * drop original readme.txt

...

This commit is contained in:

Milan* 2017-03-11 13:09:26 +01:00

parent 1a1c312ce9 ad118ea98d

commit c836129bff

78 changed files with 1432 additions and 383 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_desert_sandstone.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_desert_sandstone_block.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_desert_sandstone_brick.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_flint.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 300 B

BIN

mods/default/textures/default_grass_2.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_3.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_4.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 503 B

BIN

mods/default/textures/default_grass_5.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 628 B

BIN

mods/default/textures/default_key.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_key_skeleton.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_ladder_steel.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 587 B

BIN

mods/default/textures/default_mese_post_light_side.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_mese_post_light_side_dark.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_mese_post_light_top.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_rainforest_litter.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_rainforest_litter_side.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_sign_steel.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 537 B

BIN

mods/default/textures/default_sign_wall_steel.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 550 B

BIN

mods/default/textures/default_sign_wall_wood.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_sign_wood.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_silver_sandstone.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_silver_sandstone_block.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_silver_sandstone_brick.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_snow_side.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_snowball.png

View file

Binary file not shown.

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