mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-14 12:18:54 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonEntities.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt # common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/ClientMoLangFunctions.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 # common/src/main/resources/cobblemon-common.accesswidener # gradle/libs.versions.yml