Test e3f8aacd9e Merge branch 'tmfix' into 1.21.1-tm-fixes ...

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/TypeGemClusterBlock.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/tmmachine/TMMachineScreen.kt

2026-03-31 23:20:17 -04:00

..

src

Merge branch 'tmfix' into 1.21.1-tm-fixes

2026-03-31 23:20:17 -04:00

build.gradle.kts

Merge branch 'dynlight-refactor' into 'main'

2025-09-22 07:47:42 +00:00

gradle.properties

…