mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-21 23:58:53 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlockEntities.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt