mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-21 07:38:54 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonBakingOverrides.kt # common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PokerodItem.kt # common/src/main/resources/assets/cobblemon/lang/en_us.json # common/src/main/resources/data/cobblemon/tags/block/flowers.json # common/src/main/resources/data/minecraft/tags/block/flowers.json # fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt