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

BIN

assets/minecraft/textures/block/acacia_door_bottom.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_door_top.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_fence.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 326 B After Width:  |  Height:  |  Size: 313 B

BIN

assets/minecraft/textures/block/acacia_fence_gate.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_fence_side.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_fence_top.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_leaves.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_leaves1.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_log.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_log1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 362 B After Width:  |  Height:  |  Size: 343 B

BIN

assets/minecraft/textures/block/acacia_log_top.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_planks.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_planks2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 330 B After Width:  |  Height:  |  Size: 323 B

BIN

assets/minecraft/textures/block/acacia_sapling.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/acacia_trapdoor.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/activator_rail.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 436 B After Width:  |  Height:  |  Size: 411 B

BIN

assets/minecraft/textures/block/activator_rail_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 429 B After Width:  |  Height:  |  Size: 412 B

BIN

assets/minecraft/textures/block/allium.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 370 B After Width:  |  Height:  |  Size: 340 B

BIN

assets/minecraft/textures/block/andesite.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 379 B After Width:  |  Height:  |  Size: 364 B

BIN

assets/minecraft/textures/block/andesite1.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/anvil_base.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/anvil_side.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/anvil_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 317 B After Width:  |  Height:  |  Size: 293 B

BIN

assets/minecraft/textures/block/attached_melon_stem.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/attached_pumpkin_stem.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 293 B After Width:  |  Height:  |  Size: 268 B

BIN

assets/minecraft/textures/block/azure_bluet.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bamboo_large_leaves.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bamboo_singleleaf.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bamboo_small_leaves.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bamboo_stage0.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bamboo_stalk.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/barrel_bottom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 337 B After Width:  |  Height:  |  Size: 318 B

BIN

assets/minecraft/textures/block/barrel_side.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/barrel_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 340 B After Width:  |  Height:  |  Size: 322 B

BIN

assets/minecraft/textures/block/barrel_top_open.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 409 B After Width:  |  Height:  |  Size: 289 B

BIN

assets/minecraft/textures/block/beacon.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bedrock.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 345 B After Width:  |  Height:  |  Size: 326 B

BIN

assets/minecraft/textures/block/bee_nest_bottom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2 KiB After Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 2 KiB After Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 2 KiB

BIN

assets/minecraft/textures/block/bee_nest_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

assets/minecraft/textures/block/beehive_end.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/beehive_front.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

assets/minecraft/textures/block/beehive_side.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/beetroots_stage0.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/beetroots_stage1.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/beetroots_stage2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 313 B After Width:  |  Height:  |  Size: 299 B

BIN

assets/minecraft/textures/block/beetroots_stage3.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bell_bottom.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bell_side.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bell_top.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_door_bottom.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_door_side.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_door_top.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_fence.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 340 B After Width:  |  Height:  |  Size: 326 B

BIN

assets/minecraft/textures/block/birch_fence_gate.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 337 B After Width:  |  Height:  |  Size: 328 B

BIN

assets/minecraft/textures/block/birch_fence_side.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_fence_top.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_leaves.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_leaves1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 536 B After Width:  |  Height:  |  Size: 334 B

BIN

assets/minecraft/textures/block/birch_log.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 340 B After Width:  |  Height:  |  Size: 329 B

BIN

assets/minecraft/textures/block/birch_log1.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_log_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 369 B After Width:  |  Height:  |  Size: 363 B

BIN

assets/minecraft/textures/block/birch_planks.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_planks1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 331 B After Width:  |  Height:  |  Size: 315 B

BIN

assets/minecraft/textures/block/birch_planks2.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_sapling.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/birch_trapdoor.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 342 B After Width:  |  Height:  |  Size: 338 B

BIN

assets/minecraft/textures/block/black_concrete.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 297 B After Width:  |  Height:  |  Size: 283 B

BIN

assets/minecraft/textures/block/black_concrete_powder.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/black_glazed_terracotta.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 329 B After Width:  |  Height:  |  Size: 326 B

BIN

assets/minecraft/textures/block/black_stained_glass.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 315 B After Width:  |  Height:  |  Size: 293 B

BIN

assets/minecraft/textures/block/black_stained_glass_pane_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 208 B After Width:  |  Height:  |  Size: 206 B

BIN

assets/minecraft/textures/block/black_terracotta.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 342 B After Width:  |  Height:  |  Size: 324 B

BIN

assets/minecraft/textures/block/black_wool.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/blast_furnace_front.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/blast_furnace_front_on.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 626 B After Width:  |  Height:  |  Size: 407 B

BIN

assets/minecraft/textures/block/blast_furnace_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 553 B After Width:  |  Height:  |  Size: 370 B

BIN

assets/minecraft/textures/block/blast_furnace_top.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/blue_concrete.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 302 B After Width:  |  Height:  |  Size: 289 B

BIN

assets/minecraft/textures/block/blue_concrete_powder.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 364 B After Width:  |  Height:  |  Size: 348 B

BIN

assets/minecraft/textures/block/blue_ice.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 343 B After Width:  |  Height:  |  Size: 329 B

BIN

assets/minecraft/textures/block/blue_orchid.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/blue_stained_glass.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/blue_stained_glass_pane_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 208 B After Width:  |  Height:  |  Size: 206 B

BIN

assets/minecraft/textures/block/blue_terracotta.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/blue_wool.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 340 B After Width:  |  Height:  |  Size: 325 B

BIN

assets/minecraft/textures/block/bone_block_side.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bone_block_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 337 B After Width:  |  Height:  |  Size: 330 B

BIN

assets/minecraft/textures/block/bookshelf.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bookshelf1.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bookshelf2.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/bookshelf_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 333 B After Width:  |  Height:  |  Size: 322 B

BIN

assets/minecraft/textures/block/brain_coral.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 317 B After Width:  |  Height:  |  Size: 297 B

BIN

assets/minecraft/textures/block/brain_coral_block.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/brain_coral_fan.png

View file

Binary file not shown.

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

BIN

assets/minecraft/textures/block/brewing_stand.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 381 B After Width:  |  Height:  |  Size: 367 B

BIN

assets/minecraft/textures/block/brewing_stand_base.png

View file

Binary file not shown.

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

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