Merge branch 'master' into no-sounds

Browse source

...

This commit is contained in:

Alexander Minges 2020-05-15 18:25:03 +02:00

parent 9a5593fbdd e124d43ac6

commit afedc5e813

1585 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

assets/minecraft/textures/block

acacia_door_bottom.pngacacia_door_top.pngacacia_fence.pngacacia_fence_gate.pngacacia_fence_side.pngacacia_fence_top.pngacacia_leaves.pngacacia_leaves1.pngacacia_log.pngacacia_log1.pngacacia_log_top.pngacacia_planks.pngacacia_planks2.pngacacia_sapling.pngacacia_trapdoor.pngactivator_rail.pngactivator_rail_on.pngallium.pngandesite.pngandesite1.pnganvil_base.pnganvil_side.pnganvil_top.pngattached_melon_stem.pngattached_pumpkin_stem.pngazure_bluet.pngbamboo_large_leaves.pngbamboo_singleleaf.pngbamboo_small_leaves.pngbamboo_stage0.pngbamboo_stalk.pngbarrel_bottom.pngbarrel_side.pngbarrel_top.pngbarrel_top_open.pngbeacon.pngbedrock.pngbee_nest_bottom.pngbee_nest_front.pngbee_nest_front_honey.pngbee_nest_side.pngbee_nest_top.pngbeehive_end.pngbeehive_front.pngbeehive_front_honey.pngbeehive_side.pngbeetroots_stage0.pngbeetroots_stage1.pngbeetroots_stage2.pngbeetroots_stage3.pngbell_bottom.pngbell_side.pngbell_top.pngbirch_door_bottom.pngbirch_door_side.pngbirch_door_top.pngbirch_fence.pngbirch_fence_gate.pngbirch_fence_side.pngbirch_fence_top.pngbirch_leaves.pngbirch_leaves1.pngbirch_log.pngbirch_log1.pngbirch_log_top.pngbirch_planks.pngbirch_planks1.pngbirch_planks2.pngbirch_sapling.pngbirch_trapdoor.pngblack_concrete.pngblack_concrete_powder.pngblack_glazed_terracotta.pngblack_stained_glass.pngblack_stained_glass_pane_top.pngblack_terracotta.pngblack_wool.pngblast_furnace_front.pngblast_furnace_front_on.pngblast_furnace_side.pngblast_furnace_top.pngblue_concrete.pngblue_concrete_powder.pngblue_ice.pngblue_orchid.pngblue_stained_glass.pngblue_stained_glass_pane_top.pngblue_terracotta.pngblue_wool.pngbone_block_side.pngbone_block_top.pngbookshelf.pngbookshelf1.pngbookshelf2.pngbookshelf_top.pngbrain_coral.pngbrain_coral_block.pngbrain_coral_fan.pngbrewing_stand.pngbrewing_stand_base.png

Show more

BIN

assets/minecraft/textures/block/acacia_door_bottom.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 332 B After (image error) Size: 326 B

BIN

assets/minecraft/textures/block/acacia_door_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 332 B After (image error) Size: 317 B

BIN

assets/minecraft/textures/block/acacia_fence.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 326 B After (image error) Size: 313 B

BIN

assets/minecraft/textures/block/acacia_fence_gate.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 319 B After (image error) Size: 307 B

BIN

assets/minecraft/textures/block/acacia_fence_side.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 315 B After (image error) Size: 307 B

BIN

assets/minecraft/textures/block/acacia_fence_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 274 B After (image error) Size: 250 B

BIN

assets/minecraft/textures/block/acacia_leaves.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 346 B After (image error) Size: 333 B

BIN

assets/minecraft/textures/block/acacia_leaves1.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 259 B After (image error) Size: 255 B

BIN

assets/minecraft/textures/block/acacia_log.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 359 B After (image error) Size: 343 B

BIN

assets/minecraft/textures/block/acacia_log1.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 362 B After (image error) Size: 343 B

BIN

assets/minecraft/textures/block/acacia_log_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 350 B After (image error) Size: 346 B

BIN

assets/minecraft/textures/block/acacia_planks.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 328 B After (image error) Size: 327 B

BIN

assets/minecraft/textures/block/acacia_planks2.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 330 B After (image error) Size: 323 B

BIN

assets/minecraft/textures/block/acacia_sapling.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 322 B After (image error) Size: 303 B

BIN

assets/minecraft/textures/block/acacia_trapdoor.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 327 B After (image error) Size: 315 B

BIN

assets/minecraft/textures/block/activator_rail.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 436 B After (image error) Size: 411 B

