mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-19 06:38:53 -05:00
# Conflicts: # CHANGELOG.md # common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt