merge upstream

Browse source

...

This commit is contained in:

Milan 2019-02-07 13:17:18 +01:00

parent d788b800c8 ad6c2cf035

commit 2e451bd11e

236 changed files with 7780 additions and 2577 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_blueberries.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_blueberry_bush_leaves.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_blueberry_bush_sapling.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_blueberry_overlay.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_book.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_book_written.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_bookshelf_slot.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coniferous_litter.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coniferous_litter_side.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coral_cyan.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coral_green.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coral_pink.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_desert_cobble.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 280 B After Width:  |  Height:  |  Size: 520 B

BIN

mods/default/textures/default_dirt.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 277 B After Width:  |  Height:  |  Size: 5.8 KiB

BIN

mods/default/textures/default_emergent_jungle_sapling.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_rail_acacia_wood.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_rail_aspen_wood.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_rail_junglewood.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_rail_overlay.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_rail_pine_wood.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_rail_wood.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fern_1.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fern_2.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fern_3.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_glass.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_glass_detail.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 135 B After Width:  |  Height:  |  Size: 125 B

BIN

mods/default/textures/default_kelp.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_large_cactus_seedling.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_marram_grass_1.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_marram_grass_2.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_marram_grass_3.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_moss.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_moss_side.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_permafrost.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_pine_bush_sapling.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_pine_bush_stem.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_pine_needles.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_stones.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_stones_side.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/gui_hotbar.png

View file

Binary file not shown.

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

BIN

mods/default/textures/gui_hotbar_selected.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.6 KiB

BIN

mods/default/textures/player.png

View file

Binary file not shown.

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

BIN

mods/default/textures/player_back.png

View file

Binary file not shown.

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