BIN

assets/minecraft/textures/block/activator_rail_on.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 429 B After (image error) Size: 412 B

BIN

assets/minecraft/textures/block/allium.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 370 B After (image error) Size: 340 B

BIN

assets/minecraft/textures/block/andesite.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 379 B After (image error) Size: 364 B

BIN

assets/minecraft/textures/block/andesite1.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 370 B After (image error) Size: 351 B

BIN

assets/minecraft/textures/block/anvil_base.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 248 B After (image error) Size: 216 B

BIN

assets/minecraft/textures/block/anvil_side.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 284 B After (image error) Size: 261 B

BIN

assets/minecraft/textures/block/anvil_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 317 B After (image error) Size: 293 B

BIN

assets/minecraft/textures/block/attached_melon_stem.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 373 B After (image error) Size: 260 B

BIN

assets/minecraft/textures/block/attached_pumpkin_stem.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 293 B After (image error) Size: 268 B

BIN

assets/minecraft/textures/block/azure_bluet.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 374 B After (image error) Size: 354 B

BIN

assets/minecraft/textures/block/bamboo_large_leaves.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 273 B After (image error) Size: 271 B

BIN

assets/minecraft/textures/block/bamboo_singleleaf.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 256 B After (image error) Size: 201 B

BIN

assets/minecraft/textures/block/bamboo_small_leaves.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 248 B After (image error) Size: 237 B

BIN

assets/minecraft/textures/block/bamboo_stage0.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 317 B After (image error) Size: 245 B

BIN

assets/minecraft/textures/block/bamboo_stalk.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 246 B After (image error) Size: 241 B

BIN

assets/minecraft/textures/block/barrel_bottom.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 337 B After (image error) Size: 318 B

BIN

assets/minecraft/textures/block/barrel_side.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 351 B After (image error) Size: 332 B

BIN

assets/minecraft/textures/block/barrel_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 340 B After (image error) Size: 322 B

BIN

assets/minecraft/textures/block/barrel_top_open.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 409 B After (image error) Size: 289 B

BIN

assets/minecraft/textures/block/beacon.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 314 B After (image error) Size: 288 B

BIN

assets/minecraft/textures/block/bedrock.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 345 B After (image error) Size: 326 B

BIN

assets/minecraft/textures/block/bee_nest_bottom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 2 KiB After (image error) Size: 1.9 KiB

BIN

assets/minecraft/textures/block/bee_nest_front.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 2 KiB After (image error) Size: 1.9 KiB

BIN

assets/minecraft/textures/block/bee_nest_front_honey.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 2.2 KiB After (image error) Size: 2 KiB

BIN

assets/minecraft/textures/block/bee_nest_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 1.9 KiB After (image error) Size: 1.8 KiB

BIN

assets/minecraft/textures/block/bee_nest_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 2.2 KiB After (image error) Size: 2.1 KiB

BIN

assets/minecraft/textures/block/beehive_end.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 2 KiB After (image error) Size: 1.9 KiB

BIN

assets/minecraft/textures/block/beehive_front.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 2.1 KiB After (image error) Size: 1.9 KiB

BIN

assets/minecraft/textures/block/beehive_front_honey.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 2.3 KiB After (image error) Size: 2.1 KiB

BIN

assets/minecraft/textures/block/beehive_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 2 KiB After (image error) Size: 1.9 KiB

BIN

assets/minecraft/textures/block/beetroots_stage0.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 277 B After (image error) Size: 252 B

BIN

assets/minecraft/textures/block/beetroots_stage1.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 294 B After (image error) Size: 271 B

BIN

assets/minecraft/textures/block/beetroots_stage2.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 313 B After (image error) Size: 299 B

BIN

assets/minecraft/textures/block/beetroots_stage3.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 367 B After (image error) Size: 356 B

BIN

assets/minecraft/textures/block/bell_bottom.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 254 B After (image error) Size: 244 B

BIN

assets/minecraft/textures/block/bell_side.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 256 B After (image error) Size: 236 B

BIN

assets/minecraft/textures/block/bell_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 249 B After (image error) Size: 232 B

BIN

assets/minecraft/textures/block/birch_door_bottom.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 348 B After (image error) Size: 339 B

BIN

assets/minecraft/textures/block/birch_door_side.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 247 B After (image error) Size: 228 B

BIN

assets/minecraft/textures/block/birch_door_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 355 B After (image error) Size: 341 B

BIN

assets/minecraft/textures/block/birch_fence.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 340 B After (image error) Size: 326 B

BIN

