mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-04 23:38:53 -05:00
# Conflicts: # common/src/main/java/com/cobblemon/mod/common/mixin/PartyScrollMixin.java # 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/api/gui/GuiUtils.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/GeneralPlayerData.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerDataStoreManager.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/JsonPlayerData.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/MongoPlayerData.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/factory/JsonPlayerDataStoreFactory.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/factory/PlayerDataStoreFactory.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/keybind/CobblemonKeyBinds.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/net/SetClientPlayerDataHandler.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/RenderHelper.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/ChangeScaleAndSize.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/ChangeWalkSpeed.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/OpenStarterScreenCommand.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/net/serverhandling/starter/RequestStarterScreenHandler.kt # common/src/main/kotlin/com/cobblemon/mod/common/starter/CobbledStarterHandler.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/MiscUtils.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt # common/src/main/resources/cobblemon-common.accesswidener # fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt