Gitoido ecf5d57ad2 chore: resolve conflicts ...

# Conflicts:
#   common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt

2026-10-18 22:16:27 +00:00

..

src

chore: resolve conflicts

2026-10-18 22:16:27 +00:00

build.gradle.kts

Speed up the Gradle build

2026-09-24 10:04:35 +02:00

gradle.properties

…