assets/minecraft/textures/block/birch_fence_gate.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 337 B After (image error) Size: 328 B

BIN

assets/minecraft/textures/block/birch_fence_side.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 314 B After (image error) Size: 308 B

BIN

assets/minecraft/textures/block/birch_fence_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 272 B After (image error) Size: 250 B

BIN

assets/minecraft/textures/block/birch_leaves.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 543 B After (image error) Size: 309 B

BIN

assets/minecraft/textures/block/birch_leaves1.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 536 B After (image error) Size: 334 B

BIN

assets/minecraft/textures/block/birch_log.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 340 B After (image error) Size: 329 B

BIN

assets/minecraft/textures/block/birch_log1.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 351 B After (image error) Size: 335 B

BIN

assets/minecraft/textures/block/birch_log_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 369 B After (image error) Size: 363 B

BIN

assets/minecraft/textures/block/birch_planks.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 337 B After (image error) Size: 320 B

BIN

assets/minecraft/textures/block/birch_planks1.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 331 B After (image error) Size: 315 B

BIN

assets/minecraft/textures/block/birch_planks2.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 319 B After (image error) Size: 304 B

BIN

assets/minecraft/textures/block/birch_sapling.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 440 B After (image error) Size: 277 B

BIN

assets/minecraft/textures/block/birch_trapdoor.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 342 B After (image error) Size: 338 B

BIN

assets/minecraft/textures/block/black_concrete.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 297 B After (image error) Size: 283 B

BIN

assets/minecraft/textures/block/black_concrete_powder.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 340 B After (image error) Size: 327 B

BIN

assets/minecraft/textures/block/black_glazed_terracotta.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 329 B After (image error) Size: 326 B

BIN

assets/minecraft/textures/block/black_stained_glass.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 315 B After (image error) Size: 293 B

BIN

assets/minecraft/textures/block/black_stained_glass_pane_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 208 B After (image error) Size: 206 B

BIN

assets/minecraft/textures/block/black_terracotta.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 342 B After (image error) Size: 324 B

BIN

assets/minecraft/textures/block/black_wool.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 328 B After (image error) Size: 316 B

BIN

assets/minecraft/textures/block/blast_furnace_front.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 550 B After (image error) Size: 364 B

BIN

assets/minecraft/textures/block/blast_furnace_front_on.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 626 B After (image error) Size: 407 B

BIN

assets/minecraft/textures/block/blast_furnace_side.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 553 B After (image error) Size: 370 B

BIN

assets/minecraft/textures/block/blast_furnace_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 385 B After (image error) Size: 287 B

BIN

assets/minecraft/textures/block/blue_concrete.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 302 B After (image error) Size: 289 B

BIN

assets/minecraft/textures/block/blue_concrete_powder.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 364 B After (image error) Size: 348 B

BIN

assets/minecraft/textures/block/blue_ice.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 343 B After (image error) Size: 329 B

BIN

assets/minecraft/textures/block/blue_orchid.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 391 B After (image error) Size: 370 B

BIN

assets/minecraft/textures/block/blue_stained_glass.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 327 B After (image error) Size: 299 B

BIN

assets/minecraft/textures/block/blue_stained_glass_pane_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 208 B After (image error) Size: 206 B

BIN

assets/minecraft/textures/block/blue_terracotta.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 344 B After (image error) Size: 327 B

BIN

assets/minecraft/textures/block/blue_wool.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 340 B After (image error) Size: 325 B

BIN

assets/minecraft/textures/block/bone_block_side.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 254 B After (image error) Size: 246 B

BIN

assets/minecraft/textures/block/bone_block_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 337 B After (image error) Size: 330 B

BIN

assets/minecraft/textures/block/bookshelf.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 471 B After (image error) Size: 465 B

BIN

assets/minecraft/textures/block/bookshelf1.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 474 B After (image error) Size: 466 B

BIN

assets/minecraft/textures/block/bookshelf2.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 479 B After (image error) Size: 469 B

BIN

assets/minecraft/textures/block/bookshelf_top.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 333 B After (image error) Size: 322 B

BIN

assets/minecraft/textures/block/brain_coral.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 317 B After (image error) Size: 297 B

BIN

assets/minecraft/textures/block/brain_coral_block.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 349 B After (image error) Size: 336 B

BIN

assets/minecraft/textures/block/brain_coral_fan.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 306 B After (image error) Size: 274 B

BIN

assets/minecraft/textures/block/brewing_stand.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 381 B After (image error) Size: 367 B

BIN

assets/minecraft/textures/block/brewing_stand_base.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 354 B After (image error) Size: 343 B

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