merge upstream

Browse source

...

This commit is contained in:

Milan 2022-08-25 17:51:59 +02:00

parent 9197d947ac aff9c28eed

commit f3be63d874

697 changed files with 8307 additions and 2471 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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 476 B After Width:  |  Height:  |  Size: 288 B

BIN

mods/default/textures/default_acacia_leaves.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 444 B After Width:  |  Height:  |  Size: 247 B

BIN

mods/default/textures/default_acacia_leaves_simple.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 688 B After Width:  |  Height:  |  Size: 327 B

BIN

mods/default/textures/default_acacia_sapling.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 359 B After Width:  |  Height:  |  Size: 209 B

BIN

mods/default/textures/default_acacia_tree.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 579 B After Width:  |  Height:  |  Size: 533 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: 4.9 KiB After Width:  |  Height:  |  Size: 690 B

BIN

mods/default/textures/default_acacia_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 218 B

BIN

mods/default/textures/default_aspen_leaves.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_aspen_sapling.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 320 B After Width:  |  Height:  |  Size: 275 B

BIN

mods/default/textures/default_aspen_tree.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_aspen_tree_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 656 B After Width:  |  Height:  |  Size: 649 B

BIN

mods/default/textures/default_aspen_wood.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_blueberry_bush_leaves.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 813 B After Width:  |  Height:  |  Size: 449 B

BIN

mods/default/textures/default_blueberry_bush_sapling.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_blueberry_overlay.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_bookshelf.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 471 B After Width:  |  Height:  |  Size: 467 B

BIN

mods/default/textures/default_bookshelf_slot.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 351 B After Width:  |  Height:  |  Size: 346 B

BIN

mods/default/textures/default_bronze_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 356 B After Width:  |  Height:  |  Size: 354 B

BIN

mods/default/textures/default_bush_stem.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 428 B After Width:  |  Height:  |  Size: 245 B

BIN

mods/default/textures/default_cactus_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 314 B After Width:  |  Height:  |  Size: 309 B

BIN

mods/default/textures/default_chest_front.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_chest_inside.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 102 B After Width:  |  Height:  |  Size: 94 B

BIN

mods/default/textures/default_chest_lock.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 469 B After Width:  |  Height:  |  Size: 464 B

BIN

mods/default/textures/default_chest_top.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coal_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 236 B

BIN

mods/default/textures/default_coniferous_litter.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_coniferous_litter_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 371 B After Width:  |  Height:  |  Size: 332 B

BIN

mods/default/textures/default_copper_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 359 B After Width:  |  Height:  |  Size: 356 B

BIN

mods/default/textures/default_coral_brown.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 401 B After Width:  |  Height:  |  Size: 356 B

BIN

mods/default/textures/default_coral_cyan.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 202 B After Width:  |  Height:  |  Size: 200 B

BIN

mods/default/textures/default_coral_green.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 287 B After Width:  |  Height:  |  Size: 274 B

BIN

mods/default/textures/default_coral_orange.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 358 B After Width:  |  Height:  |  Size: 314 B

BIN

mods/default/textures/default_coral_pink.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 242 B After Width:  |  Height:  |  Size: 239 B

BIN

mods/default/textures/default_coral_skeleton.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 212 B

BIN

mods/default/textures/default_desert_sand.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 350 B After Width:  |  Height:  |  Size: 349 B

BIN

mods/default/textures/default_desert_sandstone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 275 B After Width:  |  Height:  |  Size: 254 B

BIN

mods/default/textures/default_desert_sandstone_block.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_desert_sandstone_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 630 B After Width:  |  Height:  |  Size: 464 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: 4.3 KiB After Width:  |  Height:  |  Size: 358 B

BIN

mods/default/textures/default_desert_stone_brick.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_dirt.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_dry_grass.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 303 B After Width:  |  Height:  |  Size: 263 B

BIN

mods/default/textures/default_dry_grass_1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 219 B After Width:  |  Height:  |  Size: 166 B

BIN

mods/default/textures/default_dry_grass_2.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_dry_grass_3.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 295 B After Width:  |  Height:  |  Size: 230 B

BIN

