mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-20 07:08:53 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt # common/src/main/resources/assets/cobblemon/particles/snowstorm.json # deps/local/com/bedrockk/molang/1.1.5/molang-1.1.5.pom