mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-17 13:48:53 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt # common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/BattleCountableCriterion.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/gui/GuiUtils.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonBakingOverrides.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PokemonGuiUtils.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/BattleOverlay.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleSwitchPokemonSelection.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt # common/src/main/kotlin/com/cobblemon/mod/common/events/AdvancementHandler.kt # common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/battle/BattleInitializePacket.kt # common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/starter/SetClientPlayerDataPacket.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt # common/src/main/resources/assets/cobblemon/lang/en_us.json