Merge branch 'master' into fix_copper_blocks

Browse source

...

This commit is contained in:

Michieal 2023-02-04 03:30:20 -05:00

parent 50effaa807 7d46fa3362

commit 08610296fc

3121 changed files with 84 additions and 36 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

mods

CORE/mcl_particles/textures

mcl_particles_mob_death.pngmcl_particles_smoke_anim.png

ENTITIES

mcl_boats/textures

mcl_boats_acacia_boat.pngmcl_boats_birch_boat.pngmcl_boats_oak_boat.png

mcl_minecarts/textures

mcl_minecarts_minecart_furnace.pngmcl_minecarts_rail_activator.pngmcl_minecarts_rail_detector_crossing.pngmcl_minecarts_rail_detector_crossing_powered.pngmcl_minecarts_rail_detector_curved.pngmcl_minecarts_rail_detector_curved_powered.pngmcl_minecarts_rail_golden_powered.png

mcl_mobs/textures

mobs_blood.png

mcl_paintings/textures

mcl_paintings_painting.png

mobs_mc/textures

extra_mobs_dolphin.pngextra_mobs_hoglin.pngextra_mobs_strider.pngextra_mobs_strider_cold.pngextra_mobs_tropical_fish_a.pngextra_mobs_tropical_fish_b.pngextra_mobs_tropical_fish_pattern_a_2.pngextra_mobs_tropical_fish_pattern_a_3.pngextra_mobs_tropical_fish_pattern_a_4.pngextra_mobs_tropical_fish_pattern_a_5.pngextra_mobs_tropical_fish_pattern_b_2.pngextra_mobs_tropical_fish_pattern_b_5.pngextra_mobs_tropical_fish_pattern_b_6.pngextra_mobs_zombified_piglin.pngmobs_mc_axolotl_black.pngmobs_mc_axolotl_brown.pngmobs_mc_axolotl_green.pngmobs_mc_axolotl_pink.pngmobs_mc_axolotl_purple.pngmobs_mc_axolotl_white.pngmobs_mc_axolotl_yellow.pngmobs_mc_chicken.pngmobs_mc_diamond.pngmobs_mc_emerald.pngmobs_mc_enderman_cactus_background.pngmobs_mc_ghast.pngmobs_mc_gold.pngmobs_mc_horse_black.pngmobs_mc_horse_brown.pngmobs_mc_horse_chestnut.pngmobs_mc_horse_darkbrown.pngmobs_mc_horse_gray.pngmobs_mc_horse_skeleton.pngmobs_mc_horse_white.pngmobs_mc_horse_zombie.pngmobs_mc_iron.pngmobs_mc_llama_decor_black.pngmobs_mc_llama_decor_blue.pngmobs_mc_llama_decor_brown.pngmobs_mc_llama_decor_cyan.pngmobs_mc_llama_decor_gray.pngmobs_mc_llama_decor_green.pngmobs_mc_llama_decor_light_blue.pngmobs_mc_llama_decor_light_gray.pngmobs_mc_llama_decor_lime.pngmobs_mc_llama_decor_magenta.pngmobs_mc_llama_decor_orange.pngmobs_mc_llama_decor_pink.pngmobs_mc_llama_decor_purple.pngmobs_mc_llama_decor_red.pngmobs_mc_llama_decor_white.pngmobs_mc_llama_decor_yellow.pngmobs_mc_pillager.pngmobs_mc_spawn_icon_cat.pngmobs_mc_spawn_icon_cave_spider.pngmobs_mc_spawn_icon_dragon.pngmobs_mc_spawn_icon_enderman.pngmobs_mc_spawn_icon_endermite.pngmobs_mc_spawn_icon_evoker.pngmobs_mc_spawn_icon_ghast.pngmobs_mc_spawn_icon_guardian_elder.pngmobs_mc_spawn_icon_horse_skeleton.pngmobs_mc_spawn_icon_horse_zombie.pngmobs_mc_spawn_icon_illusioner.pngmobs_mc_spawn_icon_killer_bunny.pngmobs_mc_spawn_icon_magmacube.pngmobs_mc_spawn_icon_parrot.pngmobs_mc_spawn_icon_salmon.pngmobs_mc_spawn_icon_skeleton.pngmobs_mc_spawn_icon_slime.pngmobs_mc_spawn_icon_spider.pngmobs_mc_spawn_icon_squid.pngmobs_mc_spawn_icon_vex.pngmobs_mc_spawn_icon_villager.pngmobs_mc_spawn_icon_vindicator.pngmobs_mc_spawn_icon_zombie.pngmobs_mc_stone.pngmobs_mc_stray.pngmobs_mc_stray_overlay.pngmobs_mc_witch.pngmobs_mc_wither.pngmobs_mc_wither_half_health.pngmobs_mc_wither_skeleton.pngmobs_mc_wolf_icon_roam.pngmobs_mc_wolf_icon_sit.pngspawn_egg.png

