mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-18 22:28:53 -05:00
# Conflicts: # CHANGELOG.md # common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.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/pokemon/Pokemon.kt # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/BattleCriticalHitsRequirement.kt