mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-16 21:28:52 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonEntities.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/storage/adapter/flatfile/NBTStoreAdapter.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt # fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt # forge/src/main/kotlin/com/cobblemon/mod/forge/client/CobblemonForgeClient.kt