Show more

BIN

mods/CORE/mcl_particles/textures/mcl_particles_mob_death.png

View file

Binary file not shown.

Side by side Before (image error) Size: 262 B

BIN

mods/CORE/mcl_particles/textures/mcl_particles_smoke_anim.png

View file

Binary file not shown.

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

BIN

mods/ENTITIES/mcl_boats/textures/mcl_boats_acacia_boat.png

View file

Binary file not shown.

Side by side Before (image error) Size: 265 B

BIN

mods/ENTITIES/mcl_boats/textures/mcl_boats_birch_boat.png

View file

Binary file not shown.

Side by side Before (image error) Size: 264 B

BIN

mods/ENTITIES/mcl_boats/textures/mcl_boats_oak_boat.png

View file

Binary file not shown.

Side by side Before (image error) Size: 267 B

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_minecart_furnace.png

View file

Binary file not shown.

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

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_activator.png

View file

Binary file not shown.

Side by side Before (image error) Size: 285 B

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_detector_crossing.png

View file

Binary file not shown.

Side by side Before (image error) Size: 282 B

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_detector_crossing_powered.png

View file

Binary file not shown.

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

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_detector_curved.png

View file

Binary file not shown.

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

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_detector_curved_powered.png

View file

Binary file not shown.

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

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_powered.png

View file

Binary file not shown.

Side by side Before (image error) Size: 257 B

BIN

mods/ENTITIES/mcl_mobs/textures/mobs_blood.png

View file

Binary file not shown.

Side by side Before (image error) Size: 895 B

BIN

mods/ENTITIES/mcl_paintings/textures/mcl_paintings_painting.png

View file

Binary file not shown.

Side by side Before (image error) Size: 229 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_dolphin.png

View file

Binary file not shown.

Side by side Before (image error) Size: 443 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_hoglin.png

View file

Binary file not shown.

Side by side Before (image error) Size: 3.3 KiB

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_strider.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_strider_cold.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2 KiB

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_a.png

View file

Binary file not shown.

Side by side Before (image error) Size: 192 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_b.png

View file

Binary file not shown.

Side by side Before (image error) Size: 230 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_2.png

View file

Binary file not shown.

Side by side Before (image error) Size: 183 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_3.png

View file

Binary file not shown.

Side by side Before (image error) Size: 166 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_4.png

View file

Binary file not shown.

Side by side Before (image error) Size: 165 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_5.png

View file

Binary file not shown.

Side by side Before (image error) Size: 148 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_2.png

View file

Binary file not shown.

Side by side Before (image error) Size: 179 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_5.png

View file

Binary file not shown.

Side by side Before (image error) Size: 173 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_6.png

View file

Binary file not shown.

Side by side Before (image error) Size: 165 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_zombified_piglin.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.8 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_axolotl_black.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_axolotl_brown.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_axolotl_green.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_axolotl_pink.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_axolotl_purple.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_axolotl_white.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_axolotl_yellow.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken.png

View file

Binary file not shown.

Side by side Before (image error) Size: 426 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_diamond.png

View file

Binary file not shown.

Side by side Before (image error) Size: 181 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_emerald.png

View file

Binary file not shown.

Side by side Before (image error) Size: 181 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_cactus_background.png

View file

Binary file not shown.

Side by side Before (image error) Size: 85 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_ghast.png