mods/default/textures/default_dry_grass_4.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 316 B After Width:  |  Height:  |  Size: 252 B

BIN

mods/default/textures/default_dry_grass_5.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 339 B After Width:  |  Height:  |  Size: 273 B

BIN

mods/default/textures/default_dry_grass_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 890 B After Width:  |  Height:  |  Size: 408 B

BIN

mods/default/textures/default_fence_acacia_wood.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_aspen_wood.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_junglewood.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_fence_pine_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 233 B After Width:  |  Height:  |  Size: 230 B

BIN

mods/default/textures/default_fence_rail_acacia_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 444 B After Width:  |  Height:  |  Size: 275 B

BIN

mods/default/textures/default_fence_rail_aspen_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 235 B After Width:  |  Height:  |  Size: 232 B

BIN

mods/default/textures/default_fence_rail_junglewood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 230 B After Width:  |  Height:  |  Size: 227 B

BIN

mods/default/textures/default_fence_rail_pine_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 235 B After Width:  |  Height:  |  Size: 232 B

BIN

mods/default/textures/default_fence_rail_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 230 B After Width:  |  Height:  |  Size: 227 B

BIN

mods/default/textures/default_fence_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 230 B After Width:  |  Height:  |  Size: 226 B

BIN

mods/default/textures/default_flint.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_footprint.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 466 B After Width:  |  Height:  |  Size: 284 B

BIN

mods/default/textures/default_furnace_bottom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 274 B After Width:  |  Height:  |  Size: 271 B

BIN

mods/default/textures/default_furnace_fire_fg.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 558 B After Width:  |  Height:  |  Size: 549 B

BIN

mods/default/textures/default_furnace_front.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 307 B After Width:  |  Height:  |  Size: 305 B

BIN

mods/default/textures/default_furnace_front_active.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1,020 B

BIN

mods/default/textures/default_furnace_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 274 B After Width:  |  Height:  |  Size: 271 B

BIN

mods/default/textures/default_glass_detail.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_1.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_2.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_3.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_4.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_5.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_grass_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 590 B After Width:  |  Height:  |  Size: 461 B

BIN

mods/default/textures/default_gravel.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 630 B

BIN

mods/default/textures/default_ice.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_invisible_node_overlay.png Normal file

View file

Binary file not shown.

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

BIN

mods/default/textures/default_item_smoke.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 307 B After Width:  |  Height:  |  Size: 252 B

BIN

mods/default/textures/default_jungleleaves.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_jungleleaves_simple.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_jungletree.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_jungletree_top.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_junglewood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 217 B

BIN

mods/default/textures/default_kelp.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 312 B After Width:  |  Height:  |  Size: 296 B

BIN

mods/default/textures/default_key.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_key_skeleton.png

View file

Binary file not shown.

Side by side Before 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: 587 B After Width:  |  Height:  |  Size: 297 B

BIN

mods/default/textures/default_ladder_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 467 B After Width:  |  Height:  |  Size: 458 B

BIN

mods/default/textures/default_large_cactus_seedling.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 254 B

BIN

mods/default/textures/default_lava.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 1,015 B

BIN

mods/default/textures/default_lava_flowing_animated.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_lava_source_animated.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_leaves.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_leaves_simple.png

View file

Binary file not shown.

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

BIN

mods/default/textures/default_marram_grass_1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 253 B After Width:  |  Height:  |  Size: 246 B

BIN

mods/default/textures/default_marram_grass_2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 447 B After Width:  |  Height:  |  Size: 443 B

BIN

mods/default/textures/default_marram_grass_3.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 341 B After Width:  |  Height:  |  Size: 320 B

BIN

mods/default/textures/default_mese_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 188 B After Width:  |  Height:  |  Size: 148 B

BIN

mods/default/textures/default_mese_post_light_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 294 B After Width:  |  Height:  |  Size: 245 B

BIN

mods/default/textures/default_mese_post_light_side_dark.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 301 B After Width:  |  Height:  |  Size: 248 B

BIN

mods/default/textures/default_meselamp.png

View file

Binary file not shown.

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

Some files were not shown because too many files have changed in this diff Show more