mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-06 08:18:53 -05:00
Nick
639417d6c8
# Conflicts: # common/build.gradle.kts # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt # common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/RestorationTankBlock.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/entity/GildedChestBlockEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/entity/RestorationTankBlockEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt # common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemonFromPool.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/integration/adorn/AdornCompatibility.kt # common/src/main/kotlin/com/cobblemon/mod/common/integration/jei/berry/BerryMutationProvider.kt # common/src/main/kotlin/com/cobblemon/mod/common/integration/jei/berry/BerryMutationRecipe.kt # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/ItemInteractionEvolution.kt # fabric/build.gradle.kts # fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt # gradle.properties # gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts # gradle/libs.versions.yml # gradle/wrapper/gradle-wrapper.properties # neoforge/build.gradle.kts # neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt # settings.gradle.kts