mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-22 08:08:53 -05:00
# Conflicts: # common/build.gradle.kts # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AbraModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LarvitarModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ElgyemModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililHisuiBiasModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/KlefkiModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GimmighoulRoamingModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/events/AdvancementHandler.kt # common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/BaseCobblemonHeldItemManager.kt # common/src/main/resources/data/cobblemon/advancement/recipes/held/metronome.json # common/src/main/resources/data/cobblemon/advancement/recipes/held/protective_pads.json # common/src/main/resources/data/cobblemon/advancement/recipes/held/punching_glove.json # common/src/main/resources/data/cobblemon/advancement/recipes/held/room_service.json # common/src/main/resources/data/cobblemon/advancement/recipes/held/scope_lens.json # common/src/main/resources/data/cobblemon/advancement/recipes/held/terrain_extender.json # common/src/main/resources/data/cobblemon/advancement/recipes/held/utility_umbrella.json # common/src/main/resources/data/cobblemon/advancement/recipes/held/wide_lens.json # common/src/main/resources/data/cobblemon/advancement/recipes/held/zoom_lens.json # common/src/main/resources/data/cobblemon/recipe/metronome.json # common/src/main/resources/data/cobblemon/recipe/protective_pads.json # common/src/main/resources/data/cobblemon/recipe/punching_glove.json # common/src/main/resources/data/cobblemon/recipe/room_service.json # common/src/main/resources/data/cobblemon/recipe/scope_lens.json # common/src/main/resources/data/cobblemon/recipe/terrain_extender.json # common/src/main/resources/data/cobblemon/recipe/utility_umbrella.json # common/src/main/resources/data/cobblemon/recipe/wide_lens.json # common/src/main/resources/data/cobblemon/recipe/zoom_lens.json