mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-20 07:08:53 -05:00
# Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonBlockTags.kt # common/src/main/resources/data/cobblemon/recipe/cooking_pot/whipped_dream_from_cooking_pot.json # common/src/main/resources/data/minecraft/tags/block/logs.json # common/src/main/resources/data/minecraft/tags/item/logs.json # common/src/main/resources/data/minecraft/tags/item/logs_that_burn.json