View file

Binary file not shown.

Side by side Before (image error) Size: 755 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_gold.png

View file

Binary file not shown.

Side by side Before (image error) Size: 181 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_black.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.6 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_brown.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.6 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_chestnut.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.6 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_darkbrown.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.6 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_gray.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.6 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_skeleton.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.5 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_white.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.5 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_zombie.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.5 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_iron.png

View file

Binary file not shown.

Side by side Before (image error) Size: 181 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_black.png

View file

Binary file not shown.

Side by side Before (image error) Size: 3.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_blue.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1,002 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_brown.png

View file

Binary file not shown.

Side by side Before (image error) Size: 3.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_cyan.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_gray.png

View file

Binary file not shown.

Side by side Before (image error) Size: 3 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_green.png

View file

Binary file not shown.

Side by side Before (image error) Size: 679 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_light_blue.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_light_gray.png

View file

Binary file not shown.

Side by side Before (image error) Size: 3.7 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_lime.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.4 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_magenta.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.5 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_orange.png

View file

Binary file not shown.

Side by side Before (image error) Size: 680 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_pink.png

View file

Binary file not shown.

Side by side Before (image error) Size: 4 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_purple.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.2 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_red.png

View file

Binary file not shown.

Side by side Before (image error) Size: 3.8 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_white.png

View file

Binary file not shown.

Side by side Before (image error) Size: 3.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_yellow.png

View file

Binary file not shown.

Side by side Before (image error) Size: 3.9 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_pillager.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_cat.png

View file

Binary file not shown.

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

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_cave_spider.png

View file

Binary file not shown.

Side by side Before (image error) Size: 648 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_dragon.png

View file

Binary file not shown.

Side by side Before (image error) Size: 489 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_enderman.png

View file

Binary file not shown.

Side by side Before (image error) Size: 439 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_endermite.png

View file

Binary file not shown.

Side by side Before (image error) Size: 529 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_evoker.png

View file

Binary file not shown.

Side by side Before (image error) Size: 759 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_ghast.png

View file

Binary file not shown.

Side by side Before (image error) Size: 750 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_guardian_elder.png

View file

Binary file not shown.

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

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_skeleton.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_zombie.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.2 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_illusioner.png

View file

Binary file not shown.

Side by side Before (image error) Size: 866 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_killer_bunny.png

View file

Binary file not shown.

Side by side Before (image error) Size: 828 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_magmacube.png

View file

Binary file not shown.

Side by side Before (image error) Size: 706 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_parrot.png

View file

Binary file not shown.

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

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_salmon.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.5 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_skeleton.png

View file

Binary file not shown.

Side by side Before (image error) Size: 855 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_slime.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.5 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_spider.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.2 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_squid.png

View file

Binary file not shown.

Side by side Before (image error) Size: 692 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vex.png

View file

Binary file not shown.

Side by side Before (image error) Size: 775 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_villager.png

View file

Binary file not shown.

Side by side Before (image error) Size: 629 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vindicator.png

View file

Binary file not shown.

Side by side Before (image error) Size: 676 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_zombie.png

View file

Binary file not shown.

Side by side Before (image error) Size: 751 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_stone.png

View file

Binary file not shown.

Side by side Before (image error) Size: 181 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_stray.png

View file

Binary file not shown.

Side by side Before (image error) Size: 472 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_stray_overlay.png

View file

Binary file not shown.

Side by side Before (image error) Size: 595 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_witch.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1,000 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_wither.png

View file

Binary file not shown.

Side by side Before (image error) Size: 629 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_wither_half_health.png

View file

Binary file not shown.

Side by side Before (image error) Size: 622 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_wither_skeleton.png

View file

Binary file not shown.

Side by side Before (image error) Size: 447 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_wolf_icon_roam.png

View file

Binary file not shown.

Side by side Before (image error) Size: 165 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_wolf_icon_sit.png

View file

Binary file not shown.

Side by side Before (image error) Size: 169 B

BIN

mods/ENTITIES/mobs_mc/textures/spawn_egg.png

View file

Binary file not shown.

Side by side Before (image error) Size: 158 B

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