Fun times begin

changelog 1.6.1 prep [skip-ci]
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
2026-11-02 06:19:55 -05:00 · 2025-01-17 18:19:56 -08:00 · 2024-12-26 00:06:13 +00:00 · 2024-12-25 09:08:44 +00:00 · 2024-12-25 09:08:44 +00:00 · 2024-12-25 06:29:12 +00:00
21 changed files with 2006 additions and 1135 deletions
@@ -1,5 +1,10 @@
 # Changelog
-## [1.6.0 - The Record Catch Update (Month Xth, 2024)](#1-6-0)
+## [1.6.1 (Release TBD)](#1-6-1)
+
+### Fixes
+- Fix Pokédex sometimes crashing when switching forms
+
+## [1.6.0 - The Record Catch Update (December 25th, 2024)](#1-6-0)
 #### "Now that there's a fishing mechanic, the mod is actually good!"

 ### Additions
@@ -124,9 +129,6 @@
 #### Gen 9
 - Wattrel
 - Kilowattrel
- Wiglett
- Wugtrio
- Flamigo
 - Veluza
 - Farigiraf
 - Klawf
@@ -15,6 +15,8 @@ import utilities.version
 */

 plugins {
+    alias(libs.plugins.moddev)
+
    id("cobblemon.base-conventions")
    id("cobblemon.publish-conventions")

@@ -23,38 +25,38 @@ plugins {
    id("net.nemerosa.versioning") version "3.1.0"
 }

-architectury {
-    common("neoforge", "fabric")
+neoForge {
+    neoFormVersion = "1.21.1-20240808.144430"
 }

 repositories {
    maven(url = "${rootProject.projectDir}/deps")
    maven(url = "https://api.modrinth.com/maven")
+    maven(url = "https://maven.fabricmc.net/")
    maven(url = "https://maven.neoforged.net/releases")
    mavenLocal()
 }

 dependencies {
    implementation(libs.bundles.kotlin)
-    modImplementation(libs.fabric.loader)
-    modApi(libs.molang)
+    implementation(libs.bundles.mixins)
+
+    api(libs.molang)
+    compileOnly(libs.graal)
+    compileOnly(libs.bundles.mongo)

-    // Integrations
    compileOnlyApi(libs.jei.api)
-    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
-        isTransitive = false
-    }
-    // Flywheel has no common dep so just pick one and don't use any platform specific code in common
-    // modCompileOnly(libs.flywheelFabric)
+//    compileOnly(libs.bundles.fabric.integrations.compileOnly) {
+//        isTransitive = false
+//    }

-    // Showdown
-    modCompileOnly(libs.graal)
-
-    // Data Storage
-    modCompileOnly(libs.bundles.mongo)
-
-    // Unit Testing
    testImplementation(libs.bundles.unitTesting)
+    testRuntimeOnly(libs.junit.fabric)
+
+//    // Integrations
+//    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
+//        isTransitive = false
+//    }
 }

 tasks.withType<Test> {
@@ -94,4 +96,10 @@ sourceSets {
            }
        }
    }
+}
+
+// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
+idea {
+    module.isDownloadJavadoc = true
+    module.isDownloadSources = true
 }
