Lily 11e2ed34e5 Merge branch 'main' into sega_bass_pro_fishing_2 ...

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonEntities.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
#	fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt
#	forge/src/main/kotlin/com/cobblemon/mod/forge/client/CobblemonForgeClient.kt

2024-02-15 18:54:42 -05:00

..

logs

A lot of moving to get the Forge Client to work again, gradle trial and error

2022-02-16 18:38:08 +01:00

src/main

Merge branch 'main' into sega_bass_pro_fishing_2

2024-02-15 18:54:42 -05:00

build.gradle.kts

Fix compatibility with the Forge version of Carry On, add compatibility for Adorn.

2023-10-18 22:17:35 +01:00

gradle.properties

Fixed most issues in the environment in prod, Pokemon still not rendering outside dev

2022-03-20 22:54:13 +10:00