mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-06 08:18:53 -05:00
# Conflicts: # common/src/main/java/com/cobblemon/mod/common/mixin/PlayerMixin.java # common/src/main/java/com/cobblemon/mod/common/mixin/ServerPlayerMixin.java # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt # common/src/main/kotlin/com/cobblemon/mod/common/world/gamerules/CobblemonGameRules.kt # common/src/main/resources/cobblemon-common.accesswidener