mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-18 06:09:01 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerData.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # common/src/main/resources/assets/cobblemon/lang/en_us.json # common/src/main/resources/assets/cobblemon/sounds.json # common/src/main/resources/cobblemon-common.accesswidener