Plastered_Crab 5ff3d163c0 Merge branch 'main' into we_are_cooking_now ...

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt
#	common/src/main/resources/mixins.cobblemon-common.json

2025-04-23 16:06:41 -07:00

..

src/main

Merge branch 'main' into we_are_cooking_now

2025-04-23 16:06:41 -07:00

build.gradle.kts

Modfile tweaks and small mixin fixes

2025-02-21 00:28:37 +00:00

gradle.properties

Updated a bunch of dependencies. Swapped from Forge to NeoForge (Forge is not yet on 1.20.5, might get added back later) Got to a point where we can reload the project in IntelliJ

2024-04-25 12:32:49 -04:00