@@ -595,6 +595,8 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
    }

    private fun switchForm(nextIndex: Boolean) {
+        selectedPoseIndex = 0
+
        if (nextIndex) {
            if (selectedFormIndex < visibleForms.lastIndex) selectedFormIndex++
            else selectedFormIndex = 0
@@ -15,7 +15,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_badlands</summary>

- #c:mesa
+- #c:is_badlands
+- #clifftree:dry_badlands
 - #minecraft:is_badlands
 - terralith:ashen_savanna
 - terralith:red_oasis
@@ -57,9 +58,9 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_cave</summary>

- #c:caves
- #c:underground
- #forge:is_underground
+- #c:is_cave
+- #c:is_underground
+- #clifftree:all_caves
 - biomesoplenty:glowing_grotto
 - biomesoplenty:spider_nest
 - minecraft:dripstone_caves
@@ -105,7 +106,9 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_coast</summary>

- #c:stony_shores
+- #c:is_beach
+- #c:is_stony_shores
+- #clifftree:is_cliff
 - #cobblemon:is_beach
 - minecraft:stony_shore
 - terralith:basalt_cliffs
@@ -131,13 +134,13 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_cold</summary>

 - #byg:is_cold
- #c:climate_cold
+- #c:is_cold
+- #c:is_cold/overworld
 - #cobblemon:is_cold_ocean
 - #cobblemon:is_freezing
 - #cobblemon:is_peak
 - #cobblemon:is_taiga
 - #cobblemon:is_tundra
- #forge:is_cold/overworld
 - biomesoplenty:aspen_forest
 - biomesoplenty:bog
 - biomesoplenty:cold_desert
@@ -148,6 +151,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
 - biomesoplenty:pumpkin_patch
 - biomesoplenty:seasonal_forest
 - biomesoplenty:seasonal_orchard
+- clifftree:cold_caves
+- clifftree:cold_river
 - wythers:berry_bog

 </details>
@@ -177,7 +182,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_deep_ocean</summary>

- #c:deep_ocean
+- #c:is_deep_ocean
 - #minecraft:is_deep_ocean
 - wythers:deep_icy_ocean

@@ -187,9 +192,11 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_desert</summary>

 - #byg:is_desert
- #c:desert
+- #c:is_desert
+- #clifftree:is_desert
 - #wythers:is_desert
 - biomesoplenty:lush_desert
+- clifftree:desert_cliff
 - darkerdepths:sandy_catacombs
 - minecraft:desert
 - terralith:ancient_sands
@@ -225,12 +232,22 @@ This file contains tags related to different biomes in cobblemon, as well as som

 </details>

+<details>
+<summary><b>Tag:</b> #biome:is_end</summary>
+
+- #c:is_end
+- #minecraft:is_end
+- endercon:end_border
+- endercon:end_hallows
+
+</details>
+
 <details>
 <summary><b>Tag:</b> #biome:is_floral</summary>

 - #byg:is_floral
- #c:floral
- #c:flower_forests
+- #c:flower_forest
+- #c:is_floral
 - biomesoplenty:bamboo_grove
 - biomesoplenty:cherry_blossom_grove
 - biomesoplenty:field
@@ -270,8 +287,9 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_forest</summary>

- #c:flower_forests
- #c:tree_deciduous
+- #c:is_flower_forest
+- #c:is_forest
+- #c:tree/deciduous
 - #minecraft:is_forest
 - biomesoplenty:bamboo_grove
 - biomesoplenty:cherry_blossom_grove
@@ -315,8 +333,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
 - #cobblemon:is_frozen_ocean
 - #cobblemon:is_glacial
 - #cobblemon:is_snowy
- #forge:is_snowy
 - byg:cardinal_tundra
+- clifftree:frozen_caves
 - minecraft:frozen_river
 - minecraft:jagged_peaks
 - minecraft:snowy_beach
@@ -361,7 +379,9 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_glacial</summary>

 - #byg:is_icy
- #c:icy
+- #c:is_icy
+- clifftree:glacier_cliff
+- clifftree:glacier_valley
 - minecraft:frozen_peaks
 - minecraft:ice_spikes
 - terralith:cave/frostfire_caves
@@ -406,9 +426,10 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_hills</summary>

- #c:mountain_slope
+- #c:is_hill
+- #c:is_mountain/slope
+- #c:is_windswept
 - #cobblemon:is_highlands
- #forge:is_slope
 - #minecraft:is_hill
 - biomesoplenty:jade_cliffs
 - biomesoplenty:mediterranean_forest
@@ -458,9 +479,11 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_jungle</summary>

+- #c:is_jungle
 - #minecraft:is_jungle
 - biomesoplenty:floodplain
 - biomesoplenty:rainforest
+- clifftree:tropical_river
 - terralith:cave/underground_jungle
 - wythers:dripleaf_swamp
 - wythers:eucalyptus_deanei_forest
@@ -492,9 +515,10 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_lush</summary>

- #forge:is_lush
+- #c:is_lush
 - byg:lush_stacks
 - minecraft:lush_caves
+- terralith:cave/fungal_caves
 - terralith:cave/underground_jungle
 - wythers:dripleaf_swamp
 - wythers:lichenous_caves
@@ -509,6 +533,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_magical</summary>

 - #byg:is_magical
+- #c:is_magical
 - #wythers:is_dark_forest
 - biomesoplenty:aspen_forest
 - biomesoplenty:mystic_grove
@@ -528,8 +553,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_mountain</summary>

+- #c:is_mountain
 - #cobblemon:is_hills
- #forge:is_mountain
 - #minecraft:is_mountain
 - biomesoplenty:crag
 - terralith:stony_spires
@@ -546,8 +571,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_mushroom</summary>

- #c:mushroom
- #forge:is_mushroom
+- #c:is_mushroom
+- #c:is_mushroom_island
 - biomesoplenty:fungal_jungle
 - biomesoplenty:glowing_grotto
 - biomesoplenty:mystic_grove
@@ -571,7 +596,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_ocean</summary>

- #cobblemon:is_coast
+- #c:is_ocean
 - #cobblemon:is_cold_ocean
 - #cobblemon:is_deep_ocean
 - #cobblemon:is_frozen_ocean
@@ -579,12 +604,14 @@ This file contains tags related to different biomes in cobblemon, as well as som
 - #cobblemon:is_temperate_ocean
 - #cobblemon:is_warm_ocean
 - #minecraft:is_ocean
+- clifftree:stone_ocean

 </details>

 <details>
 <summary><b>Tag:</b> #biome:is_overworld</summary>

+- #c:is_overworld
 - #cobblemon:is_arid
 - #cobblemon:is_cave
 - #cobblemon:is_coast
@@ -613,8 +640,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_peak</summary>

- #c:mountain_peak
- #forge:is_peak
+- #c:is_mountain/peak
 - minecraft:frozen_peaks
 - minecraft:jagged_peaks
 - minecraft:snowy_slopes
@@ -632,9 +658,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_plains</summary>

 - #byg:is_plains
- #c:plains
+- #c:is_plains
 - #cobblemon:is_highlands
- #forge:is_plains
 - biomesoplenty:clover_patch
 - biomesoplenty:field
 - biomesoplenty:fir_clearing
@@ -645,6 +670,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 - biomesoplenty:pasture
 - biomesoplenty:prairie
 - biomesoplenty:seasonal_orchard
+- clifftree:sparse_forest
 - minecraft:plains
 - minecraft:sunflower_plains
 - terralith:brushland
@@ -665,7 +691,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_plateau</summary>

 - #byg:is_plateau
- #forge:is_plateau
+- #c:is_plateau
 - minecraft:savanna_plateau
 - wythers:ayers_rock

@@ -674,6 +700,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_river</summary>

+- #c:is_river
 - #minecraft:is_river
 - terralith:warm_river
 - wythers:guelta
@@ -685,17 +712,22 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_sandy</summary>

 - #byg:is_sandy
+- #c:is_sandy
 - #cobblemon:is_badlands
 - #cobblemon:is_desert
+- clifftree:warm_river

 </details>

 <details>
 <summary><b>Tag:</b> #biome:is_savanna</summary>

+- #c:is_savanna
 - #minecraft:is_savanna
 - biomesoplenty:lush_desert
 - biomesoplenty:lush_savanna
+- clifftree:oasis
+- clifftree:shrubland
 - terralith:arid_highlands
 - terralith:ashen_savanna
 - terralith:brushland
@@ -715,8 +747,6 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_shrubland</summary>

- #cobblemon:is_plains
- #cobblemon:is_savanna
 - biomesoplenty:bog
 - biomesoplenty:dryland
 - biomesoplenty:field
@@ -727,6 +757,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 - biomesoplenty:rocky_shrubland
 - biomesoplenty:scrubland
 - biomesoplenty:shrubland
+- clifftree:shrubland
 - terralith:alpine_highlands
 - terralith:arid_highlands
 - terralith:brushland
@@ -764,11 +795,14 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_snowy</summary>

 - #byg:is_snowy
- #c:snowy
+- #c:is_snowy
 - #cobblemon:is_glacial
 - #cobblemon:is_snowy_forest
 - #cobblemon:is_snowy_taiga
 - byg:cardinal_tundra
+- clifftree:bog
+- clifftree:snowy_diorite_shore
+- clifftree:tundra
 - minecraft:jagged_peaks
 - minecraft:snowy_beach
 - minecraft:snowy_plains
@@ -809,6 +843,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 - biomesoplenty:snowy_coniferous_forest
 - biomesoplenty:snowy_fir_clearing
 - biomesoplenty:snowy_maple_woods
+- clifftree:snowy_old_growth_taiga
 - minecraft:grove
 - minecraft:snowy_taiga
 - terralith:alpine_grove
@@ -828,7 +863,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_spooky</summary>

 - #byg:is_spooky
- #forge:is_spooky
+- #c:is_spooky
 - #wythers:is_dark_forest
 - biomesoplenty:ominous_woods
 - byg:ebony_woods
@@ -843,8 +878,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_swamp</summary>

 - #byg:is_swamp
- #c:swamp
- #forge:is_swamp
+- #c:is_swamp
+- #clifftree:is_swamp
 - #wythers:is_swamp
 - biomesoplenty:bayou
 - biomesoplenty:bog
@@ -862,9 +897,9 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_taiga</summary>

- #c:tree_coniferous
+- #c:is_taiga
+- #c:tree/coniferous
 - #cobblemon:is_snowy_taiga
- #forge:is_coniferous
 - #minecraft:is_taiga
 - biomesoplenty:coniferous_forest
 - biomesoplenty:dead_forest
@@ -874,6 +909,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 - biomesoplenty:mediterranean_forest
 - biomesoplenty:redwood_forest
 - biomesoplenty:wetland
+- clifftree:cold_river
 - terralith:bryce_canyon
 - terralith:cloud_forest
 - terralith:haze_mountain
@@ -916,6 +952,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_temperate_ocean</summary>

+- clifftree:stone_ocean
 - minecraft:deep_ocean
 - minecraft:ocean

@@ -925,6 +962,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <summary><b>Tag:</b> #biome:is_thermal</summary>

 - biomesoplenty:hot_springs
+- clifftree:inferno
 - terralith:caldera
 - terralith:cave/thermal_caves
 - terralith:yellowstone
@@ -951,12 +989,14 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #biome:is_tundra</summary>

- #c:snowy_plains
+- #c:is_snowy_plains
 - biomesoplenty:cold_desert
 - biomesoplenty:muskeg
 - biomesoplenty:snowy_fir_clearing
 - biomesoplenty:tundra
 - byg:cardinal_tundra
+- clifftree:bog
+- clifftree:tundra
 - minecraft:ice_spikes
 - minecraft:snowy_plains
 - terralith:cold_shrubland
@@ -1119,549 +1159,11 @@ This file contains tags related to different biomes in cobblemon, as well as som

 </details>

-<details>
-<summary><b>Tag:</b> #has_block:acacia_log</summary>
-
- biomesoplenty:amethyst_canyon
- biomesoplenty:amethyst_rainforest
- biomesoplenty:lush_desert
- byg:araucaria_savanna
- byg:baobab_savanna
- byg:black_forest
- minecraft:savanna
- minecraft:savanna_plateau
- minecraft:windswept_savanna
- terralith:arid_highlands
- terralith:ashen_savanna
- terralith:fractured_savanna
- terralith:hot_shrubland
- terralith:moonlight_grove
- terralith:moonlight_valley
- terralith:savanna_badlands
- terralith:savanna_slopes
- wythers:bamboo_jungle_canyon
- wythers:bamboo_jungle_highlands
- wythers:bamboo_jungle_swamp
- wythers:bayou
- wythers:dry_savanna
- wythers:dry_tropical_forest
- wythers:eucalyptus_danei_forest
- wythers:eucalyptus_jungle
- wythers:eucalyptus_jungle_canyon
- wythers:eucalyptus_salubris_woodland
- wythers:flooded_jungle
- wythers:flooded_rainforest
- wythers:flooded_savanna
- wythers:flowering_platanal
- wythers:huangshan_highlands
- wythers:humid_tropical_grassland
- wythers:jacaranda_savanna
- wythers:jungle_canyon
- wythers:jungle_island
- wythers:lapacho_plains
- wythers:mediterranean_island
- wythers:mediterranean_island_thermal_spring
- wythers:mushroom_island
- wythers:pantanal
- wythers:sakura_forest
- wythers:savanna_badlands
- wythers:scrub_forest
- wythers:tropical_forest
- wythers:tropical_forest_canyon
- wythers:tropical_grassland
- wythers:tropical_rainforest
- wythers:tsingy_forest
- wythers:wooded_desert
- wythers:wooded_savanna
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:apricorn_log</summary>
-
- #cobblemon:is_badlands
- #cobblemon:is_desert
- #cobblemon:is_forest
- #cobblemon:is_grassland
- #cobblemon:is_hills
- #cobblemon:is_jungle
- #cobblemon:is_snowy_forest
- #cobblemon:is_swamp
- #cobblemon:is_taiga
- #cobblemon:is_tundra
- minecraft:sparse_jungle
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:birch_log</summary>
-
- #c:birch_forest
- biomesoplenty:aspen_glade
- biomesoplenty:auroral_garden
- biomesoplenty:seasonal_forest
- biomesoplenty:seasonal_orchard
- byg:aspen_forest
- byg:autumnal_forest
- byg:borealis_grove
- byg:howling_peaks
- byg:temperate_grove
- minecraft:birch_forest
- minecraft:flower_forest
- minecraft:forest
- minecraft:old_growth_birch_forest
- terralith:alpine_highlands
- terralith:arid_highlands
- terralith:birch_taiga
- terralith:blooming_valley
- terralith:cloud_forest
- terralith:haze_mountain
- terralith:lavender_forest
- terralith:lavender_valley
- terralith:lush_valley
- terralith:orchid_swamp
- terralith:sakura_grove
- terralith:sakura_valley
- terralith:shield
- terralith:temperate_highlands
- terralith:white_cliffs
- terralith:yosemite_lowlands
- wythers:aspen_crags
- wythers:autumnal_birch_forest
- wythers:autumnal_flower_forest
- wythers:autumnal_forest
- wythers:autumnal_forest_edge
- wythers:birch_swamp
- wythers:birch_taiga
- wythers:boreal_forest_red
- wythers:boreal_forest_yellow
- wythers:cool_forest
- wythers:cool_forest_edge
- wythers:eucalyptus_danei_forest
- wythers:eucalyptus_jungle
- wythers:eucalyptus_jungle_canyon
- wythers:eucalyptus_woodland
- wythers:sparse_eucalyptus_jungle
- wythers:sparse_eucalyptus_woodland
- wythers:temperate_island
- wythers:thermal_taiga
- wythers:thermal_taiga_crags
- wythers:warm_birch_forest
- wythers:waterlily_swamp
- wythers:windswept_forest
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:cherry_log</summary>
-
- minecraft:cherry_grove
- terralith:sakura_grove
- terralith:sakura_valley
- terralith:snowy_cherry_grove
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:crimson_log</summary>
-
- betternether:crimson_glowing_woods
- betternether:crimson_pinewood
- byg:crimson_gardens
- gardens_of_the_dead:whistling_woods
- minecraft:crimson_forest
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:dark_oak_log</summary>
-
- biomesoplenty:mystic_grove
- biomesoplenty:pumpkin_patch
- biomesoplenty:seasonal_forest
- byg:coconino_meadow
- byg:temperate_rainforest
- minecraft:dark_forest
- terralith:lavender_forest
- terralith:lavender_valley
- terralith:mirage_isles
- terralith:temperate_highlands
- wythers:ancient_moss_forest
- wythers:ancient_mossy_swamp
- wythers:dry_tropical_forest
- wythers:flooded_savanna
- wythers:highland_tropical_rainforest
- wythers:humid_tropical_grassland
- wythers:jungle_canyon
- wythers:pantanal
- wythers:phantasmal_forest
- wythers:phantasmal_swamp
- wythers:sparse_bamboo_jungle
- wythers:tropical_forest
- wythers:tropical_forest_canyon
- wythers:tropical_grassland
- wythers:tsingy_forest
- wythers:waterlily_swamp
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:flowering_azalea_leaves</summary>
-
- minecraft:lush_caves
- terralith:amethyst_canyon
- terralith:amethyst_rainforest
- terralith:blooming_valley
- terralith:desert_oasis
- terralith:desert_spires
- terralith:red_oasis
- terralith:sandstone_valley
- wythers:ancient_mossy_swamp
- wythers:flooded_jungle
- wythers:flooded_rainforest
- wythers:flowering_platanal
- wythers:jacaranda_savanna
- wythers:lush_shroom_cave
- wythers:mossy_cave
- wythers:pantanal
- wythers:sandy_jungle
- wythers:sparse_bamboo_jungle
- wythers:tropical_grassland
- wythers:tropical_island
- wythers:tropical_rainforest
- wythers:tsingy_forest
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:gravel</summary>
-
- biomesoplenty:cold_desert
- minecraft:windswept_gravelly_hills
- terralith:gravel_beach
- terralith:gravel_desert
- wythers:gravelly_beach
- wythers:gravelly_river
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:jungle_log</summary>
-
- #minecraft:is_jungle
- biomesoplenty:fungal_jungle
- biomesoplenty:rainforest
- byg:crag_gardens
- terralith:jungle_mountains
- terralith:rocky_jungle
- terralith:tropical_jungle
- wythers:bamboo_jungle_swamp
- wythers:desert_island
- wythers:desert_lake
- wythers:desert_river
- wythers:eucalyptus_danei_forest
- wythers:eucalyptus_jungle
- wythers:eucalyptus_jungle_canyon
- wythers:flooded_jungle
- wythers:flooded_rainforest
- wythers:flowering_platanal
- wythers:humid_tropical_grassland
- wythers:jacaranda_savanna
- wythers:jungle_island
- wythers:lapacho_plains
- wythers:mushroom_island
- wythers:pantanal
- wythers:sandy_jungle
- wythers:sparse_bamboo_jungle
- wythers:sparse_eucalyptus_jungle
- wythers:tropical_grassland
- wythers:tropical_island
- wythers:tropical_rainforest
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:mangrove_log</summary>
-
- minecraft:mangrove_swamp
- terralith:cave/underground_jungle
- wythers:coastal_mangrove
- wythers:dry_tropical_forest
- wythers:eucalyptus_danei_forest
- wythers:eucalyptus_jungle
- wythers:eucalyptus_jungle_canyon
- wythers:flooded_savanna
- wythers:forbidden_forest
- wythers:highland_tropical_rainforest
- wythers:jungle_canyon
- wythers:jungle_island
- wythers:mushroom_island
- wythers:sparse_eucalyptus_jungle
- wythers:tangled_forest
- wythers:tropical_forest
- wythers:tropical_forest_canyon
- wythers:tropical_grassland
- wythers:tropical_island
- wythers:tropical_rainforest
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:mud</summary>
-
- minecraft:mangrove_swamp
- terralith:cave/underground_jungle
- wythers:coastal_mangrove
- wythers:dripleaf_swamp
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:oak_log</summary>
-
- biomesoplenty:bamboo_grove
- biomesoplenty:cherry_blossom_grove
- biomesoplenty:dead_forest
- biomesoplenty:dryland
- biomesoplenty:floodplain
- biomesoplenty:lavender_forest
- biomesoplenty:maple_woods
- biomesoplenty:muskeg
- biomesoplenty:mystic_grove
- biomesoplenty:old_growth_woodland
- biomesoplenty:orchard
- biomesoplenty:origin_valley
- biomesoplenty:prairie
- biomesoplenty:seasonal_forest
- biomesoplenty:snowy_maple_woods
- biomesoplenty:woodland
- byg:autumnal_forest
- byg:coconino_meadow
- byg:mojave_desert
- byg:orchard
- byg:prairie
- byg:red_oak_forest
- byg:temperate_rainforest
- byg:white_mangrove_marshes
- minecraft:flower_forest
- minecraft:forest
- minecraft:swamp
- minecraft:windswept_forest
- minecraft:wooded_badlands
- terralith:alpha_islands
- terralith:alpha_islands_winter
- terralith:birch_taiga
- terralith:blooming_valley
- terralith:desert_oasis
- terralith:desert_spires
- terralith:forested_highlands
- terralith:fractured_savanna
- terralith:haze_mountain
- terralith:ice_marsh
- terralith:lavender_forest
- terralith:lavender_valley
- terralith:lush_valley
- terralith:mirage_isles
- terralith:red_oasis
- terralith:sakura_grove
- terralith:sakura_valley
- terralith:sandstone_valley
- terralith:shrubland
- terralith:temperate_highlands
- wythers:ancient_emerald_beech_forest
- wythers:ancient_golden_beech_forest
- wythers:ancient_oak_swamp
- wythers:ancient_tropical_beech_forest
- wythers:autumnal_flower_forest
- wythers:autumnal_forest
- wythers:autumnal_forest_edge
- wythers:autumnal_swamp
- wythers:birch_taiga
- wythers:boreal_forest_red
- wythers:boreal_forest_yellow
- wythers:boreal_forest_yellow
- wythers:cool_forest
- wythers:cool_forest_edge
- wythers:dry_tropical_forest
- wythers:flooded_temperate_rainforest
- wythers:flowering_platanal
- wythers:forbidden_forest
- wythers:forest_edge
- wythers:highland_tropical_rainforest
- wythers:humid_tropical_grassland
- wythers:jacaranda_savanna
- wythers:jungle_canyon
- wythers:jungle_island
- wythers:lapacho_plains
- wythers:larch_taiga
- wythers:maple_mountains
- wythers:mushroom_island
- wythers:sandy_jungle
- wythers:savanna_badlands
- wythers:sparse_bamboo_jungle
- wythers:spring_flower_forest
- wythers:subtropical_forest
- wythers:subtropical_forest_edge
- wythers:tangled_forest
- wythers:temperate_island
- wythers:temperate_rainforest
- wythers:temperate_rainforest_crags
- wythers:tropical_forest
- wythers:tropical_forest
- wythers:tropical_forest_canyon
- wythers:tropical_grassland
- wythers:tropical_rainforest
- wythers:tsingy_forest
- wythers:windswept_forest
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:red_sand</summary>
-
- #minecraft:is_badlands
- byg:atacama_desert
- byg:red_rock_valley
- terralith:ancient_sands
- terralith:arid_highlands
- terralith:bryce_canyon
- terralith:painted_mountains
- terralith:red_oasis
- wythers:ayers_rock
- wythers:badlands_desert
- wythers:badlands_jungle_canyon
- wythers:billabong
- wythers:kwongan_heath
- wythers:outback
- wythers:outback_desert
- wythers:red_desert
- wythers:red_rock_canyon
- wythers:wooded_badlands
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:sand</summary>
-
- byg:mojave_desert
- minecraft:desert
- terralith:ancient_sands
- terralith:cave/desert_caves
- terralith:desert_canyon
- terralith:desert_oasis
- terralith:desert_spires
- terralith:lush_desert
- terralith:sandstone_valley
- terralith:white_mesa
- wythers:cactus_desert
- wythers:deep_desert
- wythers:desert_island
- wythers:desert_pinnacles
- wythers:guelta
- wythers:sand_dunes
- wythers:sandy_jungle
- wythers:wooded_desert
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:spruce_log</summary>
-
- biomesoplenty:dead_forest
- biomesoplenty:field
- biomesoplenty:forested_field
- biomesoplenty:hot_springs
- biomesoplenty:jade_cliffs
- biomesoplenty:maple_woods
- biomesoplenty:mediterranean_forest
- biomesoplenty:snowy_maple_woods
- biomesoplenty:wetland
- byg:autumnal_taiga
- byg:autumnal_valley
- byg:borealis_grove
- byg:canadian_shield
- byg:coniferous_forest
- byg:frosted_coniferous_forest
- byg:frosted_taiga
- byg:howling_peaks
- byg:rose_fields
- byg:weeping_witch_forest
- minecraft:grove
- minecraft:old_growth_pine_taiga
- minecraft:old_growth_spruce_taiga
- minecraft:snowy_taiga
- minecraft:taiga
- minecraft:windswept_forest
- terralith:alpine_grove
- terralith:alpine_highlands
- terralith:bryce_canyon
- terralith:cloud_forest
- terralith:cold_shrubland
- terralith:forested_highlands
- terralith:haze_mountain
- terralith:ice_marsh
- terralith:lush_valley
- terralith:rocky_shrubland
- terralith:sakura_grove
- terralith:sakura_valley
- terralith:shield
- terralith:siberian_grove
- terralith:siberian_taiga
- terralith:snowy_maple_forest
- terralith:snowy_shield
- terralith:wintry_forest
- terralith:wintry_lowlands
- terralith:yellowstone
- terralith:yosemite_lowlands
- wythers:ancient_taiga
- wythers:bamboo_jungle_canyon
- wythers:birch_taiga
- wythers:boreal_forest_red
- wythers:boreal_forest_yellow
- wythers:cold_island
- wythers:cool_forest
- wythers:cool_forest_edge
- wythers:deep_snowy_taiga
- wythers:fen
- wythers:flooded_temperate_rainforest
- wythers:forested_highlands
- wythers:giant_sequoia_forest
- wythers:huangshan_highlands
- wythers:jade_highlands
- wythers:larch_taiga
- wythers:maple_mountains
- wythers:old_growth_taiga_crags
- wythers:old_growth_taiga_swamp
- wythers:pine_barrens
- wythers:snowy_fen
- wythers:snowy_peaks
- wythers:snowy_thermal_taiga
- wythers:taiga_crags
- wythers:temperate_island
- wythers:temperate_rainforest
- wythers:temperate_rainforest_crags
- wythers:thermal_taiga
- wythers:thermal_taiga_crags
- wythers:windswept_forest
-
-</details>
-
-<details>
-<summary><b>Tag:</b> #has_block:warped_log</summary>
-
- betternether:old_warped_woods
- byg:crimson_gardens
- byg:wailing_garth
- byg:warped_desert
- minecraft:warped_forest
- wythers:deep_dark_forest
-
-</details>
-
 <details>
 <summary><b>Tag:</b> #has_density:dense</summary>

- #c:vegetation_dense
+- #c:is_dense_vegetation
+- #c:is_dense_vegetation/overworld
 - #cobblemon:is_jungle
 - #forge:is_dense
 - #forge:is_dense/overworld
@@ -1673,7 +1175,8 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #has_density:sparse</summary>

- #c:vegetation_sparse
+- #c:is_sparse_vegetation
+- #c:is_sparse_vegetation/overworld
 - #cobblemon:is_arid
 - #cobblemon:is_grassland
 - #cobblemon:is_tundra
@@ -1715,7 +1218,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 <details>
 <summary><b>Tag:</b> #has_feature:revival_herbs</summary>

- minecraft:lush_caves
+- #cobblemon:is_lush

 </details>

@@ -5,7 +5,7 @@ This file contains tags related to different types of entities in cobblemon.
 ## Tags:

 <details>
-<summary><b>Tag:</b> #entity_types:boats</summary>
+<summary><b>Tag:</b> #entity_type:boats</summary>

 - cobblemon:boat
 - cobblemon:chest_boat
@@ -13,7 +13,7 @@ This file contains tags related to different types of entities in cobblemon.
 </details>

 <details>
-<summary><b>Tag:</b> #entity_types:cannot_have_name_tag</summary>
+<summary><b>Tag:</b> #entity_type:cannot_have_name_tag</summary>

 - cobblemon:empty_pokeball
 - cobblemon:pokemon
@@ -8,63 +8,38 @@ This file contains all current spawn presets of cobblemon.

 ## ancient_city

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **maxY** | `62` |  |
-| **neededNearbyBlocks** | `minecraft:chiseled_deepslate`; `minecraft:cobbled_deepslate_wall`; `minecraft:cracked_deepslate_bricks`; `minecraft:cracked_deepslate_tiles`; `minecraft:deepslate_brick_slab`; `minecraft:deepslate_brick_stairs`; `minecraft:deepslate_brick_wall`; `minecraft:deepslate_bricks`; `minecraft:deepslate_tile_slab`; `minecraft:deepslate_tile_stairs`; `minecraft:deepslate_tile_wall`; `minecraft:deepslate_tiles`; `minecraft:polished_basalt`; `minecraft:polished_deepslate`; `minecraft:polished_deepslate_slab`; `minecraft:polished_deepslate_wall` |  |
-| **structures** | `minecraft:ancient_city` |  |
-## apricorns
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `cobblemon:black_apricorn`; `cobblemon:blue_apricorn`; `cobblemon:green_apricorn`; `cobblemon:pink_apricorn`; `cobblemon:red_apricorn`; `cobblemon:white_apricorn`; `cobblemon:yellow_apricorn` |  |
-## blue_flowers
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:blue_orchid`; `minecraft:cornflower`; `aether_redux:pink_prismatic_petals`; `aether_redux:mixed_prismatic_petals`; `aether_redux:teal_prismatic_petals`; `biomesoplenty:blue_hydrangea`; `biomesoplenty:blue_hydrangea_bottom`; `biomesoplenty:blue_hydrangea_top`; `biomesoplenty:icy_iris`; `blue_skies:moonlit_bloom`; `blue_skies:nightcress`; `botania:blue_double_flower`; `botania:blue_floating_flower`; `botania:blue_mystical_flower`; `botania:blue_shiny_flower`; `botania:cyan_double_flower`; `botania:cyan_floating_flower`; `botania:cyan_mystical_flower`; `botania:cyan_shiny_flower`; `botania:floating_hydroangeas`; `botania:floating_labellia`; `botania:floating_manastar`; `botania:floating_marimorphosis`; `botania:floating_marimorphosis_chibi`; `botania:floating_spectrolus`; `botania:floating_tangleberrie`; `botania:floating_tangleberrie_chibi`; `botania:hydroangeas`; `botania:hydroangeas_motif`; `botania:labellia`; `botania:light_blue_double_flower`; `botania:light_blue_floating_flower`; `botania:light_blue_mystical_flower`; `botania:light_blue_shiny_flower`; `botania:manastar`; `botania:marimorphosis`; `botania:marimorphosis_chibi`; `botania:spectrolus`; `botania:tangleberrie`; `botania:tangleberrie_chibi`; `etcetera:bouquet`; `goodending:pastel_wildflowers`; `goodending:twilight_wildflowers`; `mythicbotany:aquapanthus`; `mythicbotany:aquapanthus_floating`; `mythicbotany:raindeletia`; `mythicbotany:raindeletia_floating`; `outer_end:azure_bud`; `wilderwild:blue_giany_glory_of_the_snow` |  |
+| Key                    | Conditions                       | Anticonditions |
+|------------------------|----------------------------------|----------------|
+| **maxY**               | `62`                             |                |
+| **neededNearbyBlocks** | `#cobblemon:ancient_city_blocks` |                |
+| **structures**         | `minecraft:ancient_city`         |                |
 ## derelict

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **canSeeSky** | `False` |  |
-| **maxLight** | `0` |  |
-| **neededBaseBlocks** |  | `#minecraft:animals_spawnable_on`; `#minecraft:crystal_sound_blocks`; `#minecraft:base_stone_nether`; `#minecraft:base_stone_overworld`; `#minecraft:coal_ores`; `#minecraft:copper_ores`; `#minecraft:coral_blocks`; `#minecraft:diamond_ores`; `#minecraft:dirt`; `#minecraft:dirt_like`; `#minecraft:emerald_ores`; `#minecraft:sculk_replaceable`; `#minecraft:gold_ores`; `#minecraft:grass`; `#minecraft:gravel`; `#minecraft:ice`; `#minecraft:iron_ores`; `#minecraft:lapis_ores`; `#minecraft:logs`; `#minecraft:nylium`; `#minecraft:redstone_ores`; `#minecraft:sand`; `#minecraft:snow`; `#minecraft:terracotta`; `#minecraft:valid_spawn`; `#c:adamantite_ores`; `#c:aetherium_ores`; `#c:aluminum_ores`; `#c:amethyst_blocks`; `#c:amethyst_ores`; `#c:ancient_debris`; `#c:antimony_ores`; `#c:aquarium_ores`; `#c:asterite_ores`; `#c:asteroid_asterite_ores`; `#c:banglum_ores`; `#c:basalt`; `#c:bauxite_ores`; `#c:bone_blocks`; `#c:carmot_ores`; `#c:certus_quartz_ores`; `#c:cinnabar_ores`; `#c:cobalt_ores`; `#c:coral_blocks`; `#c:dirt`; `#c:end_stones`; `#c:galaxium_ores`; `#c:galena_ores`; `#c:gravel`; `#c:galena_ores`; `#c:kyber_ores`; `#c:lead_ores`; `#c:lignite_coal_ores`; `#c:logs`; `#c:lunum_ores`; `#c:lutetium_ores`; `#c:manganese_ores`; `#c:meteor_metite_ores`; `#c:metite_ores`; `#c:midas_gold_ores`; `#c:moon_lunum_ores`; `#c:mozanite_ores`; `#c:mythril_ores`; `#c:natural_stones`; `#c:netherrack`; `#c:nether_mycelium`; `#c:nickel_ores`; `#c:nikolite_ores`; `#c:ores`; `#c:orichalcum_ores`; `#c:osmium_ores`; `#c:palladium_ores`; `#c:peridot_ores`; `#c:platinum_ores`; `#c:prometheum_ores`; `#c:pyrite_ores`; `#c:quadrillum_ores`; `#c:quartz_ores`; `#c:raw_antimony_ores`; `#c:raw_copper_ores`; `#c:raw_gold_ores`; `#c:raw_iridium_ores`; `#c:raw_iron_ores`; `#c:raw_lead_ores`; `#c:raw_nickel_ores`; `#c:raw_platinum_ores`; `#c:raw_silver_ores`; `#c:raw_tin_ores`; `#c:raw_titanium_ores`; `#c:raw_tungsten_ores`; `#c:raw_uranium_ores`; `#c:red_sandstones`; `#c:ruby_ores`; `#c:runite_ores`; `#c:salt_ores`; `#c:sand`; `#c:sandstone`; `#c:sandstones`; `#c:sapphire_ores`; `#c:sheldonite_ores`; `#c:silver_ores`; `#c:sodalite_ores`; `#c:sphalerite_ores`; `#c:starrite_ores`; `#c:stellum_ores`; `#c:stone`; `#c:stormyx_ores`; `#c:sulfur_ores`; `#c:tantalite_ores`; `#c:terracotta_blocks`; `#c:tin_ores`; `#c:titanium_ores`; `#c:topaz_ores`; `#c:truesilver_ores`; `#c:tungsten_ores`; `#c:unobtainium_ores`; `#c:ur_ores`; `#c:uranium_ores`; `#c:vermiculite_ores`; `#c:zinc_ores` |
+| Key                  | Conditions | Anticonditions       |
+|----------------------|------------|----------------------|
+| **canSeeSky**        | `False`    |                      |
+| **maxLight**         | `0`        |                      |
+| **neededBaseBlocks** |            | `#cobblemon:natural` |
 ## desert_pyramid

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **minY** | `62` |  |
-| **neededBaseBlocks** |  | `minecraft:blue_terracotta`; `minecraft:orange_terracotta` |
-| **neededNearbyBlocks** | `minecraft:chiseled_sandstone`; `minecraft:cut_sandstone`; `minecraft:orange_terracotta`; `minecraft:sandstone`; `minecraft:sandstone_slab`; `minecraft:sandstone_stairs` |  |
-| **structures** | `minecraft:desert_pyramid` |  |
+| Key                    | Conditions                         | Anticonditions                                             |
+|------------------------|------------------------------------|------------------------------------------------------------|
+| **minY**               | `62`                               |                                                            |
+| **neededBaseBlocks**   |                                    | `minecraft:blue_terracotta`; `minecraft:orange_terracotta` |
+| **neededNearbyBlocks** | `#cobblemon:desert_pyramid_blocks` |                                                            |
+| **structures**         | `minecraft:desert_pyramid`         |                                                            |
 ## end_city

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededBaseBlocks** | `minecraft:end_stone_bricks`; `minecraft:purpur_block`; `minecraft:purpur_pillar` |  |
-| **neededNearbyBlocks** | `minecraft:end_stone_bricks`; `minecraft:purpur_block`; `minecraft:purpur_pillar`; `minecraft:purpur_slab`; `minecraft:purpur_stairs` |  |
-| **structures** | `minecraft:end_city` |  |
-## flowers
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `#minecraft:flowers`; `#c:flowers`; `aether_redux:pink_prismatic_petals`; `aether_redux:mixed_prismatic_petals`; `aether_redux:teal_prismatic_petals`; `deep_aether:aerlavender`; `deep_aether:enchanted_blossom`; `deep_aether:golden_flower`; `deep_aether:radiant_orchid`; `deep_aether:tall_aerlavender`; `etcetera:bouquet`; `mythicbotany:aquapanthus`; `mythicbotany:aquapanthus_floating`; `mythicbotany:exoblaze`; `mythicbotany:exoblaze_floating`; `mythicbotany:feysythia`; `mythicbotany:feysythia_floating`; `mythicbotany:hellebore`; `mythicbotany:hellebore_floating`; `mythicbotany:petrunia`; `mythicbotany:petrunia_floating`; `mythicbotany:raindeletia`; `mythicbotany:raindeletia_floating`; `mythicbotany:wither_aconite`; `mythicbotany:wither_aconite_floating`; `twilightforest:thorn_rose` |  |
+| Key                    | Conditions                                                                        | Anticonditions |
+|------------------------|-----------------------------------------------------------------------------------|----------------|
+| **neededBaseBlocks**   | `minecraft:end_stone_bricks`; `minecraft:purpur_block`; `minecraft:purpur_pillar` |                |
+| **neededNearbyBlocks** | `#cobblemon:end_city_blocks`                                                      |                |
+| **structures**         | `minecraft:end_city`                                                              |                |
 ## foliage

 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **neededNearbyBlocks** | `#minecraft:leaves`; `#c:leaves` |  |
-## freshwater
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **biomes** | `#cobblemon:is_freshwater` | `#cobblemon:is_freezing` |
-## gemstones
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:amethyst_block`; `minecraft:budding_amethyst`; `#minecraft:crystal_sound_blocks`; `#minecraft:diamond_ores`; `#minecraft:emerald_ores`; `#c:amethyst_ores`; `#c:diamond_ores`; `#c:emerald_ores`; `#c:peridot_ores`; `#c:ruby_ores`; `#c:sapphire_ores`; `#c:topaz_ores` |  |
 ## illager_structures

 | Key | Conditions | Anticonditions |
@@ -73,30 +48,31 @@ This file contains all current spawn presets of cobblemon.
 | **structures** | `minecraft:pillager_outpost`; `minecraft:swamp_hut`; `minecraft:mansion` |  |
 ## jungle_pyramid

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **minY** | `62` |  |
-| **neededBaseBlocks** | `minecraft:cobblestone`; `#minecraft:mossy_cobblestone` |  |
-| **neededNearbyBlocks** | `minecraft:chiseled_stone_bricks`; `minecraft:cobblestone`; `minecraft:cobblestone_stairs`; `minecraft:mossy_cobblestone` |  |
-| **structures** | `minecraft:jungle_pyramid` |  |
-## lava_surface
+| Key                    | Conditions                                              | Anticonditions |
+|------------------------|---------------------------------------------------------|----------------|
+| **minY**               | `62`                                                    |                |
+| **neededBaseBlocks**   | `minecraft:cobblestone`; `#minecraft:mossy_cobblestone` |                |
+| **neededNearbyBlocks** | `#cobblemon:jungle_pyramid_blocks`                      |                |
+| **structures**         | `minecraft:jungle_pyramid`                              |                |
+
+## lava

 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **fluid** | `#minecraft:lava` |  |
 ## mansion

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **minY** | `62` |  |
-| **neededBaseBlocks** | `minecraft:birch_planks`; `minecraft:double_smooth_stone_slab`; `minecraft:oak_planks`; `minecraft:polished_andesite`; `#minecraft:wool`; `#minecraft:wool_carpets` |  |
-| **neededNearbyBlocks** | `minecraft:birch_planks`; `minecraft:cobblestone_stairs`; `minecraft:cobblestone_wall`; `minecraft:dark_oak_planks` |  |
-| **structures** | `minecraft:mansion` |  |
+| Key                    | Conditions                                                                                                                                                          | Anticonditions |
+|------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|
+| **minY**               | `62`                                                                                                                                                                |                |
+| **neededBaseBlocks**   | `minecraft:birch_planks`; `minecraft:double_smooth_stone_slab`; `minecraft:oak_planks`; `minecraft:polished_andesite`; `#minecraft:wool`; `#minecraft:wool_carpets` |                |
+| **neededNearbyBlocks** | `#cobblemon:mansion_blocks`                                                                                                                                         |                |
+| **structures**         | `minecraft:mansion`                                                                                                                                                 |                |
 ## natural

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededBaseBlocks** | `minecraft:big_dripleaf`; `minecraft:lily_pad`; `minecraft:moss_block`; `minecraft:moss_carpet`; `minecraft:sculk`; `minecraft:snow_block`; `#minecraft:animals_spawnable_on`; `#minecraft:crystal_sound_blocks`; `#minecraft:base_stone_nether`; `#minecraft:base_stone_overworld`; `#minecraft:coal_ores`; `#minecraft:copper_ores`; `#minecraft:coral_blocks`; `#minecraft:diamond_ores`; `#minecraft:dirt`; `#minecraft:dirt_like`; `#minecraft:emerald_ores`; `#minecraft:sculk_replaceable`; `#minecraft:gold_ores`; `#minecraft:grass`; `#minecraft:gravel`; `#minecraft:ice`; `#minecraft:iron_ores`; `#minecraft:lapis_ores`; `#minecraft:nylium`; `#minecraft:redstone_ores`; `#minecraft:sand`; `#minecraft:snow`; `#minecraft:terracotta`; `#minecraft:valid_spawn`; `#c:adamantite_ores`; `#c:aetherium_ores`; `#c:aluminum_ores`; `#c:amethyst_blocks`; `#c:amethyst_ores`; `#c:ancient_debris`; `#c:antimony_ores`; `#c:aquarium_ores`; `#c:asterite_ores`; `#c:asteroid_asterite_ores`; `#c:banglum_ores`; `#c:basalt`; `#c:bauxite_ores`; `#c:bone_blocks`; `#c:carmot_ores`; `#c:certus_quartz_ores`; `#c:cinnabar_ores`; `#c:cobalt_ores`; `#c:coral_blocks`; `#c:dirt`; `#c:end_stones`; `#c:galaxium_ores`; `#c:galena_ores`; `#c:gravel`; `#c:galena_ores`; `#c:kyber_ores`; `#c:lead_ores`; `#c:lignite_coal_ores`; `#c:lunum_ores`; `#c:lutetium_ores`; `#c:manganese_ores`; `#c:meteor_metite_ores`; `#c:metite_ores`; `#c:midas_gold_ores`; `#c:moon_lunum_ores`; `#c:mozanite_ores`; `#c:mythril_ores`; `#c:natural_stones`; `#c:netherrack`; `#c:nether_mycelium`; `#c:nickel_ores`; `#c:nikolite_ores`; `#c:ores`; `#c:orichalcum_ores`; `#c:osmium_ores`; `#c:palladium_ores`; `#c:peridot_ores`; `#c:platinum_ores`; `#c:prometheum_ores`; `#c:pyrite_ores`; `#c:quadrillum_ores`; `#c:quartz_ores`; `#c:raw_antimony_ores`; `#c:raw_copper_ores`; `#c:raw_gold_ores`; `#c:raw_iridium_ores`; `#c:raw_iron_ores`; `#c:raw_lead_ores`; `#c:raw_nickel_ores`; `#c:raw_platinum_ores`; `#c:raw_silver_ores`; `#c:raw_tin_ores`; `#c:raw_titanium_ores`; `#c:raw_tungsten_ores`; `#c:raw_uranium_ores`; `#c:red_sandstones`; `#c:ruby_ores`; `#c:runite_ores`; `#c:salt_ores`; `#c:sand`; `#c:sandstone`; `#c:sandstones`; `#c:sapphire_ores`; `#c:sheldonite_ores`; `#c:silver_ores`; `#c:sodalite_ores`; `#c:sphalerite_ores`; `#c:starrite_ores`; `#c:stellum_ores`; `#c:stone`; `#c:stormyx_ores`; `#c:sulfur_ores`; `#c:tantalite_ores`; `#c:terracotta_blocks`; `#c:tin_ores`; `#c:titanium_ores`; `#c:topaz_ores`; `#c:truesilver_ores`; `#c:tungsten_ores`; `#c:unobtainium_ores`; `#c:ur_ores`; `#c:uranium_ores`; `#c:vermiculite_ores`; `#c:zinc_ores` | `minecraft:farmland` |
+| Key                  | Conditions           | Anticonditions       |
+|----------------------|----------------------|----------------------|
+| **neededBaseBlocks** | `#cobblemon:natural` | `minecraft:farmland` |
 ## nether_fossil

 | Key | Conditions | Anticonditions |
@@ -105,79 +81,48 @@ This file contains all current spawn presets of cobblemon.
 | **structures** | `minecraft:nether_fossil` |  |
 ## nether_structures

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededBaseBlocks** | `minecraft:chiseled_polished_blackstone`; `minecraft:cracked_polished_blackstone_bricks`; `minecraft:gilded_blackstone`; `minecraft:nether_bricks`; `minecraft:polished_basalt`; `minecraft:polished_blackstone_bricks` |  |
-| **neededNearbyBlocks** | `minecraft:blackstone_slab`; `minecraft:blackstone_stairs`; `minecraft:blackstone_wall`; `minecraft:chiseled_polished_blackstone`; `minecraft:cracked_polished_blackstone_bricks`; `minecraft:gilded_blackstone`; `minecraft:nether_brick_fence`; `minecraft:nether_brick_stairs`; `minecraft:nether_bricks`; `minecraft:polished_basalt`; `minecraft:polished_blackstone_brick_stairs`; `minecraft:polished_blackstone_bricks` |  |
-| **structures** | `minecraft:bastion_remnant`; `minecraft:fortress` |  |
+| Key                    | Conditions                                                                                                                                                                                                              | Anticonditions |
+|------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|
+| **neededBaseBlocks**   | `minecraft:chiseled_polished_blackstone`; `minecraft:cracked_polished_blackstone_bricks`; `minecraft:gilded_blackstone`; `minecraft:nether_bricks`; `minecraft:polished_basalt`; `minecraft:polished_blackstone_bricks` |                |
+| **neededNearbyBlocks** | `#cobblemon:nether_structure_blocks`                                                                                                                                                                                    |                |
+| **structures**         | `minecraft:bastion_remnant`; `minecraft:fortress`                                                                                                                                                                       |                |
 ## ocean_monument

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **maxY** | `62` |  |
-| **neededNearbyBlocks** | `minecraft:dark_prismarine`; `minecraft:prismarine`; `minecraft:prismarine_bricks` |  |
-| **structures** | `minecraft:ocean_monument` |  |
+| Key            | Conditions           | Anticonditions |
+|----------------|----------------------|----------------|
+| **maxY**       | `62`                 |                |
+| **structures** | `minecraft:monument` |                |
 ## ocean_ruins

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **maxY** | `62` |  |
-| **neededNearbyBlocks** | `minecraft:chiseled_sandstone`; `minecraft:chiseled_stone_bricks`; `minecraft:cracked_stone_bricks`; `minecraft:cut_sandstone`; `minecraft:mossy_cobblestone`; `minecraft:mossy_stone_bricks`; `minecraft:polished_granite`; `minecraft:stone_bricks` |  |
-| **structures** | `#minecraft:ocean_ruin` |  |
-## orange_flowers
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:orange_tulip`; `minecraft:torchflower`; `aether_redux:aurum`; `biomemakeover:marigold`; `biomemakeover:moth_blossom`; `biomesoplenty:burning_blossom`; `biomesoplenty:orange_cosmos`; `blue_skies:blaze_bud`; `botania:entropinnyum`; `botania:floating_entropinnyum`; `botania:floating_pollidisiac`; `botania:floating_spectrolus`; `botania:floating_tigerseye`; `botania:floating_thermalily`; `botania:orange_double_flower`; `botania:orange_floating_flower`; `botania:orange_mystical_flower`; `botania:orange_shiny_flower`; `botania:pollidisiac`; `botania:spectrolus`; `botania:tigerseye`; `botania:thermalily`; `deep_aether:golden_flower`; `goodending:spicy_wildflowers` |  |
+| Key                    | Conditions                     | Anticonditions |
+|------------------------|--------------------------------|----------------|
+| **maxY**               | `62`                           |                |
+| **neededNearbyBlocks** | `#cobblemon:ocean_ruin_blocks` |                |
+| **structures**         | `#minecraft:ocean_ruin`        |                |
 ## pillager_outpost

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **minY** | `62` |  |
-| **neededNearbyBlocks** | `minecraft:cobblestone`; `minecraft:cobblestone_slab`; `minecraft:cobblestone_stairs`; `minecraft:cobblestone_wall`; `minecraft:dark_oak_fence`; `minecraft:dark_oak_slab`; `minecraft:dark_oak_stairs`; `minecraft:mossy_cobblestone`; `minecraft:mossy_cobblestone_slab`; `minecraft:mossy_cobblestone_stairs`; `minecraft:mossy_cobblestone_wall`; `#minecraft:logs`; `#minecraft:planks` |  |
-| **structures** | `minecraft:pillager_outpost` |  |
-## pink_flowers
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:allium`; `minecraft:lilac`; `minecraft:peony`; `minecraft:pink_tulip`; `aether_redux:iridia`; `aether_redux:pink_prismatic_petals`; `aether_redux:mixed_prismatic_petals`; `aether_redux:sweet_blossom`; `ancient_aether:highland_viola`; `biomemakeover:foxglove`; `biomesoplenty:pink_daffodil`; `biomesoplenty:pink_hibiscus`; `biomesoplenty:wildflower`; `blue_skies:blush_blossom`; `blue_skies:briskbloom`; `blue_skies:camellia`; `blue_skies:midday_bayhop`; `botania:floating_hyacidus`; `botania:floating_jaded_amaranthus`; `botania:floating_jiyuulia`; `botania:floating_jiyuulia_chibi`; `botania:floating_marimorphosis`; `botania:floating_marimorphosis_chibi`; `botania:floating_rafflowsia`; `botania:floating_rosa_arcana`; `botania:hyacidus`; `botania:jaded_amaranthus`; `botania:jiyuulia`; `botania:jiyuulia_chibi`; `botania:magenta_double_flower`; `botania:magenta_floating_flower`; `botania:magenta_mystical_flower`; `botania:magenta_shiny_flower`; `botania:marimorphosis`; `botania:marimorphosis_chibi`; `botania:pink_double_flower`; `botania:pink_floating_flower`; `botania:pink_mystical_flower`; `botania:pink_shiny_flower`; `botania:rafflowsia`; `botania:rosa_arcana`; `deep_aether:aerlavender`; `deep_aether:radiant_orchid`; `deep_aether:tall_aerlavender`; `enlightened_end:open_odd_roots`; `etcetera:bouquet`; `farmersdelight:wild_onions`; `overweight_farming:allium_bush` |  |
+| Key                    | Conditions                           | Anticonditions |
+|------------------------|--------------------------------------|----------------|
+| **minY**               | `62`                                 |                |
+| **neededNearbyBlocks** | `#cobblemon:pillager_outpost_blocks` |                |
+| **structures**         | `minecraft:pillager_outpost`         |                |
 ## redstone

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededBaseBlocks** |  | `minecraft:activator_rail`; `minecraft:daylight_detector`; `minecraft:detector_rail`; `minecraft:dispenser`; `minecraft:dropper`; `minecraft:hopper`; `minecraft:observer`; `minecraft:piston`; `minecraft:powered_comparator`; `minecraft:powered_rail`; `minecraft:powered_repeater`; `minecraft:redstone_block`; `minecraft:redstone_lamp`; `minecraft:redstone_torch`; `minecraft:redstone_wire`; `minecraft:sticky_piston`; `minecraft:unlit_redstone_torch`; `minecraft:unpowered_comparator`; `minecraft:unpowered_repeater`; `#c:redstone_blocks` |
-| **neededNearbyBlocks** | `minecraft:activator_rail`; `minecraft:daylight_detector`; `minecraft:detector_rail`; `minecraft:dispenser`; `minecraft:dropper`; `minecraft:hopper`; `minecraft:observer`; `minecraft:piston`; `minecraft:powered_comparator`; `minecraft:powered_rail`; `minecraft:powered_repeater`; `minecraft:redstone_block`; `minecraft:redstone_lamp`; `minecraft:redstone_torch`; `minecraft:redstone_wire`; `minecraft:sticky_piston`; `minecraft:unlit_redstone_torch`; `minecraft:unpowered_comparator`; `minecraft:unpowered_repeater`; `#minecraft:redstone_ores`; `#c:redstone_blocks`; `#c:redstone_ores` |  |
-## red_flowers
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:poppy`; `minecraft:red_tulip`; `minecraft:rose_bush`; `ancient_aether:sakura_blossoms`; `ancient_aether:trapped_sakura_blossoms`; `biomesoplenty:rose`; `blue_skies:flare_floret`; `botania:bellethorn`; `botania:bellethorn_chibi`; `botania:exoflame`; `botania:floating_bellethorn`; `botania:floating_bellethorn_chibi`; `botania:floating_exoflame`; `botania:floating_kekimurus`; `botania:floating_manastar`; `botania:floating_munchdew`; `botania:floating_orechid_ignem`; `botania:floating_pollidisiac`; `botania:floating_spectrolus`; `botania:kekimurus`; `botania:manastar`; `botania:munchdew`; `botania:orechid_ignem`; `botania:pollidisiac`; `botania:red_double_flower`; `botania:red_floating_flower`; `botania:red_mystical_flower`; `botania:red_shiny_flower`; `botania:spectrolus`; `etcetera:bouquet`; `goodending:balmy_wildflowers`; `mythicbotany:petrunia`; `mythicbotany:petrunia_floating`; `twilightforest:thorn_rose`; `wilderwild:milkweed` |  |
-## river
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **biomes** | `#cobblemon:is_river` | `#cobblemon:is_freezing` |
+| Key                    | Conditions                                                                   | Anticonditions               |
+|------------------------|------------------------------------------------------------------------------|------------------------------|
+| **neededBaseBlocks**   |                                                                              | `#cobblemon:redstone_blocks` |
+| **neededNearbyBlocks** | `#minecraft:redstone_ores`; `#cobblemon:redstone_blocks`; `#c:redstone_ores` |                              |
 ## ruined_portal

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:crying_obsidian`; `minecraft:netherack`; `minecraft:obsidian` |  |
-| **structures** | `#minecraft:ruined_portal` |  |
-## ruins
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **structures** | `cobblemon:ruins/decaying_crypt_ruins`; `cobblemon:ruins/deserted_gimmi_tower`; `cobblemon:ruins/deserted_house_ruins`; `cobblemon:ruins/deserted_tower_ruins`; `cobblemon:ruins/deserted_town_center_ruins`; `cobblemon:ruins/fallen_statue_ruins`; `cobblemon:ruins/frozen_gimmi_tower`; `cobblemon:ruins/hidden_bunker_ruins`; `cobblemon:ruins/lush_gimmi_tower`; `cobblemon:ruins/mossy_oubliette_ruins`; `cobblemon:ruins/rooted_gimmi_tower`; `cobblemon:ruins/sunscorched_gimmi_tower`; `cobblemon:ruins/temperate_gimmi_tower`; `cobblemon:ruins/toppled_pillars_ruins`; `cobblemon:ruins/unstable_cave_ruins` |  |
+| Key                    | Conditions                 | Anticonditions |
+|------------------------|----------------------------|----------------|
+| **neededNearbyBlocks** | `ruined_portal_blocks`     |                |
+| **structures**         | `#minecraft:ruined_portal` |                |
 ## salt

 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **biomes** | `biomesoplenty:hot_springs`; `biomesoplenty:wasteland`; `biomesoplenty:wasteland_steppe`; `terralith:amethyst_canyon`; `terralith:amethyst_rainforest`; `terralith:skylands_winter`; `terralith:yellowstone`; `wythers:calcite_caverns`; `wythers:calcite_coast`; `wythers:mediterranean_island_thermal_spring`; `wythers:salt_lakes_pink`; `wythers:salt_lakes_turquoise`; `wythers:salt_lakes_white`; `wythers:thermal_taiga` |  |
-## shipwreck
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **structures** | `#minecraft:shipwreck` |  |
 ## stronghold

 | Key | Conditions | Anticonditions |
@@ -188,49 +133,25 @@ This file contains all current spawn presets of cobblemon.
 | **structures** | `minecraft:stronghold` |  |
 ## trail_ruins

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **minY** | `32` |  |
-| **neededBaseBlocks** | `minecraft:black_glazed_terracotta`; `minecraft:blue_glazed_terracotta`; `minecraft:bricks`; `minecraft:brown_glazed_terracotta`; `minecraft:cobblestone`; `minecraft:cyan_glazed_terracotta`; `minecraft:gray_glazed_terracotta`; `minecraft:green_glazed_terracotta`; `minecraft:light_blue_glazed_terracotta`; `minecraft:light_gray_glazed_terracotta`; `minecraft:lime_glazed_terracotta`; `minecraft:magenta_glazed_terracotta`; `minecraft:mud_bricks`; `minecraft:orange_glazed_terracotta`; `minecraft:pink_glazed_terracotta`; `minecraft:purple_glazed_terracotta`; `minecraft:red_glazed_terracotta`; `minecraft:stone`; `minecraft:stone_bricks`; `minecraft:suspicious_gravel`; `minecraft:white_glazed_terracotta`; `minecraft:yellow_glazed_terracotta`; `#minecraft:convertable_to_mud`; `#minecraft:sand`; `#minecraft:terracotta`; `#minecraft:trail_ruins_replaceable` |  |
-| **neededNearbyBlocks** | `minecraft:black_glazed_terracotta`; `minecraft:blue_glazed_terracotta`; `minecraft:bricks`; `minecraft:brown_glazed_terracotta`; `minecraft:cyan_glazed_terracotta`; `minecraft:gray_glazed_terracotta`; `minecraft:green_glazed_terracotta`; `minecraft:light_blue_glazed_terracotta`; `minecraft:light_gray_glazed_terracotta`; `minecraft:lime_glazed_terracotta`; `minecraft:magenta_glazed_terracotta`; `minecraft:mud_bricks`; `minecraft:orange_glazed_terracotta`; `minecraft:pink_glazed_terracotta`; `minecraft:purple_glazed_terracotta`; `minecraft:red_glazed_terracotta`; `minecraft:suspicious_gravel`; `minecraft:white_glazed_terracotta`; `minecraft:yellow_glazed_terracotta`; `#minecraft:terracotta` |  |
-| **structures** | `minecraft:trail_ruins` |  |
-## trash
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:composter`; `etcetera:prickly_can`; `farmersdelight:organic_compost`; `manatrashcan:mana_trashcan`; `nethersdelight:soul_compost`; `overweight_farming:vegetable_compost`; `rats:trash_can`; `rats:garbage_pile`; `rats:cursed_garbage`; `rats:purified_garbage`; `rats:pied_garbage`; `rats:compressed_garbage`; `trashcans:item_trash_can`; `trashcans:liquid_trash_can`; `trashcans:energy_trash_can`; `trashcans:ultimate_trash_can` |  |
+| Key                    | Conditions                                                                                                                                                                                      | Anticonditions |
+|------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|
+| **minY**               | `32`                                                                                                                                                                                            |                |
+| **neededBaseBlocks**   | `#minecraft:convertable_to_mud`; `#minecraft:sand`; `#minecraft:trail_ruins_replaceable`; `#cobblemon:trail_ruins_blocks`; `minecraft:cobblestone`; `minecraft:stone`; `minecraft:stone_bricks` |                |
+| **neededNearbyBlocks** | `#cobblemon:trail_ruins_blocks`                                                                                                                                                                 |                |
+| **structures**         | `minecraft:trail_ruins`                                                                                                                                                                         |                |
 ## treetop

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededBaseBlocks** | `#minecraft:leaves`; `#minecraft:logs`; `#minecraft:overworld_natural_logs`; `#c:leaves`; `#c:logs` |  |
-## underground_ruins
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **structures** | `cobblemon:ruins/crumbling_arch_ruins`; `cobblemon:ruins/rooted_arch_ruins` |  |
-## underlava
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **fluid** | `#minecraft:lava` |  |
-## underwater
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **fluid** | `#minecraft:water` |  |
+| Key                  | Conditions         | Anticonditions |
+|----------------------|--------------------|----------------|
+| **neededBaseBlocks** | `#cobblemon:trees` |                |
 ## urban

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:white_concrete`; `minecraft:orange_concrete`; `minecraft:magenta_concrete`; `minecraft:light_blue_concrete`; `minecraft:yellow_concrete`; `minecraft:lime_concrete`; `minecraft:pink_concrete`; `minecraft:gray_concrete`; `minecraft:light_gray_concrete`; `minecraft:cyan_concrete`; `minecraft:purple_concrete`; `minecraft:blue_concrete`; `minecraft:brown_concrete`; `minecraft:green_concrete`; `minecraft:red_concrete`; `minecraft:black_concrete` |  |
-| **structures** |  | `minecraft:trail_ruins` |
-## village
+| Key                    | Conditions                   | Anticonditions                                |
+|------------------------|------------------------------|-----------------------------------------------|
+| **neededNearbyBlocks** | `#cobblemon:concrete_blocks` |                                               |
+| **structures**         |                              | `#minecraft:village`; `minecraft:trail_ruins` |

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **structures** | `#minecraft:village` |  |
-## water_surface
+## water

 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
@@ -240,19 +161,9 @@ This file contains all current spawn presets of cobblemon.
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **biomes** | `biomesoplenty:spider_nest`; `terralith:cave/infested_caves`; `wythers:forbidden_forest`; `wythers:phantasmal_forest`; `wythers:phantasmal_swamp` |  |
-## white_flowers
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:azure_bluet`; `minecraft:lily_of_the_valley`; `minecraft:oxeye_daisy`; `minecraft:white_tulip`; `aether:white_flower`; `aether_redux:frostbud`; `aether_redux:gilded_white_flower`; `biomemakeover:buttonbush`; `biomesoplenty:glowflower`; `blue_skies:crystal_flower`; `blue_skies:snowbloom`; `botania:floating_dandelifeon`; `botania:floating_kekimurus`; `botania:floating_pure_daisy`; `botania:floating_spectrolus`; `botania:spectrolus`; `botania:white_double_flower`; `botania:white_floating_flower`; `botania:white_mystical_flower`; `botania:white_shiny_flower`; `botania:pure_daisy`; `botania:fallen_kanade`; `botania:floating_fallen_kanade`; `botania:spectranthemum`; `botania:floating_spectranthemum`; `botania:kekimurus`; `botania:dandelifeon`; `deep_aether:enchanted_blossom`; `farmersdelight:wild_carrots`; `miners_delight:gossypium`; `miners_delight:wild_cave_carrots`; `wilderwild:alba_giany_glory_of_the_snow`; `wilderwild:datura` |  |
 ## wild

-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** |  | `minecraft:white_concrete`; `minecraft:orange_concrete`; `minecraft:magenta_concrete`; `minecraft:light_blue_concrete`; `minecraft:yellow_concrete`; `minecraft:lime_concrete`; `minecraft:pink_concrete`; `minecraft:gray_concrete`; `minecraft:light_gray_concrete`; `minecraft:cyan_concrete`; `minecraft:purple_concrete`; `minecraft:blue_concrete`; `minecraft:brown_concrete`; `minecraft:green_concrete`; `minecraft:red_concrete`; `minecraft:black_concrete` |
-| **structures** |  | `#minecraft:village` |
-## yellow_flowers
-
-| Key | Conditions | Anticonditions |
-| --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `minecraft:dandelion`; `minecraft:sunflower`; `biomesoplenty:goldenrod`; `botania:daffomill`; `botania:endoflame`; `botania:floating_daffomill`; `botania:floating_endoflame`; `botania:floating_gourmaryllis`; `botania:floating_labellia`; `botania:floating_marimorphosis`; `botania:floating_marimorphosis_chibi`; `botania:floating_rafflowsia`; `botania:floating_solegnolia`; `botania:floating_solegnolia_chibi`; `botania:floating_spectrolus`; `botania:gourmaryllis`; `botania:labellia`; `botania:marimorphosis`; `botania:marimorphosis_chibi`; `botania:rafflowsia`; `botania:solegnolia`; `botania:solegnolia_chibi`; `botania:spectrolus`; `botania:yellow_double_flower`; `botania:yellow_floating_flower`; `botania:yellow_mystical_flower`; `botania:yellow_shiny_flower`; `etcetera:bouquet`; `farmersdelight:wild_cabbages`; `goodending:balmy_wildflowers`; `goodending:pastel_wildflowers`; `mythicbotany:feysythia`; `mythicbotany:feysythia_floating` |  |
+| Key                    | Conditions | Anticonditions               |
+|------------------------|------------|------------------------------|
+| **neededNearbyBlocks** |            | `#cobblemon:concrete_blocks` |
+| **structures**         |            | `#minecraft:village`         |
@@ -19,11 +19,6 @@ plugins {
    id("cobblemon.publish-conventions")
 }

-architectury {
-    platformSetupLoomIde()
-    fabric()
-}
-
 val generatedResources = file("src/generated/resources")

 sourceSets {
@@ -42,45 +37,45 @@ repositories {
 }

 dependencies {
-    implementation(project(":common", configuration = "namedElements")) {
-        isTransitive = false
-    }
-    "developmentFabric"(project(":common", configuration = "namedElements")) {
-        isTransitive = false
-    }
-    bundle(project(path = ":common", configuration = "transformProductionFabric")) {
-        isTransitive = false
-    }
-    modLocalRuntime(libs.fabric.debugutils)
-    modImplementation(libs.fabric.loader)
-    modApi(libs.fabric.api)
-    modApi(libs.bundles.fabric)
-
-    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
-        isTransitive = false
-    }
-    modRuntimeOnly(libs.bundles.fabric.integrations.runtimeOnly)
-//    modImplementation(libs.flywheelFabric)
-//    include(libs.flywheelFabric)
-
-    include(libs.fabric.kotlin)
-
-    listOf(
-        libs.graal,
-        libs.molang
-    ).forEach {
-        bundle(it)
-        runtimeOnly(it)
-    }
-
-    minecraftServerLibraries(libs.icu4j)
+//    implementation(project(":common", configuration = "namedElements")) {
+//        isTransitive = false
+//    }
+//    "developmentFabric"(project(":common", configuration = "namedElements")) {
+//        isTransitive = false
+//    }
+//    bundle(project(path = ":common", configuration = "transformProductionFabric")) {
+//        isTransitive = false
+//    }
+//    modLocalRuntime(libs.fabric.debugutils)
+//    modImplementation(libs.fabric.loader)
+//    modApi(libs.fabric.api)
+//    modApi(libs.bundles.fabric)
+//
+//    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
+//        isTransitive = false
+//    }
+//    modRuntimeOnly(libs.bundles.fabric.integrations.runtimeOnly)
+////    modImplementation(libs.flywheelFabric)
+////    include(libs.flywheelFabric)
+//
+//    include(libs.fabric.kotlin)
+//
+//    listOf(
+//        libs.graal,
+//        libs.molang
+//    ).forEach {
+//        bundle(it)
+//        runtimeOnly(it)
+//    }
+//
+//    minecraftServerLibraries(libs.icu4j)

 }

 tasks {
    // The AW file is needed in :fabric project resources when the game is run.
    val copyAccessWidener by registering(Copy::class) {
-        from(loom.accessWidenerPath)
+//        from(loom.accessWidenerPath)
        into(generatedResources)
        dependsOn(checkLicenseMain)
    }
@@ -45,8 +45,7 @@
      "links": {
        "modmenu.curseforge": "https://www.curseforge.com/minecraft/mc-mods/cobblemon",
        "modmenu.modrinth": "https://modrinth.com/mod/cobblemon",
-        "modmenu.discord": "https://discord.gg/XnZwHjj2yS",
-        "modmenu.patreon": "https://www.patreon.com/cablemc"
+        "modmenu.discord": "https://discord.gg/cobblemon"
      }
    },
    "loom:injected_interfaces": {
@@ -3,6 +3,8 @@
 org.gradle.jvmargs=-Xmx8G
 org.gradle.daemon=false
 org.gradle.parallel=true
+#org.gradle.caching=true
+#org.gradle.configuration-cache=true

 group=com.cobblemon.mod

@@ -11,7 +13,7 @@ mc_version = 1.21.1
 parchment_version = 2024.07.28@zip

 mod_id=cobblemon
-mod_version=1.6.0
-snapshot=false
+mod_version=1.6.1
+snapshot=true

 fabric.loom.multiProjectOptimisation=false
@@ -11,12 +11,8 @@ repositories {

 dependencies {
    implementation(libs.kotlin)
-
    implementation(libs.licenser)
    implementation(libs.shadow)
-    implementation(libs.loom)
-    implementation(libs.architectury)
-
    implementation(libs.blossom)
    implementation(libs.ideaExt)
 }
@@ -8,6 +8,7 @@
 *
 */

+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import utilities.ACCESS_WIDENER

@@ -16,8 +17,6 @@ plugins {
    id("java-library")

    id("org.cadixdev.licenser")
-    id("dev.architectury.loom")
-    id("architectury-plugin")
    kotlin("jvm")
 }

@@ -42,23 +41,6 @@ license {
    header(rootProject.file("HEADER"))
 }

-architectury {
-    minecraft = project.property("mc_version").toString()
-}
-
-loom {
-    silentMojangMappingsLicense()
-    accessWidenerPath.set(project(":common").file(ACCESS_WIDENER))
-}
-
-dependencies {
-    minecraft("net.minecraft:minecraft:${rootProject.property("mc_version")}")
-    mappings(loom.layered {
-        officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-1.21:${rootProject.property("parchment_version")}")
-    })
-}
-
 tasks {
    withType<JavaCompile> {
        options.encoding = "UTF-8"
@@ -67,7 +49,7 @@ tasks {
    }

    withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "21"
+        compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
    }

    withType<Jar> {
@@ -13,15 +13,15 @@ val bundle: Configuration by configurations.creating {
    isCanBeResolved = true
 }

-loom {
-    val clientConfig = runConfigs.getByName("client")
-    clientConfig.runDir = "runClient"
-    clientConfig.programArg("--username=AshKetchum")
-    //This is AshKetchum's UUID so you get an Ash Ketchum skin
-    clientConfig.programArg("--uuid=93e4e551-589a-41cb-ab2d-435266c8e035")
-    val serverConfig = runConfigs.getByName("server")
-    serverConfig.runDir = "runServer"
-}
+//loom {
+//    val clientConfig = runConfigs.getByName("client")
+//    clientConfig.runDir = "runClient"
+//    clientConfig.programArg("--username=AshKetchum")
+//    //This is AshKetchum's UUID so you get an Ash Ketchum skin
+//    clientConfig.programArg("--uuid=93e4e551-589a-41cb-ab2d-435266c8e035")
+//    val serverConfig = runConfigs.getByName("server")
+//    serverConfig.runDir = "runServer"
+//}

 tasks {

@@ -40,23 +40,23 @@ tasks {
        relocate ("com.oracle", "com.cobblemon.mod.relocations.oracle")
    }

-    remapJar {
-        dependsOn(shadowJar)
-        inputFile.set(shadowJar.flatMap { it.archiveFile })
-        archiveBaseName.set("Cobblemon-${project.name}")
-        archiveVersion.set("${rootProject.version}")
-    }
+//    remapJar {
+//        dependsOn(shadowJar)
+//        inputFile.set(shadowJar.flatMap { it.archiveFile })
+//        archiveBaseName.set("Cobblemon-${project.name}")
+//        archiveVersion.set("${rootProject.version}")
+//    }
+//
+//    val copyJar by registering(CopyFile::class) {
+//        val productionJar = tasks.remapJar.flatMap { it.archiveFile }
+//        fileToCopy = productionJar
+//        destination = productionJar.flatMap {
+//            rootProject.layout.buildDirectory.file("libs/${it.asFile.name}")
+//        }
+//    }

-    val copyJar by registering(CopyFile::class) {
-        val productionJar = tasks.remapJar.flatMap { it.archiveFile }
-        fileToCopy = productionJar
-        destination = productionJar.flatMap {
-            rootProject.layout.buildDirectory.file("libs/${it.asFile.name}")
-        }
-    }
-
-    assemble {
-        dependsOn(copyJar)
-    }
+//    assemble {
+//        dependsOn(copyJar)
+//    }

 }
@@ -5,7 +5,6 @@ plugins {
    id("java")
    id("java-library")
    id("maven-publish")
-    id("dev.architectury.loom")
 }

 java {
@@ -25,16 +24,16 @@ publishing {
    }

    publications {
-        create<MavenPublication>(project.name) {
-            artifact(tasks.remapJar)
-            artifact(tasks.remapSourcesJar)
-
-            @Suppress("UnstableApiUsage")
-            loom.disableDeprecatedPomGeneration(this)
-
-            groupId = "com.cobblemon"
-            artifactId = project.findProperty("maven.artifactId")?.toString() ?: project.name
-            version = project.writeVersion(VersionType.PUBLISHING)
-        }
+//        create<MavenPublication>(project.name) {
+//            artifact(tasks.remapJar)
+//            artifact(tasks.remapSourcesJar)
+//
+//            @Suppress("UnstableApiUsage")
+//            loom.disableDeprecatedPomGeneration(this)
+//
+//            groupId = "com.cobblemon"
+//            artifactId = project.findProperty("maven.artifactId")?.toString() ?: project.name
+//            version = project.writeVersion(VersionType.PUBLISHING)
+//        }
    }
 }
@@ -8,9 +8,14 @@ shadow = "8.1.1"
 blossom = "2.1.0"
 idea-ext = "1.1.7"

-# Loom
-loom = "1.7-SNAPSHOT"
-architectury-plugin = "3.4-SNAPSHOT"
+# Minecraft Development
+loom = "1.9.2"
+moddev = "2.0.74"
+neoform = "1.21.1-20240808.144430"
+
+# Mixins
+mixin = "0.13.4+mixin.0.8.5"
+mixinExtras = "0.4.1"

 # Common
 molang = "1.1.18"
@@ -40,16 +45,22 @@ mockito = "5.2.0"
 mockk = "1.12.1"
 classgraph = "4.8.153"

+[plugins]
+loom = { id = "fabric-loom", version.ref="loom" }
+moddev = { id = "net.neoforged.moddev", version.ref="moddev" }
+
 [libraries]
 # General Buildscript Plugins
 kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-loom = { group = "dev.architectury", name = "architectury-loom", version.ref = "loom" }
-architectury = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
 shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
 blossom = { group = "net.kyori", name = "blossom", version.ref = "blossom" }
 ideaExt = { group = "org.jetbrains.gradle.plugin.idea-ext", name = "org.jetbrains.gradle.plugin.idea-ext.gradle.plugin", version.ref = "idea-ext"}
 licenser = { group = "gradle.plugin.org.cadixdev.gradle", name = "licenser", version.ref = "licenser" }

+# Mixins
+mixins-base = { group = "net.fabricmc", name = "sponge-mixin", version.ref = "mixin" }
+mixins-extras = { group = "io.github.llamalad7", name = "mixinextras-common", version.ref = "mixinExtras" }
+
 # Kotlin
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
@@ -82,7 +93,11 @@ mongo-driver-sync = { group = "org.mongodb", name = "mongodb-driver-sync", versi

 # Testing
 junit-fabric = { group = "net.fabricmc", name = "fabric-loader-junit", version.ref = "fabric-loader" }
+
+junit-core = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" }
 junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" }
+junit-launcher = { group = "org.junit.platform", name = "junit-platform-launcher" }
+
 mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
 mock-kotlin = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
 classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" }
@@ -93,4 +108,5 @@ fabric = [ "fabric-kotlin", "fabric-permissions" ]
 fabric-integrations-compileOnly = [ "adorn-fabric", "lambDynamicLights", "jei-api-fabric" ]
 fabric-integrations-runtimeOnly = [ "jei-fabric" ]
 mongo = [ "mongo-driver-core", "mongo-driver-sync" ]
-unitTesting = [ "junit-fabric", "junit-params", "mockito-core", "mock-kotlin", "classgraph" ]
+unitTesting = [ "junit-core", "junit-launcher", "junit-params", "mockito-core", "mock-kotlin", "classgraph" ]
+mixins = [ "mixins-base", "mixins-extras" ]
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -13,16 +13,16 @@ plugins {
    id("cobblemon.publish-conventions")
 }

-architectury {
-    platformSetupLoomIde()
-    neoForge()
-}
-
-loom {
-    neoForge {
-
-    }
-}
+//architectury {
+//    platformSetupLoomIde()
+//    neoForge()
+//}
+//
+//loom {
+//    neoForge {
+//
+//    }
+//}

 repositories {
    maven(url = "${rootProject.projectDir}/deps")
@@ -33,35 +33,35 @@ repositories {
 }

 dependencies {
-    neoForge(libs.neoforge)
-    //Because of the JEI mapping issues if we want
-    //a forge launch we gotta do some wacky stuff
-    //modImplementation(libs.jeiForge)
-    //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6'
-    //modImplementation(libs.flywheelForge)
-    //include(libs.flywheelForge)
-    modLocalRuntime(libs.neoforge.debugutils)
-    implementation(project(":common", configuration = "namedElements")) {
-        isTransitive = false
-    }
-    implementation(libs.neo.kotlin.forge) {
-        exclude(group = "net.neoforged.fancymodloader", module = "loader")
-    }
-    "developmentNeoForge"(project(":common", configuration = "namedElements")) {
-        isTransitive = false
-    }
-    bundle(project(path = ":common", configuration = "transformProductionNeoForge")) {
-        isTransitive = false
-    }
-    testImplementation(project(":common", configuration = "namedElements"))
-
-    listOf(
-        libs.graal,
-        libs.molang
-    ).forEach {
-        forgeRuntimeLibrary(it)
-        bundle(it)
-    }
+//    neoForge(libs.neoforge)
+//    //Because of the JEI mapping issues if we want
+//    //a forge launch we gotta do some wacky stuff
+//    //modImplementation(libs.jeiForge)
+//    //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6'
+//    //modImplementation(libs.flywheelForge)
+//    //include(libs.flywheelForge)
+//    modLocalRuntime(libs.neoforge.debugutils)
+//    implementation(project(":common", configuration = "namedElements")) {
+//        isTransitive = false
+//    }
+//    implementation(libs.neo.kotlin.forge) {
+//        exclude(group = "net.neoforged.fancymodloader", module = "loader")
+//    }
+//    "developmentNeoForge"(project(":common", configuration = "namedElements")) {
+//        isTransitive = false
+//    }
+//    bundle(project(path = ":common", configuration = "transformProductionNeoForge")) {
+//        isTransitive = false
+//    }
+//    testImplementation(project(":common", configuration = "namedElements"))
+//
+//    listOf(
+//        libs.graal,
+//        libs.molang
+//    ).forEach {
+//        forgeRuntimeLibrary(it)
+//        bundle(it)
+//    }
 }

 tasks {
@@ -97,9 +97,9 @@ tasks {
 }

 //Stole from architect discord, replaces loom.forge.convertAccessWideners
-tasks.remapJar {
-    atAccessWideners.add("cobblemon-common.accesswidener")
-}
+//tasks.remapJar {
+//    atAccessWideners.add("cobblemon-common.accesswidener")
+//}


 //jar {
@@ -17,8 +17,8 @@ rootProject.name = "cobblemon"

 listOf(
    "common",
-    "fabric",
-    "neoforge"
+//    "fabric",
+//    "neoforge"
 ).forEach { setupProject(it, file(it)) }

 fun setupProject(name: String, projectDirectory: File) = setupProject(name) {
@@ -57,7 +57,13 @@ def generate_markdown(json_directory, output_markdown_file):
        output_file.write(markdown_content)


-# Example usage
-json_directory = '../../common/src/main/resources/data/cobblemon/spawn_detail_presets'
-output_markdown_file = '../../docs/cobblemon-tags/spawnPresetList.md'
-generate_markdown(json_directory, output_markdown_file)
+def main():
+    # Example usage
+    json_directory = '../../common/src/main/resources/data/cobblemon/spawn_detail_presets'
+    output_markdown_file = '../../docs/cobblemon-tags/spawnPresetList.md'
+    generate_markdown(json_directory, output_markdown_file)
+    print("Spawn preset list successfully generated.")
+
+
+if __name__ == "__main__":
+    main()
@@ -8,15 +8,15 @@ BASE_PATHS = [
    "{root}/common/src/main/resources/data/minecraft/tags"
 ]
 OUTPUT_PATHS = {
-    'blocks': "{root}/docs/cobblemon-tags/BlocksTags.md",
-    'entity_types': "{root}/docs/cobblemon-tags/EntityTypesTags.md",
-    'items': "{root}/docs/cobblemon-tags/ItemTags.md",
+    'block': "{root}/docs/cobblemon-tags/BlocksTags.md",
+    'entity_type': "{root}/docs/cobblemon-tags/EntityTypesTags.md",
+    'item': "{root}/docs/cobblemon-tags/ItemTags.md",
    'biome': "{root}/docs/cobblemon-tags/BiomeTags.md",
 }
 DETAIL_TAGFILE_HEADERS = {
-    'blocks': "# Block Tags\n\nThis file contains tags related to blocks in cobblemon.\n\n## Tags:\n",
-    'entity_types': "# Entity Types Tags\n\nThis file contains tags related to different types of entities in cobblemon.\n\n## Tags:\n",
-    'items': "# Item Tags\n\nThis file contains tags related to items in cobblemon.\n\n## Tags:\n",
+    'block': "# Block Tags\n\nThis file contains tags related to block in cobblemon.\n\n## Tags:\n",
+    'entity_type': "# Entity Types Tags\n\nThis file contains tags related to different types of entities in cobblemon.\n\n## Tags:\n",
+    'item': "# Item Tags\n\nThis file contains tags related to items in cobblemon.\n\n## Tags:\n",
    'biome': "# Biome Tags\n\nThis file contains tags related to different biomes in cobblemon, as well as some worldgen and special evolution tags.\n\n## Tags:\n",
 }

@@ -33,12 +33,12 @@ def open_files_and_write_headers():


 def determine_category(root):
-    if 'blocks' in root:
-        return 'blocks'
-    elif 'entity_types' in root:
-        return 'entity_types'
-    elif 'items' in root:
-        return 'items'
+    if 'block' in root:
+        return 'block'
+    elif 'entity_type' in root:
+        return 'entity_type'
+    elif 'item' in root:
+        return 'item'
    elif 'biome' in root:
        return 'biome'
    return None
Author	SHA1	Message	Date
Nick	4550ea590a	Fun times begin	2025-01-17 18:19:56 -08:00
Polymeta	8747d3cd6f	changelog 1.6.1 prep [skip-ci] Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>	2024-12-26 00:06:13 +00:00
Hiroku	ca7a4e12be	Merge branch 'change-modmenu-links' into 'main' Update mod menu links See merge request cable-mc/cobblemon!1424	2024-12-25 09:08:44 +00:00
lion	9c3b713c4a	Update mod menu links	2024-12-25 09:08:44 +00:00
Hiroku	6c0c352001	Merge branch 'fix-dex-crash-when-switching-forms' into 'main' Fix Pokédex crash when switching forms See merge request cable-mc/cobblemon!1423	2024-12-25 06:29:12 +00:00
lion	51c1706a9a	Fix Pokédex crash when switching forms	2024-12-25 06:29:11 +00:00
Hiroku	5320704702	Edit gradle.properties	2024-12-25 06:27:07 +00:00
Paul	91e28616a9	Lil changelog amendment [skip-ci]	2024-12-25 11:39:29 +10:00
Paul	8df06a4836	The grinch stole the jar!! [skip-ci]	2024-12-25 09:25:42 +10:00
Hiroku	f2c9886ae0	Merge branch 'feature/updated-tag-scripts' into 'main' update and run tag scripts See merge request cable-mc/cobblemon!1420	2024-12-24 23:25:12 +00:00
Polymeta	d74ca7b70d	update and run tag scripts	2024-12-24 23:25:12 +00:00