mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-20 23:28:52 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/Poseable.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt # fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt