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

BIN

mods/CORE/mcl_particles/textures/mcl_particles_mob_death.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 262 B

BIN

mods/CORE/mcl_particles/textures/mcl_particles_smoke_anim.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 216 B

BIN

mods/ENTITIES/mcl_boats/textures/mcl_boats_acacia_boat.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 265 B

BIN

mods/ENTITIES/mcl_boats/textures/mcl_boats_birch_boat.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 264 B

BIN

mods/ENTITIES/mcl_boats/textures/mcl_boats_oak_boat.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 267 B

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_minecart_furnace.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 271 B

BIN

mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_activator.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 257 B

BIN

mods/ENTITIES/mcl_mobs/textures/mobs_blood.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 895 B

BIN

mods/ENTITIES/mcl_paintings/textures/mcl_paintings_painting.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 229 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_dolphin.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 443 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_hoglin.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.3 KiB

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_strider.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 2.0 KiB

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_a.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 165 B

BIN

mods/ENTITIES/mobs_mc/textures/extra_mobs_zombified_piglin.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 1.0 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_axolotl_green.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 1.0 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 426 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_diamond.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 181 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_emerald.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 85 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_ghast.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 755 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_gold.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 181 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_black.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 1.5 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_iron.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 1002 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_brown.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 3.0 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_green.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 4.0 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_decor_purple.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 3.9 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_pillager.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 1.0 KiB

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_zombie.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 751 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_stone.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 181 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_stray.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 472 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_stray_overlay.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 595 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_witch.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1000 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_wither.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 622 B

BIN

mods/ENTITIES/mobs_mc/textures/mobs_mc_wither_skeleton.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  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 Width:  |  Height:  |  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 Width:  |  Height:  |  Size: 169 B

BIN

mods/ENTITIES/mobs_mc/textures/spawn_egg.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 158 B

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