mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-19 06:38:53 -05:00
# Conflicts: # common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemRendererMixin.java # common/src/main/java/com/cobblemon/mod/common/mixin/client/ModelLoaderMixin.java # common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlockEntities.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonCommands.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatPool.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatPools.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatSpawn.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/ActivatedHabitatSettingsDTO.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/HabitatPoolSettingsDTO.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/HabitatSettingsDTO.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/NaturalHabitatSettingsDTO.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/ActivatedHabitatSpawning.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/HabitatSpawningStyle.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/NaturalHabitatSpawning.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/SpawnLoader.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/influence/detector/SpawningInfluenceDetector.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/entity/BerryBlockEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/habitat/HabitatBlock.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/habitat/HabitatBlockEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/habitat/HabitatEditGUI.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/habitat/HabitatPoolEditorGUI.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/habitat/HabitatSpawnEditorGUI.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/net/habitat/OpenHabitatBlockEditorHandler.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/HabitatBlockRenderer.kt # common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt # common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/habitat/OpenHabitatBlockEditorPacket.kt # common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt # common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/habitat/SaveHabitatBlockSettingsPacket.kt # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt # common/src/main/resources/assets/cobblemon/blockstates/habitat_block.json # common/src/main/resources/assets/cobblemon/lang/en_us.json # common/src/main/resources/data/cobblemon/species/generation1/blastoise.json # common/src/main/resources/data/cobblemon/species/generation1/grimer.json # common/src/main/resources/data/cobblemon/species/generation1/growlithe.json # common/src/main/resources/data/cobblemon/species/generation1/mrmime.json # common/src/main/resources/data/cobblemon/species/generation1/muk.json # common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json # common/src/main/resources/data/cobblemon/species/generation1/weezing.json # common/src/main/resources/data/cobblemon/species/generation2/scizor.json # common/src/main/resources/data/cobblemon/species/generation2/steelix.json # common/src/main/resources/data/cobblemon/species/generation3/absol.json # common/src/main/resources/data/cobblemon/species/generation3/castform.json # common/src/main/resources/data/cobblemon/species/generation3/flygon.json # common/src/main/resources/data/cobblemon/species/generation3/metagross.json # common/src/main/resources/data/cobblemon/species/generation4/garchomp.json # common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json # common/src/main/resources/data/cobblemon/species/generation4/staraptor.json # common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json # common/src/main/resources/data/cobblemon/species/generation5/zorua.json # common/src/main/resources/data/cobblemon/species/generation6/goodra.json # common/src/main/resources/data/cobblemon/species/generation6/inkay.json # common/src/main/resources/data/cobblemon/species/generation6/malamar.json # common/src/main/resources/data/cobblemon/species/generation6/skiddo.json # common/src/main/resources/data/cobblemon/species/generation7/drampa.json # common/src/main/resources/data/cobblemon/species/generation8/duraludon.json # common/src/main/resources/data/cobblemon/species/generation9/archaludon.json # common/src/main/resources/data/cobblemon/species/generation9/orthworm.json