mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-16 21:28:52 -05:00
# Conflicts: # common/src/main/java/com/cobblemon/mod/common/mixin/GameRendererMixin.java # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelGuiFactory.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt # common/src/main/resources/assets/cobblemon/particles/snowstorm.json # common/src/main/resources/mixins.cobblemon-common.json # fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt