Paul
a1df69c67a
Merge remote-tracking branch 'origin/1.19.3'
# Conflicts:
# common/build.gradle.kts
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
# common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt
# common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt
# common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt
# common/src/main/kotlin/com/cobblemon/mod/common/client/net/ClientPacketRegistrar.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
# common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/WildRestGoal.kt
# common/src/main/resources/assets/cobblemon/lang/en_us.json