mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-17 21:58:52 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/scheduling/SchedulingFunctions.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/PoseableEntityState.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt