From 4d2594993f23b48f1611df201b191258b1e96ee6 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 07:02:05 -0400
Subject: [PATCH 01/14] Fix tropical wilds for now

---
 biomes/tropical/tro-wilds.json | 143 +++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)

diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/tro-wilds.json
index ff10b0a6..a1c55a6b 100644
--- a/biomes/tropical/tro-wilds.json
+++ b/biomes/tropical/tro-wilds.json
@@ -177,6 +177,149 @@
                 "y": 0,
                 "z": 0
             }
+        },
+        {
+            "mode": "PAINT",
+            "chance": 0.0025,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["clutter/bincluster1"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.00375,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["clutter/camp1"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.4,
+            "density": 2,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/jungle/cocogeneric2",
+                "trees/jungle/cocogeneric3",
+                "trees/jungle/cocogeneric4",
+                "trees/jungle/cocogeneric5",
+                "trees/jungle/lgeneric6",
+                "trees/jungle/lgeneric7",
+                "trees/jungle/lgeneric8",
+                "trees/jungle/lgeneric9",
+                "trees/jungle/lgeneric1",
+                "trees/jungle/lgeneric2",
+                "trees/jungle/lgeneric3"
+            ],
+            "translate": {
+                "x": 0,
+                "y": -5,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.45,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/jungle/sgeneric1",
+                "trees/jungle/sgeneric2",
+                "trees/jungle/sgeneric3",
+                "trees/jungle/sgeneric4"
+            ],
+            "translate": {
+                "x": 0,
+                "y": -2,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.06,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/boulder1",
+                "clutter/boulder2",
+                "clutter/boulder4",
+                "clutter/boulder5",
+                "clutter/boulder6",
+                "clutter/boulder7",
+                "clutter/boulder8"
+            ],
+            "translate": {
+                "x": 0,
+                "y": -2,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.01,
+            "mode": "FAST_MIN_HEIGHT",
+            "density": 3,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/jungle/largegeneric1",
+                "trees/jungle/largegeneric2",
+                "trees/jungle/largegeneric3",
+                "trees/jungle/largegeneric4",
+                "trees/jungle/largegeneric5"
+            ],
+            "translate": {
+                "x": 0,
+                "y": -12,
+                "z": 0
+            }
         }
     ],
     "biomeZoom": 40,

From 59250bc957c51a689d37d2cfa1bb1c2c3b1a82a2 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 08:14:15 -0400
Subject: [PATCH 02/14] Reduce ID Pollution

---
 biomes/frozen/{fzn-hills.json => hills.json}  |   0
 ...ntain-cliffs.json => mountain-cliffs.json} |   0
 ...ntain-middle.json => mountain-middle.json} |   0
 .../{fzn-mountain.json => mountain.json}      |   6 +-
 .../{fzn-mountains.json => mountains.json}    |   4 +-
 biomes/frozen/{fzn-peak.json => peak.json}    |   0
 .../{fzn-pine-hills.json => pine-hills.json}  |   0
 ...{fzn-pine-plains.json => pine-plains.json} |   2 +-
 biomes/frozen/{fzn-pines.json => pines.json}  |   0
 .../frozen/{fzn-plains.json => plains.json}   |   2 +-
 ...edwood-forest.json => redwood-forest.json} |   0
 .../sea/ocean.json}                           |   0
 .../sea/river.json}                           |   0
 .../{fzn-beach.json => shore/beach.json}      |   0
 ...zn-spruce-hills.json => spruce-hills.json} |   0
 ...-spruce-plains.json => spruce-plains.json} |   2 +-
 .../frozen/{fzn-vander.json => vander.json}   |   0
 ...t-dunes-red.json => desert-dunes-red.json} |   0
 ...ot-desert-dunes.json => desert-dunes.json} |   0
 ...ntain-cliffs.json => mountain-cliffs.json} |   0
 ...ntain-middle.json => mountain-middle.json} |   0
 ...ntain-plains.json => mountain-plains.json} |   0
 .../hot/{hot-mountain.json => mountain.json}  |   0
 biomes/hot/{hot-oasis.json => oasis.json}     |   0
 .../sea/ocean-cliffs.json}                    |   0
 .../oce-hot-ocean.json => hot/sea/ocean.json} |   2 +-
 .../oce-hot-river.json => hot/sea/river.json} |   0
 .../beach-grass.json}                         |   0
 .../hot/{hot-beach.json => shore/beach.json}  |   0
 biomes/{hot/msa-blue.json => mesa/blue.json}  |   0
 .../{hot/msa-cliffs.json => mesa/cliffs.json} |   0
 biomes/{hot/msa-dark.json => mesa/dark.json}  |   8 +-
 .../{hot/msa-green.json => mesa/green.json}   |   0
 biomes/{hot/msa-mesa.json => mesa/mesa.json}  |  16 +-
 .../plateau-dirt-high.json}                   |   0
 .../plateau-dirt.json}                        |   0
 .../plateau-high.json}                        |   2 +-
 .../msa-plateau.json => mesa/plateau.json}    |   2 +-
 biomes/{hot/msa-red.json => mesa/red.json}    |   0
 .../msa-river.json => mesa/sea/river.json}    |   0
 .../msa-beach.json => mesa/shore/beach.json}  |   0
 .../msa-valleys.json => mesa/valleys.json}    |   0
 .../{hot/msa-yellow.json => mesa/yellow.json} |   2 +-
 .../mountain/{mtn-cliffs.json => cliffs.json} |   0
 ...tn-forest-hills.json => forest-hills.json} |   0
 .../mountain/{mtn-forest.json => forest.json} |   0
 .../mountain/{mtn-hills.json => hills.json}   |   2 +-
 biomes/mountain/{mtn-main.json => main.json}  |   2 +-
 .../mountain/{mtn-middle.json => middle.json} |   2 +-
 .../{mtn-mountain.json => mountain.json}      |   2 +-
 ...{mtn-plain-hills.json => plain-hills.json} |   0
 .../mountain/{mtn-plains.json => plains.json} |   0
 .../sea/lake.json}                            |   0
 .../sea/river-soft.json}                      |   0
 .../sea/river.json}                           |   0
 .../{mtn-beach.json => shore/beach.json}      |   0
 ...rimson-forest.json => crimson-forest.json} |   0
 ...us-forest-hills.json => forest-hills.json} |   0
 .../mushroom/{mus-forest.json => forest.json} |   2 +-
 .../mushroom/{mus-plains.json => plains.json} |   0
 .../sea/lake.json}                            |   0
 .../sea/ocean.json}                           |   0
 .../{mus-beach.json => shore/beach.json}      |   0
 ...-warped-forest.json => warped-forest.json} |   0
 .../acacia-denmyre.json}                      |   0
 .../sav-cliff.json => savanna/cliff.json}     |   2 +-
 .../sav-forest.json => savanna/forest.json}   |   0
 .../sav-plateau.json => savanna/plateau.json} |   0
 .../sav-savanna.json => savanna/savanna.json} |   2 +-
 .../shore/beach.json}                         |   0
 .../swamp/{swa-denmyre.json => denmyre.json}  |   0
 ...wa-marsh-rotten.json => marsh-rotten.json} |   0
 biomes/swamp/{swa-marsh.json => marsh.json}   |   2 +-
 ...-roofed-forest.json => roofed-forest.json} |   2 +-
 ...oofed-wayward.json => roofed-wayward.json} |   2 +-
 biomes/swamp/{swa-lake.json => sea/lake.json} |   2 +-
 .../sea/ocean-tree.json}                      |   0
 .../sea/ocean.json}                           |   0
 .../{swa-beach.json => shore/beach.json}      |   0
 ...-willow-forest.json => willow-forest.json} |   4 +-
 ...-birch-denmyre.json => birch-denmyre.json} |   0
 ...em-birch-forest.json => birch-forest.json} |   2 +-
 ...-flower-forest.json => flower-forest.json} |   0
 .../{tem-highlands.json => highlands.json}    |   0
 .../{tem-island.json => island.json}          |   2 +-
 ...gtree-forest.json => longtree-forest.json} |   0
 ...{tem-oak-denmyre.json => oak-denmyre.json} |   0
 .../{tem-oak-forest.json => oak-forest.json}  |   2 +-
 .../{tem-oak-hills.json => oak-hills.json}    |   0
 biomes/temperate/{tem-oak.json => oak.json}   |   2 +-
 ...{tem-plain-hills.json => plain-hills.json} |   0
 .../{tem-plains.json => plains.json}          |   4 +-
 .../{tem-plateau.json => plateau.json}        |   0
 ...pink-child.json => sakura-pink-child.json} |   0
 ...nk-forest.json => sakura-pink-forest.json} |   2 +-
 .../sea/ocean-deep.json}                      |   0
 .../sea/ocean.json}                           |   0
 .../sea/river.json}                           |   0
 .../{tem-beach.json => shore/beach.json}      |   0
 .../oak-beach.json}                           |   0
 ...anged-plains.json => stranged-plains.json} |   0
 .../temperate/{tem-wilds.json => wilds.json}  |   2 +-
 ...-bamboo-forest.json => bamboo-forest.json} |   2 +-
 ...ro-beach-bamboo.json => beach-bamboo.json} |   0
 ...-beach-charred.json => beach-charred.json} |   0
 .../tropical/{tro-beach.json => beach.json}   |   0
 .../{tro-highlands.json => highlands.json}    |   0
 ...ro-island-beach.json => island-beach.json} |   0
 ...ungle-denmyre.json => jungle-denmyre.json} |   0
 ...ain-extreme.json => mountain-extreme.json} |   2 +-
 ...ntain-middle.json => mountain-middle.json} |   2 +-
 ...ntain-plains.json => mountain-plains.json} |   0
 ...ountain-water.json => mountain-water.json} |   0
 .../{tro-mountain.json => mountain.json}      |   2 +-
 ...ro-plains-hills.json => plains-hills.json} |   0
 .../tropical/{tro-plains.json => plains.json} |   2 +-
 ...orest-hills.json => rainforest-hills.json} |   0
 ...est-island.json => rainforest-island.json} |   0
 ...hild.json => rainforest-wicked-child.json} |   0
 ...ge.json => rainforest-wicked-village.json} |   0
 ...est-wicked.json => rainforest-wicked.json} |   6 +-
 .../{tro-rainforest.json => rainforest.json}  |   4 +-
 .../sea/coral-ocean-cliffs.json}              |   2 +-
 .../sea/coral-ocean.json}                     |   0
 .../sea/ocean.json}                           |   4 +-
 .../sea/river-soft.json}                      |   0
 .../sea/river-steep.json}                     |   0
 ...-volcanic.json => submerged-volcanic.json} |   0
 ...canic-plains.json => volcanic-plains.json} |   2 +-
 ...olcanoes-lava.json => volcanoes-lava.json} |   0
 .../{tro-volcanoes.json => volcanoes.json}    |   2 +-
 .../tropical/{tro-wilds.json => wilds.json}   |   2 +-
 biomes/tundra/autumn.json                     |   2 +-
 ...-bonsai-forest.json => bonsai-forest.json} |   4 +-
 ...-forest-cliffs.json => forest-cliffs.json} |   0
 .../tundra/{tun-forest.json => forest.json}   |   2 +-
 ...un-magic-forest.json => magic-forest.json} |   0
 ...ains-cliffs.json => mountains-cliffs.json} |   0
 .../{tun-mountains.json => mountains.json}    |   2 +-
 ...edwood-cliffs.json => redwood-cliffs.json} |   0
 ...edwood-forest.json => redwood-forest.json} |   2 +-
 .../tundra/{tun-lake.json => sea/lake.json}   |   0
 .../sea/river-rocky.json}                     |   0
 .../sea/river.json}                           |   2 +-
 ...uia-redwoods.json => sequia-redwoods.json} |   0
 .../beach-stone.json}                         |   0
 .../{tun-beach.json => shore/beach.json}      |   0
 ...pruce-denmyre.json => spruce-denmyre.json} |   0
 biomes/tundra/{tun-taiga.json => taiga.json}  |   0
 dimensions/overworld.json                     |   9 +-
 regions/frozen.json                           |  24 +--
 regions/hot.json                              |  32 ++--
 regions/mushroom.json                         |  14 +-
 regions/ocean.json                            |  69 -------
 regions/swamp.json                            |  16 +-
 regions/temperate.json                        |  40 ++--
 regions/tropical.json                         |  38 ++--
 regions/tundra.json                           | 178 ++++++++++--------
 158 files changed, 258 insertions(+), 298 deletions(-)
 rename biomes/frozen/{fzn-hills.json => hills.json} (100%)
 rename biomes/frozen/{fzn-mountain-cliffs.json => mountain-cliffs.json} (100%)
 rename biomes/frozen/{fzn-mountain-middle.json => mountain-middle.json} (100%)
 rename biomes/frozen/{fzn-mountain.json => mountain.json} (96%)
 rename biomes/frozen/{fzn-mountains.json => mountains.json} (99%)
 rename biomes/frozen/{fzn-peak.json => peak.json} (100%)
 rename biomes/frozen/{fzn-pine-hills.json => pine-hills.json} (100%)
 rename biomes/frozen/{fzn-pine-plains.json => pine-plains.json} (98%)
 rename biomes/frozen/{fzn-pines.json => pines.json} (100%)
 rename biomes/frozen/{fzn-plains.json => plains.json} (99%)
 rename biomes/frozen/{fzn-redwood-forest.json => redwood-forest.json} (100%)
 rename biomes/{ocean/oce-fzn-ocean.json => frozen/sea/ocean.json} (100%)
 rename biomes/{ocean/oce-fzn-river.json => frozen/sea/river.json} (100%)
 rename biomes/frozen/{fzn-beach.json => shore/beach.json} (100%)
 rename biomes/frozen/{fzn-spruce-hills.json => spruce-hills.json} (100%)
 rename biomes/frozen/{fzn-spruce-plains.json => spruce-plains.json} (98%)
 rename biomes/frozen/{fzn-vander.json => vander.json} (100%)
 rename biomes/hot/{hot-desert-dunes-red.json => desert-dunes-red.json} (100%)
 rename biomes/hot/{hot-desert-dunes.json => desert-dunes.json} (100%)
 rename biomes/hot/{hot-mountain-cliffs.json => mountain-cliffs.json} (100%)
 rename biomes/hot/{hot-mountain-middle.json => mountain-middle.json} (100%)
 rename biomes/hot/{hot-mountain-plains.json => mountain-plains.json} (100%)
 rename biomes/hot/{hot-mountain.json => mountain.json} (100%)
 rename biomes/hot/{hot-oasis.json => oasis.json} (100%)
 rename biomes/{ocean/oce-hot-ocean-cliffs.json => hot/sea/ocean-cliffs.json} (100%)
 rename biomes/{ocean/oce-hot-ocean.json => hot/sea/ocean.json} (99%)
 rename biomes/{ocean/oce-hot-river.json => hot/sea/river.json} (100%)
 rename biomes/hot/{hot-beach-grass.json => shore/beach-grass.json} (100%)
 rename biomes/hot/{hot-beach.json => shore/beach.json} (100%)
 rename biomes/{hot/msa-blue.json => mesa/blue.json} (100%)
 rename biomes/{hot/msa-cliffs.json => mesa/cliffs.json} (100%)
 rename biomes/{hot/msa-dark.json => mesa/dark.json} (97%)
 rename biomes/{hot/msa-green.json => mesa/green.json} (100%)
 rename biomes/{hot/msa-mesa.json => mesa/mesa.json} (95%)
 rename biomes/{hot/msa-plateau-dirt-high.json => mesa/plateau-dirt-high.json} (100%)
 rename biomes/{hot/msa-plateau-dirt.json => mesa/plateau-dirt.json} (100%)
 rename biomes/{hot/msa-plateau-high.json => mesa/plateau-high.json} (98%)
 rename biomes/{hot/msa-plateau.json => mesa/plateau.json} (99%)
 rename biomes/{hot/msa-red.json => mesa/red.json} (100%)
 rename biomes/{ocean/msa-river.json => mesa/sea/river.json} (100%)
 rename biomes/{hot/msa-beach.json => mesa/shore/beach.json} (100%)
 rename biomes/{hot/msa-valleys.json => mesa/valleys.json} (100%)
 rename biomes/{hot/msa-yellow.json => mesa/yellow.json} (98%)
 rename biomes/mountain/{mtn-cliffs.json => cliffs.json} (100%)
 rename biomes/mountain/{mtn-forest-hills.json => forest-hills.json} (100%)
 rename biomes/mountain/{mtn-forest.json => forest.json} (100%)
 rename biomes/mountain/{mtn-hills.json => hills.json} (99%)
 rename biomes/mountain/{mtn-main.json => main.json} (98%)
 rename biomes/mountain/{mtn-middle.json => middle.json} (98%)
 rename biomes/mountain/{mtn-mountain.json => mountain.json} (98%)
 rename biomes/mountain/{mtn-plain-hills.json => plain-hills.json} (100%)
 rename biomes/mountain/{mtn-plains.json => plains.json} (100%)
 rename biomes/{ocean/oce-mtn-lake.json => mountain/sea/lake.json} (100%)
 rename biomes/{ocean/oce-mtn-river-soft.json => mountain/sea/river-soft.json} (100%)
 rename biomes/{ocean/oce-mtn-river.json => mountain/sea/river.json} (100%)
 rename biomes/mountain/{mtn-beach.json => shore/beach.json} (100%)
 rename biomes/mushroom/{mus-crimson-forest.json => crimson-forest.json} (100%)
 rename biomes/mushroom/{mus-forest-hills.json => forest-hills.json} (100%)
 rename biomes/mushroom/{mus-forest.json => forest.json} (99%)
 rename biomes/mushroom/{mus-plains.json => plains.json} (100%)
 rename biomes/{ocean/oce-mus-lake.json => mushroom/sea/lake.json} (100%)
 rename biomes/{ocean/oce-mus-ocean.json => mushroom/sea/ocean.json} (100%)
 rename biomes/mushroom/{mus-beach.json => shore/beach.json} (100%)
 rename biomes/mushroom/{mus-warped-forest.json => warped-forest.json} (100%)
 rename biomes/{hot/sav-acacia-denmyre.json => savanna/acacia-denmyre.json} (100%)
 rename biomes/{hot/sav-cliff.json => savanna/cliff.json} (99%)
 rename biomes/{hot/sav-forest.json => savanna/forest.json} (100%)
 rename biomes/{hot/sav-plateau.json => savanna/plateau.json} (100%)
 rename biomes/{hot/sav-savanna.json => savanna/savanna.json} (99%)
 rename biomes/{hot/sav-beach.json => savanna/shore/beach.json} (100%)
 rename biomes/swamp/{swa-denmyre.json => denmyre.json} (100%)
 rename biomes/swamp/{swa-marsh-rotten.json => marsh-rotten.json} (100%)
 rename biomes/swamp/{swa-marsh.json => marsh.json} (98%)
 rename biomes/swamp/{swa-roofed-forest.json => roofed-forest.json} (99%)
 rename biomes/swamp/{swa-roofed-wayward.json => roofed-wayward.json} (99%)
 rename biomes/swamp/{swa-lake.json => sea/lake.json} (98%)
 rename biomes/{ocean/oce-swa-ocean-tree.json => swamp/sea/ocean-tree.json} (100%)
 rename biomes/{ocean/oce-swa-ocean.json => swamp/sea/ocean.json} (100%)
 rename biomes/swamp/{swa-beach.json => shore/beach.json} (100%)
 rename biomes/swamp/{swa-willow-forest.json => willow-forest.json} (99%)
 rename biomes/temperate/{tem-birch-denmyre.json => birch-denmyre.json} (100%)
 rename biomes/temperate/{tem-birch-forest.json => birch-forest.json} (99%)
 rename biomes/temperate/{tem-flower-forest.json => flower-forest.json} (100%)
 rename biomes/temperate/{tem-highlands.json => highlands.json} (100%)
 rename biomes/temperate/{tem-island.json => island.json} (98%)
 rename biomes/temperate/{tem-longtree-forest.json => longtree-forest.json} (100%)
 rename biomes/temperate/{tem-oak-denmyre.json => oak-denmyre.json} (100%)
 rename biomes/temperate/{tem-oak-forest.json => oak-forest.json} (99%)
 rename biomes/temperate/{tem-oak-hills.json => oak-hills.json} (100%)
 rename biomes/temperate/{tem-oak.json => oak.json} (99%)
 rename biomes/temperate/{tem-plain-hills.json => plain-hills.json} (100%)
 rename biomes/temperate/{tem-plains.json => plains.json} (99%)
 rename biomes/temperate/{tem-plateau.json => plateau.json} (100%)
 rename biomes/temperate/{tem-sakura-pink-child.json => sakura-pink-child.json} (100%)
 rename biomes/temperate/{tem-sakura-pink-forest.json => sakura-pink-forest.json} (99%)
 rename biomes/{ocean/oce-tem-ocean-deep.json => temperate/sea/ocean-deep.json} (100%)
 rename biomes/{ocean/oce-tem-ocean.json => temperate/sea/ocean.json} (100%)
 rename biomes/{ocean/oce-tem-river.json => temperate/sea/river.json} (100%)
 rename biomes/temperate/{tem-beach.json => shore/beach.json} (100%)
 rename biomes/temperate/{tem-oak-beach.json => shore/oak-beach.json} (100%)
 rename biomes/temperate/{tem-stranged-plains.json => stranged-plains.json} (100%)
 rename biomes/temperate/{tem-wilds.json => wilds.json} (99%)
 rename biomes/tropical/{tro-bamboo-forest.json => bamboo-forest.json} (99%)
 rename biomes/tropical/{tro-beach-bamboo.json => beach-bamboo.json} (100%)
 rename biomes/tropical/{tro-beach-charred.json => beach-charred.json} (100%)
 rename biomes/tropical/{tro-beach.json => beach.json} (100%)
 rename biomes/tropical/{tro-highlands.json => highlands.json} (100%)
 rename biomes/tropical/{tro-island-beach.json => island-beach.json} (100%)
 rename biomes/tropical/{tro-jungle-denmyre.json => jungle-denmyre.json} (100%)
 rename biomes/tropical/{tro-mountain-extreme.json => mountain-extreme.json} (98%)
 rename biomes/tropical/{tro-mountain-middle.json => mountain-middle.json} (98%)
 rename biomes/tropical/{tro-mountain-plains.json => mountain-plains.json} (100%)
 rename biomes/tropical/{tro-mountain-water.json => mountain-water.json} (100%)
 rename biomes/tropical/{tro-mountain.json => mountain.json} (98%)
 rename biomes/tropical/{tro-plains-hills.json => plains-hills.json} (100%)
 rename biomes/tropical/{tro-plains.json => plains.json} (98%)
 rename biomes/tropical/{tro-rainforest-hills.json => rainforest-hills.json} (100%)
 rename biomes/tropical/{tro-rainforest-island.json => rainforest-island.json} (100%)
 rename biomes/tropical/{tro-rainforest-wicked-child.json => rainforest-wicked-child.json} (100%)
 rename biomes/tropical/{tro-rainforest-wicked-village.json => rainforest-wicked-village.json} (100%)
 rename biomes/tropical/{tro-rainforest-wicked.json => rainforest-wicked.json} (98%)
 rename biomes/tropical/{tro-rainforest.json => rainforest.json} (99%)
 rename biomes/{ocean/oce-tro-coral-ocean-cliffs.json => tropical/sea/coral-ocean-cliffs.json} (99%)
 rename biomes/{ocean/oce-tro-coral-ocean.json => tropical/sea/coral-ocean.json} (100%)
 rename biomes/{ocean/oce-tro-ocean.json => tropical/sea/ocean.json} (98%)
 rename biomes/{ocean/oce-tro-river-soft.json => tropical/sea/river-soft.json} (100%)
 rename biomes/{ocean/oce-tro-river-steep.json => tropical/sea/river-steep.json} (100%)
 rename biomes/tropical/{tro-submerged-volcanic.json => submerged-volcanic.json} (100%)
 rename biomes/tropical/{tro-volcanic-plains.json => volcanic-plains.json} (98%)
 rename biomes/tropical/{tro-volcanoes-lava.json => volcanoes-lava.json} (100%)
 rename biomes/tropical/{tro-volcanoes.json => volcanoes.json} (96%)
 rename biomes/tropical/{tro-wilds.json => wilds.json} (99%)
 rename biomes/tundra/{tun-bonsai-forest.json => bonsai-forest.json} (99%)
 rename biomes/tundra/{tun-forest-cliffs.json => forest-cliffs.json} (100%)
 rename biomes/tundra/{tun-forest.json => forest.json} (99%)
 rename biomes/tundra/{tun-magic-forest.json => magic-forest.json} (100%)
 rename biomes/tundra/{tun-mountains-cliffs.json => mountains-cliffs.json} (100%)
 rename biomes/tundra/{tun-mountains.json => mountains.json} (99%)
 rename biomes/tundra/{tun-redwood-cliffs.json => redwood-cliffs.json} (100%)
 rename biomes/tundra/{tun-redwood-forest.json => redwood-forest.json} (99%)
 rename biomes/tundra/{tun-lake.json => sea/lake.json} (100%)
 rename biomes/{ocean/oce-tun-river-rocky.json => tundra/sea/river-rocky.json} (100%)
 rename biomes/{ocean/oce-tun-river.json => tundra/sea/river.json} (98%)
 rename biomes/tundra/{tun-sequia-redwoods.json => sequia-redwoods.json} (100%)
 rename biomes/tundra/{tun-tundra-beach-stone.json => shore/beach-stone.json} (100%)
 rename biomes/tundra/{tun-beach.json => shore/beach.json} (100%)
 rename biomes/tundra/{tun-spruce-denmyre.json => spruce-denmyre.json} (100%)
 rename biomes/tundra/{tun-taiga.json => taiga.json} (100%)
 delete mode 100644 regions/ocean.json

diff --git a/biomes/frozen/fzn-hills.json b/biomes/frozen/hills.json
similarity index 100%
rename from biomes/frozen/fzn-hills.json
rename to biomes/frozen/hills.json
diff --git a/biomes/frozen/fzn-mountain-cliffs.json b/biomes/frozen/mountain-cliffs.json
similarity index 100%
rename from biomes/frozen/fzn-mountain-cliffs.json
rename to biomes/frozen/mountain-cliffs.json
diff --git a/biomes/frozen/fzn-mountain-middle.json b/biomes/frozen/mountain-middle.json
similarity index 100%
rename from biomes/frozen/fzn-mountain-middle.json
rename to biomes/frozen/mountain-middle.json
diff --git a/biomes/frozen/fzn-mountain.json b/biomes/frozen/mountain.json
similarity index 96%
rename from biomes/frozen/fzn-mountain.json
rename to biomes/frozen/mountain.json
index 83f828e0..de177ab1 100644
--- a/biomes/frozen/fzn-mountain.json
+++ b/biomes/frozen/mountain.json
@@ -5,9 +5,9 @@
     "rarity": 1,
     "vanillaDerivative": "SNOWY_MOUNTAINS",
     "children": [
-        "frozen/fzn-mountain-middle",
-        "frozen/fzn-peak",
-        "frozen/fzn-mountain-cliffs"
+        "frozen/mountain-middle",
+        "frozen/peak",
+        "frozen/mountain-cliffs"
     ],
     "customDerivitives": [{
         "id": "fznmountain",
diff --git a/biomes/frozen/fzn-mountains.json b/biomes/frozen/mountains.json
similarity index 99%
rename from biomes/frozen/fzn-mountains.json
rename to biomes/frozen/mountains.json
index 1fe9cb99..34df2cbf 100644
--- a/biomes/frozen/fzn-mountains.json
+++ b/biomes/frozen/mountains.json
@@ -5,8 +5,8 @@
     "derivative": "SNOWY_MOUNTAINS",
     "vanillaDerivative": "SNOWY_MOUNTAINS",
     "children": [
-        "frozen/fzn-peak",
-        "frozen/fzn-vander"
+        "frozen/peak",
+        "frozen/vander"
     ],
     "customDerivitives": [{
         "id": "fznmountains",
diff --git a/biomes/frozen/fzn-peak.json b/biomes/frozen/peak.json
similarity index 100%
rename from biomes/frozen/fzn-peak.json
rename to biomes/frozen/peak.json
diff --git a/biomes/frozen/fzn-pine-hills.json b/biomes/frozen/pine-hills.json
similarity index 100%
rename from biomes/frozen/fzn-pine-hills.json
rename to biomes/frozen/pine-hills.json
diff --git a/biomes/frozen/fzn-pine-plains.json b/biomes/frozen/pine-plains.json
similarity index 98%
rename from biomes/frozen/fzn-pine-plains.json
rename to biomes/frozen/pine-plains.json
index cc3ae564..dcf81811 100644
--- a/biomes/frozen/fzn-pine-plains.json
+++ b/biomes/frozen/pine-plains.json
@@ -4,7 +4,7 @@
     "color": "#164898",
     "rarity": 1,
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/fzn-pine-hills"],
+    "children": ["frozen/pine-hills"],
     "generators": [
         {
             "generator": "plain",
diff --git a/biomes/frozen/fzn-pines.json b/biomes/frozen/pines.json
similarity index 100%
rename from biomes/frozen/fzn-pines.json
rename to biomes/frozen/pines.json
diff --git a/biomes/frozen/fzn-plains.json b/biomes/frozen/plains.json
similarity index 99%
rename from biomes/frozen/fzn-plains.json
rename to biomes/frozen/plains.json
index 99007fa6..95320d77 100644
--- a/biomes/frozen/fzn-plains.json
+++ b/biomes/frozen/plains.json
@@ -4,7 +4,7 @@
     "color": "#3E5D8F",
     "rarity": 1,
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/fzn-hills"],
+    "children": ["frozen/hills"],
     "generators": [
         {
             "min": 4,
diff --git a/biomes/frozen/fzn-redwood-forest.json b/biomes/frozen/redwood-forest.json
similarity index 100%
rename from biomes/frozen/fzn-redwood-forest.json
rename to biomes/frozen/redwood-forest.json
diff --git a/biomes/ocean/oce-fzn-ocean.json b/biomes/frozen/sea/ocean.json
similarity index 100%
rename from biomes/ocean/oce-fzn-ocean.json
rename to biomes/frozen/sea/ocean.json
diff --git a/biomes/ocean/oce-fzn-river.json b/biomes/frozen/sea/river.json
similarity index 100%
rename from biomes/ocean/oce-fzn-river.json
rename to biomes/frozen/sea/river.json
diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/shore/beach.json
similarity index 100%
rename from biomes/frozen/fzn-beach.json
rename to biomes/frozen/shore/beach.json
diff --git a/biomes/frozen/fzn-spruce-hills.json b/biomes/frozen/spruce-hills.json
similarity index 100%
rename from biomes/frozen/fzn-spruce-hills.json
rename to biomes/frozen/spruce-hills.json
diff --git a/biomes/frozen/fzn-spruce-plains.json b/biomes/frozen/spruce-plains.json
similarity index 98%
rename from biomes/frozen/fzn-spruce-plains.json
rename to biomes/frozen/spruce-plains.json
index 1e434587..e8345b97 100644
--- a/biomes/frozen/fzn-spruce-plains.json
+++ b/biomes/frozen/spruce-plains.json
@@ -4,7 +4,7 @@
     "color": "#237695",
     "rarity": 1,
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/fzn-spruce-hills"],
+    "children": ["frozen/spruce-hills"],
     "layers": [
         {
             "minHeight": 0,
diff --git a/biomes/frozen/fzn-vander.json b/biomes/frozen/vander.json
similarity index 100%
rename from biomes/frozen/fzn-vander.json
rename to biomes/frozen/vander.json
diff --git a/biomes/hot/hot-desert-dunes-red.json b/biomes/hot/desert-dunes-red.json
similarity index 100%
rename from biomes/hot/hot-desert-dunes-red.json
rename to biomes/hot/desert-dunes-red.json
diff --git a/biomes/hot/hot-desert-dunes.json b/biomes/hot/desert-dunes.json
similarity index 100%
rename from biomes/hot/hot-desert-dunes.json
rename to biomes/hot/desert-dunes.json
diff --git a/biomes/hot/hot-mountain-cliffs.json b/biomes/hot/mountain-cliffs.json
similarity index 100%
rename from biomes/hot/hot-mountain-cliffs.json
rename to biomes/hot/mountain-cliffs.json
diff --git a/biomes/hot/hot-mountain-middle.json b/biomes/hot/mountain-middle.json
similarity index 100%
rename from biomes/hot/hot-mountain-middle.json
rename to biomes/hot/mountain-middle.json
diff --git a/biomes/hot/hot-mountain-plains.json b/biomes/hot/mountain-plains.json
similarity index 100%
rename from biomes/hot/hot-mountain-plains.json
rename to biomes/hot/mountain-plains.json
diff --git a/biomes/hot/hot-mountain.json b/biomes/hot/mountain.json
similarity index 100%
rename from biomes/hot/hot-mountain.json
rename to biomes/hot/mountain.json
diff --git a/biomes/hot/hot-oasis.json b/biomes/hot/oasis.json
similarity index 100%
rename from biomes/hot/hot-oasis.json
rename to biomes/hot/oasis.json
diff --git a/biomes/ocean/oce-hot-ocean-cliffs.json b/biomes/hot/sea/ocean-cliffs.json
similarity index 100%
rename from biomes/ocean/oce-hot-ocean-cliffs.json
rename to biomes/hot/sea/ocean-cliffs.json
diff --git a/biomes/ocean/oce-hot-ocean.json b/biomes/hot/sea/ocean.json
similarity index 99%
rename from biomes/ocean/oce-hot-ocean.json
rename to biomes/hot/sea/ocean.json
index dfbb17e2..48d90302 100644
--- a/biomes/ocean/oce-hot-ocean.json
+++ b/biomes/hot/sea/ocean.json
@@ -2,7 +2,7 @@
     "name": "Hot Ocean",
     "derivative": "WARM_OCEAN",
     "vanillaDerivative": "WARM_OCEAN",
-    "children": ["ocean/oce-hot-ocean-cliffs"],
+    "children": ["hot/sea/ocean-cliffs"],
     "color": "#103140",
     "generators": [{
         "min": -11,
diff --git a/biomes/ocean/oce-hot-river.json b/biomes/hot/sea/river.json
similarity index 100%
rename from biomes/ocean/oce-hot-river.json
rename to biomes/hot/sea/river.json
diff --git a/biomes/hot/hot-beach-grass.json b/biomes/hot/shore/beach-grass.json
similarity index 100%
rename from biomes/hot/hot-beach-grass.json
rename to biomes/hot/shore/beach-grass.json
diff --git a/biomes/hot/hot-beach.json b/biomes/hot/shore/beach.json
similarity index 100%
rename from biomes/hot/hot-beach.json
rename to biomes/hot/shore/beach.json
diff --git a/biomes/hot/msa-blue.json b/biomes/mesa/blue.json
similarity index 100%
rename from biomes/hot/msa-blue.json
rename to biomes/mesa/blue.json
diff --git a/biomes/hot/msa-cliffs.json b/biomes/mesa/cliffs.json
similarity index 100%
rename from biomes/hot/msa-cliffs.json
rename to biomes/mesa/cliffs.json
diff --git a/biomes/hot/msa-dark.json b/biomes/mesa/dark.json
similarity index 97%
rename from biomes/hot/msa-dark.json
rename to biomes/mesa/dark.json
index 0453940b..8afe5082 100644
--- a/biomes/hot/msa-dark.json
+++ b/biomes/mesa/dark.json
@@ -5,10 +5,10 @@
     "derivative": "SHATTERED_SAVANNA",
     "vanillaDerivative": "ERODED_BADLANDS",
     "children": [
-        "hot/msa-cliffs",
-        "hot/msa-red",
-        "hot/msa-green",
-        "hot/msa-blue"
+        "mesa/cliffs",
+        "mesa/red",
+        "mesa/green",
+        "mesa/blue"
     ],
     "generators": [
         {
diff --git a/biomes/hot/msa-green.json b/biomes/mesa/green.json
similarity index 100%
rename from biomes/hot/msa-green.json
rename to biomes/mesa/green.json
diff --git a/biomes/hot/msa-mesa.json b/biomes/mesa/mesa.json
similarity index 95%
rename from biomes/hot/msa-mesa.json
rename to biomes/mesa/mesa.json
index 8fd94446..91961281 100644
--- a/biomes/hot/msa-mesa.json
+++ b/biomes/mesa/mesa.json
@@ -10,14 +10,14 @@
         "ERODED_BADLANDS"
     ],
     "children": [
-        "hot/msa-valleys",
-        "hot/msa-red",
-        "hot/msa-blue",
-        "hot/msa-dark",
-        "hot/msa-green",
-        "hot/msa-red",
-        "hot/msa-yellow",
-        "hot/msa-blue"
+        "mesa/valleys",
+        "mesa/red",
+        "mesa/blue",
+        "mesa/dark",
+        "mesa/green",
+        "mesa/red",
+        "mesa/yellow",
+        "mesa/blue"
     ],
     "generators": [{
         "min": 25,
diff --git a/biomes/hot/msa-plateau-dirt-high.json b/biomes/mesa/plateau-dirt-high.json
similarity index 100%
rename from biomes/hot/msa-plateau-dirt-high.json
rename to biomes/mesa/plateau-dirt-high.json
diff --git a/biomes/hot/msa-plateau-dirt.json b/biomes/mesa/plateau-dirt.json
similarity index 100%
rename from biomes/hot/msa-plateau-dirt.json
rename to biomes/mesa/plateau-dirt.json
diff --git a/biomes/hot/msa-plateau-high.json b/biomes/mesa/plateau-high.json
similarity index 98%
rename from biomes/hot/msa-plateau-high.json
rename to biomes/mesa/plateau-high.json
index 16346638..1f43f845 100644
--- a/biomes/hot/msa-plateau-high.json
+++ b/biomes/mesa/plateau-high.json
@@ -9,7 +9,7 @@
         "BADLANDS_PLATEAU",
         "ERODED_BADLANDS"
     ],
-    "children": ["hot/msa-plateau-dirt-high"],
+    "children": ["mesa/plateau-dirt-high"],
     "generators": [
         {
             "min": 55,
diff --git a/biomes/hot/msa-plateau.json b/biomes/mesa/plateau.json
similarity index 99%
rename from biomes/hot/msa-plateau.json
rename to biomes/mesa/plateau.json
index cca3d809..36071a4e 100644
--- a/biomes/hot/msa-plateau.json
+++ b/biomes/mesa/plateau.json
@@ -9,7 +9,7 @@
         "BADLANDS_PLATEAU",
         "ERODED_BADLANDS"
     ],
-    "children": ["hot/msa-plateau-dirt"],
+    "children": ["mesa/plateau-dirt"],
     "generators": [
         {
             "min": 35,
diff --git a/biomes/hot/msa-red.json b/biomes/mesa/red.json
similarity index 100%
rename from biomes/hot/msa-red.json
rename to biomes/mesa/red.json
diff --git a/biomes/ocean/msa-river.json b/biomes/mesa/sea/river.json
similarity index 100%
rename from biomes/ocean/msa-river.json
rename to biomes/mesa/sea/river.json
diff --git a/biomes/hot/msa-beach.json b/biomes/mesa/shore/beach.json
similarity index 100%
rename from biomes/hot/msa-beach.json
rename to biomes/mesa/shore/beach.json
diff --git a/biomes/hot/msa-valleys.json b/biomes/mesa/valleys.json
similarity index 100%
rename from biomes/hot/msa-valleys.json
rename to biomes/mesa/valleys.json
diff --git a/biomes/hot/msa-yellow.json b/biomes/mesa/yellow.json
similarity index 98%
rename from biomes/hot/msa-yellow.json
rename to biomes/mesa/yellow.json
index 119db78c..318e51b1 100644
--- a/biomes/hot/msa-yellow.json
+++ b/biomes/mesa/yellow.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BDBF05",
     "vanillaDerivative": "BADLANDS",
-    "children": ["hot/msa-dark"],
+    "children": ["mesa/dark"],
     "generators": [
         {
             "min": 9,
diff --git a/biomes/mountain/mtn-cliffs.json b/biomes/mountain/cliffs.json
similarity index 100%
rename from biomes/mountain/mtn-cliffs.json
rename to biomes/mountain/cliffs.json
diff --git a/biomes/mountain/mtn-forest-hills.json b/biomes/mountain/forest-hills.json
similarity index 100%
rename from biomes/mountain/mtn-forest-hills.json
rename to biomes/mountain/forest-hills.json
diff --git a/biomes/mountain/mtn-forest.json b/biomes/mountain/forest.json
similarity index 100%
rename from biomes/mountain/mtn-forest.json
rename to biomes/mountain/forest.json
diff --git a/biomes/mountain/mtn-hills.json b/biomes/mountain/hills.json
similarity index 99%
rename from biomes/mountain/mtn-hills.json
rename to biomes/mountain/hills.json
index 92d5e9e3..a3542131 100644
--- a/biomes/mountain/mtn-hills.json
+++ b/biomes/mountain/hills.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#48525F",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["mountain/mtn-forest"],
+    "children": ["mountain/forest"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 23,
diff --git a/biomes/mountain/mtn-main.json b/biomes/mountain/main.json
similarity index 98%
rename from biomes/mountain/mtn-main.json
rename to biomes/mountain/main.json
index c7ab282a..dbb8f45d 100644
--- a/biomes/mountain/mtn-main.json
+++ b/biomes/mountain/main.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#2B2E32",
     "vanillaDerivative": "PLAINS",
-    "children": ["mountain/mtn-middle"],
+    "children": ["mountain/middle"],
     "generators": [
         {
             "min": 70,
diff --git a/biomes/mountain/mtn-middle.json b/biomes/mountain/middle.json
similarity index 98%
rename from biomes/mountain/mtn-middle.json
rename to biomes/mountain/middle.json
index f5811534..ac72b96e 100644
--- a/biomes/mountain/mtn-middle.json
+++ b/biomes/mountain/middle.json
@@ -3,7 +3,7 @@
     "color": "#36383C",
     "derivative": "TAIGA_MOUNTAINS",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["mountain/mtn-cliffs"],
+    "children": ["mountain/cliffs"],
     "generators": [
         {
             "generator": "mountain",
diff --git a/biomes/mountain/mtn-mountain.json b/biomes/mountain/mountain.json
similarity index 98%
rename from biomes/mountain/mtn-mountain.json
rename to biomes/mountain/mountain.json
index 753139fc..c4dfb5c9 100644
--- a/biomes/mountain/mtn-mountain.json
+++ b/biomes/mountain/mountain.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#4B4D4F",
     "vanillaDerivative": "MOUNTAIN_EDGE",
-    "children": ["mountain/mtn-middle"],
+    "children": ["mountain/middle"],
     "generators": [
         {
             "min": 70,
diff --git a/biomes/mountain/mtn-plain-hills.json b/biomes/mountain/plain-hills.json
similarity index 100%
rename from biomes/mountain/mtn-plain-hills.json
rename to biomes/mountain/plain-hills.json
diff --git a/biomes/mountain/mtn-plains.json b/biomes/mountain/plains.json
similarity index 100%
rename from biomes/mountain/mtn-plains.json
rename to biomes/mountain/plains.json
diff --git a/biomes/ocean/oce-mtn-lake.json b/biomes/mountain/sea/lake.json
similarity index 100%
rename from biomes/ocean/oce-mtn-lake.json
rename to biomes/mountain/sea/lake.json
diff --git a/biomes/ocean/oce-mtn-river-soft.json b/biomes/mountain/sea/river-soft.json
similarity index 100%
rename from biomes/ocean/oce-mtn-river-soft.json
rename to biomes/mountain/sea/river-soft.json
diff --git a/biomes/ocean/oce-mtn-river.json b/biomes/mountain/sea/river.json
similarity index 100%
rename from biomes/ocean/oce-mtn-river.json
rename to biomes/mountain/sea/river.json
diff --git a/biomes/mountain/mtn-beach.json b/biomes/mountain/shore/beach.json
similarity index 100%
rename from biomes/mountain/mtn-beach.json
rename to biomes/mountain/shore/beach.json
diff --git a/biomes/mushroom/mus-crimson-forest.json b/biomes/mushroom/crimson-forest.json
similarity index 100%
rename from biomes/mushroom/mus-crimson-forest.json
rename to biomes/mushroom/crimson-forest.json
diff --git a/biomes/mushroom/mus-forest-hills.json b/biomes/mushroom/forest-hills.json
similarity index 100%
rename from biomes/mushroom/mus-forest-hills.json
rename to biomes/mushroom/forest-hills.json
diff --git a/biomes/mushroom/mus-forest.json b/biomes/mushroom/forest.json
similarity index 99%
rename from biomes/mushroom/mus-forest.json
rename to biomes/mushroom/forest.json
index f257d7ad..75a3eba4 100644
--- a/biomes/mushroom/mus-forest.json
+++ b/biomes/mushroom/forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BFA6BE",
     "vanillaDerivative": "MUSHROOM_FIELDS",
-    "children": ["mushroom/mus-forest-hills"],
+    "children": ["mushroom/forest-hills"],
     "customDerivitives": [{
         "id": "musforest",
         "waterColor": "#B4B2FF",
diff --git a/biomes/mushroom/mus-plains.json b/biomes/mushroom/plains.json
similarity index 100%
rename from biomes/mushroom/mus-plains.json
rename to biomes/mushroom/plains.json
diff --git a/biomes/ocean/oce-mus-lake.json b/biomes/mushroom/sea/lake.json
similarity index 100%
rename from biomes/ocean/oce-mus-lake.json
rename to biomes/mushroom/sea/lake.json
diff --git a/biomes/ocean/oce-mus-ocean.json b/biomes/mushroom/sea/ocean.json
similarity index 100%
rename from biomes/ocean/oce-mus-ocean.json
rename to biomes/mushroom/sea/ocean.json
diff --git a/biomes/mushroom/mus-beach.json b/biomes/mushroom/shore/beach.json
similarity index 100%
rename from biomes/mushroom/mus-beach.json
rename to biomes/mushroom/shore/beach.json
diff --git a/biomes/mushroom/mus-warped-forest.json b/biomes/mushroom/warped-forest.json
similarity index 100%
rename from biomes/mushroom/mus-warped-forest.json
rename to biomes/mushroom/warped-forest.json
diff --git a/biomes/hot/sav-acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json
similarity index 100%
rename from biomes/hot/sav-acacia-denmyre.json
rename to biomes/savanna/acacia-denmyre.json
diff --git a/biomes/hot/sav-cliff.json b/biomes/savanna/cliff.json
similarity index 99%
rename from biomes/hot/sav-cliff.json
rename to biomes/savanna/cliff.json
index 53cac96e..398f8713 100644
--- a/biomes/hot/sav-cliff.json
+++ b/biomes/savanna/cliff.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BF8931",
     "vanillaDerivative": "SAVANNA",
-    "children": ["hot/sav-acacia-denmyre"],
+    "children": ["savanna/acacia-denmyre"],
     "customDerivitives": [{
         "id": "savcliff",
         "grassColor": "#DFD545",
diff --git a/biomes/hot/sav-forest.json b/biomes/savanna/forest.json
similarity index 100%
rename from biomes/hot/sav-forest.json
rename to biomes/savanna/forest.json
diff --git a/biomes/hot/sav-plateau.json b/biomes/savanna/plateau.json
similarity index 100%
rename from biomes/hot/sav-plateau.json
rename to biomes/savanna/plateau.json
diff --git a/biomes/hot/sav-savanna.json b/biomes/savanna/savanna.json
similarity index 99%
rename from biomes/hot/sav-savanna.json
rename to biomes/savanna/savanna.json
index 6d20d8ac..37c853aa 100644
--- a/biomes/hot/sav-savanna.json
+++ b/biomes/savanna/savanna.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#604418",
     "vanillaDerivative": "SAVANNA",
-    "children": ["hot/sav-cliff"],
+    "children": ["savanna/cliff"],
     "customDerivitives": [{
         "id": "savsavanna",
         "grassColor": "#DFD545",
diff --git a/biomes/hot/sav-beach.json b/biomes/savanna/shore/beach.json
similarity index 100%
rename from biomes/hot/sav-beach.json
rename to biomes/savanna/shore/beach.json
diff --git a/biomes/swamp/swa-denmyre.json b/biomes/swamp/denmyre.json
similarity index 100%
rename from biomes/swamp/swa-denmyre.json
rename to biomes/swamp/denmyre.json
diff --git a/biomes/swamp/swa-marsh-rotten.json b/biomes/swamp/marsh-rotten.json
similarity index 100%
rename from biomes/swamp/swa-marsh-rotten.json
rename to biomes/swamp/marsh-rotten.json
diff --git a/biomes/swamp/swa-marsh.json b/biomes/swamp/marsh.json
similarity index 98%
rename from biomes/swamp/swa-marsh.json
rename to biomes/swamp/marsh.json
index d70e07b5..ce824118 100644
--- a/biomes/swamp/swa-marsh.json
+++ b/biomes/swamp/marsh.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#36A300",
     "vanillaDerivative": "SWAMP",
-    "children": ["swamp/swa-marsh-rotten"],
+    "children": ["swamp/marsh-rotten"],
     "generators": [{
         "min": 3,
         "max": 6,
diff --git a/biomes/swamp/swa-roofed-forest.json b/biomes/swamp/roofed-forest.json
similarity index 99%
rename from biomes/swamp/swa-roofed-forest.json
rename to biomes/swamp/roofed-forest.json
index 07b4809a..1df159c3 100644
--- a/biomes/swamp/swa-roofed-forest.json
+++ b/biomes/swamp/roofed-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#3F9F10",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["swamp/swa-lake"],
+    "children": ["swamp/sea/lake"],
     "generators": [{
         "min": 4,
         "max": 11,
diff --git a/biomes/swamp/swa-roofed-wayward.json b/biomes/swamp/roofed-wayward.json
similarity index 99%
rename from biomes/swamp/swa-roofed-wayward.json
rename to biomes/swamp/roofed-wayward.json
index 2622f736..eab21489 100644
--- a/biomes/swamp/swa-roofed-wayward.json
+++ b/biomes/swamp/roofed-wayward.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#489A20",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["swamp/swa-lake"],
+    "children": ["swamp/sea/lake"],
     "generators": [{
         "min": -7,
         "max": -3,
diff --git a/biomes/swamp/swa-lake.json b/biomes/swamp/sea/lake.json
similarity index 98%
rename from biomes/swamp/swa-lake.json
rename to biomes/swamp/sea/lake.json
index d7330370..b2e066df 100644
--- a/biomes/swamp/swa-lake.json
+++ b/biomes/swamp/sea/lake.json
@@ -4,7 +4,7 @@
     "color": "#6A9140",
     "derivative": "SWAMP",
     "vanillaDerivative": "SWAMP",
-    "children": ["swamp/swa-marsh"],
+    "children": ["swamp/marsh"],
     "generators": [{
         "min": -8,
         "max": -5,
diff --git a/biomes/ocean/oce-swa-ocean-tree.json b/biomes/swamp/sea/ocean-tree.json
similarity index 100%
rename from biomes/ocean/oce-swa-ocean-tree.json
rename to biomes/swamp/sea/ocean-tree.json
diff --git a/biomes/ocean/oce-swa-ocean.json b/biomes/swamp/sea/ocean.json
similarity index 100%
rename from biomes/ocean/oce-swa-ocean.json
rename to biomes/swamp/sea/ocean.json
diff --git a/biomes/swamp/swa-beach.json b/biomes/swamp/shore/beach.json
similarity index 100%
rename from biomes/swamp/swa-beach.json
rename to biomes/swamp/shore/beach.json
diff --git a/biomes/swamp/swa-willow-forest.json b/biomes/swamp/willow-forest.json
similarity index 99%
rename from biomes/swamp/swa-willow-forest.json
rename to biomes/swamp/willow-forest.json
index c686ebfd..c5b7bbd5 100644
--- a/biomes/swamp/swa-willow-forest.json
+++ b/biomes/swamp/willow-forest.json
@@ -5,8 +5,8 @@
     "color": "#648D50",
     "vanillaDerivative": "DARK_FOREST",
     "children": [
-        "swamp/swa-denmyre",
-        "swamp/swa-marsh"
+        "swamp/denmyre",
+        "swamp/marsh"
     ],
     "generators": [{
         "min": 4,
diff --git a/biomes/temperate/tem-birch-denmyre.json b/biomes/temperate/birch-denmyre.json
similarity index 100%
rename from biomes/temperate/tem-birch-denmyre.json
rename to biomes/temperate/birch-denmyre.json
diff --git a/biomes/temperate/tem-birch-forest.json b/biomes/temperate/birch-forest.json
similarity index 99%
rename from biomes/temperate/tem-birch-forest.json
rename to biomes/temperate/birch-forest.json
index 3cbf7851..f1713d71 100644
--- a/biomes/temperate/tem-birch-forest.json
+++ b/biomes/temperate/birch-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#D2DF20",
     "vanillaDerivative": "BIRCH_FOREST",
-    "children": ["temperate/tem-birch-denmyre"],
+    "children": ["temperate/birch-denmyre"],
     "generators": [{
         "min": 4,
         "max": 7,
diff --git a/biomes/temperate/tem-flower-forest.json b/biomes/temperate/flower-forest.json
similarity index 100%
rename from biomes/temperate/tem-flower-forest.json
rename to biomes/temperate/flower-forest.json
diff --git a/biomes/temperate/tem-highlands.json b/biomes/temperate/highlands.json
similarity index 100%
rename from biomes/temperate/tem-highlands.json
rename to biomes/temperate/highlands.json
diff --git a/biomes/temperate/tem-island.json b/biomes/temperate/island.json
similarity index 98%
rename from biomes/temperate/tem-island.json
rename to biomes/temperate/island.json
index 26443de7..394546aa 100644
--- a/biomes/temperate/tem-island.json
+++ b/biomes/temperate/island.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#A9AF50",
     "vanillaDerivative": "PLAINS",
-    "children": ["temperate/tem-wilds"],
+    "children": ["temperate/wilds"],
     "generators": [{
         "min": 28,
         "max": 42,
diff --git a/biomes/temperate/tem-longtree-forest.json b/biomes/temperate/longtree-forest.json
similarity index 100%
rename from biomes/temperate/tem-longtree-forest.json
rename to biomes/temperate/longtree-forest.json
diff --git a/biomes/temperate/tem-oak-denmyre.json b/biomes/temperate/oak-denmyre.json
similarity index 100%
rename from biomes/temperate/tem-oak-denmyre.json
rename to biomes/temperate/oak-denmyre.json
diff --git a/biomes/temperate/tem-oak-forest.json b/biomes/temperate/oak-forest.json
similarity index 99%
rename from biomes/temperate/tem-oak-forest.json
rename to biomes/temperate/oak-forest.json
index 9d94f7c1..f9cb9e91 100644
--- a/biomes/temperate/tem-oak-forest.json
+++ b/biomes/temperate/oak-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BFEF10",
     "vanillaDerivative": "FOREST",
-    "children": ["temperate/tem-oak-denmyre"],
+    "children": ["temperate/oak-denmyre"],
     "customDerivitives": [{
         "id": "temoakforest",
         "foliageColor": "#80B918",
diff --git a/biomes/temperate/tem-oak-hills.json b/biomes/temperate/oak-hills.json
similarity index 100%
rename from biomes/temperate/tem-oak-hills.json
rename to biomes/temperate/oak-hills.json
diff --git a/biomes/temperate/tem-oak.json b/biomes/temperate/oak.json
similarity index 99%
rename from biomes/temperate/tem-oak.json
rename to biomes/temperate/oak.json
index 11ba5d93..55ea1c4f 100644
--- a/biomes/temperate/tem-oak.json
+++ b/biomes/temperate/oak.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#ADCF30",
     "vanillaDerivative": "FOREST",
-    "children": ["temperate/tem-oak-hills"],
+    "children": ["temperate/oak-hills"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 4,
diff --git a/biomes/temperate/tem-plain-hills.json b/biomes/temperate/plain-hills.json
similarity index 100%
rename from biomes/temperate/tem-plain-hills.json
rename to biomes/temperate/plain-hills.json
diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/plains.json
similarity index 99%
rename from biomes/temperate/tem-plains.json
rename to biomes/temperate/plains.json
index d59afeb2..3925c11e 100644
--- a/biomes/temperate/tem-plains.json
+++ b/biomes/temperate/plains.json
@@ -5,8 +5,8 @@
     "color": "#9BAF50",
     "vanillaDerivative": "PLAINS",
     "children": [
-        "temperate/tem-plain-hills",
-        "temperate/tem-wilds"
+        "temperate/plain-hills",
+        "temperate/wilds"
     ],
     "customDerivitives": [{
         "id": "templains",
diff --git a/biomes/temperate/tem-plateau.json b/biomes/temperate/plateau.json
similarity index 100%
rename from biomes/temperate/tem-plateau.json
rename to biomes/temperate/plateau.json
diff --git a/biomes/temperate/tem-sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json
similarity index 100%
rename from biomes/temperate/tem-sakura-pink-child.json
rename to biomes/temperate/sakura-pink-child.json
diff --git a/biomes/temperate/tem-sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json
similarity index 99%
rename from biomes/temperate/tem-sakura-pink-forest.json
rename to biomes/temperate/sakura-pink-forest.json
index c06a347c..0ceae983 100644
--- a/biomes/temperate/tem-sakura-pink-forest.json
+++ b/biomes/temperate/sakura-pink-forest.json
@@ -4,7 +4,7 @@
     "rarity": 2,
     "color": "#DF4FE8",
     "vanillaDerivative": "FOREST",
-    "children": ["temperate/tem-sakura-pink-child"],
+    "children": ["temperate/sakura-pink-child"],
     "childStyle": {
         "style": "IRIS",
         "zoom": 0.3,
diff --git a/biomes/ocean/oce-tem-ocean-deep.json b/biomes/temperate/sea/ocean-deep.json
similarity index 100%
rename from biomes/ocean/oce-tem-ocean-deep.json
rename to biomes/temperate/sea/ocean-deep.json
diff --git a/biomes/ocean/oce-tem-ocean.json b/biomes/temperate/sea/ocean.json
similarity index 100%
rename from biomes/ocean/oce-tem-ocean.json
rename to biomes/temperate/sea/ocean.json
diff --git a/biomes/ocean/oce-tem-river.json b/biomes/temperate/sea/river.json
similarity index 100%
rename from biomes/ocean/oce-tem-river.json
rename to biomes/temperate/sea/river.json
diff --git a/biomes/temperate/tem-beach.json b/biomes/temperate/shore/beach.json
similarity index 100%
rename from biomes/temperate/tem-beach.json
rename to biomes/temperate/shore/beach.json
diff --git a/biomes/temperate/tem-oak-beach.json b/biomes/temperate/shore/oak-beach.json
similarity index 100%
rename from biomes/temperate/tem-oak-beach.json
rename to biomes/temperate/shore/oak-beach.json
diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/stranged-plains.json
similarity index 100%
rename from biomes/temperate/tem-stranged-plains.json
rename to biomes/temperate/stranged-plains.json
diff --git a/biomes/temperate/tem-wilds.json b/biomes/temperate/wilds.json
similarity index 99%
rename from biomes/temperate/tem-wilds.json
rename to biomes/temperate/wilds.json
index 09297648..ed3482b5 100644
--- a/biomes/temperate/tem-wilds.json
+++ b/biomes/temperate/wilds.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#B6CF68",
     "vanillaDerivative": "PLAINS",
-    "children": ["temperate/tem-highlands"],
+    "children": ["temperate/highlands"],
     "customDerivitives": [{
         "id": "temwilds",
         "foliageColor": "#237031",
diff --git a/biomes/tropical/tro-bamboo-forest.json b/biomes/tropical/bamboo-forest.json
similarity index 99%
rename from biomes/tropical/tro-bamboo-forest.json
rename to biomes/tropical/bamboo-forest.json
index db9e790d..4e4d5e7f 100644
--- a/biomes/tropical/tro-bamboo-forest.json
+++ b/biomes/tropical/bamboo-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#9BFF00",
     "vanillaDerivative": "BAMBOO_JUNGLE",
-    "children": ["tropical/tro-wilds"],
+    "children": ["tropical/wilds"],
     "generators": [{
         "min": 5,
         "max": 9,
diff --git a/biomes/tropical/tro-beach-bamboo.json b/biomes/tropical/beach-bamboo.json
similarity index 100%
rename from biomes/tropical/tro-beach-bamboo.json
rename to biomes/tropical/beach-bamboo.json
diff --git a/biomes/tropical/tro-beach-charred.json b/biomes/tropical/beach-charred.json
similarity index 100%
rename from biomes/tropical/tro-beach-charred.json
rename to biomes/tropical/beach-charred.json
diff --git a/biomes/tropical/tro-beach.json b/biomes/tropical/beach.json
similarity index 100%
rename from biomes/tropical/tro-beach.json
rename to biomes/tropical/beach.json
diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/highlands.json
similarity index 100%
rename from biomes/tropical/tro-highlands.json
rename to biomes/tropical/highlands.json
diff --git a/biomes/tropical/tro-island-beach.json b/biomes/tropical/island-beach.json
similarity index 100%
rename from biomes/tropical/tro-island-beach.json
rename to biomes/tropical/island-beach.json
diff --git a/biomes/tropical/tro-jungle-denmyre.json b/biomes/tropical/jungle-denmyre.json
similarity index 100%
rename from biomes/tropical/tro-jungle-denmyre.json
rename to biomes/tropical/jungle-denmyre.json
diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/mountain-extreme.json
similarity index 98%
rename from biomes/tropical/tro-mountain-extreme.json
rename to biomes/tropical/mountain-extreme.json
index 3b0a7fcb..354dab85 100644
--- a/biomes/tropical/tro-mountain-extreme.json
+++ b/biomes/tropical/mountain-extreme.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#838F70",
     "vanillaDerivative": "MODIFIED_JUNGLE",
-    "children": ["tropical/tro-mountain-water"],
+    "children": ["tropical/mountain-water"],
     "generators": [{
         "generator": "mountain",
         "max": 190,
diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/mountain-middle.json
similarity index 98%
rename from biomes/tropical/tro-mountain-middle.json
rename to biomes/tropical/mountain-middle.json
index 2b2c9707..a32bca53 100644
--- a/biomes/tropical/tro-mountain-middle.json
+++ b/biomes/tropical/mountain-middle.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#39FF00",
     "vanillaDerivative": "JUNGLE_HILLS",
-    "children": ["tropical/tro-plains"],
+    "children": ["tropical/plains"],
     "generators": [
         {
             "generator": "mountain",
diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/mountain-plains.json
similarity index 100%
rename from biomes/tropical/tro-mountain-plains.json
rename to biomes/tropical/mountain-plains.json
diff --git a/biomes/tropical/tro-mountain-water.json b/biomes/tropical/mountain-water.json
similarity index 100%
rename from biomes/tropical/tro-mountain-water.json
rename to biomes/tropical/mountain-water.json
diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/mountain.json
similarity index 98%
rename from biomes/tropical/tro-mountain.json
rename to biomes/tropical/mountain.json
index 66079295..5c8b7e34 100644
--- a/biomes/tropical/tro-mountain.json
+++ b/biomes/tropical/mountain.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#2057DF",
     "vanillaDerivative": "JUNGLE_HILLS",
-    "children": ["tropical/tro-mountain-middle"],
+    "children": ["tropical/mountain-middle"],
     "generators": [{
         "min": 75,
         "max": 150,
diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/plains-hills.json
similarity index 100%
rename from biomes/tropical/tro-plains-hills.json
rename to biomes/tropical/plains-hills.json
diff --git a/biomes/tropical/tro-plains.json b/biomes/tropical/plains.json
similarity index 98%
rename from biomes/tropical/tro-plains.json
rename to biomes/tropical/plains.json
index cf7098c5..2ab8c8bf 100644
--- a/biomes/tropical/tro-plains.json
+++ b/biomes/tropical/plains.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#5EBF40",
     "vanillaDerivative": "JUNGLE",
-    "children": ["tropical/tro-plains-hills"],
+    "children": ["tropical/plains-hills"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 20,
diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/rainforest-hills.json
similarity index 100%
rename from biomes/tropical/tro-rainforest-hills.json
rename to biomes/tropical/rainforest-hills.json
diff --git a/biomes/tropical/tro-rainforest-island.json b/biomes/tropical/rainforest-island.json
similarity index 100%
rename from biomes/tropical/tro-rainforest-island.json
rename to biomes/tropical/rainforest-island.json
diff --git a/biomes/tropical/tro-rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json
similarity index 100%
rename from biomes/tropical/tro-rainforest-wicked-child.json
rename to biomes/tropical/rainforest-wicked-child.json
diff --git a/biomes/tropical/tro-rainforest-wicked-village.json b/biomes/tropical/rainforest-wicked-village.json
similarity index 100%
rename from biomes/tropical/tro-rainforest-wicked-village.json
rename to biomes/tropical/rainforest-wicked-village.json
diff --git a/biomes/tropical/tro-rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json
similarity index 98%
rename from biomes/tropical/tro-rainforest-wicked.json
rename to biomes/tropical/rainforest-wicked.json
index 758119b6..44eff35b 100644
--- a/biomes/tropical/tro-rainforest-wicked.json
+++ b/biomes/tropical/rainforest-wicked.json
@@ -5,9 +5,9 @@
     "color": "#10EF15",
     "vanillaDerivative": "MODIFIED_JUNGLE_EDGE",
     "children": [
-        "tropical/tro-rainforest-hills",
-        "tropical/tro-jungle-denmyre",
-        "tropical/tro-rainforest-wicked-child"
+        "tropical/rainforest-hills",
+        "tropical/jungle-denmyre",
+        "tropical/rainforest-wicked-child"
     ],
     "customDerivitives": [{
         "id": "trowkd",
diff --git a/biomes/tropical/tro-rainforest.json b/biomes/tropical/rainforest.json
similarity index 99%
rename from biomes/tropical/tro-rainforest.json
rename to biomes/tropical/rainforest.json
index 8b40a6ff..46aa69d4 100644
--- a/biomes/tropical/tro-rainforest.json
+++ b/biomes/tropical/rainforest.json
@@ -5,8 +5,8 @@
     "rarity": 1,
     "color": "#20DF24",
     "children": [
-        "tropical/tro-rainforest-hills",
-        "tropical/tro-jungle-denmyre"
+        "tropical/rainforest-hills",
+        "tropical/jungle-denmyre"
     ],
     "generators": [{
         "min": 20,
diff --git a/biomes/ocean/oce-tro-coral-ocean-cliffs.json b/biomes/tropical/sea/coral-ocean-cliffs.json
similarity index 99%
rename from biomes/ocean/oce-tro-coral-ocean-cliffs.json
rename to biomes/tropical/sea/coral-ocean-cliffs.json
index 09582ce4..84599237 100644
--- a/biomes/ocean/oce-tro-coral-ocean-cliffs.json
+++ b/biomes/tropical/sea/coral-ocean-cliffs.json
@@ -3,7 +3,7 @@
     "derivative": "LUKEWARM_OCEAN",
     "vanillaDerivative": "LUKEWARM_OCEAN",
     "color": "#29449F",
-    "children": ["ocean/oce-tro-coral-ocean"],
+    "children": ["tropical/sea/coral-ocean"],
     "generators": [{
         "min": -51,
         "max": -37,
diff --git a/biomes/ocean/oce-tro-coral-ocean.json b/biomes/tropical/sea/coral-ocean.json
similarity index 100%
rename from biomes/ocean/oce-tro-coral-ocean.json
rename to biomes/tropical/sea/coral-ocean.json
diff --git a/biomes/ocean/oce-tro-ocean.json b/biomes/tropical/sea/ocean.json
similarity index 98%
rename from biomes/ocean/oce-tro-ocean.json
rename to biomes/tropical/sea/ocean.json
index bef752c1..f1f882bb 100644
--- a/biomes/ocean/oce-tro-ocean.json
+++ b/biomes/tropical/sea/ocean.json
@@ -4,8 +4,8 @@
     "color": "#182960",
     "vanillaDerivative": "WARM_OCEAN",
     "children": [
-        "ocean/oce-tro-coral-ocean",
-        "ocean/oce-tro-coral-ocean-cliffs"
+        "tropical/sea/coral-ocean",
+        "tropical/sea/coral-ocean-cliffs"
     ],
     "generators": [{
         "min": -38,
diff --git a/biomes/ocean/oce-tro-river-soft.json b/biomes/tropical/sea/river-soft.json
similarity index 100%
rename from biomes/ocean/oce-tro-river-soft.json
rename to biomes/tropical/sea/river-soft.json
diff --git a/biomes/ocean/oce-tro-river-steep.json b/biomes/tropical/sea/river-steep.json
similarity index 100%
rename from biomes/ocean/oce-tro-river-steep.json
rename to biomes/tropical/sea/river-steep.json
diff --git a/biomes/tropical/tro-submerged-volcanic.json b/biomes/tropical/submerged-volcanic.json
similarity index 100%
rename from biomes/tropical/tro-submerged-volcanic.json
rename to biomes/tropical/submerged-volcanic.json
diff --git a/biomes/tropical/tro-volcanic-plains.json b/biomes/tropical/volcanic-plains.json
similarity index 98%
rename from biomes/tropical/tro-volcanic-plains.json
rename to biomes/tropical/volcanic-plains.json
index 9faad996..e8f16f45 100644
--- a/biomes/tropical/tro-volcanic-plains.json
+++ b/biomes/tropical/volcanic-plains.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#40BF43",
     "vanillaDerivative": "THE_VOID",
-    "children": ["tropical/tro-volcanoes"],
+    "children": ["tropical/volcanoes"],
     "generators": [{
         "min": 120,
         "max": 190,
diff --git a/biomes/tropical/tro-volcanoes-lava.json b/biomes/tropical/volcanoes-lava.json
similarity index 100%
rename from biomes/tropical/tro-volcanoes-lava.json
rename to biomes/tropical/volcanoes-lava.json
diff --git a/biomes/tropical/tro-volcanoes.json b/biomes/tropical/volcanoes.json
similarity index 96%
rename from biomes/tropical/tro-volcanoes.json
rename to biomes/tropical/volcanoes.json
index 41c00915..ac258788 100644
--- a/biomes/tropical/tro-volcanoes.json
+++ b/biomes/tropical/volcanoes.json
@@ -11,7 +11,7 @@
         "fogColor": "#DD793C",
         "downfallType": "none"
     }],
-    "children": ["tropical/tro-volcanoes-lava"],
+    "children": ["tropical/volcanoes-lava"],
     "generators": [
         {
             "generator": "mountain",
diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/wilds.json
similarity index 99%
rename from biomes/tropical/tro-wilds.json
rename to biomes/tropical/wilds.json
index a1c55a6b..8787bb8c 100644
--- a/biomes/tropical/tro-wilds.json
+++ b/biomes/tropical/wilds.json
@@ -4,7 +4,7 @@
     "vanillaDerivative": "JUNGLE",
     "rarity": 1,
     "color": "#708F70",
-    "children": ["tropical/tro-highlands"],
+    "children": ["tropical/highlands"],
     "generators": [{
         "min": 10,
         "max": 20,
diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json
index 5d6ae921..d98070d0 100644
--- a/biomes/tundra/autumn.json
+++ b/biomes/tundra/autumn.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#23EBA3",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["tundra/tun-redwood-cliffs"],
+    "children": ["tundra/redwood-cliffs"],
     "generators": [{
         "min": 4,
         "max": 10,
diff --git a/biomes/tundra/tun-bonsai-forest.json b/biomes/tundra/bonsai-forest.json
similarity index 99%
rename from biomes/tundra/tun-bonsai-forest.json
rename to biomes/tundra/bonsai-forest.json
index f2532603..6fb795ce 100644
--- a/biomes/tundra/tun-bonsai-forest.json
+++ b/biomes/tundra/bonsai-forest.json
@@ -5,8 +5,8 @@
     "rarity": 1,
     "vanillaDerivative": "FLOWER_FOREST",
     "children": [
-        "tundra/tun-sequia-redwoods",
-        "tundra/tun-redwood-cliffs"
+        "tundra/sequia-redwoods",
+        "tundra/redwood-cliffs"
     ],
     "generators": [{
         "min": 17,
diff --git a/biomes/tundra/tun-forest-cliffs.json b/biomes/tundra/forest-cliffs.json
similarity index 100%
rename from biomes/tundra/tun-forest-cliffs.json
rename to biomes/tundra/forest-cliffs.json
diff --git a/biomes/tundra/tun-forest.json b/biomes/tundra/forest.json
similarity index 99%
rename from biomes/tundra/tun-forest.json
rename to biomes/tundra/forest.json
index 83ac64a5..9b2488ec 100644
--- a/biomes/tundra/tun-forest.json
+++ b/biomes/tundra/forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#169864",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["tundra/tun-forest-cliffs"],
+    "children": ["tundra/forest-cliffs"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 14,
diff --git a/biomes/tundra/tun-magic-forest.json b/biomes/tundra/magic-forest.json
similarity index 100%
rename from biomes/tundra/tun-magic-forest.json
rename to biomes/tundra/magic-forest.json
diff --git a/biomes/tundra/tun-mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json
similarity index 100%
rename from biomes/tundra/tun-mountains-cliffs.json
rename to biomes/tundra/mountains-cliffs.json
diff --git a/biomes/tundra/tun-mountains.json b/biomes/tundra/mountains.json
similarity index 99%
rename from biomes/tundra/tun-mountains.json
rename to biomes/tundra/mountains.json
index 6386d28e..eca85c4b 100644
--- a/biomes/tundra/tun-mountains.json
+++ b/biomes/tundra/mountains.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#3AD0B2",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["tundra/tun-mountains-cliffs"],
+    "children": ["tundra/mountains-cliffs"],
     "generators": [{
         "min": 66,
         "max": 89,
diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json
similarity index 100%
rename from biomes/tundra/tun-redwood-cliffs.json
rename to biomes/tundra/redwood-cliffs.json
diff --git a/biomes/tundra/tun-redwood-forest.json b/biomes/tundra/redwood-forest.json
similarity index 99%
rename from biomes/tundra/tun-redwood-forest.json
rename to biomes/tundra/redwood-forest.json
index 13e1cdae..c9250fd7 100644
--- a/biomes/tundra/tun-redwood-forest.json
+++ b/biomes/tundra/redwood-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#23EBA3",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["tundra/tun-redwood-cliffs"],
+    "children": ["tundra/redwood-cliffs"],
     "generators": [{
         "min": 4,
         "max": 10,
diff --git a/biomes/tundra/tun-lake.json b/biomes/tundra/sea/lake.json
similarity index 100%
rename from biomes/tundra/tun-lake.json
rename to biomes/tundra/sea/lake.json
diff --git a/biomes/ocean/oce-tun-river-rocky.json b/biomes/tundra/sea/river-rocky.json
similarity index 100%
rename from biomes/ocean/oce-tun-river-rocky.json
rename to biomes/tundra/sea/river-rocky.json
diff --git a/biomes/ocean/oce-tun-river.json b/biomes/tundra/sea/river.json
similarity index 98%
rename from biomes/ocean/oce-tun-river.json
rename to biomes/tundra/sea/river.json
index e13188fe..ff2ba2a7 100644
--- a/biomes/ocean/oce-tun-river.json
+++ b/biomes/tundra/sea/river.json
@@ -3,7 +3,7 @@
     "derivative": "COLD_OCEAN",
     "vanillaDerivative": "RIVER",
     "color": "#3E31BF",
-    "children": ["ocean/oce-tun-river-rocky"],
+    "children": ["tundra/sea/river-rocky"],
     "generators": [{
         "generator": "river",
         "max": -10,
diff --git a/biomes/tundra/tun-sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json
similarity index 100%
rename from biomes/tundra/tun-sequia-redwoods.json
rename to biomes/tundra/sequia-redwoods.json
diff --git a/biomes/tundra/tun-tundra-beach-stone.json b/biomes/tundra/shore/beach-stone.json
similarity index 100%
rename from biomes/tundra/tun-tundra-beach-stone.json
rename to biomes/tundra/shore/beach-stone.json
diff --git a/biomes/tundra/tun-beach.json b/biomes/tundra/shore/beach.json
similarity index 100%
rename from biomes/tundra/tun-beach.json
rename to biomes/tundra/shore/beach.json
diff --git a/biomes/tundra/tun-spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json
similarity index 100%
rename from biomes/tundra/tun-spruce-denmyre.json
rename to biomes/tundra/spruce-denmyre.json
diff --git a/biomes/tundra/tun-taiga.json b/biomes/tundra/taiga.json
similarity index 100%
rename from biomes/tundra/tun-taiga.json
rename to biomes/tundra/taiga.json
diff --git a/dimensions/overworld.json b/dimensions/overworld.json
index 6c6cb96e..6a315204 100644
--- a/dimensions/overworld.json
+++ b/dimensions/overworld.json
@@ -18,12 +18,11 @@
     "regions": [
         "mushroom",
         "swamp",
-        "frozen",
-        "tundra",
-        "temperate",
-        "ocean",
+        "hot",
         "tropical",
-        "hot"
+        "temperate",
+        "frozen",
+        "tundra"
     ],
     "regionStyle": {
         "style": "NOWHERE_CELLULAR",
diff --git a/regions/frozen.json b/regions/frozen.json
index 2cd027b8..57094852 100644
--- a/regions/frozen.json
+++ b/regions/frozen.json
@@ -2,28 +2,28 @@
     "name": "Frozen",
     "color": "#51BFBD",
     "landBiomes": [
-        "frozen/fzn-plains",
-        "frozen/fzn-pines",
-        "frozen/fzn-plains",
-        "frozen/fzn-mountain",
-        "frozen/fzn-redwood-forest",
-        "frozen/fzn-hills",
-        "frozen/fzn-pine-plains",
-        "frozen/fzn-spruce-plains"
+        "frozen/plains",
+        "frozen/pines",
+        "frozen/plains",
+        "frozen/mountain",
+        "frozen/redwood-forest",
+        "frozen/hills",
+        "frozen/pine-plains",
+        "frozen/spruce-plains"
     ],
-    "shoreBiomes": ["frozen/fzn-beach"],
-    "seaBiomes": ["ocean/oce-fzn-river"],
+    "shoreBiomes": ["frozen/shore/beach"],
+    "seaBiomes": ["frozen/sea/ocean"],
     "caveBiomes": [
         "cave/ice-cavern",
         "cave/cracked-cavern"
     ],
-    "riverBiomes": ["ocean/oce-fzn-river"],
+    "riverBiomes": ["frozen/sea/river"],
     "jigsawStructures": [{
         "structure": "murky_stronghold",
         "rarity": 750
     }],
     "spotBiomes": [{
-        "biome": "frozen/fzn-vander",
+        "biome": "frozen/vander",
         "scale": 25,
         "type": "LAND",
         "shuffle": 328,
diff --git a/regions/hot.json b/regions/hot.json
index cec93565..cbec80d4 100644
--- a/regions/hot.json
+++ b/regions/hot.json
@@ -2,22 +2,22 @@
     "name": "Hot",
     "color": "#E7D900",
     "landBiomes": [
-        "hot/hot-desert-dunes",
-        "hot/hot-desert-dunes-red",
-        "hot/sav-forest",
-        "hot/sav-savanna",
-        "hot/sav-forest",
-        "hot/sav-plateau",
-        "hot/sav-acacia-denmyre",
-        "hot/msa-plateau",
-        "hot/msa-valleys",
-        "hot/msa-plateau-high",
-        "hot/msa-valleys",
-        "hot/msa-mesa",
-        "hot/msa-cliffs"
+        "hot/desert-dunes",
+        "hot/desert-dunes-red",
+        "savanna/forest",
+        "savanna/savanna",
+        "savanna/forest",
+        "savanna/plateau",
+        "savanna/acacia-denmyre",
+        "mesa/plateau",
+        "mesa/valleys",
+        "mesa/plateau-high",
+        "mesa/valleys",
+        "mesa/mesa",
+        "mesa/cliffs"
     ],
-    "shoreBiomes": ["hot/hot-beach"],
-    "seaBiomes": ["ocean/oce-hot-ocean"],
+    "shoreBiomes": ["hot/shore/beach"],
+    "seaBiomes": ["hot/sea/ocean"],
     "caveBiomes": [
         "cave/sandy-cave",
         "cave/sandy-red-cave"
@@ -64,7 +64,7 @@
         }
     ],
     "spotBiomes": [{
-        "biome": "hot/hot-oasis",
+        "biome": "hot/oasis",
         "scale": 5,
         "type": "SEA",
         "shuffle": 328,
diff --git a/regions/mushroom.json b/regions/mushroom.json
index 46935322..ce2cf201 100644
--- a/regions/mushroom.json
+++ b/regions/mushroom.json
@@ -2,18 +2,18 @@
     "name": "Mushroom",
     "color": "#DD86DC",
     "landBiomes": [
-        "mushroom/mus-forest",
-        "mushroom/mus-crimson-forest",
-        "mushroom/mus-forest-hills",
-        "mushroom/mus-plains",
-        "mushroom/mus-warped-forest"
+        "mushroom/forest",
+        "mushroom/crimson-forest",
+        "mushroom/forest-hills",
+        "mushroom/plains",
+        "mushroom/warped-forest"
     ],
-    "shoreBiomes": ["mushroom/mus-beach"],
+    "shoreBiomes": ["mushroom/shore/beach"],
     "jigsawStructures": [{
         "structure": "murky_stronghold",
         "rarity": 750
     }],
-    "seaBiomes": ["ocean/oce-mus-ocean"],
+    "seaBiomes": ["mushroom/sea/ocean"],
     "caveBiomes": [
         "cave/tundra-cavern",
         "cave/murky-cavern-gleaming",
diff --git a/regions/ocean.json b/regions/ocean.json
deleted file mode 100644
index f21b060e..00000000
--- a/regions/ocean.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "name": "Ocean",
-    "color": "#2D329C",
-    "landBiomes": ["ocean/oce-beach"],
-    "shoreBiomes": ["temperate/tem-beach"],
-    "seaBiomes": [
-        "ocean/oce-deep",
-        "ocean/oce-ocean",
-        "ocean/oce-deep"
-    ],
-    "caveBiomes": [
-        "cave/spiked-cavern",
-        "cave/tropical-cavern",
-        "cave/cavern-coral",
-        "cave/cavern-root",
-        "cave/lit-cavern",
-        "cave/old-cavern",
-        "cave/cracked-cavern"
-    ],
-    "riverBiomes": ["ocean/oce-ocean"],
-    "biomeImplosionRatio": 0.7,
-    "loot": {"tables": [
-        "beach-clutter",
-        "global-treasure",
-        "ocean-clutter",
-        "tropical-treasure"
-    ]},
-    "entityInitialSpawns": [
-        {
-            "entity": "glowsquid",
-            "maxSpawns": 2,
-            "rarity": 40
-        },
-        {
-            "entity": "drowned",
-            "maxSpawns": 2,
-            "rarity": 45
-        }
-    ],
-    "rarity": 3,
-    "effects": [
-        {
-            "particleAltX": 0.001,
-            "particleAltY": 0.2,
-            "particleAltZ": 0.001,
-            "chance": 2,
-            "particleEffect": "BUBBLE_POP",
-            "particleOffset": 0,
-            "interval": 1350,
-            "particleCount": 0
-        },
-        {
-            "particleAltX": 0.001,
-            "particleAltY": 0.2,
-            "particleAltZ": 0.001,
-            "chance": 2,
-            "particleEffect": "WATER_BUBBLE",
-            "particleOffset": 0,
-            "interval": 1350,
-            "particleCount": 0
-        }
-    ],
-    "seaBiomeZoom": 20,
-    "shoreRatio": 0.01,
-    "shoreHeightMin": 0,
-    "shoreHeightMax": 1,
-    "landBiomeZoom": 0.5,
-    "shoreBiomeZoom": 0.5
-}
diff --git a/regions/swamp.json b/regions/swamp.json
index c8c1f504..dbbe4af1 100644
--- a/regions/swamp.json
+++ b/regions/swamp.json
@@ -2,20 +2,20 @@
     "name": "Swamp",
     "color": "#68411E",
     "landBiomes": [
-        "swamp/swa-roofed-forest",
-        "swamp/swa-willow-forest",
-        "swamp/swa-lake",
-        "swamp/swa-roofed-wayward",
-        "swamp/swa-marsh"
+        "swamp/roofed-forest",
+        "swamp/willow-forest",
+        "swamp/sea/lake",
+        "swamp/roofed-wayward",
+        "swamp/marsh"
     ],
-    "shoreBiomes": ["swamp/swa-beach"],
+    "shoreBiomes": ["swamp/shore/beach"],
     "jigsawStructures": [{
         "structure": "murky_stronghold",
         "rarity": 750
     }],
     "seaBiomes": [
-        "ocean/oce-swa-ocean",
-        "ocean/oce-swa-ocean-tree"
+        "swamp/sea/ocean",
+        "swamp/sea/ocean-tree"
     ],
     "caveBiomes": [
         "cave/murky-cavern",
diff --git a/regions/temperate.json b/regions/temperate.json
index 0d52bcb3..6baeca24 100644
--- a/regions/temperate.json
+++ b/regions/temperate.json
@@ -2,23 +2,23 @@
     "name": "Temperate",
     "color": "#8BD03C",
     "landBiomes": [
-        "temperate/tem-plateau",
-        "temperate/tem-flower-forest",
-        "temperate/tem-stranged-plains",
-        "temperate/tem-longtree-forest",
-        "temperate/tem-sakura-pink-forest",
-        "temperate/tem-oak",
-        "temperate/tem-plains",
-        "temperate/tem-oak-forest",
-        "temperate/tem-wilds",
-        "temperate/tem-birch-forest"
+        "temperate/plateau",
+        "temperate/flower-forest",
+        "temperate/stranged-plains",
+        "temperate/longtree-forest",
+        "temperate/sakura-pink-forest",
+        "temperate/oak",
+        "temperate/plains",
+        "temperate/oak-forest",
+        "temperate/wilds",
+        "temperate/birch-forest"
     ],
     "shoreBiomes": [
-        "temperate/tem-beach",
-        "temperate/tem-oak-beach"
+        "temperate/shore/beach",
+        "temperate/shore/oak-beach"
     ],
     "seaBiomes": [
-        "ocean/oce-tem-river",
+        "temperate/sea/river",
         "ocean/oce-deep"
     ],
     "caveBiomes": [
@@ -26,7 +26,7 @@
         "cave/cracked-cavern",
         "cave/lit-cavern"
     ],
-    "riverBiomes": ["ocean/oce-tem-river"],
+    "riverBiomes": ["temperate/sea/river"],
     "jigsawStructures": [{
         "structure": "murky_stronghold",
         "rarity": 750
@@ -59,37 +59,37 @@
         {
             "entity": "wolf",
             "maxSpawns": 2,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 18
         },
         {
             "entity": "goat",
             "maxSpawns": 2,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 38
         },
         {
             "entity": "horse",
             "maxSpawns": 3,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 60
         },
         {
             "entity": "llama",
             "maxSpawns": 3,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 65
         },
         {
             "entity": "fox",
             "maxSpawns": 1,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 40
         },
         {
             "entity": "bee",
             "maxSpawns": 1,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 30
         }
     ],
diff --git a/regions/tropical.json b/regions/tropical.json
index af526e80..21a9657b 100644
--- a/regions/tropical.json
+++ b/regions/tropical.json
@@ -2,28 +2,28 @@
     "name": "Tropical",
     "color": "#0F3415",
     "landBiomes": [
-        "tropical/tro-rainforest",
-        "tropical/tro-plains",
-        "tropical/tro-bamboo-forest",
-        "tropical/tro-rainforest-wicked",
-        "tropical/tro-volcanic-plains",
-        "tropical/tro-mountain",
-        "tropical/tro-mountain-extreme",
-        "tropical/tro-mountain-plains",
-        "tropical/tro-wilds",
-        "tropical/tro-plains-hills"
+        "tropical/rainforest",
+        "tropical/plains",
+        "tropical/bamboo-forest",
+        "tropical/rainforest-wicked",
+        "tropical/volcanic-plains",
+        "tropical/mountain",
+        "tropical/mountain-extreme",
+        "tropical/mountain-plains",
+        "tropical/wilds",
+        "tropical/plains-hills"
     ],
     "shoreBiomes": [
-        "tropical/tro-island-beach",
-        "tropical/tro-beach",
-        "tropical/tro-submerged-volcanic",
-        "tropical/tro-beach-bamboo"
+        "tropical/island-beach",
+        "tropical/beach",
+        "tropical/submerged-volcanic",
+        "tropical/beach-bamboo"
     ],
     "seaBiomes": [
-        "tropical/tro-submerged-volcanic",
-        "ocean/oce-tro-ocean",
-        "tropical/tro-rainforest-island",
-        "ocean/oce-tro-river-soft"
+        "tropical/submerged-volcanic",
+        "tropical/sea/ocean",
+        "tropical/rainforest-island",
+        "tropical/sea/river-soft"
     ],
     "caveBiomes": [
         "cave/tropical-cavern",
@@ -74,7 +74,7 @@
         {
             "entity": "ocelot",
             "maxSpawns": 2,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 10
         },
         {
diff --git a/regions/tundra.json b/regions/tundra.json
index 307c1162..561eed64 100644
--- a/regions/tundra.json
+++ b/regions/tundra.json
@@ -2,31 +2,36 @@
     "name": "Tundra",
     "color": "#3CD0B1",
     "landBiomes": [
-        "tundra/tun-taiga",
-        "tundra/tun-redwood-forest",
-        "tundra/tun-sequia-redwoods",
-        "tundra/tun-magic-forest",
-        "tundra/tun-forest",
-        "tundra/tun-spruce-denmyre",
-        "tundra/tun-lake",
-        "tundra/tun-mountains",
-        "tundra/tun-mountains",
-        "tundra/tun-mountains-cliffs",
-        "mountain/mtn-mountain",
-        "mountain/mtn-hills",
-        "mountain/mtn-forest-hills",
-        "mountain/mtn-forest",
-        "mountain/mtn-plains",
-        "mountain/mtn-cliffs",
-        "mountain/mtn-mountain",
-        "tundra/autumn"
+        "tundra/taiga",
+        "tundra/redwood-forest",
+        "tundra/sequia-redwoods",
+        "tundra/magic-forest",
+        "tundra/autumn",
+        "tundra/forest",
+        "tundra/spruce-denmyre",
+        "tundra/mountains",
+        "tundra/mountains",
+        "tundra/mountains-cliffs",
+        "mountain/hills",
+        "mountain/forest-hills",
+        "mountain/forest",
+        "mountain/plains",
+        "mountain/cliffs",
+        "mountain/mountain"
+    ],
+    "shoreBiomes": [
+        "tundra/shore/beach",
+        "tundra/shore/beach-stone"
+    ],
+    "seaBiomes": [
+        "mountain/sea/lake"
+    ],
+    "jigsawStructures": [
+        {
+            "structure": "murky_stronghold",
+            "rarity": 750
+        }
     ],
-    "shoreBiomes": ["tundra/tun-beach"],
-    "seaBiomes": ["ocean/oce-tun-river"],
-    "jigsawStructures": [{
-        "structure": "murky_stronghold",
-        "rarity": 750
-    }],
     "caveBiomes": [
         "cave/tundra-cavern",
         "cave/spiked-cavern"
@@ -69,18 +74,29 @@
             "rarity": 20
         }
     ],
-    "riverBiomes": ["ocean/oce-tun-river"],
+    "riverBiomes": [
+        "tundra/sea/river",
+        "tundra/sea/river-rocky",
+        "mountain/sea/river",
+        "mountain/sea/river-soft"
+    ],
     "biomeImplosionRatio": 0.25,
-    "deposits": [{
-        "minHeight": 15,
-        "maxPerChunk": 3,
-        "maxHeight": 60,
-        "minPerChunk": 2,
-        "minSize": 1,
-        "maxSize": 2,
-        "palette": [{"block": "emerald_ore"}],
-        "varience": 2
-    }],
+    "deposits": [
+        {
+            "minHeight": 15,
+            "maxPerChunk": 3,
+            "maxHeight": 60,
+            "minPerChunk": 2,
+            "minSize": 1,
+            "maxSize": 2,
+            "palette": [
+                {
+                    "block": "emerald_ore"
+                }
+            ],
+            "varience": 2
+        }
+    ],
     "riverRarity": 1,
     "landBiomeZoom": 1.85,
     "riverStyle": {
@@ -104,47 +120,61 @@
             "cold-food"
         ]
     },
-    "objects": [{
-        "heightmap": {
-            "seed": 1337,
-            "style": {
-                "style": "SIMPLEX",
-                "multiplier": 10
+    "objects": [
+        {
+            "heightmap": {
+                "seed": 1337,
+                "style": {
+                    "style": "SIMPLEX",
+                    "multiplier": 10
+                },
+                "offsetY": 5
             },
-            "offsetY": 5
-        },
-        "chance": 0.05,
-        "bottom": true,
-        "density": 1,
-        "place": [
-            "structures/amethyst1",
-            "structures/amethyst2",
-            "structures/amethyst3",
-            "structures/amethyst4",
-            "structures/amethyst5",
-            "structures/amethyst6"
-        ],
-        "edit": [{
-            "find": [{"block": "glass"}],
-            "replace": {"palette": [{"block": "void_air"}]}
-        }],
-        "enabled": true,
-        "xAxis": {
-            "interval": 90,
-            "max": 360,
-            "min": 0
-        },
-        "yAxis": {
-            "interval": 90,
-            "max": 360,
-            "min": 0
-        },
-        "translate": {
-            "yRandom": 10,
-            "y": 2
+            "chance": 0.05,
+            "bottom": true,
+            "density": 1,
+            "place": [
+                "structures/amethyst1",
+                "structures/amethyst2",
+                "structures/amethyst3",
+                "structures/amethyst4",
+                "structures/amethyst5",
+                "structures/amethyst6"
+            ],
+            "edit": [
+                {
+                    "find": [
+                        {
+                            "block": "glass"
+                        }
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "void_air"
+                            }
+                        ]
+                    }
+                }
+            ],
+            "enabled": true,
+            "xAxis": {
+                "interval": 90,
+                "max": 360,
+                "min": 0
+            },
+            "yAxis": {
+                "interval": 90,
+                "max": 360,
+                "min": 0
+            },
+            "translate": {
+                "yRandom": 10,
+                "y": 2
+            }
         }
-    }],
+    ],
     "shoreHeightZoom": 1.14,
     "riverThickness": 0.025,
     "rarity": 2
-}
+}
\ No newline at end of file

From d9257e28240a8c0796147123c6b299dde4413a60 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 08:26:17 -0400
Subject: [PATCH 03/14] Reduce Custom Biome ID Pollution

---
 biomes/frozen/hills.json                       | 2 +-
 biomes/frozen/mountain-cliffs.json             | 2 +-
 biomes/frozen/mountain-middle.json             | 2 +-
 biomes/frozen/mountain.json                    | 2 +-
 biomes/frozen/mountains.json                   | 2 +-
 biomes/frozen/peak.json                        | 2 +-
 biomes/frozen/pine-hills.json                  | 2 +-
 biomes/frozen/pine-plains.json                 | 2 +-
 biomes/frozen/pines.json                       | 2 +-
 biomes/frozen/plains.json                      | 2 +-
 biomes/frozen/redwood-forest.json              | 2 +-
 biomes/frozen/shore/beach.json                 | 2 +-
 biomes/frozen/spruce-hills.json                | 2 +-
 biomes/frozen/spruce-plains.json               | 2 +-
 biomes/frozen/vander.json                      | 2 +-
 biomes/mushroom/forest-hills.json              | 2 +-
 biomes/mushroom/forest.json                    | 2 +-
 biomes/mushroom/plains.json                    | 2 +-
 biomes/mushroom/shore/beach.json               | 2 +-
 biomes/savanna/acacia-denmyre.json             | 2 +-
 biomes/savanna/cliff.json                      | 2 +-
 biomes/savanna/forest.json                     | 2 +-
 biomes/savanna/plateau.json                    | 2 +-
 biomes/savanna/savanna.json                    | 2 +-
 biomes/savanna/shore/beach.json                | 2 +-
 biomes/swamp/marsh-rotten.json                 | 2 +-
 biomes/temperate/birch-forest.json             | 2 +-
 biomes/temperate/flower-forest.json            | 2 +-
 biomes/temperate/island.json                   | 2 +-
 biomes/temperate/oak-forest.json               | 2 +-
 biomes/temperate/oak-hills.json                | 2 +-
 biomes/temperate/oak.json                      | 2 +-
 biomes/temperate/plain-hills.json              | 2 +-
 biomes/temperate/plains.json                   | 2 +-
 biomes/temperate/plateau.json                  | 2 +-
 biomes/temperate/sakura-pink-child.json        | 2 +-
 biomes/temperate/sakura-pink-forest.json       | 2 +-
 biomes/temperate/stranged-plains.json          | 2 +-
 biomes/temperate/wilds.json                    | 2 +-
 biomes/tropical/bamboo-forest.json             | 2 +-
 biomes/tropical/highlands.json                 | 2 +-
 biomes/tropical/mountain-extreme.json          | 2 +-
 biomes/tropical/mountain-middle.json           | 2 +-
 biomes/tropical/mountain-plains.json           | 2 +-
 biomes/tropical/mountain-water.json            | 2 +-
 biomes/tropical/mountain.json                  | 2 +-
 biomes/tropical/plains-hills.json              | 2 +-
 biomes/tropical/plains.json                    | 2 +-
 biomes/tropical/rainforest-hills.json          | 2 +-
 biomes/tropical/rainforest-island.json         | 2 +-
 biomes/tropical/rainforest-wicked-child.json   | 2 +-
 biomes/tropical/rainforest-wicked-village.json | 2 +-
 biomes/tropical/rainforest-wicked.json         | 2 +-
 biomes/tropical/rainforest.json                | 2 +-
 biomes/tropical/volcanic-plains.json           | 2 +-
 biomes/tropical/volcanoes-lava.json            | 2 +-
 biomes/tropical/volcanoes.json                 | 2 +-
 biomes/tundra/autumn.json                      | 2 +-
 biomes/tundra/bonsai-forest.json               | 2 +-
 biomes/tundra/forest-cliffs.json               | 2 +-
 biomes/tundra/forest.json                      | 2 +-
 biomes/tundra/mountains-cliffs.json            | 2 +-
 biomes/tundra/mountains.json                   | 2 +-
 biomes/tundra/redwood-cliffs.json              | 2 +-
 biomes/tundra/redwood-forest.json              | 2 +-
 biomes/tundra/sea/lake.json                    | 2 +-
 biomes/tundra/sequia-redwoods.json             | 2 +-
 biomes/tundra/spruce-denmyre.json              | 2 +-
 biomes/tundra/taiga.json                       | 2 +-
 69 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/biomes/frozen/hills.json b/biomes/frozen/hills.json
index dac0ed1c..bad00246 100644
--- a/biomes/frozen/hills.json
+++ b/biomes/frozen/hills.json
@@ -32,7 +32,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznhills",
+        "id": "frozen_hills",
         "waterColor": "#216FC4",
         "downfallType": "snow",
         "temperature": -3,
diff --git a/biomes/frozen/mountain-cliffs.json b/biomes/frozen/mountain-cliffs.json
index 253065aa..c167aaa1 100644
--- a/biomes/frozen/mountain-cliffs.json
+++ b/biomes/frozen/mountain-cliffs.json
@@ -34,7 +34,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznmountaincliff",
+        "id": "frozen_mountaincliff",
         "downfallType": "snow",
         "temperature": -3,
         "waterColor": "#216FC4",
diff --git a/biomes/frozen/mountain-middle.json b/biomes/frozen/mountain-middle.json
index f61381b3..35a7e38d 100644
--- a/biomes/frozen/mountain-middle.json
+++ b/biomes/frozen/mountain-middle.json
@@ -17,7 +17,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznmtnmiddle",
+        "id": "frozen_mountain_middle",
         "waterColor": "#216FC4",
         "fogColor": "#A6D1FF",
         "downfallType": "snow",
diff --git a/biomes/frozen/mountain.json b/biomes/frozen/mountain.json
index de177ab1..1eeb6f6d 100644
--- a/biomes/frozen/mountain.json
+++ b/biomes/frozen/mountain.json
@@ -10,7 +10,7 @@
         "frozen/mountain-cliffs"
     ],
     "customDerivitives": [{
-        "id": "fznmountain",
+        "id": "frozen_mountain",
         "waterColor": "#216FC4",
         "downfallType": "snow",
         "temperature": -3,
diff --git a/biomes/frozen/mountains.json b/biomes/frozen/mountains.json
index 34df2cbf..9b32b6dc 100644
--- a/biomes/frozen/mountains.json
+++ b/biomes/frozen/mountains.json
@@ -9,7 +9,7 @@
         "frozen/vander"
     ],
     "customDerivitives": [{
-        "id": "fznmountains",
+        "id": "frozen_mountains",
         "waterColor": "#216FC4",
         "downfallType": "snow",
         "temperature": -3,
diff --git a/biomes/frozen/peak.json b/biomes/frozen/peak.json
index ba58cd76..f8736fc3 100644
--- a/biomes/frozen/peak.json
+++ b/biomes/frozen/peak.json
@@ -4,7 +4,7 @@
     "color": "#48ADEA",
     "vanillaDerivative": "SNOWY_TAIGA_MOUNTAINS",
     "customDerivitives": [{
-        "id": "fznpeak",
+        "id": "frozen_peak",
         "waterColor": "#216FC4",
         "fogColor": "#A6D1FF",
         "downfallType": "snow",
diff --git a/biomes/frozen/pine-hills.json b/biomes/frozen/pine-hills.json
index acb864df..22888f0a 100644
--- a/biomes/frozen/pine-hills.json
+++ b/biomes/frozen/pine-hills.json
@@ -32,7 +32,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznpinehills",
+        "id": "frozen_pine_hills",
         "downfallType": "snow",
         "temperature": -3,
         "waterColor": "#216FC4",
diff --git a/biomes/frozen/pine-plains.json b/biomes/frozen/pine-plains.json
index dcf81811..9336172d 100644
--- a/biomes/frozen/pine-plains.json
+++ b/biomes/frozen/pine-plains.json
@@ -18,7 +18,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznpineplain",
+        "id": "frozen_pine_plains",
         "waterColor": "#216FC4",
         "fogColor": "#A6D1FF",
         "downfallType": "snow",
diff --git a/biomes/frozen/pines.json b/biomes/frozen/pines.json
index 54e50860..ae464a33 100644
--- a/biomes/frozen/pines.json
+++ b/biomes/frozen/pines.json
@@ -37,7 +37,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznpines",
+        "id": "frozen_pines",
         "waterColor": "#216FC4",
         "downfallType": "snow",
         "temperature": -3,
diff --git a/biomes/frozen/plains.json b/biomes/frozen/plains.json
index 95320d77..68e440b0 100644
--- a/biomes/frozen/plains.json
+++ b/biomes/frozen/plains.json
@@ -18,7 +18,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznplains",
+        "id": "frozen_plains",
         "waterColor": "#216FC4",
         "fogColor": "#A6D1FF",
         "waterFogColor": "#216FC4",
diff --git a/biomes/frozen/redwood-forest.json b/biomes/frozen/redwood-forest.json
index 712a771c..7e8ab7b7 100644
--- a/biomes/frozen/redwood-forest.json
+++ b/biomes/frozen/redwood-forest.json
@@ -17,7 +17,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznredwoodfor",
+        "id": "frozen_redwood_forest",
         "waterColor": "#216FC4",
         "fogColor": "#A6D1FF",
         "downfallType": "snow",
diff --git a/biomes/frozen/shore/beach.json b/biomes/frozen/shore/beach.json
index 7ee6854a..3ac1ab19 100644
--- a/biomes/frozen/shore/beach.json
+++ b/biomes/frozen/shore/beach.json
@@ -22,7 +22,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznbeach",
+        "id": "frozen_beach",
         "waterColor": "#216FC4",
         "fogColor": "#A6D1FF",
         "downfallType": "snow",
diff --git a/biomes/frozen/spruce-hills.json b/biomes/frozen/spruce-hills.json
index 5d8d121b..3fa2d8f6 100644
--- a/biomes/frozen/spruce-hills.json
+++ b/biomes/frozen/spruce-hills.json
@@ -32,7 +32,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznsprucehill",
+        "id": "frozen_spruce_hills",
         "waterColor": "#216FC4",
         "fogColor": "#A6D1FF",
         "downfallType": "snow",
diff --git a/biomes/frozen/spruce-plains.json b/biomes/frozen/spruce-plains.json
index e8345b97..4979752a 100644
--- a/biomes/frozen/spruce-plains.json
+++ b/biomes/frozen/spruce-plains.json
@@ -33,7 +33,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznspruceplains",
+        "id": "frozen_spruce_plains",
         "waterFogColor": "#216FC4",
         "foliageColor": "#B8D0E1",
         "downfallType": "snow",
diff --git a/biomes/frozen/vander.json b/biomes/frozen/vander.json
index fc20ab2b..7e82500b 100644
--- a/biomes/frozen/vander.json
+++ b/biomes/frozen/vander.json
@@ -31,7 +31,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "fznvander",
+        "id": "frozen_vander",
         "waterColor": "#216FC4",
         "fogColor": "#A6D1FF",
         "waterFogColor": "#216FC4",
diff --git a/biomes/mushroom/forest-hills.json b/biomes/mushroom/forest-hills.json
index effac767..c12bd2cc 100644
--- a/biomes/mushroom/forest-hills.json
+++ b/biomes/mushroom/forest-hills.json
@@ -10,7 +10,7 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
-        "id": "mushills",
+        "id": "mushroom_hills",
         "waterColor": "#B4B2FF",
         "foliageColor": "#C9A9FF",
         "waterFogColor": "#BD94DF",
diff --git a/biomes/mushroom/forest.json b/biomes/mushroom/forest.json
index 75a3eba4..d65591b0 100644
--- a/biomes/mushroom/forest.json
+++ b/biomes/mushroom/forest.json
@@ -6,7 +6,7 @@
     "vanillaDerivative": "MUSHROOM_FIELDS",
     "children": ["mushroom/forest-hills"],
     "customDerivitives": [{
-        "id": "musforest",
+        "id": "mushroom_forest",
         "waterColor": "#B4B2FF",
         "foliageColor": "#C9A9FF",
         "waterFogColor": "#BD94DF",
diff --git a/biomes/mushroom/plains.json b/biomes/mushroom/plains.json
index c0fc919b..fa90da06 100644
--- a/biomes/mushroom/plains.json
+++ b/biomes/mushroom/plains.json
@@ -5,7 +5,7 @@
     "derivative": "MUSHROOM_FIELDS",
     "vanillaDerivative": "MUSHROOM_FIELDS",
     "customDerivitives": [{
-        "id": "musplains",
+        "id": "mushroom_plains",
         "waterColor": "#B4B2FF",
         "foliageColor": "#C9A9FF",
         "waterFogColor": "#BD94DF",
diff --git a/biomes/mushroom/shore/beach.json b/biomes/mushroom/shore/beach.json
index 796ab409..7c2d6cc8 100644
--- a/biomes/mushroom/shore/beach.json
+++ b/biomes/mushroom/shore/beach.json
@@ -10,7 +10,7 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
-        "id": "mus",
+        "id": "mushroom_beach",
         "waterColor": "#B4B2FF",
         "foliageColor": "#C9A9FF",
         "waterFogColor": "#BD94DF",
diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json
index fa59964d..69fea029 100644
--- a/biomes/savanna/acacia-denmyre.json
+++ b/biomes/savanna/acacia-denmyre.json
@@ -5,7 +5,7 @@
     "color": "#FFB641",
     "vanillaDerivative": "SAVANNA",
     "customDerivitives": [{
-        "id": "savdenmyre",
+        "id": "savanna_acacia_denmyre",
         "grassColor": "#DFD545",
         "foliageColor": "#D6A513",
         "waterColor": "#E2EF3B",
diff --git a/biomes/savanna/cliff.json b/biomes/savanna/cliff.json
index 398f8713..e74639da 100644
--- a/biomes/savanna/cliff.json
+++ b/biomes/savanna/cliff.json
@@ -6,7 +6,7 @@
     "vanillaDerivative": "SAVANNA",
     "children": ["savanna/acacia-denmyre"],
     "customDerivitives": [{
-        "id": "savcliff",
+        "id": "savanna_cliffs",
         "grassColor": "#DFD545",
         "foliageColor": "#D6A513",
         "waterColor": "#E2EF3B",
diff --git a/biomes/savanna/forest.json b/biomes/savanna/forest.json
index 52f1cbcf..2514dd6e 100644
--- a/biomes/savanna/forest.json
+++ b/biomes/savanna/forest.json
@@ -5,7 +5,7 @@
     "derivative": "SAVANNA",
     "vanillaDerivative": "SAVANNA",
     "customDerivitives": [{
-        "id": "savforest",
+        "id": "savanna_forest",
         "grassColor": "#E2EF3B",
         "foliageColor": "#D6A513",
         "waterColor": "#E2EF3B",
diff --git a/biomes/savanna/plateau.json b/biomes/savanna/plateau.json
index 1d29d958..e51c8a73 100644
--- a/biomes/savanna/plateau.json
+++ b/biomes/savanna/plateau.json
@@ -5,7 +5,7 @@
     "color": "#805B21",
     "vanillaDerivative": "SAVANNA",
     "customDerivitives": [{
-        "id": "savplateau",
+        "id": "savanna_plateau",
         "grassColor": "#FFCB31",
         "foliageColor": "#D6A513",
         "waterColor": "#E2EF3B",
diff --git a/biomes/savanna/savanna.json b/biomes/savanna/savanna.json
index 37c853aa..1d72a1cf 100644
--- a/biomes/savanna/savanna.json
+++ b/biomes/savanna/savanna.json
@@ -6,7 +6,7 @@
     "vanillaDerivative": "SAVANNA",
     "children": ["savanna/cliff"],
     "customDerivitives": [{
-        "id": "savsavanna",
+        "id": "savanna",
         "grassColor": "#DFD545",
         "foliageColor": "#D6A513",
         "waterColor": "#E2EF3B",
diff --git a/biomes/savanna/shore/beach.json b/biomes/savanna/shore/beach.json
index b41ece4e..5e6b1eb3 100644
--- a/biomes/savanna/shore/beach.json
+++ b/biomes/savanna/shore/beach.json
@@ -5,7 +5,7 @@
     "color": "#DF9F39",
     "vanillaDerivative": "SAVANNA",
     "customDerivitives": [{
-        "id": "savbeach",
+        "id": "savanna_beach",
         "grassColor": "#E2EF3B",
         "foliageColor": "#D6A513",
         "waterColor": "#8DFFE8",
diff --git a/biomes/swamp/marsh-rotten.json b/biomes/swamp/marsh-rotten.json
index 95facfd1..a24ea533 100644
--- a/biomes/swamp/marsh-rotten.json
+++ b/biomes/swamp/marsh-rotten.json
@@ -10,7 +10,7 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
-        "id": "swamprottenmarsh",
+        "id": "swamp_marsh_rotten",
         "waterColor": "#684D1A",
         "grassColor": "#5C581A",
         "spawnRarity": 20,
diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json
index f1713d71..11fa5818 100644
--- a/biomes/temperate/birch-forest.json
+++ b/biomes/temperate/birch-forest.json
@@ -11,7 +11,7 @@
         "generator": "smooth-dunes"
     }],
     "customDerivitives": [{
-        "id": "temoak",
+        "id": "birch_forest",
         "foliageColor": "#6CC646",
         "grassColor": "#A1C646",
         "category": "forest"
diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json
index 43306fbd..6a458154 100644
--- a/biomes/temperate/flower-forest.json
+++ b/biomes/temperate/flower-forest.json
@@ -10,7 +10,7 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
-        "id": "temflowerfrst",
+        "id": "flower_forest",
         "foliageColor": "#64C329",
         "grassColor": "#48A620",
         "category": "forest"
diff --git a/biomes/temperate/island.json b/biomes/temperate/island.json
index 394546aa..430974f9 100644
--- a/biomes/temperate/island.json
+++ b/biomes/temperate/island.json
@@ -11,7 +11,7 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
-        "id": "temisland",
+        "id": "island",
         "foliageColor": "#69DF51",
         "waterColor": "#48BFBC",
         "grassColor": "#BEDF51",
diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json
index f9cb9e91..7f618a40 100644
--- a/biomes/temperate/oak-forest.json
+++ b/biomes/temperate/oak-forest.json
@@ -6,7 +6,7 @@
     "vanillaDerivative": "FOREST",
     "children": ["temperate/oak-denmyre"],
     "customDerivitives": [{
-        "id": "temoakforest",
+        "id": "oak_forest",
         "foliageColor": "#80B918",
         "waterColor": "#25638E",
         "grassColor": "#698E25",
diff --git a/biomes/temperate/oak-hills.json b/biomes/temperate/oak-hills.json
index 100dc7e9..4a8b727b 100644
--- a/biomes/temperate/oak-hills.json
+++ b/biomes/temperate/oak-hills.json
@@ -5,7 +5,7 @@
     "derivative": "FOREST",
     "vanillaDerivative": "FOREST",
     "customDerivitives": [{
-        "id": "temoakhills",
+        "id": "oak_hills",
         "foliageColor": "#5CA528",
         "waterColor": "#2851A5",
         "grassColor": "#51A528",
diff --git a/biomes/temperate/oak.json b/biomes/temperate/oak.json
index 55ea1c4f..a04adce2 100644
--- a/biomes/temperate/oak.json
+++ b/biomes/temperate/oak.json
@@ -11,7 +11,7 @@
         "min": 3
     }],
     "customDerivitives": [{
-        "id": "temoak",
+        "id": "oak_woods",
         "foliageColor": "#b76e79",
         "waterColor": "#b76e79",
         "grassColor": "#b76e79",
diff --git a/biomes/temperate/plain-hills.json b/biomes/temperate/plain-hills.json
index 28d46bd0..5ee6a107 100644
--- a/biomes/temperate/plain-hills.json
+++ b/biomes/temperate/plain-hills.json
@@ -5,7 +5,7 @@
     "color": "#A4BF40",
     "vanillaDerivative": "PLAINS",
     "customDerivitives": [{
-        "id": "templainhills",
+        "id": "plains_hills",
         "foliageColor": "#8AA528",
         "waterColor": "#284CA5",
         "grassColor": "#8AA528",
diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json
index 3925c11e..0caba9e1 100644
--- a/biomes/temperate/plains.json
+++ b/biomes/temperate/plains.json
@@ -9,7 +9,7 @@
         "temperate/wilds"
     ],
     "customDerivitives": [{
-        "id": "templains",
+        "id": "plains",
         "foliageColor": "#7FA528",
         "waterColor": "#2840A5",
         "grassColor": "#A4C646",
diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json
index 7bb7e808..d331b3c2 100644
--- a/biomes/temperate/plateau.json
+++ b/biomes/temperate/plateau.json
@@ -5,7 +5,7 @@
     "color": "#929F60",
     "vanillaDerivative": "FOREST",
     "customDerivitives": [{
-        "id": "templateau",
+        "id": "plateau",
         "foliageColor": "#44A528",
         "waterColor": "#2883A5",
         "grassColor": "#28A54A",
diff --git a/biomes/temperate/sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json
index 45af0f62..4432e603 100644
--- a/biomes/temperate/sakura-pink-child.json
+++ b/biomes/temperate/sakura-pink-child.json
@@ -5,7 +5,7 @@
     "derivative": "FLOWER_FOREST",
     "vanillaDerivative": "FOREST",
     "customDerivitives": [{
-        "id": "temsakurapinkchild",
+        "id": "sakura_child_forest",
         "foliageColor": "#AE42C9",
         "waterColor": "#A5FFED",
         "grassColor": "#83FF6C",
diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json
index 0ceae983..3e63709f 100644
--- a/biomes/temperate/sakura-pink-forest.json
+++ b/biomes/temperate/sakura-pink-forest.json
@@ -11,7 +11,7 @@
         "multiplier": 4
     },
     "customDerivitives": [{
-        "id": "temsakurapink",
+        "id": "sakura_pink",
         "foliageColor": "#FFADF0",
         "waterColor": "#A5FFED",
         "grassColor": "#A8FF98",
diff --git a/biomes/temperate/stranged-plains.json b/biomes/temperate/stranged-plains.json
index 6db26b84..1e5c6c2e 100644
--- a/biomes/temperate/stranged-plains.json
+++ b/biomes/temperate/stranged-plains.json
@@ -10,7 +10,7 @@
         "exponent": 2
     },
     "customDerivitives": [{
-        "id": "pemstrangeplains",
+        "id": "stranged_plains",
         "foliageColor": "#65A528",
         "waterColor": "#2873A5",
         "grassColor": "#B8D92B",
diff --git a/biomes/temperate/wilds.json b/biomes/temperate/wilds.json
index ed3482b5..38d9e722 100644
--- a/biomes/temperate/wilds.json
+++ b/biomes/temperate/wilds.json
@@ -6,7 +6,7 @@
     "vanillaDerivative": "PLAINS",
     "children": ["temperate/highlands"],
     "customDerivitives": [{
-        "id": "temwilds",
+        "id": "wilds",
         "foliageColor": "#237031",
         "waterColor": "#236270",
         "grassColor": "#28A538",
diff --git a/biomes/tropical/bamboo-forest.json b/biomes/tropical/bamboo-forest.json
index 4e4d5e7f..f6b699fb 100644
--- a/biomes/tropical/bamboo-forest.json
+++ b/biomes/tropical/bamboo-forest.json
@@ -11,7 +11,7 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
-        "id": "trobamboo",
+        "id": "tropical_bamboo_forest",
         "foliageColor": "#20A52F",
         "grassColor": "#1E7307",
         "waterColor": "#3AB2A2",
diff --git a/biomes/tropical/highlands.json b/biomes/tropical/highlands.json
index 8a82f986..54db83ea 100644
--- a/biomes/tropical/highlands.json
+++ b/biomes/tropical/highlands.json
@@ -10,7 +10,7 @@
         "generator": "mountain"
     }],
     "customDerivitives": [{
-        "id": "trohighlands",
+        "id": "tropical_highlands",
         "foliageColor": "#478F04",
         "grassColor": "#41A726",
         "waterColor": "#3AB2A2",
diff --git a/biomes/tropical/mountain-extreme.json b/biomes/tropical/mountain-extreme.json
index 354dab85..193dd5be 100644
--- a/biomes/tropical/mountain-extreme.json
+++ b/biomes/tropical/mountain-extreme.json
@@ -11,7 +11,7 @@
         "min": 85
     }],
     "customDerivitives": [{
-        "id": "tromtnextreme",
+        "id": "tropical_mountain_extreme",
         "foliageColor": "#478F04",
         "grassColor": "#41A726",
         "waterColor": "#3AB2A2",
diff --git a/biomes/tropical/mountain-middle.json b/biomes/tropical/mountain-middle.json
index a32bca53..83a1341c 100644
--- a/biomes/tropical/mountain-middle.json
+++ b/biomes/tropical/mountain-middle.json
@@ -18,7 +18,7 @@
         }
     ],
     "customDerivitives": [{
-        "id": "tromtnmiddle",
+        "id": "tropical_mountain_middle",
         "foliageColor": "#478F04",
         "grassColor": "#41A726",
         "waterColor": "#3AB2A2",
diff --git a/biomes/tropical/mountain-plains.json b/biomes/tropical/mountain-plains.json
index 7d5694a4..d81abdcb 100644
--- a/biomes/tropical/mountain-plains.json
+++ b/biomes/tropical/mountain-plains.json
@@ -10,7 +10,7 @@
         "generator": "mountain"
     }],
     "customDerivitives": [{
-        "id": "tromtnplains",
+        "id": "tropical_mountain_plains",
         "foliageColor": "#258F04",
         "grassColor": "#41A726",
         "category": "jungle",
diff --git a/biomes/tropical/mountain-water.json b/biomes/tropical/mountain-water.json
index 0661d687..8e89ab3b 100644
--- a/biomes/tropical/mountain-water.json
+++ b/biomes/tropical/mountain-water.json
@@ -9,7 +9,7 @@
         "min": 2
     }],
     "customDerivitives": [{
-        "id": "trowater",
+        "id": "tropical_mountain_water",
         "waterColor": "#3AB2A2",
         "waterFogColor": "#3AB2A2"
     }],
diff --git a/biomes/tropical/mountain.json b/biomes/tropical/mountain.json
index 5c8b7e34..9dd7eb3e 100644
--- a/biomes/tropical/mountain.json
+++ b/biomes/tropical/mountain.json
@@ -11,7 +11,7 @@
         "generator": "mountain"
     }],
     "customDerivitives": [{
-        "id": "tromountain",
+        "id": "tropical_mountain",
         "foliageColor": "#478F04",
         "grassColor": "#41A726",
         "category": "jungle",
diff --git a/biomes/tropical/plains-hills.json b/biomes/tropical/plains-hills.json
index 8d18237d..3265c2f7 100644
--- a/biomes/tropical/plains-hills.json
+++ b/biomes/tropical/plains-hills.json
@@ -10,7 +10,7 @@
         "min": -10
     }],
     "customDerivitives": [{
-        "id": "troplainshills",
+        "id": "tropical_plains_hills",
         "foliageColor": "#40C42B",
         "grassColor": "#41A726",
         "category": "jungle",
diff --git a/biomes/tropical/plains.json b/biomes/tropical/plains.json
index 2ab8c8bf..4a0b3c09 100644
--- a/biomes/tropical/plains.json
+++ b/biomes/tropical/plains.json
@@ -11,7 +11,7 @@
         "min": -10
     }],
     "customDerivitives": [{
-        "id": "troplain",
+        "id": "tropical_plains",
         "foliageColor": "#40C42B",
         "grassColor": "#41A726",
         "category": "jungle",
diff --git a/biomes/tropical/rainforest-hills.json b/biomes/tropical/rainforest-hills.json
index c45654d4..8d85a2fa 100644
--- a/biomes/tropical/rainforest-hills.json
+++ b/biomes/tropical/rainforest-hills.json
@@ -10,7 +10,7 @@
         "generator": "plain-cliffs"
     }],
     "customDerivitives": [{
-        "id": "trohills",
+        "id": "tropical_raionforest_hills",
         "foliageColor": "#258F04",
         "grassColor": "#41A726",
         "category": "jungle",
diff --git a/biomes/tropical/rainforest-island.json b/biomes/tropical/rainforest-island.json
index 777833f2..bf65ef9a 100644
--- a/biomes/tropical/rainforest-island.json
+++ b/biomes/tropical/rainforest-island.json
@@ -10,7 +10,7 @@
         "generator": "mountain"
     }],
     "customDerivitives": [{
-        "id": "troisle",
+        "id": "tropical_rainforest_island",
         "foliageColor": "#258F04",
         "grassColor": "#3FE727",
         "category": "jungle",
diff --git a/biomes/tropical/rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json
index 0c54a722..fb6c8009 100644
--- a/biomes/tropical/rainforest-wicked-child.json
+++ b/biomes/tropical/rainforest-wicked-child.json
@@ -10,7 +10,7 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
-        "id": "trowkdchild",
+        "id": "tropical_rainforest_wicked_child",
         "foliageColor": "#478F04",
         "grassColor": "#197300",
         "category": "jungle",
diff --git a/biomes/tropical/rainforest-wicked-village.json b/biomes/tropical/rainforest-wicked-village.json
index 8c000515..2fae70e4 100644
--- a/biomes/tropical/rainforest-wicked-village.json
+++ b/biomes/tropical/rainforest-wicked-village.json
@@ -10,7 +10,7 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
-        "id": "trowkdvilla",
+        "id": "tropical_rainforest_wicked_village",
         "foliageColor": "#478F04",
         "grassColor": "#197300",
         "category": "jungle",
diff --git a/biomes/tropical/rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json
index 44eff35b..602368e9 100644
--- a/biomes/tropical/rainforest-wicked.json
+++ b/biomes/tropical/rainforest-wicked.json
@@ -10,7 +10,7 @@
         "tropical/rainforest-wicked-child"
     ],
     "customDerivitives": [{
-        "id": "trowkd",
+        "id": "tropical_rainforest_wicked",
         "foliageColor": "#478F04",
         "grassColor": "#197300",
         "category": "jungle",
diff --git a/biomes/tropical/rainforest.json b/biomes/tropical/rainforest.json
index 46aa69d4..ecfbd3e9 100644
--- a/biomes/tropical/rainforest.json
+++ b/biomes/tropical/rainforest.json
@@ -14,7 +14,7 @@
         "generator": "mountain"
     }],
     "customDerivitives": [{
-        "id": "trorainforest",
+        "id": "tropical_rainforest",
         "foliageColor": "#258F04",
         "grassColor": "#2DAF09",
         "waterColor": "#3AB2A2",
diff --git a/biomes/tropical/volcanic-plains.json b/biomes/tropical/volcanic-plains.json
index e8f16f45..9a4c9df8 100644
--- a/biomes/tropical/volcanic-plains.json
+++ b/biomes/tropical/volcanic-plains.json
@@ -11,7 +11,7 @@
         "generator": "mountain"
     }],
     "customDerivitives": [{
-        "id": "trovolcanoplains",
+        "id": "tropical_volcanic_plains",
         "grassColor": "#9BC20D",
         "foliageColor": "#9CD320",
         "fogColor": "#DD793C",
diff --git a/biomes/tropical/volcanoes-lava.json b/biomes/tropical/volcanoes-lava.json
index 703d0a4f..3cd864da 100644
--- a/biomes/tropical/volcanoes-lava.json
+++ b/biomes/tropical/volcanoes-lava.json
@@ -5,7 +5,7 @@
     "rarity": 1,
     "color": "#50AF52",
     "customDerivitives": [{
-        "id": "trovolcanolava",
+        "id": "tropical_volcanic_lava",
         "grassColor": "#BDBF0B",
         "foliageColor": "#BDBF0B",
         "fogColor": "#DD793C",
diff --git a/biomes/tropical/volcanoes.json b/biomes/tropical/volcanoes.json
index ac258788..f601ec47 100644
--- a/biomes/tropical/volcanoes.json
+++ b/biomes/tropical/volcanoes.json
@@ -5,7 +5,7 @@
     "rarity": 1,
     "color": "#609F61",
     "customDerivitives": [{
-        "id": "trovolcanolava",
+        "id": "tropical_volcano",
         "grassColor": "#BDBF0B",
         "foliageColor": "#BDBF0B",
         "fogColor": "#DD793C",
diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json
index d98070d0..14f97e85 100644
--- a/biomes/tundra/autumn.json
+++ b/biomes/tundra/autumn.json
@@ -11,8 +11,8 @@
         "generator": "smooth-dunes"
     }],
     "customDerivitives": [{
+        "id": "tundra_autumn",
         "grassColor": "#bf4d24",
-        "id": "autumna",
         "category": "forest",
         "humidity": 0.3,
         "downfallType": "rain",
diff --git a/biomes/tundra/bonsai-forest.json b/biomes/tundra/bonsai-forest.json
index 6fb795ce..80caafd1 100644
--- a/biomes/tundra/bonsai-forest.json
+++ b/biomes/tundra/bonsai-forest.json
@@ -14,8 +14,8 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
+        "id": "tundra_bonsai_forest",
         "grassColor": "#CB6E08",
-        "id": "tunbonsai",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/forest-cliffs.json b/biomes/tundra/forest-cliffs.json
index 69d7f3e0..7789bae6 100644
--- a/biomes/tundra/forest-cliffs.json
+++ b/biomes/tundra/forest-cliffs.json
@@ -17,8 +17,8 @@
         }
     ],
     "customDerivitives": [{
+        "id": "tundra_forest_cliffs",
         "grassColor": "#56B16F",
-        "id": "tunforestcliff",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json
index 9b2488ec..81ab9d05 100644
--- a/biomes/tundra/forest.json
+++ b/biomes/tundra/forest.json
@@ -11,8 +11,8 @@
         "min": 8
     }],
     "customDerivitives": [{
+        "id": "tundra_forest",
         "grassColor": "#56B16F",
-        "id": "tunforest",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json
index 11e60fab..1069b65c 100644
--- a/biomes/tundra/mountains-cliffs.json
+++ b/biomes/tundra/mountains-cliffs.json
@@ -17,8 +17,8 @@
         }
     ],
     "customDerivitives": [{
+        "id": "tundra_magical_forest_cliffs",
         "grassColor": "#B0A747",
-        "id": "tunmagicforest",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/mountains.json b/biomes/tundra/mountains.json
index eca85c4b..3ea945fc 100644
--- a/biomes/tundra/mountains.json
+++ b/biomes/tundra/mountains.json
@@ -21,8 +21,8 @@
         }
     ],
     "customDerivitives": [{
+        "id": "tundra_mountains",
         "grassColor": "#B0A747",
-        "id": "tunmountain",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json
index a56b1e69..1c21134c 100644
--- a/biomes/tundra/redwood-cliffs.json
+++ b/biomes/tundra/redwood-cliffs.json
@@ -17,8 +17,8 @@
         }
     ],
     "customDerivitives": [{
+        "id": "tundra_redwood_cliffs",
         "grassColor": "#A17E3C",
-        "id": "tunredwoodcliff",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json
index c9250fd7..b34d6ec9 100644
--- a/biomes/tundra/redwood-forest.json
+++ b/biomes/tundra/redwood-forest.json
@@ -11,8 +11,8 @@
         "generator": "smooth-dunes"
     }],
     "customDerivitives": [{
+        "id": "tundra_redwood_forest",
         "grassColor": "#AC7B1F",
-        "id": "tunredwoodfrst",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/sea/lake.json b/biomes/tundra/sea/lake.json
index 62dcf346..7a811090 100644
--- a/biomes/tundra/sea/lake.json
+++ b/biomes/tundra/sea/lake.json
@@ -10,8 +10,8 @@
         "generator": "river"
     }],
     "customDerivitives": [{
+        "id": "tundra_lake",
         "grassColor": "#CB6E08",
-        "id": "tunlake",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json
index 1c80d678..04f87303 100644
--- a/biomes/tundra/sequia-redwoods.json
+++ b/biomes/tundra/sequia-redwoods.json
@@ -10,8 +10,8 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
+        "id": "tundra_sequoia_redwoods",
         "grassColor": "#7BA13C",
-        "id": "tunseqredwood",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#FFE0AF"
diff --git a/biomes/tundra/spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json
index d8cfcf90..fbf22456 100644
--- a/biomes/tundra/spruce-denmyre.json
+++ b/biomes/tundra/spruce-denmyre.json
@@ -10,8 +10,8 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
+        "id": "tundra_spruce_denmyre",
         "grassColor": "#7BA13C",
-        "id": "tundenmyre",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"
diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json
index 5eda4d61..8302eb5d 100644
--- a/biomes/tundra/taiga.json
+++ b/biomes/tundra/taiga.json
@@ -10,8 +10,8 @@
         "generator": "plain"
     }],
     "customDerivitives": [{
+        "id": "tundra_taiga",
         "grassColor": "#7BA13C",
-        "id": "tuntiaga",
         "waterColor": "#80B4C6",
         "waterFogColor": "#80B4C6",
         "fogColor": "#8091C6"

From 06f143ddcaea1856ba84e26c0a88744661c24877 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 08:29:42 -0400
Subject: [PATCH 04/14] ID Tweaks

---
 biomes/tropical/wilds.json | 2 +-
 biomes/tundra/autumn.json  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/biomes/tropical/wilds.json b/biomes/tropical/wilds.json
index 8787bb8c..7e72a709 100644
--- a/biomes/tropical/wilds.json
+++ b/biomes/tropical/wilds.json
@@ -11,7 +11,7 @@
         "generator": "mountain"
     }],
     "customDerivitives": [{
-        "id": "trowilds",
+        "id": "tropical_wilds",
         "foliageColor": "#2C8806",
         "grassColor": "#183F0E",
         "waterColor": "#11BA89",
diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json
index 14f97e85..1dc0c674 100644
--- a/biomes/tundra/autumn.json
+++ b/biomes/tundra/autumn.json
@@ -11,7 +11,7 @@
         "generator": "smooth-dunes"
     }],
     "customDerivitives": [{
-        "id": "tundra_autumn",
+        "id": "tundra_autumn_red",
         "grassColor": "#bf4d24",
         "category": "forest",
         "humidity": 0.3,
@@ -24,7 +24,7 @@
     },
     {
         "grassColor": "#BF8924",
-        "id": "tunautumnb",
+        "id": "tundra_autumn_orange",
         "category": "forest",
         "humidity": 0.3,
         "downfallType": "rain",
@@ -36,7 +36,7 @@
     },
     {
         "grassColor": "#bf6724",
-        "id": "autumnc",
+        "id": "tundra_autumn_yellow",
         "category": "forest",
         "humidity": 0.3,
         "downfallType": "rain",

From ed0313365be08013bdca1318178bc6070a2f7b92 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 08:49:25 -0400
Subject: [PATCH 05/14] Strip all "data": {"persistent": true} tags (they are
 assumed now)

---
 biomes/cave/old-cavern.json                    |  6 ++----
 biomes/cave/tropical-cavern.json               |  3 +--
 biomes/frozen/hills.json                       |  6 ++----
 biomes/frozen/mountain-cliffs.json             | 12 ++++--------
 biomes/frozen/mountains.json                   |  6 ++----
 biomes/frozen/pine-hills.json                  |  6 ++----
 biomes/frozen/pine-plains.json                 |  6 ++----
 biomes/frozen/pines.json                       | 12 ++++--------
 biomes/frozen/plains.json                      |  6 ++----
 biomes/frozen/redwood-forest.json              |  6 ++----
 biomes/frozen/spruce-hills.json                |  6 ++----
 biomes/frozen/spruce-plains.json               |  6 ++----
 biomes/frozen/vander.json                      |  6 ++----
 biomes/mountain/forest-hills.json              |  3 +--
 biomes/mountain/forest.json                    |  3 +--
 biomes/savanna/acacia-denmyre.json             |  3 +--
 biomes/swamp/denmyre.json                      | 12 ++++--------
 biomes/swamp/marsh.json                        |  3 +--
 biomes/swamp/roofed-wayward.json               | 12 ++++--------
 biomes/swamp/sea/ocean-tree.json               |  3 +--
 biomes/swamp/shore/beach.json                  |  3 +--
 biomes/temperate/birch-denmyre.json            | 12 ++++--------
 biomes/temperate/flower-forest.json            |  6 ++----
 biomes/temperate/longtree-forest.json          |  3 +--
 biomes/temperate/oak-denmyre.json              | 15 +++++----------
 biomes/temperate/oak-forest.json               |  6 ++----
 biomes/temperate/plateau.json                  |  6 ++----
 biomes/temperate/sakura-pink-child.json        |  3 +--
 biomes/temperate/sakura-pink-forest.json       |  3 +--
 biomes/tropical/bamboo-forest.json             |  3 +--
 biomes/tropical/jungle-denmyre.json            | 12 ++++--------
 biomes/tropical/mountain-extreme.json          |  3 ---
 biomes/tropical/mountain-plains.json           |  3 ---
 biomes/tropical/rainforest-hills.json          |  7 -------
 biomes/tropical/rainforest-island.json         |  7 -------
 biomes/tropical/rainforest-wicked-child.json   |  7 -------
 biomes/tropical/rainforest-wicked-village.json |  4 ----
 biomes/tropical/rainforest-wicked.json         |  7 -------
 biomes/tropical/rainforest.json                |  7 -------
 biomes/tundra/bonsai-forest.json               |  1 -
 biomes/tundra/redwood-cliffs.json              |  1 -
 biomes/tundra/redwood-forest.json              |  1 -
 biomes/tundra/sea/lake.json                    | 18 ++++++------------
 biomes/tundra/spruce-denmyre.json              | 18 ++++++------------
 biomes/tundra/taiga.json                       |  1 -
 45 files changed, 78 insertions(+), 205 deletions(-)

diff --git a/biomes/cave/old-cavern.json b/biomes/cave/old-cavern.json
index 4c6e9b5f..5bec8228 100644
--- a/biomes/cave/old-cavern.json
+++ b/biomes/cave/old-cavern.json
@@ -49,8 +49,7 @@
                 },
                 {
                     "block": "jungle_leaves",
-                    "weight": 1,
-                    "data": {"persistent": true}
+                    "weight": 1
                 },
                 {
                     "block": "shroomlight",
@@ -122,8 +121,7 @@
         {
             "chance": 0.034,
             "palette": [{
-                "block": "jungle_leaves",
-                "data": {"persistent": true}
+                "block": "jungle_leaves"
             }]
         },
         {
diff --git a/biomes/cave/tropical-cavern.json b/biomes/cave/tropical-cavern.json
index 6b20ce27..dfccb444 100644
--- a/biomes/cave/tropical-cavern.json
+++ b/biomes/cave/tropical-cavern.json
@@ -18,8 +18,7 @@
                 "block": "stone"
             },
             {
-                "block": "jungle_leaves",
-                "data": {"persistent": true}
+                "block": "jungle_leaves"
             },
             {
                 "weight": 2,
diff --git a/biomes/frozen/hills.json b/biomes/frozen/hills.json
index bad00246..7695dc3f 100644
--- a/biomes/frozen/hills.json
+++ b/biomes/frozen/hills.json
@@ -90,12 +90,10 @@
                     },
                     "palette": [
                         {
-                            "block": "oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "oak_leaves"
                         },
                         {
-                            "block": "dark_oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "dark_oak_leaves"
                         }
                     ]
                 }
diff --git a/biomes/frozen/mountain-cliffs.json b/biomes/frozen/mountain-cliffs.json
index c167aaa1..8387c3aa 100644
--- a/biomes/frozen/mountain-cliffs.json
+++ b/biomes/frozen/mountain-cliffs.json
@@ -117,12 +117,10 @@
                     },
                     "palette": [
                         {
-                            "block": "oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "oak_leaves"
                         },
                         {
-                            "block": "dark_oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "dark_oak_leaves"
                         }
                     ]
                 }
@@ -177,12 +175,10 @@
                     },
                     "palette": [
                         {
-                            "block": "oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "oak_leaves"
                         },
                         {
-                            "block": "dark_oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "dark_oak_leaves"
                         }
                     ]
                 }
diff --git a/biomes/frozen/mountains.json b/biomes/frozen/mountains.json
index 9b32b6dc..fe38b273 100644
--- a/biomes/frozen/mountains.json
+++ b/biomes/frozen/mountains.json
@@ -122,12 +122,10 @@
                     },
                     "palette": [
                         {
-                            "block": "oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "oak_leaves"
                         },
                         {
-                            "block": "dark_oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "dark_oak_leaves"
                         }
                     ]
                 }
diff --git a/biomes/frozen/pine-hills.json b/biomes/frozen/pine-hills.json
index 22888f0a..a2a2527f 100644
--- a/biomes/frozen/pine-hills.json
+++ b/biomes/frozen/pine-hills.json
@@ -88,12 +88,10 @@
                 },
                 "palette": [
                     {
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     },
                     {
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }
                 ]
             }
diff --git a/biomes/frozen/pine-plains.json b/biomes/frozen/pine-plains.json
index 9336172d..f9bfcd32 100644
--- a/biomes/frozen/pine-plains.json
+++ b/biomes/frozen/pine-plains.json
@@ -96,12 +96,10 @@
                 },
                 "palette": [
                     {
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     },
                     {
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }
                 ]
             }
diff --git a/biomes/frozen/pines.json b/biomes/frozen/pines.json
index ae464a33..d22fac45 100644
--- a/biomes/frozen/pines.json
+++ b/biomes/frozen/pines.json
@@ -95,12 +95,10 @@
                     },
                     "palette": [
                         {
-                            "block": "oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "oak_leaves"
                         },
                         {
-                            "block": "dark_oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "dark_oak_leaves"
                         }
                     ]
                 }
@@ -141,12 +139,10 @@
                     },
                     "palette": [
                         {
-                            "block": "oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "oak_leaves"
                         },
                         {
-                            "block": "dark_oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "dark_oak_leaves"
                         }
                     ]
                 }
diff --git a/biomes/frozen/plains.json b/biomes/frozen/plains.json
index 68e440b0..2135f862 100644
--- a/biomes/frozen/plains.json
+++ b/biomes/frozen/plains.json
@@ -191,12 +191,10 @@
                     },
                     "palette": [
                         {
-                            "block": "oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "oak_leaves"
                         },
                         {
-                            "block": "dark_oak_leaves",
-                            "data": {"persistent": true}
+                            "block": "dark_oak_leaves"
                         }
                     ]
                 }
diff --git a/biomes/frozen/redwood-forest.json b/biomes/frozen/redwood-forest.json
index 7e8ab7b7..6fc5d258 100644
--- a/biomes/frozen/redwood-forest.json
+++ b/biomes/frozen/redwood-forest.json
@@ -117,12 +117,10 @@
                         },
                         "palette": [
                             {
-                                "block": "oak_leaves",
-                                "data": {"persistent": true}
+                                "block": "oak_leaves"
                             },
                             {
-                                "block": "dark_oak_leaves",
-                                "data": {"persistent": true}
+                                "block": "dark_oak_leaves"
                             }
                         ]
                     }
diff --git a/biomes/frozen/spruce-hills.json b/biomes/frozen/spruce-hills.json
index 3fa2d8f6..36ac8e6c 100644
--- a/biomes/frozen/spruce-hills.json
+++ b/biomes/frozen/spruce-hills.json
@@ -95,12 +95,10 @@
                 },
                 "palette": [
                     {
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     },
                     {
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }
                 ]
             }
diff --git a/biomes/frozen/spruce-plains.json b/biomes/frozen/spruce-plains.json
index 4979752a..186eefdc 100644
--- a/biomes/frozen/spruce-plains.json
+++ b/biomes/frozen/spruce-plains.json
@@ -103,12 +103,10 @@
                 },
                 "palette": [
                     {
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     },
                     {
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }
                 ]
             }
diff --git a/biomes/frozen/vander.json b/biomes/frozen/vander.json
index 7e82500b..f6350db7 100644
--- a/biomes/frozen/vander.json
+++ b/biomes/frozen/vander.json
@@ -169,12 +169,10 @@
                         },
                         "palette": [
                             {
-                                "block": "oak_leaves",
-                                "data": {"persistent": true}
+                                "block": "oak_leaves"
                             },
                             {
-                                "block": "dark_oak_leaves",
-                                "data": {"persistent": true}
+                                "block": "dark_oak_leaves"
                             }
                         ]
                     }
diff --git a/biomes/mountain/forest-hills.json b/biomes/mountain/forest-hills.json
index 8b28674b..25869e07 100644
--- a/biomes/mountain/forest-hills.json
+++ b/biomes/mountain/forest-hills.json
@@ -210,8 +210,7 @@
                     {"block": "dark_oak_fence_gate"}
                 ],
                 "replace": {"palette": [{
-                    "block": "spruce_leaves",
-                    "data": {"persistent": true}
+                    "block": "spruce_leaves"
                 }]}
             }],
             "chance": 1,
diff --git a/biomes/mountain/forest.json b/biomes/mountain/forest.json
index 04f1ffec..d5bee8e5 100644
--- a/biomes/mountain/forest.json
+++ b/biomes/mountain/forest.json
@@ -210,8 +210,7 @@
                     {"block": "dark_oak_fence_gate"}
                 ],
                 "replace": {"palette": [{
-                    "block": "spruce_leaves",
-                    "data": {"persistent": true}
+                    "block": "spruce_leaves"
                 }]}
             }],
             "chance": 1,
diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json
index 69fea029..4a5cdb26 100644
--- a/biomes/savanna/acacia-denmyre.json
+++ b/biomes/savanna/acacia-denmyre.json
@@ -120,8 +120,7 @@
             {
                 "find": [{"block": "acacia_leaves"}],
                 "replace": {"palette": [{
-                    "block": "acacia_leaves",
-                    "data": {"persistent": true}
+                    "block": "acacia_leaves"
                 }]}
             }
         ],
diff --git a/biomes/swamp/denmyre.json b/biomes/swamp/denmyre.json
index 8b4bf807..7d5bd659 100644
--- a/biomes/swamp/denmyre.json
+++ b/biomes/swamp/denmyre.json
@@ -122,8 +122,7 @@
                 {
                     "find": [{"block": "acacia_leaves"}],
                     "replace": {"palette": [{
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }]}
                 },
                 {
@@ -191,22 +190,19 @@
                 {
                     "find": [{"block": "spruce_leaves"}],
                     "replace": {"palette": [{
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "dark_oak_fence"}],
                     "replace": {"palette": [{
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }]}
                 }
             ],
diff --git a/biomes/swamp/marsh.json b/biomes/swamp/marsh.json
index ce824118..2bc13f07 100644
--- a/biomes/swamp/marsh.json
+++ b/biomes/swamp/marsh.json
@@ -95,8 +95,7 @@
                 {
                     "find": [{"block": "jungle_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 },
                 {
diff --git a/biomes/swamp/roofed-wayward.json b/biomes/swamp/roofed-wayward.json
index eab21489..ac3d4c93 100644
--- a/biomes/swamp/roofed-wayward.json
+++ b/biomes/swamp/roofed-wayward.json
@@ -90,15 +90,13 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "dark_oak_fence"}],
                     "replace": {"palette": [{
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }]}
                 }
             ],
@@ -135,15 +133,13 @@
                 {
                     "find": [{"block": "spruce_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "dark_oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "dark_oak_leaves"
                     }]}
                 }
             ],
diff --git a/biomes/swamp/sea/ocean-tree.json b/biomes/swamp/sea/ocean-tree.json
index 1fa4428f..a1b0fc81 100644
--- a/biomes/swamp/sea/ocean-tree.json
+++ b/biomes/swamp/sea/ocean-tree.json
@@ -158,8 +158,7 @@
                 {
                     "find": [{"block": "jungle_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 },
                 {
diff --git a/biomes/swamp/shore/beach.json b/biomes/swamp/shore/beach.json
index ad9d5aab..2889668b 100644
--- a/biomes/swamp/shore/beach.json
+++ b/biomes/swamp/shore/beach.json
@@ -93,8 +93,7 @@
             {
                 "find": [{"block": "jungle_leaves"}],
                 "replace": {"palette": [{
-                    "block": "oak_leaves",
-                    "data": {"persistent": true}
+                    "block": "oak_leaves"
                 }]}
             },
             {
diff --git a/biomes/temperate/birch-denmyre.json b/biomes/temperate/birch-denmyre.json
index b45327d0..bbcd8aa2 100644
--- a/biomes/temperate/birch-denmyre.json
+++ b/biomes/temperate/birch-denmyre.json
@@ -141,8 +141,7 @@
                 {
                     "find": [{"block": "acacia_leaves"}],
                     "replace": {"palette": [{
-                        "block": "birch_leaves",
-                        "data": {"persistent": true}
+                        "block": "birch_leaves"
                     }]}
                 },
                 {
@@ -183,22 +182,19 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "birch_leaves",
-                        "data": {"persistent": true}
+                        "block": "birch_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
                     "replace": {"palette": [{
-                        "block": "birch_leaves",
-                        "data": {"persistent": true}
+                        "block": "birch_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
                     "replace": {"palette": [{
-                        "block": "birch_leaves",
-                        "data": {"persistent": true}
+                        "block": "birch_leaves"
                     }]}
                 }
             ],
diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json
index 6a458154..af4bb261 100644
--- a/biomes/temperate/flower-forest.json
+++ b/biomes/temperate/flower-forest.json
@@ -166,8 +166,7 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 }
             ],
@@ -524,8 +523,7 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{
-                "block": "oak_leaves",
-                "data": {"persistent": true}
+                "block": "oak_leaves"
             }]
         },
         {
diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json
index 4a64cf16..a9a15098 100644
--- a/biomes/temperate/longtree-forest.json
+++ b/biomes/temperate/longtree-forest.json
@@ -217,8 +217,7 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{
-                "block": "oak_leaves",
-                "data": {"persistent": true}
+                "block": "oak_leaves"
             }]
         },
         {
diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json
index 42c8f90a..5f7c0474 100644
--- a/biomes/temperate/oak-denmyre.json
+++ b/biomes/temperate/oak-denmyre.json
@@ -73,8 +73,7 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{
-                "block": "oak_leaves",
-                "data": {"persistent": true}
+                "block": "oak_leaves"
             }]
         },
         {
@@ -145,8 +144,7 @@
                 {
                     "find": [{"block": "acacia_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 },
                 {
@@ -187,22 +185,19 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 }
             ],
diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json
index 7f618a40..4b3be002 100644
--- a/biomes/temperate/oak-forest.json
+++ b/biomes/temperate/oak-forest.json
@@ -136,8 +136,7 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 }
             ],
@@ -289,8 +288,7 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{
-                "block": "oak_leaves",
-                "data": {"persistent": true}
+                "block": "oak_leaves"
             }]
         },
         {
diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json
index d331b3c2..a4e1bdbc 100644
--- a/biomes/temperate/plateau.json
+++ b/biomes/temperate/plateau.json
@@ -188,8 +188,7 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
+                        "block": "oak_leaves"
                     }]}
                 }
             ],
@@ -307,8 +306,7 @@
             "zoom": 0.2,
             "palette": [
                 {
-                    "block": "oak_leaves",
-                    "data": {"persistent": true}
+                    "block": "oak_leaves"
                 },
                 {"block": "rose_bush"},
                 {"block": "cobblestone_slab"}
diff --git a/biomes/temperate/sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json
index 4432e603..1cab251d 100644
--- a/biomes/temperate/sakura-pink-child.json
+++ b/biomes/temperate/sakura-pink-child.json
@@ -211,8 +211,7 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{
-                "block": "oak_leaves",
-                "data": {"persistent": true}
+                "block": "oak_leaves"
             }]
         },
         {
diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json
index 3e63709f..b4fe049b 100644
--- a/biomes/temperate/sakura-pink-forest.json
+++ b/biomes/temperate/sakura-pink-forest.json
@@ -219,8 +219,7 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [{
-                "block": "oak_leaves",
-                "data": {"persistent": true}
+                "block": "oak_leaves"
             }]
         },
         {
diff --git a/biomes/tropical/bamboo-forest.json b/biomes/tropical/bamboo-forest.json
index f6b699fb..cbfcb967 100644
--- a/biomes/tropical/bamboo-forest.json
+++ b/biomes/tropical/bamboo-forest.json
@@ -101,8 +101,7 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "jungle_leaves",
-                        "data": {"persistent": true}
+                        "block": "jungle_leaves"
                     }]}
                 },
                 {
diff --git a/biomes/tropical/jungle-denmyre.json b/biomes/tropical/jungle-denmyre.json
index a5afd010..8ae9a673 100644
--- a/biomes/tropical/jungle-denmyre.json
+++ b/biomes/tropical/jungle-denmyre.json
@@ -107,8 +107,7 @@
                 {
                     "find": [{"block": "acacia_leaves"}],
                     "replace": {"palette": [{
-                        "block": "jungle_leaves",
-                        "data": {"persistent": true}
+                        "block": "jungle_leaves"
                     }]}
                 },
                 {
@@ -150,22 +149,19 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "jungle_leaves",
-                        "data": {"persistent": true}
+                        "block": "jungle_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
                     "replace": {"palette": [{
-                        "block": "jungle_leaves",
-                        "data": {"persistent": true}
+                        "block": "jungle_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
                     "replace": {"palette": [{
-                        "block": "jungle_leaves",
-                        "data": {"persistent": true}
+                        "block": "jungle_leaves"
                     }]}
                 }
             ],
diff --git a/biomes/tropical/mountain-extreme.json b/biomes/tropical/mountain-extreme.json
index 193dd5be..d2c39dc3 100644
--- a/biomes/tropical/mountain-extreme.json
+++ b/biomes/tropical/mountain-extreme.json
@@ -101,18 +101,15 @@
             "zoom": 0.1,
             "palette": [
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "tall_grass"},
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 }
             ],
diff --git a/biomes/tropical/mountain-plains.json b/biomes/tropical/mountain-plains.json
index d81abdcb..49ab2aa7 100644
--- a/biomes/tropical/mountain-plains.json
+++ b/biomes/tropical/mountain-plains.json
@@ -114,18 +114,15 @@
             "zoom": 0.1,
             "palette": [
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "tall_grass"},
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 }
             ],
diff --git a/biomes/tropical/rainforest-hills.json b/biomes/tropical/rainforest-hills.json
index 8d85a2fa..b3bf3942 100644
--- a/biomes/tropical/rainforest-hills.json
+++ b/biomes/tropical/rainforest-hills.json
@@ -38,7 +38,6 @@
             "palette": [
                 {"block": "grass_block"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {
@@ -80,18 +79,15 @@
             "zoom": 0.1,
             "palette": [
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "tall_grass"},
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 }
             ],
@@ -267,17 +263,14 @@
         "palette": [
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"}
diff --git a/biomes/tropical/rainforest-island.json b/biomes/tropical/rainforest-island.json
index bf65ef9a..c62f07f1 100644
--- a/biomes/tropical/rainforest-island.json
+++ b/biomes/tropical/rainforest-island.json
@@ -24,7 +24,6 @@
             "palette": [
                 {"block": "grass_block"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {
@@ -71,18 +70,15 @@
             "zoom": 0.1,
             "palette": [
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "tall_grass"},
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 }
             ],
@@ -267,17 +263,14 @@
         "palette": [
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"}
diff --git a/biomes/tropical/rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json
index fb6c8009..011e193f 100644
--- a/biomes/tropical/rainforest-wicked-child.json
+++ b/biomes/tropical/rainforest-wicked-child.json
@@ -24,7 +24,6 @@
             "palette": [
                 {"block": "grass_block"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {
@@ -80,18 +79,15 @@
             "zoom": 0.1,
             "palette": [
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "tall_grass"},
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 }
             ],
@@ -276,17 +272,14 @@
         "palette": [
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"}
diff --git a/biomes/tropical/rainforest-wicked-village.json b/biomes/tropical/rainforest-wicked-village.json
index 2fae70e4..b83ac53f 100644
--- a/biomes/tropical/rainforest-wicked-village.json
+++ b/biomes/tropical/rainforest-wicked-village.json
@@ -24,7 +24,6 @@
             "palette": [
                 {"block": "grass_block"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {
@@ -104,17 +103,14 @@
         "palette": [
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"}
diff --git a/biomes/tropical/rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json
index 602368e9..ff3b4bf4 100644
--- a/biomes/tropical/rainforest-wicked.json
+++ b/biomes/tropical/rainforest-wicked.json
@@ -29,7 +29,6 @@
             "palette": [
                 {"block": "grass_block"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {
@@ -71,18 +70,15 @@
             "zoom": 0.1,
             "palette": [
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "tall_grass"},
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 }
             ],
@@ -267,17 +263,14 @@
         "palette": [
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"}
diff --git a/biomes/tropical/rainforest.json b/biomes/tropical/rainforest.json
index ecfbd3e9..c93f5ab1 100644
--- a/biomes/tropical/rainforest.json
+++ b/biomes/tropical/rainforest.json
@@ -28,7 +28,6 @@
             "palette": [
                 {"block": "grass_block"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {
@@ -70,18 +69,15 @@
             "zoom": 0.1,
             "palette": [
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "tall_grass"},
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 },
                 {"block": "grass"},
                 {
-                    "data": {"persistent": true},
                     "block": "jungle_leaves"
                 }
             ],
@@ -278,17 +274,14 @@
         "palette": [
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"},
             {
-                "data": {"persistent": true},
                 "block": "jungle_leaves"
             },
             {"block": "stripped_jungle_wood"}
diff --git a/biomes/tundra/bonsai-forest.json b/biomes/tundra/bonsai-forest.json
index 80caafd1..efa8158d 100644
--- a/biomes/tundra/bonsai-forest.json
+++ b/biomes/tundra/bonsai-forest.json
@@ -205,7 +205,6 @@
             "edit": [{
                 "find": [{"block": "oak_leaves"}],
                 "replace": {"palette": [{
-                    "data": {"persistent": true},
                     "block": "birch_leaves"
                 }]}
             }],
diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json
index 1c21134c..856d927f 100644
--- a/biomes/tundra/redwood-cliffs.json
+++ b/biomes/tundra/redwood-cliffs.json
@@ -286,7 +286,6 @@
             "edit": [{
                 "find": [{"block": "oak_leaves"}],
                 "replace": {"palette": [{
-                    "data": {"persistent": true},
                     "block": "birch_leaves"
                 }]}
             }],
diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json
index b34d6ec9..556f1e80 100644
--- a/biomes/tundra/redwood-forest.json
+++ b/biomes/tundra/redwood-forest.json
@@ -247,7 +247,6 @@
             "edit": [{
                 "find": [{"block": "oak_leaves"}],
                 "replace": {"palette": [{
-                    "data": {"persistent": true},
                     "block": "birch_leaves"
                 }]}
             }],
diff --git a/biomes/tundra/sea/lake.json b/biomes/tundra/sea/lake.json
index 7a811090..82cbda36 100644
--- a/biomes/tundra/sea/lake.json
+++ b/biomes/tundra/sea/lake.json
@@ -154,22 +154,19 @@
                 {
                     "find": [{"block": "acacia_leaves"}],
                     "replace": {"palette": [{
-                        "block": "spruce_leaves",
-                        "data": {"persistent": true}
+                        "block": "spruce_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "acacia_fence"}],
                     "replace": {"palette": [{
-                        "block": "spruce_fence",
-                        "data": {"persistent": true}
+                        "block": "spruce_fence"
                     }]}
                 },
                 {
                     "find": [{"block": "acacia_wood"}],
                     "replace": {"palette": [{
-                        "block": "spruce_wood",
-                        "data": {"persistent": true}
+                        "block": "spruce_wood"
                     }]}
                 }
             ],
@@ -202,22 +199,19 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "spruce_leaves",
-                        "data": {"persistent": true}
+                        "block": "spruce_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
                     "replace": {"palette": [{
-                        "block": "spruce_leaves",
-                        "data": {"persistent": true}
+                        "block": "spruce_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
                     "replace": {"palette": [{
-                        "block": "spruce_leaves",
-                        "data": {"persistent": true}
+                        "block": "spruce_leaves"
                     }]}
                 }
             ],
diff --git a/biomes/tundra/spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json
index fbf22456..1e4392d9 100644
--- a/biomes/tundra/spruce-denmyre.json
+++ b/biomes/tundra/spruce-denmyre.json
@@ -164,22 +164,19 @@
                 {
                     "find": [{"block": "acacia_leaves"}],
                     "replace": {"palette": [{
-                        "block": "spruce_leaves",
-                        "data": {"persistent": true}
+                        "block": "spruce_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "acacia_fence"}],
                     "replace": {"palette": [{
-                        "block": "spruce_fence",
-                        "data": {"persistent": true}
+                        "block": "spruce_fence"
                     }]}
                 },
                 {
                     "find": [{"block": "acacia_wood"}],
                     "replace": {"palette": [{
-                        "block": "spruce_wood",
-                        "data": {"persistent": true}
+                        "block": "spruce_wood"
                     }]}
                 }
             ],
@@ -212,22 +209,19 @@
                 {
                     "find": [{"block": "birch_leaves"}],
                     "replace": {"palette": [{
-                        "block": "spruce_leaves",
-                        "data": {"persistent": true}
+                        "block": "spruce_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
                     "replace": {"palette": [{
-                        "block": "spruce_leaves",
-                        "data": {"persistent": true}
+                        "block": "spruce_leaves"
                     }]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
                     "replace": {"palette": [{
-                        "block": "spruce_leaves",
-                        "data": {"persistent": true}
+                        "block": "spruce_leaves"
                     }]}
                 }
             ],
diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json
index 8302eb5d..9cc6e06b 100644
--- a/biomes/tundra/taiga.json
+++ b/biomes/tundra/taiga.json
@@ -204,7 +204,6 @@
             "edit": [{
                 "find": [{"block": "oak_leaves"}],
                 "replace": {"palette": [{
-                    "data": {"persistent": true},
                     "block": "birch_leaves"
                 }]}
             }],

From 27422d569bbf0c6bee529df993ecebcae4f94cf9 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 08:56:57 -0400
Subject: [PATCH 06/14] Beautify

---
 biomes/cave/old-cavern.json                   |   4 +-
 biomes/cave/tropical-cavern.json              |   4 +-
 biomes/frozen/hills.json                      |   8 +-
 biomes/frozen/mountain-cliffs.json            |  16 +-
 biomes/frozen/mountains.json                  |   8 +-
 biomes/frozen/pine-hills.json                 |   8 +-
 biomes/frozen/pine-plains.json                |   8 +-
 biomes/frozen/pines.json                      |  16 +-
 biomes/frozen/plains.json                     |   8 +-
 biomes/frozen/redwood-forest.json             |   8 +-
 biomes/frozen/spruce-hills.json               |   8 +-
 biomes/frozen/spruce-plains.json              |   8 +-
 biomes/frozen/vander.json                     |   8 +-
 biomes/mountain/forest-hills.json             |   4 +-
 biomes/mountain/forest.json                   |   4 +-
 biomes/savanna/acacia-denmyre.json            |   4 +-
 biomes/swamp/denmyre.json                     |  16 +-
 biomes/swamp/marsh.json                       |   4 +-
 biomes/swamp/roofed-wayward.json              |  16 +-
 biomes/swamp/sea/ocean-tree.json              |   4 +-
 biomes/swamp/shore/beach.json                 |   4 +-
 biomes/temperate/birch-denmyre.json           |  16 +-
 biomes/temperate/flower-forest.json           |   8 +-
 biomes/temperate/longtree-forest.json         |   4 +-
 biomes/temperate/oak-denmyre.json             |  20 +-
 biomes/temperate/oak-forest.json              |   8 +-
 biomes/temperate/plateau.json                 |   8 +-
 biomes/temperate/sakura-pink-child.json       |   4 +-
 biomes/temperate/sakura-pink-forest.json      |   4 +-
 biomes/tropical/bamboo-forest.json            |   4 +-
 biomes/tropical/jungle-denmyre.json           |  16 +-
 biomes/tropical/mountain-extreme.json         |  12 +-
 biomes/tropical/mountain-plains.json          |  12 +-
 biomes/tropical/rainforest-hills.json         |  28 +-
 biomes/tropical/rainforest-island.json        |  28 +-
 biomes/tropical/rainforest-wicked-child.json  |  28 +-
 .../tropical/rainforest-wicked-village.json   |  16 +-
 biomes/tropical/rainforest-wicked.json        |  28 +-
 biomes/tropical/rainforest.json               |  28 +-
 biomes/tundra/autumn.json                     | 284 +++++++-----------
 biomes/tundra/bonsai-forest.json              |   4 +-
 biomes/tundra/redwood-cliffs.json             |   4 +-
 biomes/tundra/redwood-forest.json             |   4 +-
 biomes/tundra/sea/lake.json                   |  24 +-
 biomes/tundra/spruce-denmyre.json             |  24 +-
 biomes/tundra/taiga.json                      |   4 +-
 dimensions/overworld.json                     | 176 +++--------
 regions/tundra.json                           | 132 ++++----
 48 files changed, 332 insertions(+), 764 deletions(-)

diff --git a/biomes/cave/old-cavern.json b/biomes/cave/old-cavern.json
index 5bec8228..29d9713a 100644
--- a/biomes/cave/old-cavern.json
+++ b/biomes/cave/old-cavern.json
@@ -120,9 +120,7 @@
         },
         {
             "chance": 0.034,
-            "palette": [{
-                "block": "jungle_leaves"
-            }]
+            "palette": [{"block": "jungle_leaves"}]
         },
         {
             "chance": 0.0013,
diff --git a/biomes/cave/tropical-cavern.json b/biomes/cave/tropical-cavern.json
index dfccb444..55c29abc 100644
--- a/biomes/cave/tropical-cavern.json
+++ b/biomes/cave/tropical-cavern.json
@@ -17,9 +17,7 @@
                 "weight": 2,
                 "block": "stone"
             },
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {
                 "weight": 2,
                 "block": "stone"
diff --git a/biomes/frozen/hills.json b/biomes/frozen/hills.json
index 7695dc3f..0b0605e5 100644
--- a/biomes/frozen/hills.json
+++ b/biomes/frozen/hills.json
@@ -89,12 +89,8 @@
                         "zoom": 0.2
                     },
                     "palette": [
-                        {
-                            "block": "oak_leaves"
-                        },
-                        {
-                            "block": "dark_oak_leaves"
-                        }
+                        {"block": "oak_leaves"},
+                        {"block": "dark_oak_leaves"}
                     ]
                 }
             }],
diff --git a/biomes/frozen/mountain-cliffs.json b/biomes/frozen/mountain-cliffs.json
index 8387c3aa..133d137e 100644
--- a/biomes/frozen/mountain-cliffs.json
+++ b/biomes/frozen/mountain-cliffs.json
@@ -116,12 +116,8 @@
                         "zoom": 0.2
                     },
                     "palette": [
-                        {
-                            "block": "oak_leaves"
-                        },
-                        {
-                            "block": "dark_oak_leaves"
-                        }
+                        {"block": "oak_leaves"},
+                        {"block": "dark_oak_leaves"}
                     ]
                 }
             }],
@@ -174,12 +170,8 @@
                         "zoom": 0.2
                     },
                     "palette": [
-                        {
-                            "block": "oak_leaves"
-                        },
-                        {
-                            "block": "dark_oak_leaves"
-                        }
+                        {"block": "oak_leaves"},
+                        {"block": "dark_oak_leaves"}
                     ]
                 }
             }],
diff --git a/biomes/frozen/mountains.json b/biomes/frozen/mountains.json
index fe38b273..1fd03348 100644
--- a/biomes/frozen/mountains.json
+++ b/biomes/frozen/mountains.json
@@ -121,12 +121,8 @@
                         "zoom": 0.2
                     },
                     "palette": [
-                        {
-                            "block": "oak_leaves"
-                        },
-                        {
-                            "block": "dark_oak_leaves"
-                        }
+                        {"block": "oak_leaves"},
+                        {"block": "dark_oak_leaves"}
                     ]
                 }
             }],
diff --git a/biomes/frozen/pine-hills.json b/biomes/frozen/pine-hills.json
index a2a2527f..4d51a960 100644
--- a/biomes/frozen/pine-hills.json
+++ b/biomes/frozen/pine-hills.json
@@ -87,12 +87,8 @@
                     "zoom": 0.2
                 },
                 "palette": [
-                    {
-                        "block": "oak_leaves"
-                    },
-                    {
-                        "block": "dark_oak_leaves"
-                    }
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
                 ]
             }
         }],
diff --git a/biomes/frozen/pine-plains.json b/biomes/frozen/pine-plains.json
index f9bfcd32..d0c3caa4 100644
--- a/biomes/frozen/pine-plains.json
+++ b/biomes/frozen/pine-plains.json
@@ -95,12 +95,8 @@
                     "zoom": 0.2
                 },
                 "palette": [
-                    {
-                        "block": "oak_leaves"
-                    },
-                    {
-                        "block": "dark_oak_leaves"
-                    }
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
                 ]
             }
         }],
diff --git a/biomes/frozen/pines.json b/biomes/frozen/pines.json
index d22fac45..70235af4 100644
--- a/biomes/frozen/pines.json
+++ b/biomes/frozen/pines.json
@@ -94,12 +94,8 @@
                         "zoom": 0.2
                     },
                     "palette": [
-                        {
-                            "block": "oak_leaves"
-                        },
-                        {
-                            "block": "dark_oak_leaves"
-                        }
+                        {"block": "oak_leaves"},
+                        {"block": "dark_oak_leaves"}
                     ]
                 }
             }],
@@ -138,12 +134,8 @@
                         "zoom": 0.2
                     },
                     "palette": [
-                        {
-                            "block": "oak_leaves"
-                        },
-                        {
-                            "block": "dark_oak_leaves"
-                        }
+                        {"block": "oak_leaves"},
+                        {"block": "dark_oak_leaves"}
                     ]
                 }
             }],
diff --git a/biomes/frozen/plains.json b/biomes/frozen/plains.json
index 2135f862..47a3bcff 100644
--- a/biomes/frozen/plains.json
+++ b/biomes/frozen/plains.json
@@ -190,12 +190,8 @@
                         "zoom": 0.2
                     },
                     "palette": [
-                        {
-                            "block": "oak_leaves"
-                        },
-                        {
-                            "block": "dark_oak_leaves"
-                        }
+                        {"block": "oak_leaves"},
+                        {"block": "dark_oak_leaves"}
                     ]
                 }
             }],
diff --git a/biomes/frozen/redwood-forest.json b/biomes/frozen/redwood-forest.json
index 6fc5d258..b8de3940 100644
--- a/biomes/frozen/redwood-forest.json
+++ b/biomes/frozen/redwood-forest.json
@@ -116,12 +116,8 @@
                             "zoom": 0.2
                         },
                         "palette": [
-                            {
-                                "block": "oak_leaves"
-                            },
-                            {
-                                "block": "dark_oak_leaves"
-                            }
+                            {"block": "oak_leaves"},
+                            {"block": "dark_oak_leaves"}
                         ]
                     }
                 },
diff --git a/biomes/frozen/spruce-hills.json b/biomes/frozen/spruce-hills.json
index 36ac8e6c..e689840e 100644
--- a/biomes/frozen/spruce-hills.json
+++ b/biomes/frozen/spruce-hills.json
@@ -94,12 +94,8 @@
                     "zoom": 0.2
                 },
                 "palette": [
-                    {
-                        "block": "oak_leaves"
-                    },
-                    {
-                        "block": "dark_oak_leaves"
-                    }
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
                 ]
             }
         }],
diff --git a/biomes/frozen/spruce-plains.json b/biomes/frozen/spruce-plains.json
index 186eefdc..e335af91 100644
--- a/biomes/frozen/spruce-plains.json
+++ b/biomes/frozen/spruce-plains.json
@@ -102,12 +102,8 @@
                     "zoom": 0.2
                 },
                 "palette": [
-                    {
-                        "block": "oak_leaves"
-                    },
-                    {
-                        "block": "dark_oak_leaves"
-                    }
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
                 ]
             }
         }],
diff --git a/biomes/frozen/vander.json b/biomes/frozen/vander.json
index f6350db7..b1aae9f0 100644
--- a/biomes/frozen/vander.json
+++ b/biomes/frozen/vander.json
@@ -168,12 +168,8 @@
                             "zoom": 0.2
                         },
                         "palette": [
-                            {
-                                "block": "oak_leaves"
-                            },
-                            {
-                                "block": "dark_oak_leaves"
-                            }
+                            {"block": "oak_leaves"},
+                            {"block": "dark_oak_leaves"}
                         ]
                     }
                 }
diff --git a/biomes/mountain/forest-hills.json b/biomes/mountain/forest-hills.json
index 25869e07..6829bd67 100644
--- a/biomes/mountain/forest-hills.json
+++ b/biomes/mountain/forest-hills.json
@@ -209,9 +209,7 @@
                     {"block": "dark_oak_fence"},
                     {"block": "dark_oak_fence_gate"}
                 ],
-                "replace": {"palette": [{
-                    "block": "spruce_leaves"
-                }]}
+                "replace": {"palette": [{"block": "spruce_leaves"}]}
             }],
             "chance": 1,
             "density": 5,
diff --git a/biomes/mountain/forest.json b/biomes/mountain/forest.json
index d5bee8e5..f7382a3d 100644
--- a/biomes/mountain/forest.json
+++ b/biomes/mountain/forest.json
@@ -209,9 +209,7 @@
                     {"block": "dark_oak_fence"},
                     {"block": "dark_oak_fence_gate"}
                 ],
-                "replace": {"palette": [{
-                    "block": "spruce_leaves"
-                }]}
+                "replace": {"palette": [{"block": "spruce_leaves"}]}
             }],
             "chance": 1,
             "density": 5,
diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json
index 4a5cdb26..46e6af12 100644
--- a/biomes/savanna/acacia-denmyre.json
+++ b/biomes/savanna/acacia-denmyre.json
@@ -119,9 +119,7 @@
             },
             {
                 "find": [{"block": "acacia_leaves"}],
-                "replace": {"palette": [{
-                    "block": "acacia_leaves"
-                }]}
+                "replace": {"palette": [{"block": "acacia_leaves"}]}
             }
         ],
         "rotation": {
diff --git a/biomes/swamp/denmyre.json b/biomes/swamp/denmyre.json
index 7d5bd659..f7204863 100644
--- a/biomes/swamp/denmyre.json
+++ b/biomes/swamp/denmyre.json
@@ -121,9 +121,7 @@
                 },
                 {
                     "find": [{"block": "acacia_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "dark_oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "dark_oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "acacia_fence"}],
@@ -189,21 +187,15 @@
             "edit": [
                 {
                     "find": [{"block": "spruce_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "dark_oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "dark_oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "dark_oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "dark_oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "dark_oak_fence"}],
-                    "replace": {"palette": [{
-                        "block": "dark_oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "dark_oak_leaves"}]}
                 }
             ],
             "density": 2,
diff --git a/biomes/swamp/marsh.json b/biomes/swamp/marsh.json
index 2bc13f07..c778f946 100644
--- a/biomes/swamp/marsh.json
+++ b/biomes/swamp/marsh.json
@@ -94,9 +94,7 @@
             "edit": [
                 {
                     "find": [{"block": "jungle_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "jungle_wood"}],
diff --git a/biomes/swamp/roofed-wayward.json b/biomes/swamp/roofed-wayward.json
index ac3d4c93..87f41178 100644
--- a/biomes/swamp/roofed-wayward.json
+++ b/biomes/swamp/roofed-wayward.json
@@ -89,15 +89,11 @@
             "edit": [
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "dark_oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "dark_oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "dark_oak_fence"}],
-                    "replace": {"palette": [{
-                        "block": "dark_oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "dark_oak_leaves"}]}
                 }
             ],
             "rotation": {
@@ -132,15 +128,11 @@
             "edit": [
                 {
                     "find": [{"block": "spruce_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "dark_oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "dark_oak_leaves"}]}
                 }
             ],
             "rotation": {
diff --git a/biomes/swamp/sea/ocean-tree.json b/biomes/swamp/sea/ocean-tree.json
index a1b0fc81..67896ed0 100644
--- a/biomes/swamp/sea/ocean-tree.json
+++ b/biomes/swamp/sea/ocean-tree.json
@@ -157,9 +157,7 @@
             "edit": [
                 {
                     "find": [{"block": "jungle_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "jungle_wood"}],
diff --git a/biomes/swamp/shore/beach.json b/biomes/swamp/shore/beach.json
index 2889668b..32384c43 100644
--- a/biomes/swamp/shore/beach.json
+++ b/biomes/swamp/shore/beach.json
@@ -92,9 +92,7 @@
         "edit": [
             {
                 "find": [{"block": "jungle_leaves"}],
-                "replace": {"palette": [{
-                    "block": "oak_leaves"
-                }]}
+                "replace": {"palette": [{"block": "oak_leaves"}]}
             },
             {
                 "find": [{"block": "jungle_wood"}],
diff --git a/biomes/temperate/birch-denmyre.json b/biomes/temperate/birch-denmyre.json
index bbcd8aa2..f49d5382 100644
--- a/biomes/temperate/birch-denmyre.json
+++ b/biomes/temperate/birch-denmyre.json
@@ -140,9 +140,7 @@
                 },
                 {
                     "find": [{"block": "acacia_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "birch_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "birch_leaves"}]}
                 },
                 {
                     "find": [{"block": "acacia_fence"}],
@@ -181,21 +179,15 @@
             "edit": [
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "birch_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "birch_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "birch_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "birch_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
-                    "replace": {"palette": [{
-                        "block": "birch_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "birch_leaves"}]}
                 }
             ],
             "chance": 0.3,
diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json
index af4bb261..1916674a 100644
--- a/biomes/temperate/flower-forest.json
+++ b/biomes/temperate/flower-forest.json
@@ -165,9 +165,7 @@
                 },
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 }
             ],
             "place": [
@@ -522,9 +520,7 @@
             "chance": 0.04,
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
-            "palette": [{
-                "block": "oak_leaves"
-            }]
+            "palette": [{"block": "oak_leaves"}]
         },
         {
             "chance": 0.02,
diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json
index a9a15098..0bca4481 100644
--- a/biomes/temperate/longtree-forest.json
+++ b/biomes/temperate/longtree-forest.json
@@ -216,9 +216,7 @@
             "chance": 0.02,
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
-            "palette": [{
-                "block": "oak_leaves"
-            }]
+            "palette": [{"block": "oak_leaves"}]
         },
         {
             "chance": 0.02,
diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json
index 5f7c0474..7f7e85d7 100644
--- a/biomes/temperate/oak-denmyre.json
+++ b/biomes/temperate/oak-denmyre.json
@@ -72,9 +72,7 @@
             "chance": 0.03,
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
-            "palette": [{
-                "block": "oak_leaves"
-            }]
+            "palette": [{"block": "oak_leaves"}]
         },
         {
             "chance": 0.02,
@@ -143,9 +141,7 @@
                 },
                 {
                     "find": [{"block": "acacia_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "acacia_fence"}],
@@ -184,21 +180,15 @@
             "edit": [
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 }
             ],
             "chance": 0.3,
diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json
index 4b3be002..749cfea1 100644
--- a/biomes/temperate/oak-forest.json
+++ b/biomes/temperate/oak-forest.json
@@ -135,9 +135,7 @@
                 },
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 }
             ],
             "place": [
@@ -287,9 +285,7 @@
             "chance": 0.03,
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
-            "palette": [{
-                "block": "oak_leaves"
-            }]
+            "palette": [{"block": "oak_leaves"}]
         },
         {
             "chance": 0.02,
diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json
index a4e1bdbc..763b7ca2 100644
--- a/biomes/temperate/plateau.json
+++ b/biomes/temperate/plateau.json
@@ -187,9 +187,7 @@
                 },
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "oak_leaves"}]}
                 }
             ],
             "place": [
@@ -305,9 +303,7 @@
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
             "palette": [
-                {
-                    "block": "oak_leaves"
-                },
+                {"block": "oak_leaves"},
                 {"block": "rose_bush"},
                 {"block": "cobblestone_slab"}
             ]
diff --git a/biomes/temperate/sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json
index 1cab251d..f36ca25b 100644
--- a/biomes/temperate/sakura-pink-child.json
+++ b/biomes/temperate/sakura-pink-child.json
@@ -210,9 +210,7 @@
             "chance": 0.03,
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
-            "palette": [{
-                "block": "oak_leaves"
-            }]
+            "palette": [{"block": "oak_leaves"}]
         },
         {
             "chance": 0.02,
diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json
index b4fe049b..acd5738b 100644
--- a/biomes/temperate/sakura-pink-forest.json
+++ b/biomes/temperate/sakura-pink-forest.json
@@ -218,9 +218,7 @@
             "chance": 0.03,
             "variance": {"style": "STATIC"},
             "zoom": 0.2,
-            "palette": [{
-                "block": "oak_leaves"
-            }]
+            "palette": [{"block": "oak_leaves"}]
         },
         {
             "chance": 0.02,
diff --git a/biomes/tropical/bamboo-forest.json b/biomes/tropical/bamboo-forest.json
index cbfcb967..57d2da7f 100644
--- a/biomes/tropical/bamboo-forest.json
+++ b/biomes/tropical/bamboo-forest.json
@@ -100,9 +100,7 @@
                 },
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "jungle_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "jungle_leaves"}]}
                 },
                 {
                     "find": [{"block": "stripped_birch_log"}],
diff --git a/biomes/tropical/jungle-denmyre.json b/biomes/tropical/jungle-denmyre.json
index 8ae9a673..68a75ce1 100644
--- a/biomes/tropical/jungle-denmyre.json
+++ b/biomes/tropical/jungle-denmyre.json
@@ -106,9 +106,7 @@
                 },
                 {
                     "find": [{"block": "acacia_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "jungle_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "jungle_leaves"}]}
                 },
                 {
                     "find": [{"block": "acacia_fence"}],
@@ -148,21 +146,15 @@
             "edit": [
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "jungle_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "jungle_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "jungle_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "jungle_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
-                    "replace": {"palette": [{
-                        "block": "jungle_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "jungle_leaves"}]}
                 }
             ],
             "density": 2,
diff --git a/biomes/tropical/mountain-extreme.json b/biomes/tropical/mountain-extreme.json
index d2c39dc3..8b9df0d0 100644
--- a/biomes/tropical/mountain-extreme.json
+++ b/biomes/tropical/mountain-extreme.json
@@ -100,18 +100,12 @@
             "variance": {"style": "IRIS"},
             "zoom": 0.1,
             "palette": [
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "tall_grass"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                }
+                {"block": "jungle_leaves"}
             ],
             "style": {
                 "style": "FRACTAL_BILLOW_IRIS",
diff --git a/biomes/tropical/mountain-plains.json b/biomes/tropical/mountain-plains.json
index 49ab2aa7..813714d0 100644
--- a/biomes/tropical/mountain-plains.json
+++ b/biomes/tropical/mountain-plains.json
@@ -113,18 +113,12 @@
             "variance": {"style": "IRIS"},
             "zoom": 0.1,
             "palette": [
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "tall_grass"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                }
+                {"block": "jungle_leaves"}
             ],
             "style": {
                 "style": "FRACTAL_BILLOW_IRIS",
diff --git a/biomes/tropical/rainforest-hills.json b/biomes/tropical/rainforest-hills.json
index b3bf3942..e8489001 100644
--- a/biomes/tropical/rainforest-hills.json
+++ b/biomes/tropical/rainforest-hills.json
@@ -37,9 +37,7 @@
             "zoom": 0.35,
             "palette": [
                 {"block": "grass_block"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {
                     "weight": 2,
                     "block": "grass_block"
@@ -78,18 +76,12 @@
             "variance": {"style": "IRIS"},
             "zoom": 0.1,
             "palette": [
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "tall_grass"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                }
+                {"block": "jungle_leaves"}
             ],
             "style": {
                 "style": "FRACTAL_BILLOW_IRIS",
@@ -262,17 +254,11 @@
         "zoom": 0.1,
         "palette": [
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"}
         ]
     }
diff --git a/biomes/tropical/rainforest-island.json b/biomes/tropical/rainforest-island.json
index c62f07f1..7e29786c 100644
--- a/biomes/tropical/rainforest-island.json
+++ b/biomes/tropical/rainforest-island.json
@@ -23,9 +23,7 @@
             "zoom": 0.6,
             "palette": [
                 {"block": "grass_block"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {
                     "weight": 2,
                     "block": "grass_block"
@@ -69,18 +67,12 @@
             "variance": {"style": "IRIS"},
             "zoom": 0.1,
             "palette": [
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "tall_grass"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                }
+                {"block": "jungle_leaves"}
             ],
             "style": {
                 "style": "FRACTAL_BILLOW_IRIS",
@@ -262,17 +254,11 @@
         "zoom": 0.1,
         "palette": [
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"}
         ]
     }
diff --git a/biomes/tropical/rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json
index 011e193f..ff09d9d7 100644
--- a/biomes/tropical/rainforest-wicked-child.json
+++ b/biomes/tropical/rainforest-wicked-child.json
@@ -23,9 +23,7 @@
             "zoom": 0.6,
             "palette": [
                 {"block": "grass_block"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {
                     "weight": 2,
                     "block": "grass_block"
@@ -78,18 +76,12 @@
             "variance": {"style": "IRIS"},
             "zoom": 0.1,
             "palette": [
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "tall_grass"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                }
+                {"block": "jungle_leaves"}
             ],
             "style": {
                 "style": "FRACTAL_BILLOW_IRIS",
@@ -271,17 +263,11 @@
         "zoom": 0.1,
         "palette": [
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"}
         ]
     }
diff --git a/biomes/tropical/rainforest-wicked-village.json b/biomes/tropical/rainforest-wicked-village.json
index b83ac53f..7889f825 100644
--- a/biomes/tropical/rainforest-wicked-village.json
+++ b/biomes/tropical/rainforest-wicked-village.json
@@ -23,9 +23,7 @@
             "zoom": 0.6,
             "palette": [
                 {"block": "grass_block"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {
                     "weight": 2,
                     "block": "grass_block"
@@ -102,17 +100,11 @@
         "zoom": 0.1,
         "palette": [
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"}
         ]
     }
diff --git a/biomes/tropical/rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json
index ff3b4bf4..f0515857 100644
--- a/biomes/tropical/rainforest-wicked.json
+++ b/biomes/tropical/rainforest-wicked.json
@@ -28,9 +28,7 @@
             "zoom": 0.6,
             "palette": [
                 {"block": "grass_block"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {
                     "weight": 2,
                     "block": "grass_block"
@@ -69,18 +67,12 @@
             "variance": {"style": "IRIS"},
             "zoom": 0.1,
             "palette": [
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "tall_grass"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                }
+                {"block": "jungle_leaves"}
             ],
             "style": {
                 "style": "FRACTAL_BILLOW_IRIS",
@@ -262,17 +254,11 @@
         "zoom": 0.1,
         "palette": [
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"}
         ]
     }
diff --git a/biomes/tropical/rainforest.json b/biomes/tropical/rainforest.json
index c93f5ab1..883be300 100644
--- a/biomes/tropical/rainforest.json
+++ b/biomes/tropical/rainforest.json
@@ -27,9 +27,7 @@
             "zoom": 0.6,
             "palette": [
                 {"block": "grass_block"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {
                     "weight": 2,
                     "block": "grass_block"
@@ -68,18 +66,12 @@
             "variance": {"style": "IRIS"},
             "zoom": 0.1,
             "palette": [
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "tall_grass"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                },
+                {"block": "jungle_leaves"},
                 {"block": "grass"},
-                {
-                    "block": "jungle_leaves"
-                }
+                {"block": "jungle_leaves"}
             ],
             "style": {
                 "style": "FRACTAL_BILLOW_IRIS",
@@ -273,17 +265,11 @@
         "zoom": 0.1,
         "palette": [
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"},
-            {
-                "block": "jungle_leaves"
-            },
+            {"block": "jungle_leaves"},
             {"block": "stripped_jungle_wood"}
         ]
     }
diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json
index 1dc0c674..260bffce 100644
--- a/biomes/tundra/autumn.json
+++ b/biomes/tundra/autumn.json
@@ -10,42 +10,44 @@
         "max": 10,
         "generator": "smooth-dunes"
     }],
-    "customDerivitives": [{
-        "id": "tundra_autumn_red",
-        "grassColor": "#bf4d24",
-        "category": "forest",
-        "humidity": 0.3,
-        "downfallType": "rain",
-        "temperature": 0.6,
-        "foliageColor": "#bf2811",
-        "waterColor": "#80B4C6",
-        "waterFogColor": "#80B4C6",
-        "fogColor": "#8091C6"
-    },
-    {
-        "grassColor": "#BF8924",
-        "id": "tundra_autumn_orange",
-        "category": "forest",
-        "humidity": 0.3,
-        "downfallType": "rain",
-        "temperature": 0.6,
-        "foliageColor": "#eb6e07",
-        "waterColor": "#80B4C6",
-        "waterFogColor": "#80B4C6",
-        "fogColor": "#8091C6"
-    },
-    {
-        "grassColor": "#bf6724",
-        "id": "tundra_autumn_yellow",
-        "category": "forest",
-        "humidity": 0.3,
-        "downfallType": "rain",
-        "temperature": 0.6,
-        "foliageColor": "#ebc107",
-        "waterColor": "#80B4C6",
-        "waterFogColor": "#80B4C6",
-        "fogColor": "#8091C6"
-    }],
+    "customDerivitives": [
+        {
+            "id": "tundra_autumn_red",
+            "grassColor": "#bf4d24",
+            "category": "forest",
+            "humidity": 0.3,
+            "downfallType": "rain",
+            "temperature": 0.6,
+            "foliageColor": "#bf2811",
+            "waterColor": "#80B4C6",
+            "waterFogColor": "#80B4C6",
+            "fogColor": "#8091C6"
+        },
+        {
+            "grassColor": "#BF8924",
+            "id": "tundra_autumn_orange",
+            "category": "forest",
+            "humidity": 0.3,
+            "downfallType": "rain",
+            "temperature": 0.6,
+            "foliageColor": "#eb6e07",
+            "waterColor": "#80B4C6",
+            "waterFogColor": "#80B4C6",
+            "fogColor": "#8091C6"
+        },
+        {
+            "grassColor": "#bf6724",
+            "id": "tundra_autumn_yellow",
+            "category": "forest",
+            "humidity": 0.3,
+            "downfallType": "rain",
+            "temperature": 0.6,
+            "foliageColor": "#ebc107",
+            "waterColor": "#80B4C6",
+            "waterFogColor": "#80B4C6",
+            "fogColor": "#8091C6"
+        }
+    ],
     "biomeStyle": {
         "style": "STATIC",
         "zoom": 1
@@ -230,35 +232,19 @@
                 },
                 "enabled": true
             },
-            "edit": [
-                {
-                    "find": [
-                        {
-                            "block": "birch_leaves"
-                        },
-                        {
-                            "block": "spruce_leaves"
-                        }
-                    ],
-                    "exact": false,
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "jungle_leaves"
-                            },
-                            {
-                                "block": "acacia_leaves"
-                            },
-                            {
-                                "block": "oak_leaves"
-                            },
-                            {
-                                "block": "dark_oak_leaves"
-                            }
-                        ]
-                    }
-                }
-            ],
+            "edit": [{
+                "find": [
+                    {"block": "birch_leaves"},
+                    {"block": "spruce_leaves"}
+                ],
+                "exact": false,
+                "replace": {"palette": [
+                    {"block": "jungle_leaves"},
+                    {"block": "acacia_leaves"},
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
+                ]}
+            }],
             "place": [
                 "trees/mixed/tredwood1",
                 "trees/mixed/tredwood2",
@@ -315,35 +301,19 @@
                 },
                 "enabled": true
             },
-            "edit": [
-                {
-                    "find": [
-                        {
-                            "block": "birch_leaves"
-                        },
-                        {
-                            "block": "spruce_leaves"
-                        }
-                    ],
-                    "exact": false,
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "jungle_leaves"
-                            },
-                            {
-                                "block": "acacia_leaves"
-                            },
-                            {
-                                "block": "oak_leaves"
-                            },
-                            {
-                                "block": "dark_oak_leaves"
-                            }
-                        ]
-                    }
-                }
-            ],
+            "edit": [{
+                "find": [
+                    {"block": "birch_leaves"},
+                    {"block": "spruce_leaves"}
+                ],
+                "exact": false,
+                "replace": {"palette": [
+                    {"block": "jungle_leaves"},
+                    {"block": "acacia_leaves"},
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
+                ]}
+            }],
             "place": [
                 "trees/mixed/tredwoodsmol1",
                 "trees/mixed/tredwoodsmol2",
@@ -371,35 +341,19 @@
                 },
                 "enabled": true
             },
-            "edit": [
-                {
-                    "find": [
-                        {
-                            "block": "birch_leaves"
-                        },
-                        {
-                            "block": "spruce_leaves"
-                        }
-                    ],
-                    "exact": false,
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "jungle_leaves"
-                            },
-                            {
-                                "block": "acacia_leaves"
-                            },
-                            {
-                                "block": "oak_leaves"
-                            },
-                            {
-                                "block": "dark_oak_leaves"
-                            }
-                        ]
-                    }
-                }
-            ],
+            "edit": [{
+                "find": [
+                    {"block": "birch_leaves"},
+                    {"block": "spruce_leaves"}
+                ],
+                "exact": false,
+                "replace": {"palette": [
+                    {"block": "jungle_leaves"},
+                    {"block": "acacia_leaves"},
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
+                ]}
+            }],
             "place": [
                 "clutter/spruceclutt1",
                 "clutter/spruceclutt2",
@@ -424,35 +378,19 @@
                 },
                 "enabled": true
             },
-            "edit": [
-                {
-                    "find": [
-                        {
-                            "block": "birch_leaves"
-                        },
-                        {
-                            "block": "spruce_leaves"
-                        }
-                    ],
-                    "exact": false,
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "jungle_leaves"
-                            },
-                            {
-                                "block": "acacia_leaves"
-                            },
-                            {
-                                "block": "oak_leaves"
-                            },
-                            {
-                                "block": "dark_oak_leaves"
-                            }
-                        ]
-                    }
-                }
-            ],
+            "edit": [{
+                "find": [
+                    {"block": "birch_leaves"},
+                    {"block": "spruce_leaves"}
+                ],
+                "exact": false,
+                "replace": {"palette": [
+                    {"block": "jungle_leaves"},
+                    {"block": "acacia_leaves"},
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
+                ]}
+            }],
             "place": [
                 "clutter/rshrub1",
                 "clutter/rshrub2"
@@ -480,35 +418,19 @@
                 "trees/mixed/tredwoodbee3",
                 "trees/mixed/tredwoodbee4"
             ],
-            "edit": [
-                {
-                    "find": [
-                        {
-                            "block": "birch_leaves"
-                        },
-                        {
-                            "block": "spruce_leaves"
-                        }
-                    ],
-                    "exact": false,
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "jungle_leaves"
-                            },
-                            {
-                                "block": "acacia_leaves"
-                            },
-                            {
-                                "block": "oak_leaves"
-                            },
-                            {
-                                "block": "dark_oak_leaves"
-                            }
-                        ]
-                    }
-                }
-            ],
+            "edit": [{
+                "find": [
+                    {"block": "birch_leaves"},
+                    {"block": "spruce_leaves"}
+                ],
+                "exact": false,
+                "replace": {"palette": [
+                    {"block": "jungle_leaves"},
+                    {"block": "acacia_leaves"},
+                    {"block": "oak_leaves"},
+                    {"block": "dark_oak_leaves"}
+                ]}
+            }],
             "translate": {
                 "x": 0,
                 "y": -8,
diff --git a/biomes/tundra/bonsai-forest.json b/biomes/tundra/bonsai-forest.json
index efa8158d..502ec78a 100644
--- a/biomes/tundra/bonsai-forest.json
+++ b/biomes/tundra/bonsai-forest.json
@@ -204,9 +204,7 @@
             "chance": 0.75,
             "edit": [{
                 "find": [{"block": "oak_leaves"}],
-                "replace": {"palette": [{
-                    "block": "birch_leaves"
-                }]}
+                "replace": {"palette": [{"block": "birch_leaves"}]}
             }],
             "rotation": {
                 "yAxis": {
diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json
index 856d927f..cee44753 100644
--- a/biomes/tundra/redwood-cliffs.json
+++ b/biomes/tundra/redwood-cliffs.json
@@ -285,9 +285,7 @@
             "chance": 0.45,
             "edit": [{
                 "find": [{"block": "oak_leaves"}],
-                "replace": {"palette": [{
-                    "block": "birch_leaves"
-                }]}
+                "replace": {"palette": [{"block": "birch_leaves"}]}
             }],
             "rotation": {
                 "yAxis": {
diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json
index 556f1e80..4e73b825 100644
--- a/biomes/tundra/redwood-forest.json
+++ b/biomes/tundra/redwood-forest.json
@@ -246,9 +246,7 @@
             "chance": 0.45,
             "edit": [{
                 "find": [{"block": "oak_leaves"}],
-                "replace": {"palette": [{
-                    "block": "birch_leaves"
-                }]}
+                "replace": {"palette": [{"block": "birch_leaves"}]}
             }],
             "rotation": {
                 "yAxis": {
diff --git a/biomes/tundra/sea/lake.json b/biomes/tundra/sea/lake.json
index 82cbda36..bf75d8e9 100644
--- a/biomes/tundra/sea/lake.json
+++ b/biomes/tundra/sea/lake.json
@@ -153,21 +153,15 @@
                 },
                 {
                     "find": [{"block": "acacia_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_leaves"}]}
                 },
                 {
                     "find": [{"block": "acacia_fence"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_fence"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_fence"}]}
                 },
                 {
                     "find": [{"block": "acacia_wood"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_wood"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_wood"}]}
                 }
             ],
             "rotation": {
@@ -198,21 +192,15 @@
             "edit": [
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_leaves"}]}
                 }
             ],
             "chance": 0.3,
diff --git a/biomes/tundra/spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json
index 1e4392d9..da60fb9e 100644
--- a/biomes/tundra/spruce-denmyre.json
+++ b/biomes/tundra/spruce-denmyre.json
@@ -163,21 +163,15 @@
                 },
                 {
                     "find": [{"block": "acacia_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_leaves"}]}
                 },
                 {
                     "find": [{"block": "acacia_fence"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_fence"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_fence"}]}
                 },
                 {
                     "find": [{"block": "acacia_wood"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_wood"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_wood"}]}
                 }
             ],
             "rotation": {
@@ -208,21 +202,15 @@
             "edit": [
                 {
                     "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_leaves"}]}
                 },
                 {
                     "find": [{"block": "spruce_wood"}],
-                    "replace": {"palette": [{
-                        "block": "spruce_leaves"
-                    }]}
+                    "replace": {"palette": [{"block": "spruce_leaves"}]}
                 }
             ],
             "chance": 0.3,
diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json
index 9cc6e06b..39606bb0 100644
--- a/biomes/tundra/taiga.json
+++ b/biomes/tundra/taiga.json
@@ -203,9 +203,7 @@
             "chance": 0.25,
             "edit": [{
                 "find": [{"block": "oak_leaves"}],
-                "replace": {"palette": [{
-                    "block": "birch_leaves"
-                }]}
+                "replace": {"palette": [{"block": "birch_leaves"}]}
             }],
             "rotation": {
                 "yAxis": {
diff --git a/dimensions/overworld.json b/dimensions/overworld.json
index 6a315204..ce7af173 100644
--- a/dimensions/overworld.json
+++ b/dimensions/overworld.json
@@ -39,9 +39,7 @@
     },
     "SEAS": "Sea settings (for the biomes that are oceans).",
     "seaZoom": 1.25,
-    "seaBiomeStyle": {
-        "style": "FRACTAL_FBM_IRIS"
-    },
+    "seaBiomeStyle": {"style": "FRACTAL_FBM_IRIS"},
     "LAND": "Land settings (for the biomes that are non-ocean).",
     "landZoom": 3.2,
     "landBiomeStyle": {
@@ -55,13 +53,11 @@
     },
     "LOOT": "Contains a list of loot tables that are attempted to be applied to all chests that spawn.",
     "lootTries": 32,
-    "loot": {
-        "tables": [
-            "global-treasure",
-            "global-tools",
-            "global-clutter"
-        ]
-    },
+    "loot": {"tables": [
+        "global-treasure",
+        "global-tools",
+        "global-clutter"
+    ]},
     "ORES": "All settings in regards to deposits. Contains the ores spawning in your world.",
     "deposits": [
         {
@@ -71,11 +67,7 @@
             "minPerChunk": 1,
             "minSize": 25,
             "maxSize": 25,
-            "palette": [
-                {
-                    "block": "granite"
-                }
-            ],
+            "palette": [{"block": "granite"}],
             "varience": 2
         },
         {
@@ -85,11 +77,7 @@
             "minPerChunk": 1,
             "minSize": 25,
             "maxSize": 25,
-            "palette": [
-                {
-                    "block": "andesite"
-                }
-            ],
+            "palette": [{"block": "andesite"}],
             "varience": 2
         },
         {
@@ -99,11 +87,7 @@
             "minPerChunk": 1,
             "minSize": 25,
             "maxSize": 25,
-            "palette": [
-                {
-                    "block": "diorite"
-                }
-            ],
+            "palette": [{"block": "diorite"}],
             "varience": 2
         },
         {
@@ -113,11 +97,7 @@
             "minPerChunk": 1,
             "minSize": 25,
             "maxSize": 25,
-            "palette": [
-                {
-                    "block": "gravel"
-                }
-            ],
+            "palette": [{"block": "gravel"}],
             "varience": 2
         },
         {
@@ -127,11 +107,7 @@
             "minPerChunk": 128,
             "minSize": 8,
             "maxSize": 4,
-            "palette": [
-                {
-                    "block": "deepslate"
-                }
-            ],
+            "palette": [{"block": "deepslate"}],
             "varience": 4
         },
         {
@@ -142,30 +118,14 @@
             "minSize": 8,
             "maxSize": 4,
             "palette": [
-                {
-                    "block": "deepslate_copper_ore"
-                },
-                {
-                    "block": "deepslate_diamond_ore"
-                },
-                {
-                    "block": "deepslate_emerald_ore"
-                },
-                {
-                    "block": "deepslate_gold_ore"
-                },
-                {
-                    "block": "deepslate_iron_ore"
-                },
-                {
-                    "block": "deepslate_coal_ore"
-                },
-                {
-                    "block": "deepslate_redstone_ore"
-                },
-                {
-                    "block": "deepslate_lapis_ore"
-                }
+                {"block": "deepslate_copper_ore"},
+                {"block": "deepslate_diamond_ore"},
+                {"block": "deepslate_emerald_ore"},
+                {"block": "deepslate_gold_ore"},
+                {"block": "deepslate_iron_ore"},
+                {"block": "deepslate_coal_ore"},
+                {"block": "deepslate_redstone_ore"},
+                {"block": "deepslate_lapis_ore"}
             ],
             "varience": 4
         },
@@ -176,11 +136,7 @@
             "minPerChunk": 0,
             "minSize": 3,
             "maxSize": 6,
-            "palette": [
-                {
-                    "block": "diamond_ore"
-                }
-            ],
+            "palette": [{"block": "diamond_ore"}],
             "varience": 5
         },
         {
@@ -190,14 +146,10 @@
             "minPerChunk": 3,
             "minSize": 6,
             "maxSize": 10,
-            "palette": [
-                {
-                    "data": {
-                        "lit": false
-                    },
-                    "block": "redstone_ore"
-                }
-            ],
+            "palette": [{
+                "data": {"lit": false},
+                "block": "redstone_ore"
+            }],
             "varience": 7
         },
         {
@@ -207,11 +159,7 @@
             "minPerChunk": 1,
             "minSize": 3,
             "maxSize": 5,
-            "palette": [
-                {
-                    "block": "gold_ore"
-                }
-            ],
+            "palette": [{"block": "gold_ore"}],
             "varience": 3
         },
         {
@@ -221,11 +169,7 @@
             "minPerChunk": 2,
             "minSize": 3,
             "maxSize": 8,
-            "palette": [
-                {
-                    "block": "lapis_ore"
-                }
-            ],
+            "palette": [{"block": "lapis_ore"}],
             "varience": 5
         },
         {
@@ -235,11 +179,7 @@
             "minPerChunk": 8,
             "minSize": 4,
             "maxSize": 8,
-            "palette": [
-                {
-                    "block": "iron_ore"
-                }
-            ],
+            "palette": [{"block": "iron_ore"}],
             "varience": 7
         },
         {
@@ -249,11 +189,7 @@
             "minPerChunk": 8,
             "minSize": 4,
             "maxSize": 9,
-            "palette": [
-                {
-                    "block": "copper_ore"
-                }
-            ],
+            "palette": [{"block": "copper_ore"}],
             "varience": 7
         },
         {
@@ -263,11 +199,7 @@
             "minPerChunk": 9,
             "minSize": 6,
             "maxSize": 10,
-            "palette": [
-                {
-                    "block": "coal_ore"
-                }
-            ],
+            "palette": [{"block": "coal_ore"}],
             "varience": 9
         }
     ],
@@ -338,34 +270,28 @@
             },
             "fluid": {
                 "fluidHeight": 12,
-                "fluidType": {
-                    "block": "lava"
-                }
+                "fluidType": {"block": "lava"}
             }
         }
     ],
-    "caveBiomeStyle": {
-        "style": "CELLULAR_IRIS_DOUBLE"
-    },
+    "caveBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"},
     "CAVERNS//CARVING": "Carving layers that cut off certain parts of the world",
     "carving": true,
-    "carveLayers": [
-        {
-            "style": {
-                "style": "PERLIN_IRIS_HALF",
-                "zoom": 0.2,
-                "fracture": {
-                    "multiplier": 5,
-                    "style": "PERLIN",
-                    "zoom": 0.5
-                }
-            },
-            "fullPercent": 0.01,
-            "threshold": 0.68,
-            "minHeight": -50,
-            "maxHeight": 110
-        }
-    ],
+    "carveLayers": [{
+        "style": {
+            "style": "PERLIN_IRIS_HALF",
+            "zoom": 0.2,
+            "fracture": {
+                "multiplier": 5,
+                "style": "PERLIN",
+                "zoom": 0.5
+            }
+        },
+        "fullPercent": 0.01,
+        "threshold": 0.68,
+        "minHeight": -50,
+        "maxHeight": 110
+    }],
     "RAVINES": "Settings regarding ravines. Iris does not know when and where they spawn, so it may look weird (with cave fluids)",
     "ravines": false,
     "ravineRarity": 500,
@@ -408,12 +334,8 @@
             "trigger": "PHANTOM"
         }
     ],
-    "skylandBiomeStyle": {
-        "style": "CELLULAR_IRIS_DOUBLE"
-    },
-    "islandBiomeStyle": {
-        "style": "CELLULAR_IRIS_DOUBLE"
-    },
+    "skylandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"},
+    "islandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"},
     "shoreBiomeStyle": {
         "style": "CELLULAR",
         "fracture": {
@@ -446,4 +368,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/regions/tundra.json b/regions/tundra.json
index 561eed64..3dab7e06 100644
--- a/regions/tundra.json
+++ b/regions/tundra.json
@@ -23,15 +23,11 @@
         "tundra/shore/beach",
         "tundra/shore/beach-stone"
     ],
-    "seaBiomes": [
-        "mountain/sea/lake"
-    ],
-    "jigsawStructures": [
-        {
-            "structure": "murky_stronghold",
-            "rarity": 750
-        }
-    ],
+    "seaBiomes": ["mountain/sea/lake"],
+    "jigsawStructures": [{
+        "structure": "murky_stronghold",
+        "rarity": 750
+    }],
     "caveBiomes": [
         "cave/tundra-cavern",
         "cave/spiked-cavern"
@@ -81,22 +77,16 @@
         "mountain/sea/river-soft"
     ],
     "biomeImplosionRatio": 0.25,
-    "deposits": [
-        {
-            "minHeight": 15,
-            "maxPerChunk": 3,
-            "maxHeight": 60,
-            "minPerChunk": 2,
-            "minSize": 1,
-            "maxSize": 2,
-            "palette": [
-                {
-                    "block": "emerald_ore"
-                }
-            ],
-            "varience": 2
-        }
-    ],
+    "deposits": [{
+        "minHeight": 15,
+        "maxPerChunk": 3,
+        "maxHeight": 60,
+        "minPerChunk": 2,
+        "minSize": 1,
+        "maxSize": 2,
+        "palette": [{"block": "emerald_ore"}],
+        "varience": 2
+    }],
     "riverRarity": 1,
     "landBiomeZoom": 1.85,
     "riverStyle": {
@@ -120,61 +110,47 @@
             "cold-food"
         ]
     },
-    "objects": [
-        {
-            "heightmap": {
-                "seed": 1337,
-                "style": {
-                    "style": "SIMPLEX",
-                    "multiplier": 10
-                },
-                "offsetY": 5
+    "objects": [{
+        "heightmap": {
+            "seed": 1337,
+            "style": {
+                "style": "SIMPLEX",
+                "multiplier": 10
             },
-            "chance": 0.05,
-            "bottom": true,
-            "density": 1,
-            "place": [
-                "structures/amethyst1",
-                "structures/amethyst2",
-                "structures/amethyst3",
-                "structures/amethyst4",
-                "structures/amethyst5",
-                "structures/amethyst6"
-            ],
-            "edit": [
-                {
-                    "find": [
-                        {
-                            "block": "glass"
-                        }
-                    ],
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "void_air"
-                            }
-                        ]
-                    }
-                }
-            ],
-            "enabled": true,
-            "xAxis": {
-                "interval": 90,
-                "max": 360,
-                "min": 0
-            },
-            "yAxis": {
-                "interval": 90,
-                "max": 360,
-                "min": 0
-            },
-            "translate": {
-                "yRandom": 10,
-                "y": 2
-            }
+            "offsetY": 5
+        },
+        "chance": 0.05,
+        "bottom": true,
+        "density": 1,
+        "place": [
+            "structures/amethyst1",
+            "structures/amethyst2",
+            "structures/amethyst3",
+            "structures/amethyst4",
+            "structures/amethyst5",
+            "structures/amethyst6"
+        ],
+        "edit": [{
+            "find": [{"block": "glass"}],
+            "replace": {"palette": [{"block": "void_air"}]}
+        }],
+        "enabled": true,
+        "xAxis": {
+            "interval": 90,
+            "max": 360,
+            "min": 0
+        },
+        "yAxis": {
+            "interval": 90,
+            "max": 360,
+            "min": 0
+        },
+        "translate": {
+            "yRandom": 10,
+            "y": 2
         }
-    ],
+    }],
     "shoreHeightZoom": 1.14,
     "riverThickness": 0.025,
     "rarity": 2
-}
\ No newline at end of file
+}

From 59190e8eaa8cda1ce2e2042cd576d01a649eb4a5 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 09:27:34 -0400
Subject: [PATCH 07/14] Fixed jigsaw igloos

---
 jigsaw-pieces/igloo/bottom.json | 58 -------------------------------
 jigsaw-pieces/igloo/middle.json | 60 +--------------------------------
 2 files changed, 1 insertion(+), 117 deletions(-)

diff --git a/jigsaw-pieces/igloo/bottom.json b/jigsaw-pieces/igloo/bottom.json
index 8e45f1a4..ae4acd74 100644
--- a/jigsaw-pieces/igloo/bottom.json
+++ b/jigsaw-pieces/igloo/bottom.json
@@ -13,63 +13,5 @@
         },
         "direction": "WEST_NEGATIVE_X"
     }],
-    "placementOptions": {
-        "overStilt": 0,
-        "chance": 1,
-        "meld": false,
-        "density": 1,
-        "boreExtendMinY": 0,
-        "edit": [],
-        "bottom": false,
-        "translateCenter": false,
-        "rotation": {
-            "yAxis": {
-                "min": 0,
-                "max": 0,
-                "interval": 90,
-                "enabled": true
-            },
-            "xAxis": {
-                "min": 0,
-                "max": 0,
-                "interval": 0,
-                "enabled": false
-            },
-            "zAxis": {
-                "min": 0,
-                "max": 0,
-                "interval": 0,
-                "enabled": false
-            },
-            "enabled": true
-        },
-        "boreExtendMaxY": 0,
-        "smartBore": false,
-        "waterloggable": false,
-        "bore": true,
-        "translate": {
-            "yRandom": 0,
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "mode": "FAST_MAX_HEIGHT",
-        "carvingSupport": "SURFACE_ONLY",
-        "snow": 0,
-        "underwater": false,
-        "place": [],
-        "onwater": false,
-        "clamp": {
-            "minimumHeight": 0,
-            "maximumHeight": 255
-        },
-        "warp": {
-            "multiplier": 1,
-            "style": "FLAT",
-            "zoom": 1,
-            "maxFractureAccuracy": false,
-            "exponent": 1
-        }
-    },
     "object": "jigsaw/igloo/bottom"
 }
diff --git a/jigsaw-pieces/igloo/middle.json b/jigsaw-pieces/igloo/middle.json
index 3997b854..96086a51 100644
--- a/jigsaw-pieces/igloo/middle.json
+++ b/jigsaw-pieces/igloo/middle.json
@@ -16,7 +16,7 @@
         },
         {
             "targetName": "*",
-            "innerConnector": false,
+            "innerConnector": true,
             "entityCount": 1,
             "rotateConnector": false,
             "name": "",
@@ -29,63 +29,5 @@
             "direction": "EAST_POSITIVE_X"
         }
     ],
-    "placementOptions": {
-        "overStilt": 0,
-        "chance": 1,
-        "meld": false,
-        "density": 1,
-        "boreExtendMinY": 0,
-        "edit": [],
-        "bottom": false,
-        "translateCenter": false,
-        "rotation": {
-            "yAxis": {
-                "min": 0,
-                "max": 0,
-                "interval": 90,
-                "enabled": true
-            },
-            "xAxis": {
-                "min": 0,
-                "max": 0,
-                "interval": 0,
-                "enabled": false
-            },
-            "zAxis": {
-                "min": 0,
-                "max": 0,
-                "interval": 0,
-                "enabled": false
-            },
-            "enabled": true
-        },
-        "boreExtendMaxY": 0,
-        "smartBore": false,
-        "waterloggable": false,
-        "bore": true,
-        "translate": {
-            "yRandom": 0,
-            "x": 0,
-            "y": 0,
-            "z": 0
-        },
-        "mode": "FAST_MAX_HEIGHT",
-        "carvingSupport": "SURFACE_ONLY",
-        "snow": 0,
-        "underwater": false,
-        "place": [],
-        "onwater": false,
-        "clamp": {
-            "minimumHeight": 0,
-            "maximumHeight": 255
-        },
-        "warp": {
-            "multiplier": 1,
-            "style": "FLAT",
-            "zoom": 1,
-            "maxFractureAccuracy": false,
-            "exponent": 1
-        }
-    },
     "object": "jigsaw/igloo/middle"
 }

From f5676a8ec1cf041c2e6484712541b7dc51b5b7b8 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Fri, 23 Jul 2021 18:45:47 +0200
Subject: [PATCH 08/14] fix missing objects

---
 biomes/tropical/sea/river-steep.json |   2 +-
 biomes/tundra/bonsai-forest.json     |   9 ++++-----
 objects/clutter/ellipsoid1.iob       | Bin 0 -> 25016 bytes
 3 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 objects/clutter/ellipsoid1.iob

diff --git a/biomes/tropical/sea/river-steep.json b/biomes/tropical/sea/river-steep.json
index d998a9cd..5a812e47 100644
--- a/biomes/tropical/sea/river-steep.json
+++ b/biomes/tropical/sea/river-steep.json
@@ -91,7 +91,7 @@
             ]
         },
         {
-            "place": ["landform/underwater/ellipsoid-1"],
+            "place": ["clutter/ellipsoid1"],
             "chance": 0.5,
             "underwater": true,
             "mode": "CENTER_HEIGHT",
diff --git a/biomes/tundra/bonsai-forest.json b/biomes/tundra/bonsai-forest.json
index 502ec78a..e751d8bc 100644
--- a/biomes/tundra/bonsai-forest.json
+++ b/biomes/tundra/bonsai-forest.json
@@ -162,11 +162,10 @@
                 "enabled": true
             },
             "place": [
-                "sacred-bonsai/med-1",
-                "sacred-bonsai/med-2",
-                "sacred-bonsai/med-3",
-                "sacred-bonsai/med-4",
-                "sacred-bonsai/med-5"
+                "trees/bonsai/med-1",
+                "trees/bonsai/med-2",
+                "trees/bonsai/med-3",
+                "trees/bonsai/med-4"
             ],
             "translate": {
                 "x": 0,
diff --git a/objects/clutter/ellipsoid1.iob b/objects/clutter/ellipsoid1.iob
new file mode 100644
index 0000000000000000000000000000000000000000..53f3b2cf51adb0bc0e7fbdc51983c48e154b2420
GIT binary patch
literal 25016
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

literal 0
HcmV?d00001


From d25d8c42b3b5c00062f0234198ffa0d0dbde10bc Mon Sep 17 00:00:00 2001
From: StrangeOne101 <strange.toby@gmail.com>
Date: Sat, 24 Jul 2021 06:00:32 +1200
Subject: [PATCH 09/14] Overhauled Temperate Plains & Forest

# Biomes
- Redone the biomes: Oak Forest, Birch Forest, Plains, Oak Denymre
- Added new biomes: Lush Plains, Meadows, Thin Birch Forest, Combo Forest (Oak + Birch Forest)
- Removed biomes: Oak hills, plains hills
- Disabled biomes: Highland, birch denmyre, flower forest, wilds
- Updated minor things in all biomes within temperate

# Generators
- Added two new generators: highlands and rare-hills.
- Highlands is a more rounded plains biome
- Rare hills is one designed to add random large hills to a biome. Used instead of making hill biome variants

# Minor Changes
- Updated sugarcane spawnings
- Changed biome colors of stranged plains
---
 biomes/hot/shore/beach-grass.json          |  18 +-
 biomes/hot/shore/beach.json                |  18 +-
 biomes/ocean/oce-beach.json                |  14 +
 biomes/swamp/shore/beach.json              |  16 +-
 biomes/temperate/birch-forest.json         |  80 ++-
 biomes/temperate/birch-thin.json           | 228 +++++++++
 biomes/temperate/combo-forest.json         | 357 ++++++++++++++
 biomes/temperate/island.json               |   2 +-
 biomes/temperate/longtree-forest.json      |   2 +-
 biomes/temperate/lush-plains-red.json      | 347 +++++++++++++
 biomes/temperate/lush-plains-yellow.json   | 347 +++++++++++++
 biomes/temperate/lush-plains.json          | 375 ++++++++++++++
 biomes/temperate/meadows.json              | 394 +++++++++++++++
 biomes/temperate/oak-denmyre.json          |  77 +--
 biomes/temperate/oak-forest.json           | 549 +++++++++------------
 biomes/temperate/oak-hills.json            | 230 ---------
 biomes/temperate/oak.json                  | 224 ---------
 biomes/temperate/plain-hills.json          | 143 ------
 biomes/temperate/plains.json               | 214 ++++----
 biomes/temperate/plateau.json              |   2 +-
 biomes/temperate/sakura-pink-child.json    |   2 +-
 biomes/temperate/sakura-pink-forest.json   |   2 +-
 biomes/temperate/shore/beach.json          |  22 +-
 biomes/temperate/stranged-plains.json      |  28 +-
 biomes/tundra/shore/beach.json             |  14 +
 dimensions/overworld.json                  |   1 +
 generators/highplains.json                 |  19 +
 generators/rare-hills.json                 |  26 +
 objects/clutter/statue-villager-acacia.iob | Bin 0 -> 2229 bytes
 objects/clutter/statue-villager-hell.iob   | Bin 0 -> 2075 bytes
 objects/clutter/statue-villager-ocean.iob  | Bin 0 -> 2297 bytes
 objects/clutter/statue-villager-plains.iob | Bin 0 -> 1975 bytes
 objects/structures/ruins-greek-temple.iob  | Bin 0 -> 35590 bytes
 objects/trees/oak/generic1.iob             | Bin 0 -> 33070 bytes
 objects/trees/oak/generic2.iob             | Bin 0 -> 22957 bytes
 objects/trees/oak/generic3.iob             | Bin 0 -> 5386 bytes
 objects/trees/oak/generic4.iob             | Bin 0 -> 16513 bytes
 objects/trees/oak/generic5.iob             | Bin 0 -> 19039 bytes
 objects/trees/oak/generic6.iob             | Bin 0 -> 21799 bytes
 regions/temperate.json                     |   7 +-
 40 files changed, 2623 insertions(+), 1135 deletions(-)
 create mode 100644 biomes/temperate/birch-thin.json
 create mode 100644 biomes/temperate/combo-forest.json
 create mode 100644 biomes/temperate/lush-plains-red.json
 create mode 100644 biomes/temperate/lush-plains-yellow.json
 create mode 100644 biomes/temperate/lush-plains.json
 create mode 100644 biomes/temperate/meadows.json
 delete mode 100644 biomes/temperate/oak-hills.json
 delete mode 100644 biomes/temperate/oak.json
 delete mode 100644 biomes/temperate/plain-hills.json
 create mode 100644 generators/highplains.json
 create mode 100644 generators/rare-hills.json
 create mode 100644 objects/clutter/statue-villager-acacia.iob
 create mode 100644 objects/clutter/statue-villager-hell.iob
 create mode 100644 objects/clutter/statue-villager-ocean.iob
 create mode 100644 objects/clutter/statue-villager-plains.iob
 create mode 100644 objects/structures/ruins-greek-temple.iob
 create mode 100644 objects/trees/oak/generic1.iob
 create mode 100644 objects/trees/oak/generic2.iob
 create mode 100644 objects/trees/oak/generic3.iob
 create mode 100644 objects/trees/oak/generic4.iob
 create mode 100644 objects/trees/oak/generic5.iob
 create mode 100644 objects/trees/oak/generic6.iob

diff --git a/biomes/hot/shore/beach-grass.json b/biomes/hot/shore/beach-grass.json
index 6b5c2d29..b398453a 100644
--- a/biomes/hot/shore/beach-grass.json
+++ b/biomes/hot/shore/beach-grass.json
@@ -49,15 +49,17 @@
         },
         {
             "partOf": "SHORE_LINE",
-            "verticalZoom": 0.2,
-            "chance": 0.08,
-            "variance": {"style": "SIMPLEX"},
-            "stackMax": 6,
-            "zoom": 5,
+            "chance": 0.09,
+            "stackMin": 1,
+            "stackMax": 4,
             "palette": [{"block": "sugar_cane"}],
-            "style": {"style": "STATIC"},
-            "heightVariance": {"style": "IRIS"},
-            "stackMin": 1
+            "style": {
+                "style": "IRIS",
+                "zoom": 0.65
+            },
+            "heightVariance": {
+                "style": "STATIC"
+            }
         },
         {
             "chance": 0.01,
diff --git a/biomes/hot/shore/beach.json b/biomes/hot/shore/beach.json
index a54b3eb5..c47ce355 100644
--- a/biomes/hot/shore/beach.json
+++ b/biomes/hot/shore/beach.json
@@ -49,15 +49,17 @@
         },
         {
             "partOf": "SHORE_LINE",
-            "verticalZoom": 0.2,
-            "chance": 0.08,
-            "variance": {"style": "SIMPLEX"},
-            "stackMax": 6,
-            "zoom": 5,
+            "chance": 0.09,
+            "stackMin": 1,
+            "stackMax": 4,
             "palette": [{"block": "sugar_cane"}],
-            "style": {"style": "STATIC"},
-            "heightVariance": {"style": "IRIS"},
-            "stackMin": 1
+            "style": {
+                "style": "IRIS",
+                "zoom": 0.65
+            },
+            "heightVariance": {
+                "style": "STATIC"
+            }
         }
     ],
     "wall": {
diff --git a/biomes/ocean/oce-beach.json b/biomes/ocean/oce-beach.json
index 228f5ead..b85b0263 100644
--- a/biomes/ocean/oce-beach.json
+++ b/biomes/ocean/oce-beach.json
@@ -65,6 +65,20 @@
         {
             "chance": 0.5,
             "palette": [{"block": "grass"}]
+        },
+        {
+            "partOf": "SHORE_LINE",
+            "chance": 0.09,
+            "stackMin": 1,
+            "stackMax": 4,
+            "palette": [{"block": "sugar_cane"}],
+            "style": {
+                "style": "IRIS",
+                "zoom": 0.65
+            },
+            "heightVariance": {
+                "style": "STATIC"
+            }
         }
     ],
     "objects": [{
diff --git a/biomes/swamp/shore/beach.json b/biomes/swamp/shore/beach.json
index ad9d5aab..4a2e8280 100644
--- a/biomes/swamp/shore/beach.json
+++ b/biomes/swamp/shore/beach.json
@@ -66,15 +66,17 @@
         },
         {
             "partOf": "SHORE_LINE",
-            "chance": 0.009,
-            "verticalZoom": 0.2,
-            "variance": {"style": "SIMPLEX"},
-            "stackMax": 4,
+            "chance": 0.09,
             "stackMin": 1,
-            "zoom": 5,
+            "stackMax": 4,
             "palette": [{"block": "sugar_cane"}],
-            "style": {"style": "STATIC"},
-            "heightVariance": {"style": "STATIC"}
+            "style": {
+                "style": "IRIS",
+                "zoom": 0.65
+            },
+            "heightVariance": {
+                "style": "STATIC"
+            }
         }
     ],
     "objects": [{
diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json
index f1713d71..41f12919 100644
--- a/biomes/temperate/birch-forest.json
+++ b/biomes/temperate/birch-forest.json
@@ -1,20 +1,25 @@
 {
-    "name": "Temperate Birch Forest",
-    "derivative": "PLAINS",
-    "rarity": 1,
-    "color": "#D2DF20",
+    "name": "Birch Forest",
+    "derivative": "BIRCH_FOREST",
     "vanillaDerivative": "BIRCH_FOREST",
-    "children": ["temperate/birch-denmyre"],
-    "generators": [{
-        "min": 4,
-        "max": 7,
-        "generator": "smooth-dunes"
-    }],
-    "customDerivitives": [{
-        "id": "temoak",
-        "foliageColor": "#6CC646",
-        "grassColor": "#A1C646",
-        "category": "forest"
+    "children": ["temperate/birch-thin"],
+    "childStyle": {
+        "style": "NOWHERE_SIMPLEX",
+        "zoom": 5
+    },
+    "color": "#d8fa5f",
+    "rarity": 3,
+    "biomeZoom": 50,
+    "generators": [
+    {
+        "min": 5,
+        "max": 12,
+        "generator": "highplains"
+    },
+    {
+        "min": 0,
+        "max": 50,
+        "generator": "rare-hills"
     }],
     "jigsawStructures": [
         {
@@ -62,6 +67,38 @@
             ]
         }
     ],
+    "entityInitialSpawns": [
+        {
+            "entity": "cow",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "pig",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "chicken",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "sheep",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "bee",
+            "maxSpawns": 2,
+            "minSpawns": 1,
+            "rarity": 70
+        }
+    ],
     "objects": [
         {
             "mode": "PAINT",
@@ -158,7 +195,7 @@
         },
         {
             "chance": 0.08,
-            "density": 4,
+            "density": 2,
             "rotation": {
                 "yAxis": {
                     "min": 0,
@@ -181,20 +218,19 @@
             }
         }
     ],
-    "biomeZoom": 60,
     "biomeStyle": {"style": "IRIS"},
     "decorators": [
         {
-            "chance": 0.09,
+            "chance": 0.03,
             "variance": {"style": "STATIC"},
             "zoom": 0.1,
             "palette": [
-                {"block": "grass"},
                 {"block": "allium"},
                 {"block": "poppy"},
                 {"block": "dandelion"},
                 {"block": "azure_bluet"},
                 {"block": "pink_tulip"},
+                {"block": "cornflower"},
                 {"block": "lily_of_the_valley"}
             ],
             "style": {"style": "STATIC"}
@@ -221,9 +257,5 @@
             {"block": "andesite"},
             {"block": "stone"}
         ]
-    },
-    "biomeScatter": [
-        "FOREST",
-        "PLAINS"
-    ]
+    }
 }
diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json
new file mode 100644
index 00000000..1874cce2
--- /dev/null
+++ b/biomes/temperate/birch-thin.json
@@ -0,0 +1,228 @@
+{
+    "name": "Birch Thin Forest",
+    "derivative": "BIRCH_FOREST",
+    "vanillaDerivative": "BIRCH_FOREST",
+    "color": "#e3fa93",
+    "rarity": 4,
+    "generators": [{
+        "min": 5,
+        "max": 15,
+        "generator": "highplains"
+    },
+    {
+        "min": 0,
+        "max": 40,
+        "generator": "rare-hills"
+    }],
+    "jigsawStructures": [
+        {
+            "rarity": 900,
+            "structure": "pillager_outpost"
+        },
+        {
+            "rarity": 1100,
+            "structure": "village-temperate"
+        }
+    ],
+    "layers": [
+        {
+            "style": {"style": "STATIC"},
+            "palette": [
+                {
+                    "block": "grass_block",
+                    "weight": 30
+                },
+                {
+                    "block": "coarse_dirt"
+                }
+            ]
+        },
+        {"palette": [{"block": "dirt"}]},
+        {
+            "minHeight": 1,
+            "maxHeight": 3,
+            "palette": [
+                {"block": "dirt"},
+                {"block": "coarse_dirt"}
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {"style": "STATIC"},
+            "palette": [
+                {"block": "stone"},
+                {"block": "andesite"},
+                {"block": "stone"}
+            ]
+        }
+    ],
+    "entityInitialSpawns": [
+        {
+            "entity": "cow",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "pig",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "chicken",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "sheep",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "bee",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 50
+        }
+    ],
+    "objects": [
+        {
+            "mode": "PAINT",
+            "chance": 0.0025,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["clutter/bincluster1"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "PAINT",
+            "chance": 0.00375,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["clutter/camp1"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.9,
+            "density": 1,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/birch/antioch3",
+                "trees/birch/antioch4",
+                "trees/birch/antioch5",
+                "trees/birch/antioch6",
+                "trees/birch/antioch7",
+                "trees/birch/antioch8",
+                "trees/birch/antioch9",
+                "trees/birch/antioch10",
+                "trees/birch/antioch11",
+                "trees/birch/antioch12",
+                "trees/birch/antioch13"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.08,
+            "density": 1,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/birch/antioch3b",
+                "trees/birch/antioch4b",
+                "trees/birch/antioch5b",
+                "trees/birch/antioch6b"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        }
+    ],
+    "biomeZoom": 50,
+    "biomeStyle": {"style": "IRIS"},
+    "decorators": [
+        {
+            "chance": 0.03,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.1,
+            "palette": [
+                {"block": "grass"},
+                {"block": "allium"},
+                {"block": "poppy"},
+                {"block": "dandelion"},
+                {"block": "azure_bluet"},
+                {"block": "pink_tulip"},
+                {"block": "lily_of_the_valley"}
+            ],
+            "style": {"style": "STATIC"}
+        },
+        {
+            "chance": 0.4,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.3,
+            "palette": [{"block": "grass", "weight": 10}, {"block": "fern"}],
+            "style": {"style": "STATIC"}
+        },
+        {
+            "chance": 0.017,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.3,
+            "palette": [{"block": "tall_grass"}],
+            "style": {"style": "STATIC"}
+        }
+    ],
+    "wall": {
+        "style": {"style": "STATIC"},
+        "palette": [
+            {"block": "stone"},
+            {"block": "andesite"},
+            {"block": "stone"}
+        ]
+    }
+}
diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json
new file mode 100644
index 00000000..44709261
--- /dev/null
+++ b/biomes/temperate/combo-forest.json
@@ -0,0 +1,357 @@
+{
+    "name": "Combo Forest",
+    "derivative": "FOREST",
+    "vanillaDerivative": "FOREST",
+    "children": ["temperate/oak-denmyre"],
+    "generators": [{
+        "min": 5,
+        "max": 12,
+        "generator": "plain"
+    }],
+    "rarity": 3,
+    "biomeZoom": 50,
+    "layers": [
+        {
+            "style": {"style": "STATIC"},
+            "palette": [{"block": "grass_block"}]
+        },
+        {"palette": [{"block": "dirt"}]},
+        {
+            "minHeight": 1,
+            "maxHeight": 3,
+            "palette": [
+                {"block": "dirt"},
+                {"block": "coarse_dirt"}
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {"style": "STATIC"},
+            "palette": [
+                {"block": "stone"},
+                {"block": "andesite"},
+                {"block": "stone"}
+            ]
+        }
+    ],
+    "jigsawStructures": [
+        {
+            "rarity": 1700,
+            "structure": "pillager_outpost"
+        },
+        {
+            "rarity": 1500,
+            "structure": "village-temperate"
+        }
+    ],
+    "entityInitialSpawns": [
+        {
+            "entity": "cow",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "pig",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "chicken",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "sheep",
+            "maxSpawns": 1,
+            "minSpawns": 1,
+            "rarity": 7
+        }
+    ],
+    "objects": [
+        {
+            "chance": 0.07,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/oak/hoakgeneric3",
+                "trees/oak/hoakgeneric4",
+                "trees/oak/hoakgeneric5",
+                "trees/oak/hoakgeneric6",
+                "trees/oak/hoakgeneric7",
+                "trees/oak/hoakgeneric8",
+                "trees/oak/hoakgeneric9",
+                "trees/oak/hoakgeneric1",
+                "trees/oak/shoakgeneric3",
+                "trees/oak/shoakgeneric4",
+                "trees/oak/shoakgeneric5",
+                "trees/oak/shoakgeneric6",
+                "trees/oak/shoakgeneric7",
+                "trees/oak/shoakgeneric8",
+                "trees/oak/shoakgeneric9",
+                "trees/oak/shoakgeneric1",
+                "trees/oak/shoakgeneric2"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "PAINT",
+            "chance": 0.00975,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/camp1",
+                "clutter/camp4",
+                "clutter/camp5",
+                "clutter/camp3"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 1,
+            "density": 2,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "edit": [
+                {
+                    "find": [
+                        {"block": "birch_wood"},
+                        {"block": "birch_log"}
+                    ],
+                    "replace": {"palette": [{"block": "oak_wood"}]}
+                },
+                {
+                    "find": [{"block": "birch_leaves"}],
+                    "replace": {"palette": [{
+                        "block": "oak_leaves",
+                        "data": {"persistent": true}
+                    }]}
+                }
+            ],
+            "place": [
+                "trees/birch/antioch3",
+                "trees/birch/antioch4",
+                "trees/birch/antioch5",
+                "trees/birch/antioch6",
+                "trees/birch/antioch7",
+                "trees/birch/antioch8",
+                "trees/birch/antioch9",
+                "trees/birch/antioch10",
+                "trees/birch/antioch11",
+                "trees/birch/antioch12",
+                "trees/birch/antioch13"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.9,
+            "density": 1,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/birch/antioch3",
+                "trees/birch/antioch4",
+                "trees/birch/antioch5",
+                "trees/birch/antioch6",
+                "trees/birch/antioch7",
+                "trees/birch/antioch8",
+                "trees/birch/antioch9",
+                "trees/birch/antioch10",
+                "trees/birch/antioch11",
+                "trees/birch/antioch12",
+                "trees/birch/antioch13"
+            ]
+        },
+        {
+            "chance": 0.18,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/oak/toak1",
+                "trees/oak/toak2",
+                "trees/oak/toak3",
+                "trees/oak/toak4",
+                "trees/oak/toak8",
+                "trees/oak/toak10"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.001,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/obelisk1",
+                "clutter/obelisk2",
+                "clutter/obelisk3",
+                "clutter/obelisk4",
+                "clutter/obelisk5",
+                "clutter/obelisk6",
+                "clutter/obelisk7"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.001,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/literalgarbage1",
+                "clutter/literalgarbage2",
+                "clutter/literalgarbage3",
+                "clutter/literalgarbage4"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        }
+    ],
+    "biomeStyle": {"style": "IRIS"},
+    "decorators": [
+        {
+            "chance": 0.8,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.2,
+            "palette": [
+                {
+                    "weight": 1,
+                    "block": "grass"
+                },
+                {"block": "grass"},
+                {"block": "grass"},
+                {
+                    "chance": 7,
+                    "block": "grass"
+                }
+            ]
+        },
+        {
+            "chance": 0.03,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.2,
+            "palette": [{
+                "block": "oak_leaves",
+                "data": {"persistent": true}
+            }]
+        },
+        {
+            "chance": 0.02,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.2,
+            "palette": [{"block": "tall_grass"}]
+        },
+        {
+            "chance": 0.03,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.2,
+            "palette": [{"block": "rose_bush"}]
+        },
+        {
+            "chance": 0.05,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.2,
+            "palette": [{
+                "chance": 3,
+                "block": "red_mushroom"
+            }]
+        },
+        {
+            "chance": 0.05,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.2,
+            "palette": [{
+                "chance": 3,
+                "block": "poppy"
+            }]
+        },
+        {
+            "chance": 0.03,
+            "variance": {"style": "STATIC"},
+            "zoom": 0.2,
+            "palette": [{"block": "cobblestone_slab"}]
+        }
+    ],
+    "wall": {
+        "style": {"style": "STATIC"},
+        "palette": [
+            {"block": "stone"},
+            {"block": "andesite"},
+            {"block": "stone"}
+        ]
+    },
+    "biomeScatter": ["FOREST"]
+}
diff --git a/biomes/temperate/island.json b/biomes/temperate/island.json
index 394546aa..cd21e2d0 100644
--- a/biomes/temperate/island.json
+++ b/biomes/temperate/island.json
@@ -1,7 +1,7 @@
 {
     "name": "Temperate Island",
     "derivative": "PLAINS",
-    "rarity": 1,
+    "rarity": 3,
     "color": "#A9AF50",
     "vanillaDerivative": "PLAINS",
     "children": ["temperate/wilds"],
diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json
index 4a64cf16..b635ce40 100644
--- a/biomes/temperate/longtree-forest.json
+++ b/biomes/temperate/longtree-forest.json
@@ -1,6 +1,6 @@
 {
     "vanillaDerivative": "FOREST",
-    "rarity": 1,
+    "rarity": 5,
     "color": "#9B9F60",
     "name": "Long tree forest",
     "effects": [{
diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json
new file mode 100644
index 00000000..ac99c77c
--- /dev/null
+++ b/biomes/temperate/lush-plains-red.json
@@ -0,0 +1,347 @@
+{
+    "name": "Lush Plains Red",
+    "derivative": "FOREST",
+    "vanillaDerivative": "FOREST",
+    "color": "#de3535",
+    "rarity": 5,
+    "generators": [{
+        "min": 4,
+        "max": 7,
+        "generator": "plain"
+    }],
+    "jigsawStructures": [
+        {
+            "rarity": 1700,
+            "structure": "pillager_outpost"
+        },
+        {
+            "rarity": 1500,
+            "structure": "village-temperate"
+        }
+    ],
+    "layers": [
+        {"palette": [{"block": "grass_block"}]},
+        {
+            "minHeight": 2,
+            "maxHeight": 2,
+            "palette": [{"block": "dirt"}]
+        },
+        {
+            "minHeight": 1,
+            "maxHeight": 3,
+            "palette": [
+                {"block": "dirt"},
+                {"block": "coarse_dirt"}
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {"style": "STATIC"},
+            "palette": [
+                {"block": "dirt"},
+                {"block": "stone"}
+            ]
+        }
+    ],
+    "decorators": [
+        {
+            "chance": 0.04,
+            "style": {
+                "style": "STATIC"
+            },
+            "palette": [
+                {"block": "rose_bush", "weight": 6},
+                {"block": "poppy", "weight": 8}
+            ]
+        },
+        {
+            "chance": 0.01,
+            "palette": [{"block": "tall_grass"}]
+        },
+        {
+            "chance": 0.5,
+            "palette": [
+                {
+                    "block": "grass",
+                    "weight": 15
+                },
+                {
+                    "block": "fern",
+                    "weight": 1
+                }
+            ]
+        },
+        {
+            "chance": 0.07,
+            "palette": [
+                {
+                    "block": "oak_leaves",
+                    "data": {
+                        "persistent": true
+                    }
+                }
+            ]
+        }
+    ],
+    "objects": [
+        {
+            "mode": "VACUUM",
+            "chance": 0.00975,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/camp1",
+                "clutter/camp3",
+                "clutter/camp4",
+                "clutter/camp5"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "VACUUM",
+            "chance": 0.00675,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["clutter/camp2"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.002,
+            "edit": [{
+                "find": [{"block": "glass"}],
+                "replace": {"palette": [{"block": "void_air"}]}
+            }],
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["structures/cave2"],
+            "translate": {
+                "x": 0,
+                "y": -57,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.01,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/oak/hoakgeneric3",
+                "trees/oak/hoakgeneric4",
+                "trees/oak/hoakgeneric5",
+                "trees/oak/hoakgeneric6",
+                "trees/oak/hoakgeneric7",
+                "trees/oak/hoakgeneric8",
+                "trees/oak/hoakgeneric9",
+                "trees/oak/hoakgeneric1",
+                "trees/oak/shoakgeneric3",
+                "trees/oak/shoakgeneric4",
+                "trees/oak/shoakgeneric5",
+                "trees/oak/shoakgeneric6",
+                "trees/oak/shoakgeneric7",
+                "trees/oak/shoakgeneric8",
+                "trees/oak/shoakgeneric9",
+                "trees/oak/shoakgeneric1",
+                "trees/oak/shoakgeneric2"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 1.0E-4,
+            "mode": "VACUUM",
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["structures/ruin1"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.005,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/obelisk1",
+                "clutter/obelisk2",
+                "clutter/obelisk3",
+                "clutter/obelisk4",
+                "clutter/obelisk5",
+                "clutter/obelisk6",
+                "clutter/obelisk7"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "PAINT",
+            "chance": 0.002,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/genericpeak1",
+                "clutter/genericpeak2",
+                "clutter/genericpeak3",
+                "clutter/genericpeak5",
+                "clutter/genericpeak6"
+            ],
+            "translate": {
+                "x": 0,
+                "y": -4,
+                "z": 0
+            }
+        },
+        {
+            "place": [
+                "trees/oak/generic1",
+                "trees/oak/generic2",
+                "trees/oak/generic3",
+                "trees/oak/generic4",
+                "trees/oak/generic5",
+                "trees/oak/generic6"
+            ],
+            "chance": 0.07,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                 "structures/landstone1",
+                "structures/landstone2",
+                "structures/landstone3",
+                "structures/landstone4",
+                "structures/landstone5"
+            ],
+            "chance": 0.02,
+            "mode": "MIN_HEIGHT",
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "clutter/statue-villager-plains"
+            ],
+            "chance": 0.008,
+            "mode": "MIN_HEIGHT",
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        }
+    ],
+    "entityInitialSpawns": [
+        {
+            "entity": "cow",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "pig",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "chicken",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "sheep",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        }
+    ],
+    "biomeStyle": {"style": "IRIS"},
+    "wall": {"palette": [
+        {"block": "stone"},
+        {"block": "andesite"}
+    ]}
+}
diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json
new file mode 100644
index 00000000..a15cd4bd
--- /dev/null
+++ b/biomes/temperate/lush-plains-yellow.json
@@ -0,0 +1,347 @@
+{
+    "name": "Lush Plains Yellow",
+    "derivative": "FOREST",
+    "vanillaDerivative": "FOREST",
+    "color": "#d8e310",
+    "rarity": 5,
+    "generators": [{
+        "min": 4,
+        "max": 7,
+        "generator": "plain"
+    }],
+    "jigsawStructures": [
+        {
+            "rarity": 1700,
+            "structure": "pillager_outpost"
+        },
+        {
+            "rarity": 1500,
+            "structure": "village-temperate"
+        }
+    ],
+    "layers": [
+        {"palette": [{"block": "grass_block"}]},
+        {
+            "minHeight": 2,
+            "maxHeight": 2,
+            "palette": [{"block": "dirt"}]
+        },
+        {
+            "minHeight": 1,
+            "maxHeight": 3,
+            "palette": [
+                {"block": "dirt"},
+                {"block": "coarse_dirt"}
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {"style": "STATIC"},
+            "palette": [
+                {"block": "dirt"},
+                {"block": "stone"}
+            ]
+        }
+    ],
+    "decorators": [
+        {
+            "chance": 0.05,
+            "style": {
+                "style": "STATIC"
+            },
+            "palette": [
+                {"block": "dandelion", "weight": 8},
+                {"block": "sunflower", "weight": 1}
+            ]
+        },
+        {
+            "chance": 0.01,
+            "palette": [{"block": "tall_grass"}]
+        },
+        {
+            "chance": 0.5,
+            "palette": [
+                {
+                    "block": "grass",
+                    "weight": 15
+                },
+                {
+                    "block": "fern",
+                    "weight": 1
+                }
+            ]
+        },
+        {
+            "chance": 0.08,
+            "palette": [
+                {
+                    "block": "oak_leaves",
+                    "data": {
+                        "persistent": true
+                    }
+                }
+            ]
+        }
+    ],
+    "objects": [
+        {
+            "mode": "VACUUM",
+            "chance": 0.00975,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/camp1",
+                "clutter/camp3",
+                "clutter/camp4",
+                "clutter/camp5"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "VACUUM",
+            "chance": 0.00675,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["clutter/camp2"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.002,
+            "edit": [{
+                "find": [{"block": "glass"}],
+                "replace": {"palette": [{"block": "void_air"}]}
+            }],
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["structures/cave2"],
+            "translate": {
+                "x": 0,
+                "y": -57,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.01,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/oak/hoakgeneric3",
+                "trees/oak/hoakgeneric4",
+                "trees/oak/hoakgeneric5",
+                "trees/oak/hoakgeneric6",
+                "trees/oak/hoakgeneric7",
+                "trees/oak/hoakgeneric8",
+                "trees/oak/hoakgeneric9",
+                "trees/oak/hoakgeneric1",
+                "trees/oak/shoakgeneric3",
+                "trees/oak/shoakgeneric4",
+                "trees/oak/shoakgeneric5",
+                "trees/oak/shoakgeneric6",
+                "trees/oak/shoakgeneric7",
+                "trees/oak/shoakgeneric8",
+                "trees/oak/shoakgeneric9",
+                "trees/oak/shoakgeneric1",
+                "trees/oak/shoakgeneric2"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 1.0E-4,
+            "mode": "VACUUM",
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["structures/ruin1"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.005,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/obelisk1",
+                "clutter/obelisk2",
+                "clutter/obelisk3",
+                "clutter/obelisk4",
+                "clutter/obelisk5",
+                "clutter/obelisk6",
+                "clutter/obelisk7"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "PAINT",
+            "chance": 0.002,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/genericpeak1",
+                "clutter/genericpeak2",
+                "clutter/genericpeak3",
+                "clutter/genericpeak5",
+                "clutter/genericpeak6"
+            ],
+            "translate": {
+                "x": 0,
+                "y": -4,
+                "z": 0
+            }
+        },
+        {
+            "place": [
+                "trees/oak/generic1",
+                "trees/oak/generic2",
+                "trees/oak/generic3",
+                "trees/oak/generic4",
+                "trees/oak/generic5",
+                "trees/oak/generic6"
+            ],
+            "chance": 0.07,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                 "structures/landstone1",
+                "structures/landstone2",
+                "structures/landstone3",
+                "structures/landstone4",
+                "structures/landstone5"
+            ],
+            "chance": 0.02,
+            "mode": "MIN_HEIGHT",
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "clutter/statue-villager-plains"
+            ],
+            "chance": 0.008,
+            "mode": "MIN_HEIGHT",
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        }
+    ],
+    "entityInitialSpawns": [
+        {
+            "entity": "cow",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "pig",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "chicken",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "sheep",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        }
+    ],
+    "biomeStyle": {"style": "IRIS"},
+    "wall": {"palette": [
+        {"block": "stone"},
+        {"block": "andesite"}
+    ]}
+}
diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json
new file mode 100644
index 00000000..e3ab427e
--- /dev/null
+++ b/biomes/temperate/lush-plains.json
@@ -0,0 +1,375 @@
+{
+    "name": "Lush Plains",
+    "derivative": "JUNGLE_EDGE",
+    "vanillaDerivative": "JUNGLE_EDGE",
+    "color": "#68de35",
+    "generators": [{
+        "min": 4,
+        "max": 7,
+        "generator": "plain"
+    }],
+    "rarity": 3,
+    "biomeZoom": 30,
+    "children": [
+        "temperate/lush-plains-yellow",
+        "temperate/lush-plains-red"
+    ],
+    "childStyle": {
+        "style": "CELLULAR_IRIS_THICK",
+        "zoom": 20
+    },
+    "jigsawStructures": [
+        {
+            "rarity": 1700,
+            "structure": "pillager_outpost"
+        },
+        {
+            "rarity": 1500,
+            "structure": "village-temperate"
+        }
+    ],
+    "layers": [
+        {"palette": [{"block": "grass_block"}]},
+        {
+            "minHeight": 2,
+            "maxHeight": 2,
+            "palette": [{"block": "dirt"}]
+        },
+        {
+            "minHeight": 1,
+            "maxHeight": 3,
+            "palette": [
+                {"block": "dirt"},
+                {"block": "coarse_dirt"}
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {"style": "STATIC"},
+            "palette": [
+                {"block": "dirt"},
+                {"block": "stone"}
+            ]
+        }
+    ],
+    "decorators": [
+        {
+            "chance": 0.06,
+            "variance": {
+                "style": "STATIC"
+            },
+            "style": {
+                "style": "STATIC"
+            },
+            "palette": [
+                {"block": "orange_tulip"},
+                {"block": "white_tulip"},
+                {"block": "dandelion"},
+                {"block": "poppy"},
+                {"block": "blue_orchid"},
+                {"block": "azure_bluet"},
+                {"block": "red_tulip"},
+                {"block": "allium"},
+                {"block": "pink_tulip"},
+                {"block": "oxeye_daisy"},
+                {"block": "cornflower"},
+                {"block": "lily_of_the_valley"},
+                {"block": "rose_bush"},
+                {"block": "lilac"}
+            ]
+        },
+        {
+            "chance": 0.01,
+            "palette": [{"block": "tall_grass"}]
+        },
+        {
+            "chance": 0.5,
+            "palette": [
+                {
+                    "block": "grass",
+                    "weight": 15
+                },
+                {
+                    "block": "fern",
+                    "weight": 1
+                }
+            ]
+        },
+        {
+            "chance": 0.08,
+            "palette": [
+                {
+                    "block": "oak_leaves",
+                    "data": {
+                        "persistent": true
+                    }
+                }
+            ],
+            "style": {
+                "style": "STATIC",
+                "zoom": 0.8
+            }
+        }
+    ],
+    "objects": [
+        {
+            "mode": "VACUUM",
+            "chance": 0.00975,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/camp1",
+                "clutter/camp3",
+                "clutter/camp4",
+                "clutter/camp5"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "VACUUM",
+            "chance": 0.00675,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["clutter/camp2"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.002,
+            "edit": [{
+                "find": [{"block": "glass"}],
+                "replace": {"palette": [{"block": "void_air"}]}
+            }],
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["structures/cave2"],
+            "translate": {
+                "x": 0,
+                "y": -57,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.01,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/oak/hoakgeneric3",
+                "trees/oak/hoakgeneric4",
+                "trees/oak/hoakgeneric5",
+                "trees/oak/hoakgeneric6",
+                "trees/oak/hoakgeneric7",
+                "trees/oak/hoakgeneric8",
+                "trees/oak/hoakgeneric9",
+                "trees/oak/hoakgeneric1",
+                "trees/oak/shoakgeneric3",
+                "trees/oak/shoakgeneric4",
+                "trees/oak/shoakgeneric5",
+                "trees/oak/shoakgeneric6",
+                "trees/oak/shoakgeneric7",
+                "trees/oak/shoakgeneric8",
+                "trees/oak/shoakgeneric9",
+                "trees/oak/shoakgeneric1",
+                "trees/oak/shoakgeneric2"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 1.0E-4,
+            "mode": "VACUUM",
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["structures/ruin1"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.005,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/obelisk1",
+                "clutter/obelisk2",
+                "clutter/obelisk3",
+                "clutter/obelisk4",
+                "clutter/obelisk5",
+                "clutter/obelisk6",
+                "clutter/obelisk7"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "PAINT",
+            "chance": 0.002,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/genericpeak1",
+                "clutter/genericpeak2",
+                "clutter/genericpeak3",
+                "clutter/genericpeak5",
+                "clutter/genericpeak6"
+            ],
+            "translate": {
+                "x": 0,
+                "y": -4,
+                "z": 0
+            }
+        },
+        {
+            "place": [
+                "trees/oak/generic1",
+                "trees/oak/generic2",
+                "trees/oak/generic3",
+                "trees/oak/generic4",
+                "trees/oak/generic5",
+                "trees/oak/generic6"
+            ],
+            "chance": 0.07,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "structures/landstone1",
+                "structures/landstone2",
+                "structures/landstone3",
+                "structures/landstone4",
+                "structures/landstone5"
+            ],
+            "chance": 0.02,
+            "mode": "MIN_HEIGHT",
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "clutter/statue-villager-plains"
+            ],
+            "chance": 0.008,
+            "mode": "MIN_HEIGHT",
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        }
+    ],
+    "entityInitialSpawns": [
+        {
+            "entity": "cow",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "pig",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "chicken",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "sheep",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        }
+    ],
+    "biomeStyle": {"style": "IRIS"},
+    "wall": {"palette": [
+        {"block": "stone"},
+        {"block": "andesite"}
+    ]}
+}
diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json
new file mode 100644
index 00000000..a6d72893
--- /dev/null
+++ b/biomes/temperate/meadows.json
@@ -0,0 +1,394 @@
+{
+    "name": "Meadows",
+    "derivative": "FOREST",
+    "vanillaDerivative": "FOREST",
+    "color": "#50af6b",
+    "rarity": 4,
+    "generators": [{
+        "min": 5,
+        "max": 12,
+        "generator": "highplains"
+    }],
+    "customDerivitives": [
+        {
+            "category": "plains",
+            "humidity": 0.8,
+            "temperature": 0.5,
+            "id": "meadow",
+            "downfallType": "rain",
+            "grassColor": "#83BB6D"
+        }
+    ],
+    "jigsawStructures": [
+        {
+            "rarity": 2200,
+            "structure": "pillager_outpost"
+        },
+        {
+            "rarity": 1900,
+            "structure": "village-temperate"
+        }
+    ],
+    "layers": [
+        {"palette": [{"block": "grass_block"}]},
+        {
+            "minHeight": 2,
+            "maxHeight": 2,
+            "palette": [{"block": "dirt"}]
+        },
+        {
+            "minHeight": 1,
+            "maxHeight": 3,
+            "palette": [
+                {"block": "dirt"},
+                {"block": "coarse_dirt"}
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {"style": "STATIC"},
+            "palette": [
+                {"block": "dirt"},
+                {"block": "stone"}
+            ]
+        }
+    ],
+    "decorators": [
+        {
+            "chance": 0.04,
+            "variance": {
+                "style": "TRIOCTAVE_SIMPLEX",
+                "zoom": 6,
+                "fracture": {
+                    "style": "STATIC",
+                    "zoom": 0.2,
+                    "multiplier": 10
+                }
+            },
+            "style": {
+                "style": "STATIC"
+            },
+            "palette": [
+                {"block": "cornflower"},
+                {"block": "allium"},
+                {"block": "cornflower"}
+            ]
+        },
+        {
+            "chance": 0.02,
+            "variance": {
+                "style": "TRIOCTAVE_SIMPLEX",
+                "zoom": 6,
+                "fracture": {
+                    "style": "STATIC",
+                    "zoom": 0.2,
+                    "multiplier": 10
+                }
+            },
+            "style": {
+                "style": "STATIC"
+            },
+            "palette": [
+                {"block": "poppy"},
+                {"block": "pink_tulip"},
+                {"block": "lily_of_the_valley"}
+            ]
+        },
+        {
+            "chance": 0.005,
+            "palette": [{"block": "tall_grass"}]
+        },
+        {
+            "chance": 0.1,
+            "palette": [{"block": "grass"}]
+        }
+    ],
+    "objects": [
+        {
+            "mode": "VACUUM",
+            "chance": 0.00975,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/camp1",
+                "clutter/camp3",
+                "clutter/camp4",
+                "clutter/camp5"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "VACUUM",
+            "chance": 0.00675,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["clutter/camp2"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.002,
+            "edit": [{
+                "find": [{"block": "glass"}],
+                "replace": {"palette": [{"block": "void_air"}]}
+            }],
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["structures/cave2"],
+            "translate": {
+                "x": 0,
+                "y": -57,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.01,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "trees/oak/hoakgeneric3",
+                "trees/oak/hoakgeneric4",
+                "trees/oak/hoakgeneric5",
+                "trees/oak/hoakgeneric6",
+                "trees/oak/hoakgeneric7",
+                "trees/oak/hoakgeneric8",
+                "trees/oak/hoakgeneric9",
+                "trees/oak/hoakgeneric1",
+                "trees/oak/shoakgeneric3",
+                "trees/oak/shoakgeneric4",
+                "trees/oak/shoakgeneric5",
+                "trees/oak/shoakgeneric6",
+                "trees/oak/shoakgeneric7",
+                "trees/oak/shoakgeneric8",
+                "trees/oak/shoakgeneric9",
+                "trees/oak/shoakgeneric1",
+                "trees/oak/shoakgeneric2"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 1.0E-4,
+            "mode": "VACUUM",
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": ["structures/ruin1"],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.005,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/obelisk1",
+                "clutter/obelisk2",
+                "clutter/obelisk3",
+                "clutter/obelisk4",
+                "clutter/obelisk5",
+                "clutter/obelisk6",
+                "clutter/obelisk7"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "mode": "PAINT",
+            "chance": 0.002,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 360,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "clutter/genericpeak1",
+                "clutter/genericpeak2",
+                "clutter/genericpeak3",
+                "clutter/genericpeak5",
+                "clutter/genericpeak6"
+            ],
+            "translate": {
+                "x": 0,
+                "y": -4,
+                "z": 0
+            }
+        },
+        {
+            "place": [
+                "trees/oak/generic1",
+                "trees/oak/generic2",
+                "trees/oak/generic3",
+                "trees/oak/generic4",
+                "trees/oak/generic5",
+                "trees/oak/generic6"
+            ],
+            "chance": 0.02,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "clutter/statue-villager-plains"
+            ],
+            "chance": 0.008,
+            "mode": "MIN_HEIGHT",
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "structures/ruins-greek-temple"
+            ],
+            "chance": 0.0005,
+            "mode": "VACUUM",
+            "translate": {
+                "y": -5
+            },
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360,
+                    "enabled": true
+                }
+            },
+            "edit": [
+                {
+                    "find": [
+                        {
+                            "block": "gold_block"
+                        }
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "chest",
+                                "weight": 1
+                            },
+                            {
+                                "block": "dirt",
+                                "weight": 5
+                            }
+                        ]
+                    },
+                    "chance": 1
+                }
+            ]
+        }
+    ],
+    "entityInitialSpawns": [
+        {
+            "entity": "cow",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "pig",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "chicken",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "sheep",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "horse",
+            "minSpawns": 2,
+            "maxSpawns": 5,
+            "rarity": 120
+        }
+    ],
+    "biomeStyle": {"style": "IRIS"},
+    "wall": {"palette": [
+        {"block": "stone"},
+        {"block": "andesite"}
+    ]}
+}
diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json
index 42c8f90a..974d715d 100644
--- a/biomes/temperate/oak-denmyre.json
+++ b/biomes/temperate/oak-denmyre.json
@@ -1,12 +1,12 @@
 {
-    "name": "Temperate Oak Denmyre",
-    "rarity": 1,
+    "name": "Oak Denmyre",
+    "rarity": 6,
     "color": "#C8FF00",
     "derivative": "FOREST",
     "vanillaDerivative": "FOREST",
     "generators": [{
-        "min": 4,
-        "max": 7,
+        "min": 5,
+        "max": 12,
         "generator": "plain"
     }],
     "layers": [
@@ -121,7 +121,7 @@
             "rotation": {
                 "yAxis": {
                     "min": 0,
-                    "max": 0,
+                    "max": 360,
                     "interval": 90,
                     "enabled": true
                 },
@@ -135,7 +135,7 @@
             }
         },
         {
-            "chance": 0.5,
+            "chance": 0.2,
             "density": 2,
             "edit": [
                 {
@@ -161,7 +161,7 @@
             "rotation": {
                 "yAxis": {
                     "min": 0,
-                    "max": 0,
+                    "max": 360,
                     "interval": 90,
                     "enabled": true
                 },
@@ -183,56 +183,23 @@
             }
         },
         {
-            "edit": [
-                {
-                    "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
-                    }]}
-                },
-                {
-                    "find": [{"block": "spruce_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
-                    }]}
-                },
-                {
-                    "find": [{"block": "spruce_wood"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
-                    }]}
-                }
-            ],
-            "chance": 0.3,
-            "density": 2,
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
             "place": [
-                "clutter/oakdenclutt1",
-                "clutter/oakdenclutt2",
-                "clutter/oakdenclutt3",
-                "clutter/oakdenclutt4",
-                "clutter/oakdenclutt5",
-                "clutter/oakdenclutt6",
-                "clutter/oakdenclutt7",
-                "clutter/oakdenclutt8",
-                "clutter/oakdenclutt9",
-                "clutter/oakdenclutt10"
+                "trees/oak/generic1",
+                "trees/oak/generic2",
+                "trees/oak/generic3",
+                "trees/oak/generic4",
+                "trees/oak/generic5",
+                "trees/oak/generic6"
             ],
-            "translate": {
-                "x": 0,
-                "y": -1,
-                "z": 0
+            "chance": 0.4,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
             }
         }
     ],
diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json
index f9cb9e91..70abb1fe 100644
--- a/biomes/temperate/oak-forest.json
+++ b/biomes/temperate/oak-forest.json
@@ -1,47 +1,19 @@
 {
-    "name": "Temperate Oak Forest",
-    "derivative": "DEEP_LUKEWARM_OCEAN",
-    "rarity": 1,
-    "color": "#BFEF10",
+    "name": "Oak Forest",
+    "derivative": "FOREST",
+    "color": "#ADCF30",
     "vanillaDerivative": "FOREST",
-    "children": ["temperate/oak-denmyre"],
-    "customDerivitives": [{
-        "id": "temoakforest",
-        "foliageColor": "#80B918",
-        "waterColor": "#25638E",
-        "grassColor": "#698E25",
-        "category": "forest"
-    }],
     "generators": [{
-        "min": 4,
-        "max": 7,
-        "generator": "plain"
+        "generator": "smooth-dunes",
+        "max": 12,
+        "min": 5
+    },
+    {
+        "generator": "rare-hills",
+        "max": 40,
+        "min": 0
     }],
-    "layers": [
-        {
-            "style": {"style": "STATIC"},
-            "palette": [{"block": "grass_block"}]
-        },
-        {"palette": [{"block": "dirt"}]},
-        {
-            "minHeight": 1,
-            "maxHeight": 3,
-            "palette": [
-                {"block": "dirt"},
-                {"block": "coarse_dirt"}
-            ]
-        },
-        {
-            "minHeight": 6,
-            "maxHeight": 18,
-            "style": {"style": "STATIC"},
-            "palette": [
-                {"block": "stone"},
-                {"block": "andesite"},
-                {"block": "stone"}
-            ]
-        }
-    ],
+    "rarity": 3,
     "jigsawStructures": [
         {
             "rarity": 1700,
@@ -52,291 +24,254 @@
             "structure": "village-temperate"
         }
     ],
-    "objects": [
+    "layers": [
         {
-            "chance": 0.07,
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "place": [
-                "trees/oak/hoakgeneric3",
-                "trees/oak/hoakgeneric4",
-                "trees/oak/hoakgeneric5",
-                "trees/oak/hoakgeneric6",
-                "trees/oak/hoakgeneric7",
-                "trees/oak/hoakgeneric8",
-                "trees/oak/hoakgeneric9",
-                "trees/oak/hoakgeneric1",
-                "trees/oak/shoakgeneric3",
-                "trees/oak/shoakgeneric4",
-                "trees/oak/shoakgeneric5",
-                "trees/oak/shoakgeneric6",
-                "trees/oak/shoakgeneric7",
-                "trees/oak/shoakgeneric8",
-                "trees/oak/shoakgeneric9",
-                "trees/oak/shoakgeneric1",
-                "trees/oak/shoakgeneric2"
-            ],
-            "translate": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            }
-        },
-        {
-            "mode": "PAINT",
-            "chance": 0.00975,
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "place": [
-                "clutter/camp1",
-                "clutter/camp4",
-                "clutter/camp5",
-                "clutter/camp3"
-            ],
-            "translate": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            }
-        },
-        {
-            "chance": 1,
-            "density": 2,
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "edit": [
-                {
-                    "find": [
-                        {"block": "birch_wood"},
-                        {"block": "birch_log"}
-                    ],
-                    "replace": {"palette": [{"block": "oak_wood"}]}
-                },
-                {
-                    "find": [{"block": "birch_leaves"}],
-                    "replace": {"palette": [{
-                        "block": "oak_leaves",
-                        "data": {"persistent": true}
-                    }]}
-                }
-            ],
-            "place": [
-                "trees/birch/antioch3",
-                "trees/birch/antioch4",
-                "trees/birch/antioch5",
-                "trees/birch/antioch6",
-                "trees/birch/antioch7",
-                "trees/birch/antioch8",
-                "trees/birch/antioch9",
-                "trees/birch/antioch10",
-                "trees/birch/antioch11",
-                "trees/birch/antioch12",
-                "trees/birch/antioch13"
-            ],
-            "translate": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            }
-        },
-        {
-            "chance": 0.18,
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "place": [
-                "trees/oak/thoakgeneric1",
-                "trees/oak/thoakgeneric2",
-                "trees/oak/thoakgeneric3",
-                "trees/oak/thoakgeneric4",
-                "trees/oak/thoakgeneric8",
-                "trees/oak/thoakgeneric10"
-            ],
-            "translate": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            }
-        },
-        {
-            "chance": 0.001,
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "place": [
-                "clutter/obelisk1",
-                "clutter/obelisk2",
-                "clutter/obelisk3",
-                "clutter/obelisk4",
-                "clutter/obelisk5",
-                "clutter/obelisk6",
-                "clutter/obelisk7"
-            ],
-            "translate": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            }
-        },
-        {
-            "chance": 0.001,
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "place": [
-                "clutter/literalgarbage1",
-                "clutter/literalgarbage2",
-                "clutter/literalgarbage3",
-                "clutter/literalgarbage4"
-            ],
-            "translate": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            }
-        },
-        {
-            "chance": 0.0015,
-            "edit": [
-                {
-                    "find": [{"block": "white_wool"}],
-                    "replace": {"palette": [{"block": "oak_wood"}]}
-                },
-                {
-                    "find": [{"block": "black_wool"}],
-                    "replace": {"palette": [{"block": "oak_wood"}]}
-                }
-            ],
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "mode": "MIN_HEIGHT",
-            "place": ["trees/mixed/smoakog80"],
-            "translate": {
-                "x": 0,
-                "y": -4,
-                "z": 0
-            }
-        }
-    ],
-    "biomeZoom": 60,
-    "biomeStyle": {"style": "IRIS"},
-    "decorators": [
-        {
-            "chance": 0.8,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.2,
+            "style": {"style": "STATIC"},
+            "zoom": 0.656,
             "palette": [
                 {
-                    "weight": 1,
-                    "block": "grass"
+                    "weight": 19,
+                    "block": "grass_block"
                 },
-                {"block": "grass"},
-                {"block": "grass"},
+                {"block": "coarse_dirt"},
+                {"block": "gravel"},
                 {
-                    "chance": 7,
-                    "block": "grass"
+                    "weight": 19,
+                    "block": "grass_block"
                 }
             ]
         },
         {
-            "chance": 0.03,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.2,
-            "palette": [{
-                "block": "oak_leaves",
-                "data": {"persistent": true}
-            }]
+            "minHeight": 2,
+            "maxHeight": 2,
+            "palette": [{"block": "dirt"}]
         },
         {
-            "chance": 0.02,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.2,
+            "style": {"style": "STATIC"},
+            "minHeight": 1,
+            "maxHeight": 1,
+            "palette": [
+                {"block": "dirt"},
+                {"block": "stone"}
+            ]
+        }
+    ],
+    "wall": {"palette": [
+        {"block": "stone"},
+        {"block": "andesite"},
+        {"block": "cobblestone"},
+        {"block": "mossy_cobblestone"}
+    ]},
+    "decorators": [
+        {
+            "chance": 0.2,
+            "variance": {
+                "style": "CELLULAR",
+                "zoom": 0.3,
+                "fracture": {
+                    "style": "SIMPLEX",
+                    "zoom": 0.2,
+                    "multiplier": 10
+                }
+            },
+            "style": {
+                "style": "TRIOCTAVE_SIMPLEX",
+                "zoom": 0.35,
+                "fracture": {
+                    "style": "STATIC",
+                    "multiplier": 8
+                }
+            },
+            "palette": [
+                {"block": "dandelion"},
+                {"block": "poppy"},
+                {"block": "blue_orchid"},
+                {"block": "allium"},
+                {"block": "azure_bluet"},
+                {"block": "red_tulip"},
+                {"block": "orange_tulip"},
+                {"block": "white_tulip"},
+                {"block": "pink_tulip"},
+                {"block": "oxeye_daisy"},
+                {"block": "cornflower"},
+                {"block": "lily_of_the_valley"}
+            ]
+        },
+        {
+            "chance": 0.03,
             "palette": [{"block": "tall_grass"}]
         },
         {
-            "chance": 0.03,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.2,
-            "palette": [{"block": "rose_bush"}]
+            "chance": 0.5,
+            "palette": [{"block": "grass"}]
+        },
+        {
+            "chance": 0.06,
+            "palette": [{"block": "fern"}]
+        },
+        {
+            "chance": 0.04,
+            "palette": [{"block": "red_mushroom"}]
+        },
+        {
+            "chance": 0.1,
+            "palette": [{"block": "large_fern"}]
         },
         {
             "chance": 0.05,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.2,
-            "palette": [{
-                "chance": 3,
-                "block": "red_mushroom"
-            }]
-        },
-        {
-            "chance": 0.05,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.2,
-            "palette": [{
-                "chance": 3,
-                "block": "poppy"
-            }]
-        },
-        {
-            "chance": 0.03,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.2,
             "palette": [{"block": "cobblestone_slab"}]
         }
     ],
-    "wall": {
-        "style": {"style": "STATIC"},
-        "palette": [
-            {"block": "stone"},
-            {"block": "andesite"},
-            {"block": "stone"}
-        ]
-    },
-    "biomeScatter": ["FOREST"]
+    "objects": [
+        {
+            "place": [
+                "clutter/boulder1",
+                "clutter/boulder2",
+                "clutter/boulder3",
+                "clutter/boulder4",
+                "clutter/boulder5",
+                "clutter/boulder6",
+                "clutter/boulder7",
+                "clutter/boulder8",
+                "clutter/boulder9",
+                "clutter/boulder10"
+            ],
+            "chance": 0.1,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            },
+            "translate": {
+                "x": 0,
+                "y": -3,
+                "z": 0
+            }
+        },
+        {
+            "place": [
+                "trees/oak/hoakgeneric1",
+                "trees/oak/hoakgeneric2",
+                "trees/oak/hoakgeneric3",
+                "trees/oak/hoakgeneric4",
+                "trees/oak/hoakgeneric5"
+            ],
+            "chance": 0.08,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "trees/oak/generic1",
+                "trees/oak/generic2",
+                "trees/oak/generic3",
+                "trees/oak/generic4",
+                "trees/oak/generic5",
+                "trees/oak/generic6"
+            ],
+            "chance": 0.6,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "trees/oak/shoakgeneric1",
+                "trees/oak/shoakgeneric2",
+                "trees/oak/shoakgeneric3",
+                "trees/oak/shoakgeneric4",
+                "trees/oak/shoakgeneric4"
+            ],
+            "chance": 0.1,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "trees/oak/toak1",
+                "trees/oak/toak2",
+                "trees/oak/toak3",
+                "trees/oak/toak4",
+                "trees/oak/toak5",
+                "trees/oak/toak6",
+                "trees/oak/toak7",
+                "trees/oak/toak8",
+                "trees/oak/toak9",
+                "trees/oak/toak10",
+                "trees/oak/toak11"
+            ],
+            "chance": 0.1,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "clutter/sbush1",
+                "clutter/sbush2",
+                "clutter/sbush3"
+            ],
+            "chance": 0.6,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "trees/oak/massivegeneric1",
+                "trees/oak/massivegeneric2",
+                "trees/oak/massivegeneric3"
+            ],
+            "chance": 0.00001,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            },
+            "scale": {
+                "minimumScale": 0.6,
+                "maximumScale": 0.6
+            }
+        }
+    ]
 }
diff --git a/biomes/temperate/oak-hills.json b/biomes/temperate/oak-hills.json
deleted file mode 100644
index 100dc7e9..00000000
--- a/biomes/temperate/oak-hills.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-    "name": "Temperate Oak Hills",
-    "rarity": 1,
-    "color": "#B6DF20",
-    "derivative": "FOREST",
-    "vanillaDerivative": "FOREST",
-    "customDerivitives": [{
-        "id": "temoakhills",
-        "foliageColor": "#5CA528",
-        "waterColor": "#2851A5",
-        "grassColor": "#51A528",
-        "category": "forest"
-    }],
-    "generators": [
-        {
-            "generator": "smooth-dunes",
-            "max": 30,
-            "min": 3
-        },
-        {
-            "generator": "small-cliffs",
-            "min": -17,
-            "max": 0
-        }
-    ],
-    "jigsawStructures": [
-        {
-            "rarity": 1700,
-            "structure": "pillager_outpost"
-        },
-        {
-            "rarity": 1500,
-            "structure": "village-temperate"
-        }
-    ],
-    "layers": [
-        {"palette": [
-            {"block": "grass_block"},
-            {"block": "grass_block"},
-            {"block": "grass_block"},
-            {"block": "podzol"},
-            {"block": "coarse_dirt"}
-        ]},
-        {
-            "minHeight": 2,
-            "maxHeight": 2,
-            "palette": [{"block": "dirt"}]
-        },
-        {
-            "style": {"style": "STATIC"},
-            "minHeight": 1,
-            "maxHeight": 1,
-            "palette": [
-                {"block": "dirt"},
-                {"block": "stone"}
-            ]
-        }
-    ],
-    "wall": {"palette": [
-        {"block": "stone"},
-        {"block": "andesite"},
-        {"block": "cobblestone"},
-        {"block": "mossy_cobblestone"}
-    ]},
-    "decorators": [
-        {
-            "chance": 0.2,
-            "variance": {
-                "style": "CELLULAR",
-                "zoom": 0.3,
-                "fracture": {
-                    "style": "SIMPLEX",
-                    "zoom": 0.2,
-                    "multiplier": 10
-                }
-            },
-            "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.35,
-                "fracture": {
-                    "style": "STATIC",
-                    "multiplier": 8
-                }
-            },
-            "palette": [
-                {"block": "dandelion"},
-                {"block": "poppy"},
-                {"block": "blue_orchid"},
-                {"block": "allium"},
-                {"block": "azure_bluet"},
-                {"block": "red_tulip"},
-                {"block": "orange_tulip"},
-                {"block": "white_tulip"},
-                {"block": "pink_tulip"},
-                {"block": "oxeye_daisy"},
-                {"block": "cornflower"},
-                {"block": "lily_of_the_valley"}
-            ]
-        },
-        {
-            "chance": 0.03,
-            "palette": [{"block": "tall_grass"}]
-        },
-        {
-            "chance": 0.5,
-            "palette": [{"block": "grass"}]
-        },
-        {
-            "chance": 0.06,
-            "palette": [{"block": "fern"}]
-        },
-        {
-            "chance": 0.04,
-            "palette": [{"block": "red_mushroom"}]
-        },
-        {
-            "chance": 0.1,
-            "palette": [{"block": "large_fern"}]
-        },
-        {
-            "chance": 0.05,
-            "palette": [{"block": "cobblestone_slab"}]
-        }
-    ],
-    "objects": [
-        {
-            "place": [
-                "clutter/boulder1",
-                "clutter/boulder2",
-                "clutter/boulder3",
-                "clutter/boulder4",
-                "clutter/boulder5",
-                "clutter/boulder6",
-                "clutter/boulder7",
-                "clutter/boulder8",
-                "clutter/boulder9",
-                "clutter/boulder10"
-            ],
-            "chance": 0.4,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            },
-            "translate": {
-                "x": 0,
-                "y": -3,
-                "z": 0
-            }
-        },
-        {
-            "place": [
-                "trees/oak/hoakgeneric1",
-                "trees/oak/hoakgeneric2",
-                "trees/oak/hoakgeneric3",
-                "trees/oak/hoakgeneric4",
-                "trees/oak/hoakgeneric5"
-            ],
-            "chance": 0.5,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        },
-        {
-            "place": [
-                "trees/oak/shoakgeneric1",
-                "trees/oak/shoakgeneric2",
-                "trees/oak/shoakgeneric3",
-                "trees/oak/shoakgeneric4",
-                "trees/oak/shoakgeneric5"
-            ],
-            "chance": 0.5,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        },
-        {
-            "place": [
-                "trees/oak/thoakgeneric1",
-                "trees/oak/thoakgeneric2",
-                "trees/oak/thoakgeneric3",
-                "trees/oak/thoakgeneric4",
-                "trees/oak/thoakgeneric4"
-            ],
-            "chance": 0.5,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        },
-        {
-            "place": [
-                "clutter/sbush1",
-                "clutter/sbush2",
-                "clutter/sbush3"
-            ],
-            "chance": 0.6,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        }
-    ]
-}
diff --git a/biomes/temperate/oak.json b/biomes/temperate/oak.json
deleted file mode 100644
index 55ea1c4f..00000000
--- a/biomes/temperate/oak.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-    "name": "Temperate Oak",
-    "derivative": "FOREST",
-    "rarity": 1,
-    "color": "#ADCF30",
-    "vanillaDerivative": "FOREST",
-    "children": ["temperate/oak-hills"],
-    "generators": [{
-        "generator": "smooth-dunes",
-        "max": 4,
-        "min": 3
-    }],
-    "customDerivitives": [{
-        "id": "temoak",
-        "foliageColor": "#b76e79",
-        "waterColor": "#b76e79",
-        "grassColor": "#b76e79",
-        "category": "forest"
-    }],
-    "jigsawStructures": [
-        {
-            "rarity": 1700,
-            "structure": "pillager_outpost"
-        },
-        {
-            "rarity": 1500,
-            "structure": "village-temperate"
-        }
-    ],
-    "layers": [
-        {"palette": [
-            {"block": "grass_block"},
-            {"block": "grass_block"},
-            {"block": "grass_block"},
-            {"block": "podzol"},
-            {"block": "coarse_dirt"}
-        ]},
-        {
-            "minHeight": 2,
-            "maxHeight": 2,
-            "palette": [{"block": "dirt"}]
-        },
-        {
-            "style": {"style": "STATIC"},
-            "minHeight": 1,
-            "maxHeight": 1,
-            "palette": [
-                {"block": "dirt"},
-                {"block": "stone"}
-            ]
-        }
-    ],
-    "wall": {"palette": [
-        {"block": "stone"},
-        {"block": "andesite"},
-        {"block": "cobblestone"},
-        {"block": "mossy_cobblestone"}
-    ]},
-    "decorators": [
-        {
-            "chance": 0.2,
-            "variance": {
-                "style": "CELLULAR",
-                "zoom": 0.3,
-                "fracture": {
-                    "style": "SIMPLEX",
-                    "zoom": 0.2,
-                    "multiplier": 10
-                }
-            },
-            "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.35,
-                "fracture": {
-                    "style": "STATIC",
-                    "multiplier": 8
-                }
-            },
-            "palette": [
-                {"block": "dandelion"},
-                {"block": "poppy"},
-                {"block": "blue_orchid"},
-                {"block": "allium"},
-                {"block": "azure_bluet"},
-                {"block": "red_tulip"},
-                {"block": "orange_tulip"},
-                {"block": "white_tulip"},
-                {"block": "pink_tulip"},
-                {"block": "oxeye_daisy"},
-                {"block": "cornflower"},
-                {"block": "lily_of_the_valley"}
-            ]
-        },
-        {
-            "chance": 0.03,
-            "palette": [{"block": "tall_grass"}]
-        },
-        {
-            "chance": 0.5,
-            "palette": [{"block": "grass"}]
-        },
-        {
-            "chance": 0.06,
-            "palette": [{"block": "fern"}]
-        },
-        {
-            "chance": 0.04,
-            "palette": [{"block": "red_mushroom"}]
-        },
-        {
-            "chance": 0.1,
-            "palette": [{"block": "large_fern"}]
-        },
-        {
-            "chance": 0.05,
-            "palette": [{"block": "cobblestone_slab"}]
-        }
-    ],
-    "objects": [
-        {
-            "place": [
-                "clutter/boulder1",
-                "clutter/boulder2",
-                "clutter/boulder3",
-                "clutter/boulder4",
-                "clutter/boulder5",
-                "clutter/boulder6",
-                "clutter/boulder7",
-                "clutter/boulder8",
-                "clutter/boulder9",
-                "clutter/boulder10"
-            ],
-            "chance": 0.4,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            },
-            "translate": {
-                "x": 0,
-                "y": -3,
-                "z": 0
-            }
-        },
-        {
-            "place": [
-                "trees/oak/hoakgeneric1",
-                "trees/oak/hoakgeneric2",
-                "trees/oak/hoakgeneric3",
-                "trees/oak/hoakgeneric4",
-                "trees/oak/hoakgeneric5"
-            ],
-            "chance": 0.5,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        },
-        {
-            "place": [
-                "trees/oak/shoakgeneric1",
-                "trees/oak/shoakgeneric2",
-                "trees/oak/shoakgeneric3",
-                "trees/oak/shoakgeneric4",
-                "trees/oak/shoakgeneric5"
-            ],
-            "chance": 0.5,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        },
-        {
-            "place": [
-                "trees/oak/thoakgeneric1",
-                "trees/oak/thoakgeneric2",
-                "trees/oak/thoakgeneric3",
-                "trees/oak/thoakgeneric4",
-                "trees/oak/thoakgeneric4"
-            ],
-            "chance": 0.5,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        },
-        {
-            "place": [
-                "clutter/sbush1",
-                "clutter/sbush2",
-                "clutter/sbush3"
-            ],
-            "chance": 0.6,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        }
-    ]
-}
diff --git a/biomes/temperate/plain-hills.json b/biomes/temperate/plain-hills.json
deleted file mode 100644
index 28d46bd0..00000000
--- a/biomes/temperate/plain-hills.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-    "name": "Temperate Plains Hills",
-    "derivative": "PLAINS",
-    "rarity": 1,
-    "color": "#A4BF40",
-    "vanillaDerivative": "PLAINS",
-    "customDerivitives": [{
-        "id": "templainhills",
-        "foliageColor": "#8AA528",
-        "waterColor": "#284CA5",
-        "grassColor": "#8AA528",
-        "category": "forest"
-    }],
-    "generators": [
-        {
-            "min": 4,
-            "max": 7,
-            "generator": "plain"
-        },
-        {
-            "generator": "small-cliffs",
-            "min": -17,
-            "max": 0
-        }
-    ],
-    "jigsawStructures": [
-        {
-            "rarity": 1700,
-            "structure": "pillager_outpost"
-        },
-        {
-            "rarity": 1500,
-            "structure": "village-temperate"
-        }
-    ],
-    "layers": [
-        {"palette": [{"block": "grass_block"}]},
-        {
-            "minHeight": 2,
-            "maxHeight": 2,
-            "palette": [{"block": "dirt"}]
-        },
-        {
-            "style": {"style": "STATIC"},
-            "minHeight": 1,
-            "maxHeight": 1,
-            "palette": [
-                {"block": "dirt"},
-                {"block": "stone"}
-            ]
-        }
-    ],
-    "wall": {"palette": [
-        {"block": "stone"},
-        {"block": "andesite"}
-    ]},
-    "decorators": [
-        {
-            "chance": 0.2,
-            "variance": {
-                "style": "CELLULAR",
-                "zoom": 0.3,
-                "fracture": {
-                    "style": "SIMPLEX",
-                    "zoom": 0.2,
-                    "multiplier": 10
-                }
-            },
-            "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.3,
-                "fracture": {
-                    "style": "STATIC",
-                    "multiplier": 8
-                }
-            },
-            "palette": [
-                {"block": "dandelion"},
-                {"block": "poppy"},
-                {"block": "blue_orchid"},
-                {"block": "allium"},
-                {"block": "azure_bluet"},
-                {"block": "red_tulip"},
-                {"block": "orange_tulip"},
-                {"block": "white_tulip"},
-                {"block": "pink_tulip"},
-                {"block": "oxeye_daisy"},
-                {"block": "cornflower"},
-                {"block": "lily_of_the_valley"}
-            ]
-        },
-        {
-            "chance": 0.01,
-            "palette": [{"block": "tall_grass"}]
-        },
-        {
-            "chance": 0.5,
-            "palette": [{"block": "grass"}]
-        }
-    ],
-    "objects": [
-        {
-            "place": [
-                "trees/oak/truegeneric1",
-                "trees/oak/truegeneric3",
-                "trees/oak/truegeneric3",
-                "trees/oak/truegeneric4",
-                "trees/oak/truegeneric5",
-                "trees/oak/truegeneric6"
-            ],
-            "chance": 0.07,
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        },
-        {
-            "place": [
-                "structures/landstone1",
-                "structures/landstone2",
-                "structures/landstone3",
-                "structures/landstone4",
-                "structures/landstone5"
-            ],
-            "chance": 0.02,
-            "mode": "MIN_HEIGHT",
-            "rotation": {
-                "enabled": true,
-                "yAxis": {
-                    "enabled": true,
-                    "interval": 90,
-                    "min": -360,
-                    "max": 360
-                }
-            }
-        }
-    ]
-}
diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json
index 3925c11e..740ce3e5 100644
--- a/biomes/temperate/plains.json
+++ b/biomes/temperate/plains.json
@@ -1,25 +1,14 @@
 {
-    "name": "Temperate Plains",
+    "name": "Plains",
     "derivative": "PLAINS",
-    "rarity": 1,
-    "color": "#9BAF50",
     "vanillaDerivative": "PLAINS",
-    "children": [
-        "temperate/plain-hills",
-        "temperate/wilds"
-    ],
-    "customDerivitives": [{
-        "id": "templains",
-        "foliageColor": "#7FA528",
-        "waterColor": "#2840A5",
-        "grassColor": "#A4C646",
-        "category": "forest"
-    }],
+    "color": "#9BAF50",
     "generators": [{
         "min": 4,
-        "max": 7,
+        "max": 10,
         "generator": "plain"
     }],
+    "rarity": 2,
     "jigsawStructures": [
         {
             "rarity": 1700,
@@ -55,50 +44,20 @@
             ]
         }
     ],
-    "childStyle": {
-        "style": "IRIS",
-        "zoom": 0.5,
-        "exponent": 2
-    },
     "decorators": [
         {
-            "chance": 0.19,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.3,
-            "palette": [{"block": "grass"}],
-            "style": {"style": "STATIC"}
-        },
-        {
-            "chance": 0.02,
-            "variance": {"style": "STATIC"},
-            "zoom": 0.3,
-            "palette": [{
-                "data": {"age": 7},
-                "block": "wheat"
-            }],
-            "style": {
-                "style": "IRIS",
-                "zoom": 0.28
-            }
-        },
-        {
-            "chance": 0.2,
+            "chance": 0.004,
             "variance": {
-                "style": "CELLULAR",
-                "zoom": 0.3,
+                "style": "TRIOCTAVE_SIMPLEX",
+                "zoom": 6,
                 "fracture": {
-                    "style": "SIMPLEX",
+                    "style": "STATIC",
                     "zoom": 0.2,
                     "multiplier": 10
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.3,
-                "fracture": {
-                    "style": "STATIC",
-                    "multiplier": 8
-                }
+                "style": "STATIC"
             },
             "palette": [
                 {"block": "dandelion"},
@@ -155,7 +114,7 @@
             "rotation": {
                 "yAxis": {
                     "min": 0,
-                    "max": 0,
+                    "max": 360,
                     "interval": 90,
                     "enabled": true
                 },
@@ -169,21 +128,24 @@
             }
         },
         {
-            "mode": "VACUUM",
-            "chance": 0.00675,
+            "chance": 0.002,
+            "edit": [{
+                "find": [{"block": "glass"}],
+                "replace": {"palette": [{"block": "void_air"}]}
+            }],
             "rotation": {
                 "yAxis": {
                     "min": 0,
-                    "max": 0,
+                    "max": 360,
                     "interval": 90,
                     "enabled": true
                 },
                 "enabled": true
             },
-            "place": ["clutter/camp2"],
+            "place": ["structures/cave2"],
             "translate": {
                 "x": 0,
-                "y": 0,
+                "y": -57,
                 "z": 0
             }
         },
@@ -192,7 +154,7 @@
             "rotation": {
                 "yAxis": {
                     "min": 0,
-                    "max": 0,
+                    "max": 360,
                     "interval": 90,
                     "enabled": true
                 },
@@ -229,7 +191,7 @@
             "rotation": {
                 "yAxis": {
                     "min": 0,
-                    "max": 0,
+                    "max": 360,
                     "interval": 90,
                     "enabled": true
                 },
@@ -247,7 +209,7 @@
             "rotation": {
                 "yAxis": {
                     "min": 0,
-                    "max": 0,
+                    "max": 360,
                     "interval": 90,
                     "enabled": true
                 },
@@ -274,7 +236,7 @@
             "rotation": {
                 "yAxis": {
                     "min": 0,
-                    "max": 0,
+                    "max": 360,
                     "interval": 90,
                     "enabled": true
                 },
@@ -293,44 +255,10 @@
                 "z": 0
             }
         },
-        {
-            "chance": 2.0E-7,
-            "edit": [
-                {
-                    "find": [{"block": "orange_terracotta"}],
-                    "replace": {"palette": [{"block": "pink_concrete"}]}
-                },
-                {
-                    "find": [{"block": "red_terracotta"}],
-                    "replace": {"palette": [{"block": "pink_wool"}]}
-                }
-            ],
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "mode": "MIN_HEIGHT",
-            "place": [
-                "void/void",
-                "void/void",
-                "void/void",
-                "trees/mixed/smoakog80"
-            ],
-            "translate": {
-                "x": 0,
-                "y": -1,
-                "z": 0
-            }
-        },
         {
             "place": [
                 "trees/oak/truegeneric1",
-                "trees/oak/truegeneric3",
+                "trees/oak/truegeneric2",
                 "trees/oak/truegeneric3",
                 "trees/oak/truegeneric4",
                 "trees/oak/truegeneric5",
@@ -342,7 +270,7 @@
                 "yAxis": {
                     "enabled": true,
                     "interval": 90,
-                    "min": -360,
+                    "min": 0,
                     "max": 360
                 }
             }
@@ -362,16 +290,104 @@
                 "yAxis": {
                     "enabled": true,
                     "interval": 90,
-                    "min": -360,
+                    "min": 0,
                     "max": 360
                 }
             }
+        },
+        {
+            "place": [
+                "clutter/statue-villager-plains"
+            ],
+            "chance": 0.008,
+            "mode": "MIN_HEIGHT",
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "place": [
+                "structures/ruins-greek-temple"
+            ],
+            "chance": 0.0005,
+            "mode": "VACUUM",
+            "translate": {
+                "y": -4
+            },
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "interval": 90,
+                    "min": 0,
+                    "max": 360,
+                    "enabled": true
+                }
+            },
+            "edit": [
+                {
+                    "find": [
+                        {
+                            "block": "gold_block"
+                        }
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "chest",
+                                "weight": 1
+                            },
+                            {
+                                "block": "dirt",
+                                "weight": 5
+                            }
+                        ]
+                    },
+                    "chance": 1
+                }
+            ]
+        }
+    ],
+    "entityInitialSpawns": [
+        {
+            "entity": "cow",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "pig",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "chicken",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "sheep",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 7
+        },
+        {
+            "entity": "horse",
+            "minSpawns": 2,
+            "maxSpawns": 5,
+            "rarity": 120
         }
     ],
     "biomeStyle": {"style": "IRIS"},
     "wall": {"palette": [
         {"block": "stone"},
         {"block": "andesite"}
-    ]},
-    "biomeZoom": 60
+    ]}
 }
diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json
index 7bb7e808..63e87258 100644
--- a/biomes/temperate/plateau.json
+++ b/biomes/temperate/plateau.json
@@ -1,7 +1,7 @@
 {
     "name": "Temperate Plateau",
     "derivative": "DEEP_LUKEWARM_OCEAN",
-    "rarity": 2,
+    "rarity": 4,
     "color": "#929F60",
     "vanillaDerivative": "FOREST",
     "customDerivitives": [{
diff --git a/biomes/temperate/sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json
index 45af0f62..99bbf594 100644
--- a/biomes/temperate/sakura-pink-child.json
+++ b/biomes/temperate/sakura-pink-child.json
@@ -1,6 +1,6 @@
 {
     "name": "Temperate Sakura Child Forest",
-    "rarity": 1,
+    "rarity": 4,
     "color": "#EE96F4",
     "derivative": "FLOWER_FOREST",
     "vanillaDerivative": "FOREST",
diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json
index 0ceae983..3790290f 100644
--- a/biomes/temperate/sakura-pink-forest.json
+++ b/biomes/temperate/sakura-pink-forest.json
@@ -1,7 +1,7 @@
 {
     "name": "Temperate Sakura Pink Forest",
     "derivative": "FLOWER_FOREST",
-    "rarity": 2,
+    "rarity": 4,
     "color": "#DF4FE8",
     "vanillaDerivative": "FOREST",
     "children": ["temperate/sakura-pink-child"],
diff --git a/biomes/temperate/shore/beach.json b/biomes/temperate/shore/beach.json
index 02c8d747..1962aad6 100644
--- a/biomes/temperate/shore/beach.json
+++ b/biomes/temperate/shore/beach.json
@@ -50,14 +50,24 @@
         {
             "partOf": "SHORE_LINE",
             "chance": 0.09,
-            "verticalZoom": 0.2,
-            "variance": {"style": "SIMPLEX"},
-            "stackMax": 2,
             "stackMin": 1,
-            "zoom": 5,
+            "stackMax": 4,
             "palette": [{"block": "sugar_cane"}],
-            "style": {"style": "STATIC"},
-            "heightVariance": {"style": "STATIC"}
+            "style": {
+                "style": "IRIS",
+                "zoom": 0.65
+            },
+            "heightVariance": {
+                "style": "STATIC"
+            }
+        }
+    ],
+    "entityInitialSpawns": [
+        {
+            "entity": "turtle",
+            "maxSpawns": 3,
+            "minSpawns": 1,
+            "rarity": 80
         }
     ],
     "objects": [{
diff --git a/biomes/temperate/stranged-plains.json b/biomes/temperate/stranged-plains.json
index 6db26b84..3990cc0e 100644
--- a/biomes/temperate/stranged-plains.json
+++ b/biomes/temperate/stranged-plains.json
@@ -1,6 +1,6 @@
 {
     "name": "Stranged Plains",
-    "rarity": 1,
+    "rarity": 5,
     "color": "#F7F448",
     "derivative": "PLAINS",
     "vanillaDerivative": "PLAINS",
@@ -10,15 +10,15 @@
         "exponent": 2
     },
     "customDerivitives": [{
-        "id": "pemstrangeplains",
-        "foliageColor": "#65A528",
-        "waterColor": "#2873A5",
-        "grassColor": "#B8D92B",
-        "category": "forest"
+        "id": "estrangedplains",
+        "category": "plains",
+        "humidity": 0.45,
+        "temperature": 0.875,
+        "grassColor": "#b9bf4e"
     }],
     "generators": [{
         "min": 4,
-        "max": 7,
+        "max": 10,
         "generator": "plain"
     }],
     "decorators": [
@@ -140,12 +140,12 @@
         },
         {
             "place": [
-                "trees/oak/truegeneric1",
-                "trees/oak/truegeneric3",
-                "trees/oak/truegeneric3",
-                "trees/oak/truegeneric4",
-                "trees/oak/truegeneric5",
-                "trees/oak/truegeneric6"
+                "trees/oak/generic1",
+                "trees/oak/generic2",
+                "trees/oak/generic3",
+                "trees/oak/generic4",
+                "trees/oak/generic5",
+                "trees/oak/generic6"
             ],
             "chance": 0.07,
             "rotation": {
@@ -204,8 +204,6 @@
             ]
         }
     ],
-    "biomeZoom": 60,
-    "biomeStyle": {"style": "IRIS"},
     "wall": {"palette": [
         {"block": "stone"},
         {"block": "andesite"}
diff --git a/biomes/tundra/shore/beach.json b/biomes/tundra/shore/beach.json
index 685fc072..935a8832 100644
--- a/biomes/tundra/shore/beach.json
+++ b/biomes/tundra/shore/beach.json
@@ -69,6 +69,20 @@
                 }
             ],
             "style": {"style": "STATIC"}
+        },
+        {
+            "partOf": "SHORE_LINE",
+            "chance": 0.06,
+            "stackMin": 1,
+            "stackMax": 4,
+            "palette": [{"block": "sugar_cane"}],
+            "style": {
+                "style": "IRIS",
+                "zoom": 0.65
+            },
+            "heightVariance": {
+                "style": "STATIC"
+            }
         }
     ],
     "objects": [{
diff --git a/dimensions/overworld.json b/dimensions/overworld.json
index 6a315204..c5474065 100644
--- a/dimensions/overworld.json
+++ b/dimensions/overworld.json
@@ -18,6 +18,7 @@
     "regions": [
         "mushroom",
         "swamp",
+        "temperate",
         "hot",
         "tropical",
         "temperate",
diff --git a/generators/highplains.json b/generators/highplains.json
new file mode 100644
index 00000000..d84274fa
--- /dev/null
+++ b/generators/highplains.json
@@ -0,0 +1,19 @@
+{
+    "interpolator": {
+        "function": "BILINEAR_STARCAST_3",
+        "horizontalScale": 50
+    },
+    "seed": 377394,
+    "composite": [{
+        "style": {
+            "style": "IRIS_DOUBLE",
+            "zoom": 0.87,
+            "fracture": {
+                "style": "NOWHERE_SIMPLEX",
+                "zoom": 1.14
+            }
+        },
+        "seed": 474325,
+        "bezier": true
+    }]
+}
diff --git a/generators/rare-hills.json b/generators/rare-hills.json
new file mode 100644
index 00000000..db25552e
--- /dev/null
+++ b/generators/rare-hills.json
@@ -0,0 +1,26 @@
+{
+    "interpolator": {
+        "function": "BILINEAR_STARCAST_6",
+        "horizontalScale": 8
+    },
+    "seed": 377394,
+    "composite": [
+    {
+        "style": {
+            "style": "SIMPLEX_CELLS",
+            "zoom": 7.55,
+            "fracture": {
+                "style": "IRIS",
+                "zoom": 2.25,
+                "multiplier": 60
+            },
+            "exponent": 5.8
+        },
+        "seed": 928331,
+        "bezier": false,
+        "sinCentered": false,
+        "opacity": 1
+    }
+    ],
+    "multiplicitive": false
+}
diff --git a/objects/clutter/statue-villager-acacia.iob b/objects/clutter/statue-villager-acacia.iob
new file mode 100644
index 0000000000000000000000000000000000000000..7cf80068f135939d347af8fe369c4103cc538d16
GIT binary patch
literal 2229
zcmbu9O>fgc5QZm72`z1*g#!mJJ#q2{#0iuOw_d1(L^(uOv`L)As%u-eLnwc}1@pc$
z>$;K=p{14c?07zQc4pQhvMVC{cy{FAw1~@-^S39bXCFVv3pu}x(`Z(>MfKjz+$?sJ
zMU>8>apcNsv~Woo1!-1PE59zY_3e7&s;Ee^<uaOk?Iwa#Rji{>UbS&o?rJhkvf0Jh
zeUHo0kMQrC(*M4DYNDaMX*czUDHAsxS66v7s<J%jWE{%Nj!T}n^rDp4tzzbiZ_#{`
zuP^h9I2|ugrgS;dvV?Nn+Ia){)V^xcs9ao>jVEgxtX#6tq{@{;dSz9(c)6<nl;gH|
zEc<=pecqCvHrWDBv#QE2gY7w<ZHcMXx=)f18cdy?PL~6nOFtv;x{2P-h(B#7Kq#Y*
z*L01_=rBa1jZ2c??pOqQwuy@7UW9jt35|~P9OL9iW0PfbyBJqnF2>#4s0aOr%jggN
zwUhq;-f|z<wSjTmN$JvgiLyi!mc%|HDMWvtb!l1aa-HkfqC4}}G1`RkrQM?Yg?h-x
zf<7TWhNTST5h&7E_N3=2#=2JaVYdUT0qn>f*crLT1G`2)@OmSCXw%0(WA>CotWECY
zjmQwcMp4q9e~(qN7?gLVkDVy@JjHWR|HAt{=t<<K#6HHl_WD8n6Z$8xBWY(8BkUUe
z4fM#XHi{B?)z{vSWPBs)hfMa7FL?l+$*3D-t(y{cQ(DaiST}mE58!Xa8C6Ez)E;$H
zqHZMf1oyB%spkNP(3*^Msvh+K4_PnpDeI|3o$bByDeBGMJY)WNG=G)ZcjN>;**xr@
zt`VcrqbGjdV_n!I$m~01_MI~O4jJ7bkM!64I04j?L&PPIU`HOKD=NdD7K~>ED8rt#
zZujK5c9DCsT59jf)6<?+;r^VPp3Vb_v#5+bl!$A3*i(;uH51MSGoqamdh&=eEDs@H
Wdzqv?Y4c<I-*`Pqy|J%k9ppF1_^p)y

literal 0
HcmV?d00001

diff --git a/objects/clutter/statue-villager-hell.iob b/objects/clutter/statue-villager-hell.iob
new file mode 100644
index 0000000000000000000000000000000000000000..b72299bc531fb87d63ea64eef4e82a0d076eb2ce
GIT binary patch
literal 2075
zcmbtVQB%`E5WW<Fs;DT;_~HXUAW!<>3`}_NjVE3dbt)6D?KRC1lFr?AGX8bI#&361
zg3y*!k4e9NyL;d6-lm6AYEvoo0?&rpIkBlbID3C^a{B2=?W_IEG&cjQNB%H3er&AO
zgA4WczBTUKba3I+$Hk7=WxC(<za}Q~#Uw1XH#RGh#0;a6&YU?{-<plq3}eY9s<HDr
zwXQePgEUVfqn!`OIvcT+8*7L<Z*`iC{r@SKW<BMjRW(1>@Nuin!(!Uc%%Zk_tlIzA
zfw^Mp$8uu*!u#SfT<g$QjN)IEzqhVCFYLT-dTAan`b#6-uIP5Mhs$JdM_eE4g4g=z
zlD(zQvL3z3QC{RG<W}V?pQ(JEP9kro3#K2^o60fg>g$pW%YHPiUx9ZIgiCFGPbVh&
z&^B%Ji)x+r^MkZ}wcNV|8sT;`+-p>Ez*+2cK2+^et$W|xNtI+p={yFEtMyC;xL##3
zR#nXd)qy#{L#SXE9^Bf<7r-tt^m%8&E{h`Q3MU0<Ran3$*f|5@if7z{S$L=V4f{6y
zgjkGS_?cI;+TW>e;CzZWLM%bVF-P3oe_i_tpTRFYsIF=|A?XW8->9%l`+?h}#}z}L
z5&0OApZwGpkh=$Vp+y}dkLZAt-gBJZ7NU00B_sG|%^AUQCir(3Fup__@mH{K0C({a
zzJ?wlou=T7@eOPpJo8yl4Z_J5s6DES{$LkQkzBPP?7}4igd>~oXkHvIh^B?pyaJvB
mAtIPVrAC?;{NPvQg`bcrVGjFsZ6_o<bJ%ZcJ0aO?uGAkcw8T~b

literal 0
HcmV?d00001

diff --git a/objects/clutter/statue-villager-ocean.iob b/objects/clutter/statue-villager-ocean.iob
new file mode 100644
index 0000000000000000000000000000000000000000..21d12b31273abf5f1b6d28624b930e02c8b9b809
GIT binary patch
literal 2297
zcmbuAPjA{l5XHxkG-;Z&r0u2ZB_DuOrCt*G(pyfIS}CncDO!jD3xknug!0vsVE4V*
zMTW)+kXmwno}EAYc4yg$$bpEQ;H}H?WfG=mSD(%<zka!pck*W(PJ&)y`q}vup0P<_
zcjhLFT7gM3e-clE<|IzCq5Vwb+46HX^|NFaH0LG@k|-Vwf@{BTq7);6%WTX0s`~P=
zYP8c$!rmyA^U`^3l2K<xR~ngaE4!Hneilz3PTZDXPvmAMOwv~0^uo!&=i-_}6ZQRW
zoMrL2nGOxgrdeXb!7%%;+FbsQwSR1@yR6L}*ev>YS$Jh1%l=03{CVv~Vq3PBU2gYw
zvcFZzP9JIEb~P_5YwDrvY&=*$pGsbnwQGkyS61FAsJgLkHEV+OC%fZ$Y*&gZkIl-p
zz!S9Vt?<3F{Ca!!(y_9)>+grM=s)*{_>a0)I`1xm2iI9!uFCY4AJMwp=j^h`s3_zG
zE@lDuNj!UaJ=m7HCC2J*+%i|YhB18+PkKdeiN79fK4cw!vIf7}n$5YG#m7c3HPjHV
zqli~(1%X!UIZ%ZnhpJrUWq}8QM@6oDr88-&Rycy2m5$+8!oN_rr^G)eC8|5-jtl3n
z759jLjd{s8h$k6unL93=zgFC7eNi%wb_4U1SZ#4jV%#!UayRy|f>Wqe!rp_ud^yf<
z`nad;1$X2WuO;@MwykaVopH!xPnpABQx6^`cZ~KOSTCR-Jb_M<<79*D1wF1Gd<&0`
zBW?lv5OE~tRq{;LHJTck#q$DEuN$}IdGYiV(A%(cXuR5p=WbEECA+8b8i{yEt^)a(
ypC^pENz7}BuLW%OjijHX-`eam{IG9zoPDwLSet#bc}mnFnSbx%N%YU!l>HZ=idIno

literal 0
HcmV?d00001

diff --git a/objects/clutter/statue-villager-plains.iob b/objects/clutter/statue-villager-plains.iob
new file mode 100644
index 0000000000000000000000000000000000000000..8fad5309454c0d6966200a52ecfdac5626531b6a
GIT binary patch
literal 1975
zcmb_cU2hUW6unEq7F%uA#20<&58%OQV&Vrced~i7qrpTZWS|3V1eWZKsr>d@>p6F}
zj%=4e6DQf6xnF0_-aES@(h!k-JUeo5ny2o#^ZfYq!^s<YB!{zfZil%U`Pa^8b1TnE
zj=r0kLDw%Aw(YY;>)d#oPqXpZp0!72>TFLQmn#N&I{fbBQ>DM}yh(G{9hqS|AGfV>
zzBMt^k+Qpq!8y+7CLK?F)nV_-q^or2_I7k%%5<u|q|s$R{3M7RWZq}9)@GgW%fzcX
z|Dj}8H}mx(-z;-(35l3i|9{E-9O>5+&$Ilx58H`;8d-0McG8K_^=HQWv32XeMcx~y
zmL?mo%hv2KBm0W#O<&2YO?8EWiVy5Xxio%~>x<sTqKYnTQu{GhhqqjNeYbAhlSp}H
z?E>%MZP)xvU3=M+uQ6DmcIA(8>su(&kwohF{c$N?T@`kMUt(B_@CQ4Q8r%sUVh#Ra
zC+cGbV*-E3QR^>P0zX$>!VXdOzzPV)--tI5CxTn?4#KoyDefZg66PNAh*$xUr#AAg
z<G&DWB2FX^v4*;f!mkKF5q@bv$zAM;d_Uqo{B_^~{EFBI8-2q59{h^f6YnFRwTILJ
z+@&rcbr8{|0`VTOkKo6GAFDv^5ccHZxdAz^&{IXkh}6A<2mFfUpv`G8_JH-=lTU5V
zi!o+|DTE1z8n`vWd}cJEmlNeYh)q??T+S<zhlmrg0wS)q&MT2U*cU~8K=xnH#XLeC
R5!!-{{L3PrsQn7I$RDs8qjUfO

literal 0
HcmV?d00001

diff --git a/objects/structures/ruins-greek-temple.iob b/objects/structures/ruins-greek-temple.iob
new file mode 100644
index 0000000000000000000000000000000000000000..acb4f0406cbfcc6a95bfc26d8cf263c87965aa92
GIT binary patch
literal 35590
zcmb8&Pmf*Kb*Ax47Rf47l$ZdGWSF4G88v#;4NrQOQD#9JhGEbWEfGzdX_7(yd}&dZ
z$SM|Dsyx57jv)sK5Zgicc&)w9xqI(>?mq9k&b{T+>Ga=Er_-PH|9^3M{I{>3zy9mL
z{~v$-w}1D4{&%^*_|5a*KKt_3(_g>&U;qD~p1ykXZ@>K2i<e*iztdm+l>hRZ=dYi=
zc=pvV|3il-KXrKh=H+jno&Nl%#8=N>zIy)V+3COil=}MRi?5DT|K(5F*S~rB^36BL
ziBJFYr-tLDUcY$ytDnF5*MEHWvtPY@^XBDm{^p;bzIpcQ#mle1e)iSRe*N^t>u10C
z!`J=t>5DJD?iW9u=&R?i-u&TYjuZdm^A|6kzWVvoe|i4;XaDkx|Dwac{o?cwKb`SE
zjQN+Z-#mT(>h;fm{q)P{zy11W|NQLro4@(y>5E_ge!Q>0dD`G#zj^ia`PbjP`Ok*`
z2Mhh5jO|~4ar(c1+)KZH`A=`Y`4eCJk398nU%vX2PyI(O*t4g9@`9cI{K4sq+ncWD
z)9L>5_IJZOr$4*>H2EjPJM|OaJ$*hrJ3SuWJAF31e|mJ}9}Z8ai-YF}9~|xXhxbqS
z4xSAkobC=!r#nafG(5k(9p1hDaocZih8=apACLHYcz*j~c=z^dcyW7qw7(zTzkPS`
zhvB{3?~nL*!#lU%4KHrr4$p7D9o}s{KF<7~9Q@+o=La7TFItc7_h@*2dU(Va2hR^a
zIC%fyy@O}N^VVa}bLWUp!?V_7@~sD+w;mgRI{5M6_0j%ec+q-nzsup-?fWBsckqXU
z-w)5b4z~Yy2j3q2cG-Gd_xfk2C&Rm4A7a<X^6|mXhUZ-$n}2xlVtCOE_B;=c{Qcp1
z*T?ohJ9zito#EN(v~la9-$m;&=V?9WxUP@o$Ai}gKODR|czN*s!FLCLIQad+-wn^Y
zKK8tC4}LqmXgxm6{GSZZS`YC>>#_OA2R}RVkB<1^!HXl`6+Gv8aPa=Ydq?}(5#K#{
z=iq7R`k3Qe4?Jr<HvV+PACLI@;D>`(2QLr4KlpBVe*41_e}BZkJL2ySzCHNuvh}z+
z)&s4_^7Dg_hdwXc@6o}BN4_g|jz2&6V0hL(wfTF)^JXZ%=<|YS?H}8I+PL))pSK>%
zn{Ds<n0~h(4_*&j-Gf(0{_^1aBmeG*e>nL4@S@L)^SM5jZx4Puw13>(-geb~7@oHe
zi66GE%eR}a->33ES9ssPJ8a*L=l0!++jrw#`|jl1cPHPz8-1?u!Kr<B^6k6vWZ#|G
z4(fH<cjJY9H$G^D)84w_oz`vgjSii4+uL{bzir=*UA@CreR$WtTmIBOgLmw^@qY8&
z{_VTd-o88e_T6}9-<^E>Zai;2KFYTqc+q;GeP-FdJN?>sC*Qt1Y~LNW?+)8{<5?qK
zw(k~Sv>qF`?@qt=-Ral98_%1;#I47~tq0z1J(lge6Swa=uJzcseYbe_-FV)5Y`%SW
z`nB&4+jocUyVI|IcjETlc(?Ufw(p8tkLzLk?y!9~+Gm#SyOVF<9k%Zd+jrwxBU-la
zPTo7{yzRTw-o86D6Z!VtVf*f|eK)!<FWYzJTaRV?Zn4$exP5o}x9?8B_T6Fo?y!A#
z*uFb#-yOE^M)#qO+jomyADeIA)vxvVFl^r)w(kzxccahC#_hY4Z{HoZ?+#tL&O<p^
zpZ48}+jocUyF)v}t_Rv@mOjzu-@ZF+-;M6e)818#uEK3^-<`O9clx*QPXG4ZiQ9LF
z?YqPF-FT5s*|>do^6k5mZ{HoZ@5;9xSHmX<+joo4x;~ceyVKsjJ8a*b_V(R)F<0!a
z$F{fcPQHD2`nT^+|MuM>rKNxSZuEJXxb;By<;k}mn{VHBT<fuH-<^K#yOVF<jd#;s
z%l6U9x33P{XQTDl_V(fF-@ZKg_UVb+x3TrOIo)X=eKLI1{voy=oB!;HFNUtS$+wR$
z+n4Kq(Rj8$UA*VRbNh2#U3{nglP=ay7vDKO99?|Je>?io#oFm&$J51~zt0~&7+ow+
z7t7Pdj;D)_n=Y<j>x=j8&(Za^F<pFTb}gL!Il6i`PZv8IT`W%*I}cslJnYZ$(dc5w
z)5Y?1v2~z}#dNXp(Z%LZ7b9J4{B*JL(#7(0G1A43ql?9Kv3_(h(#7(0vGdTy`qRZo
z7i*`BwbRAsK^I#Gy14e%V@Vf_>0+ddkuKJsE*8_pV!BvN7x#Lt$HsKAJY9@*G1A3I
z7suA)dPo<G>0+ddkuFBM80li9i;*ryx_H+E&s&d;>0&Wmyz7D1W83Ls^Pr2%w;mhQ
z#qxBqJY9@*G1A3I7wbnCi|Jydi+4Tntm|X*bg`H&)=n4ePZ!75<HL|HHeR||o-Q^&
zx)|wVdAe9Xx>!sXi|Jzh=wf-g*gDX~@^rD7E=IaoKe{-!9!t8|{ODqNx)|wVq>GU*
zM!Fd3Vx)_aE=IZ->0+ddtpi=`b?9Pwx;VBTSHt$_Azf^|bn&jok}lStE=IaoJ6$ZM
zi;*str;EjOG1A5Ibg`H&7SqMC^;puywcDSEbg`H&M!ML1=wipw#qxBq`O(E<x)|wV
zq>HuF#bUY`>0+ddW9xBq`(tc>j`S`*YCX{S(ffs`&WHCq-?VqWjoY8)JKrb$I^U9h
z7Sqq#>1VG;KX=~Nck}e~k6mZ<vwl7)`q9rwKkH9FYp0*l6=a<Bv)7@Yf9xpw`Nw+G
z&&EwZcb@)5dH|`gZKt0*U+cT=^mFHJeYc%{c3%3~`RHf;>1U*$k$y({*|_Lu<EEd@
zgMLQ(8R=*3^t1l-vpoHbMvC+^($7dgBmIo-=#F>gApMN=vw70b^|L?Aw;oISSv&o#
zoqk688QY(yoqiV6&yJ^`#q=}M&qzNb{fzW8($B_2KNq(iOZwUSPCv`j&$}KQ)6b5h
zpS9D^+P!mPcUYvK^`oDikA9XnBcz{^evYljl72QH`dOZS7SqpS`q}!>&qzOOr=O92
zc0JM0V)_~BXUEgeNI&aGKWnF-%eNjMhV-+Ten$Ek>1XqypT+bu($AfzGj42z^7OMj
z{Vb-Rkpi)9-dQpIjP!GCJ&;~p($8Z0Sv&oV^z*LA#`Lp1{fzW8($7dgBmHdN^fS`W
z^7J#(&$0Em8q&|^O+T9t{j8mSM*11)XQZF?<M_}!<#_rTeX{kVpS9ab#jbFqpXKRi
z^P``OTaRh)`q-F$mZzVs5B-evbLZ*bZKt30qo3vJXQZFy>1Q$h?DgnpG5w76vvGfM
zy4UDFi+#3Fk55mGIeu~Q$?W1{yZPhW?}ne>zCH3!+7h?_u=eHKBmZPnddDvtC)NJA
zaS!{PHX5(DtbO9zH&5U9>8l^=x1{go9}ge4o?^Q*s`F02&a<TNyGnciKMlKoM4tz|
z-}{djoe%Ao+pg}doxazfzVCHf(T(YQF@3LH-Mddo?*PvIV@TiYN8gukyc4^BOibT*
zeB(#&|F)}p@276_^u6Qhd-J95wbS>Gr|-3^ds}Dv-l*w&r0*R^-y08oZ`|}f()UQ;
z?|N)Z-^<hYNZ(se`d&Z!UY@>3`X1?fY)1ZVgh;<_p1wCO`o4bdAKKkNCZ_M@>3gK_
zk-m3U`X1?fdHUY@=zB4JFQ)IEm%f*$?~%UOPT$AY<67SRV@ThN>3id*@5S`Jn7%hJ
z`rh&My>|K@yMGMndog{F^gTAC{<R(()AzFUJ<|8aN8dY&zL%%(=jem<y_mj7`rdK$
zz2oS6RQJ|S-y?mG^gYt|NZ;4L_4pueJ(l#nn7&8)9_f3e?~%So`X1?fr0<cwH*fmh
z>(KY|y|Y95UQFN1()UQ;BYp4e^u3tAH$VDbOy47Y@73vhF@3KeeJ`f(ork{HkG_|u
z?~%So`aZTESN*GAiF5y$JbkZS-5cq9{pfo!eQ&<>y_mii)AwTfUQFMM>3eJjBKMDp
z>3doF-ni*|F@3-5v83<i>3e6R@8@g>>3cDKkMup#_ekF(eUJ1#()Z3s-{W`9;HF*U
zyJm1R_l<k;^I~-0Nc*%Z-!0u&j(F(4a>UE-E5%Rxzclq6KkWEr_m#<aU)lC$<D0ng
zZNB@;(LStw*?nd5e92AwGhZ^VbC56TPSN~v{fL+!F%NzO`H`F1FWhmQXUUIv;>wT6
z^CLICfBcC4{K!rB2Yy7mEBL1OogZ-=KO*Kw^yf$P^T|hd2;@h!?;Vfd6Z?E1y@^_p
zs>k&s9pCjJ_W9U;{74nBu7}O@Bl`0ryB_E{$maPGufvac9e%`k_z~nsI?nwh(pMYv
zBl7$R@*~KPAU}c}gYy{quE*y25$AJ<)Xyg$`4QwtV(YQwN6dpCk>^K{A3=V^Jopjw
z<445&h~xMX{rHhxkB#{e{rC}iendZhM9hyAyPpjC5%b|k<oOZgN6be(U(Ao_$B&39
zK=jV($B&5l5#&eE&WC1%{0Q<RvGrK;BVvBU`1uhrKZ5)S@*~KPAU}fq2=XJyk03vS
z{0Q<R&d-k^KVtm+i23m&^=myg=0~*iBl7$R@*~KPASI0a2=XK7ibj3}y`yL*&dZO8
z`4R6kKjMAjN5uR{?XAa>ACc!rj9)!pJ3oT_2=XJyk03wdIDW+W`4M@31o;u<N22>l
zocqbd{7A=jec;?rhWv<r{0Q<R=!(^k9})8-Vtxeqk;c;umS!N&k03u1TaP6_BIZZT
zgC8*uegyfEUZ>Hcvn}}%d45Dcegydu{rC~&N01*uegydueA^tX#&?a))$n%N{Xlig
zeFo)+?h_O99h)C^22VxScgXV{(|+Xnj%^>-zT`XP`Hme4uJ1s;gHv*s;sW0f=RTo-
z=b8Sk!yd<P?0L}VAHBag_lNkv{ULgPH_vb67QF*er48+e+s<$3&u{3*Z(vt&q$lxy
z@9(hp7w7(<U+?e6{KlyGqaVLvUY;lD$8R9N!S(YS$ZyE=8?HKjL!RG2enUII;r#qY
zaqIdqPQ5C6N5$(m(DMZ3H;~^zegpXp<TsGturB<DnBPEt1KZh#{Dzp{h^+_i^8_)!
zf&2#Y8^~`UztMPG51i+{ljk?I^Bd;LZ;1H~{rC+rzu|a(W7lKyt;e<YuGb~MA?7!%
z6Te}8{DwTgf&2#Y8^~`Uzk&P)@*B>>Z-|>wv>$HFZx|21QG5I0lHU;X8^+CVh&@k0
zegpXp<TsGtFmHYX`3-q~1NjZF$8TuoH{|&Z<K#DtkKZtFexvr*WAprmnBUNk-w^W~
z$ZsIOf&7N^@EiK`8(ya!Y~p4TeV&*6Mse%0<Tu3p2J#!oZ&(+8L(Fd=zah_Wi1`iV
zH+DTX<~QW|4dgeh3%?=eH)88?71wW|=Lz!s2J#!oZy>*6zWj!m-#~r?`3>{uH^lq~
z@*B?I4Eoppu`$14T>OSsegpXp^gIFi4dgeF-!Na#6U6+6b>TO}{08zH$ZvQZenUTg
z1NjZ)H}vBxJ~ivNL-z?gpLp4Q<A{gjFSK{xIP$~tc1HOnUs3G75vzv{=f1JWZCtyG
zjr+l{aW44^dA{OP>(5tgza?Mssr~rj(Dxw4qt1r>Mg5!a_V2z?Y@gg6ny>H;O};{&
zudt)?70%07i1~_rlDjcqVLW_=etd<>4__fq0qzsuZRaayr`~>MU2LD6cB3nvvqbN^
z*gVktzU_R4etd=F`HEhz_Z{~+hj!07J~e8-LOWmKJbZ<iuP|@EV%G!h3mfwl=EGMY
zUt#=wg_y4p^A$+R$d4n6o^y!#3hj0}@ysmp6=J?3wjN8q!o2tjdA<Vqiq6w|Ecpua
z;48HA6=J?Z%vYf29LQH7U*Y_G1@aZn%U75`Us1oVk0oCr<|~k|K)%Af_zE#!fs`$d
zBaD27etd;IUx8-g^?b6m^A+;*j+f;tjEk=*-+C<h3VFUlp07Z@0{IH$E0C|ypRX`q
zzCxa_K)ymdUm@lz#C%0@>p`(hoodKei1~{8wH~OhyW}gh^A*Tf;3}WFZ%qGj${oj7
zXs3K}uJp)Pi1`ZdD_>FEdZ6nAeabe^S7_%ekgsqYUx9puJYRu)1@aZhS0G=p>#;Fk
z;q~~6+FOsU6j!Ix&wXRaS7`T~1NjQ%EA-<ltdkMR+rj1e3gj!0uh32rp?6fCufSD~
zbKlV3dQ898W64+4uj^xDzCu5~0{IH$E6j_pus(c+<M;~ge1({=(2uVW^A*Tf)UWlp
z=}E^vM?lXJ?ln$&{@(0^IQ#L?_k`-#>!Isy={bVq>H2%EQ~Pr~bw2c*5nXS%-xKnL
zg{~LV_4m^IbiL#0dhK+*^U(F$-Q{*%OLsHv?q1I0ZWZm%(dQ5O*p2O)+U*wFeM+>u
zI>c6`*J*w5UhB2(biICb{k=v_*E<hgFHhGaT`y19$JXOxq*HL8BcSI9NY|S$UElGY
zdGmC=cDf$vdZg=-u1C5ayJF&gf8KfMdNEyZUUYr^T8|}NFHhGSH(jrtu1C6Fo~{>r
zj(~JM()Es~>yfUPr|ZRZy_l}Y_GfH8u7`BJn65{<9_f0d>yfTUx*q9zr0dO-t{2nw
zNY~5v&PK{;N!M%dN=Ezhkgji??9UU^_1fur^PuaIu1C6FJ6&&m=z1|-FQ)6obiMv`
zJ<|2^biJ6akFCcC`L2&8T`y19%hUBp*CSo8ovs(t^<uhSOxGh_FHhHt>3Zy)9n$q;
zx<1;UhjhJ|u1C7w`q1@ax*q9zr0bEc*N?96b?wg+dyb%;u1C6FKe}E_*CSmYTaT+q
zC!*_PN!N?%dh?>|J5TGeF<q~{D|SfNi|Km(>3aR?dU?7Yo57H-7t{5z^}u-!JuzJ`
zrt7uS^+?wvU5|9Vesuk=$C9qsPS+z{uOD6Sx}odk>3XE=tpnZc2^`)0vDo*7kZ%6i
ztb8vB>E!Yqzp*-e`HuGqx1KoraeUD6;@OYmJlBnnThGnY%lfNyIS;)ork5R0>5A!P
z<J+CY{v&>5KaTbvywiH($$lJrCNdoLT|BBX&VD@o+K(sSejMj}n{oEzIL~#X{b&2p
z%g#?PYp0ic{nlgi^zyEUoz8lo@3G?S$3uE~*JJbavUQ@D_1m3tp6gCOdRg8bML&8O
z-NA8`Z|(H5e)Mwr)?;G(@x;Ab+KqD9ze9Rie|lLvy^QoS(#zg=dRaeuS)N`N)5~Id
zd9RO+>1Fezmuqi5mh^JR*^ehrFN^7A{pe++myupZdKu|uq?a8>FN?jixObS<%VNsH
zIO%2MqnFEfeQcgy7Sqc}FC)E-^s?jVWih>s^fJ=RNH2RGdRa^_BfX6Da%?@^`BpC@
zy^QoS(#v~&Y)mi9)63>dNr>rX{nX*b^m5~DJvN?qw7i*Ur<ajlj;+U%UKZ2KNG~J3
zjPx?n%SbPqC%ugHa^tWc59wtwy{tdIte-mkULPCN%eA*26oB<u(#v9c+5G5bq?gT~
zUN%p98COAAkL^b<JDy%fdKukW^`9%em|m8rmyJ&y-uUQcq?c=NJ(l#ce)O_Dy^QoS
z(#z&eFFT%I)}LNRdRaeuSv$QfrkAzT%ds=;Q$|m*?20`Pjq16Zr-RGecjfK7k<UQu
zhId*wTpf&ba8>Wt4P8guP6vzW;GT-MZX46V&ey&hA2m{(=b!#<MANTz!`XKuoiqJf
zx6RYRsvmSP(!r|lbg<*-V0k*&DCuBNXX#*1UFl%`=wPIS^{0c84mNH&*m&t+RNqEA
z80lc^MhA=OU@;vmrh}0V-u2j+4wk2b<>_E?pO7IPET)5vn+~=PbnvdnwA**}n_Us@
z2Ayv{1!C_$(!q|SgT-_((!ug{u$T@O)4^go*!k$-;@0Cjx)0&%V5EbQ4n{f{>0qRT
zkq++sy#lTdmZyWQ105{iCnC<iJ24%soenPFdMxQ+<D-M+>0qRTkq*{Q2b&iiY(42<
z?Q}5G!AJ)q9jrectUnzrPX{9%Y#wxQaqEFTFG%NXo(|Sd2kTD<Yo~+d>0rmv!D2cX
z>0qRT^=}5lc8JN-!P@EI*m_KR*T=?musj`X{B*FG4n{f{>0qRT^`nEubTHDvNCzVw
zY+dMJ{pnz&gLgfy;?}o!JvOF;#dI*z!JV)5z^!kK>0sxfgT-{P{&cXI4n{f{o57F{
z7SqA?Z#{6oPgCB$tG)GD(!pXn80lc7gB?!?i`BQqbg-BXHh(%;Ob2@%I#^5xBOPpB
zbg*Am^u5MNhYoAU*>8t*u5W0m3+qqkiq(bnQx_J~xvo4q*ZJt&>t2V>m8VR_bguKz
zxt_$(x!396{e;Z(#9}+2{HgWA`F&EfUgD`9Prm&&PIYle=Q@tgb)33zuiJWUUR_vB
z=juo2Ixn58Kb`CRbgr1rHO}_iA)PCxbIn^_80lP87e+c4>0JF?>AN0C$80;DtDVl(
zPUkvqcZ$`y+UeZ#t;dqiH4i#hp3W7gLgT2%IQ#9y?YD7tt~{M9rgI%f=gQN$@^miJ
zx!8U??R0Lj{Whvg;q13VI#*2Rnh%{TrgM?bbsU{5Hd3T>^>^pgPUp%~Ah<iGI?Tp&
zZu!<@N#}~YdWXGh!$v#o-$+evOy}xP=k9uJOy|nexk%?~r*p-0F4DP3=SKVOu>E#O
z=gQN$Nav!uFw(i5*M2*kk(H-&wbQvsK_H!rd&jUI8`HVgjm|YcI@fsV-1@g3o2PSK
z7j&+6Iv43&{pehzbCJ%~PUj+>>-==Cb~+d7T<z_*Lpry7>*0<z`|ZSZt~{M9PZ1%V
z>;0y4&4bR}>jPKkBAttLF4DRBZ3Sue+sV_p+U)@5OXn7k&P6&`p3W81xk%?Cor`oX
z(z!_IBAttLuJh2jVmen$=UOK^SDwy|eNKEEPrU%mAN?W<-B<8&$Kj*aucue#>D@gJ
zt>4D<uJialhko>KztV60Hl}yA)4PtRcfB6Hs~^4FzpdZ4w}TY#_c^LYw0`2P`=YvU
z<7)kIpWeySyMFCY@2WP_yS|l9?{+@>Z(O~L^sc`qK=0~D?>e5|)lToq)4NFT8b7^T
z+<M^Z-Cd8()4O7Nw{bMmjp<!^dKc+kRQGj0dRI*EBE9SQu8fK4U3q#p+JA@iuJNe~
zA-$_z6+leyBG+df=w0hW@9IbIBE5_BuKx6{nBGNt7wKK3cVp`@cTM~6#Ol7rP49Xi
z>0SNk-Cd6*z1!<F5?sBjpSrJp^sboR)sNoQuTRL3-j%0!>u3LsQ)if%dJwy7qPqp!
zCH1#En5R#LnBGNt7wKL7>0SNkT`|2Yrg!zDcah#TK6=-<=-u+8cah#jdKc+k{pek!
zcO6gfYNvOR-bH#B>0SMMM<;G3LwZ*`z1w;0ztMV3-u|n-^+0#`jp<!^dRLy_71O)U
zL+^^|T`|2Yrgz2ku9)6MdKc;4*m_*W)w`(fD^Kqty(>@eis@aky04htMS2(MUG4O)
znBHxkMm~9ZSDxNQdN<mCwcCG(^sYR;i}bE`dRI*ET0eSMp58@zS3A9n^e)o7+UZ>}
zy^HiN(z~(i!aH$le)zcY;G@p7u{v-0*3CP$^<DkxUf+<Rdp~rY(7j0aau#&26{maU
zUHOi4hw)8*y0_P9-EjV1Rou$A{(EK2^S1I^-|c*@oBpmN-0xX;zM{?3y~f|ZJN@Wh
z$I-pLe(Q$rC!42x<>}tW(Ym4Q2z{=Wbgy>0*F5N6^Pqc??zKL2ubA#dx)<qQ^PqdJ
zn;k%YpLkf0jomrq>0bT!ld<(($EojXr+cjf-CNvxEa_e`-HUXue(k$)s)duMd*#)4
zk?z%>?nSy+p6(UXy<)o8y3oDybZ=}ud~#R!iq&_K?nSy6>0a~>A>F&{u`%5%Pxm6-
ztDWu@k3x%-N#hyai|(}MNB0^h-CO^z-p$j!V!GG(+jl2!-yOE^4(VR!QQy^{?$w{}
z71O;)_afbkbg$Q?dy88SJJ{42hIFrS(!KI@FVel{NB4^9UZfb%JEooP71O=WL-*n+
z)$+Sz(ka`I?yZ08fvbDXt50+Bd<v(%cW>CJhy6RGdmT^rBHfF0FVek8_c}k_E2ewJ
zbg!81jje~Be06WHZ{IDp9=P>g{pen#dy(!%J0DUEj`N8Y)4fRdI{)4=R`-hOUhQ<R
zanZfST^~!jxAXOR*_iItkM7lv?$u8Bis@eMbg!81MY<R1UZi`G?$w{}MY`8~t23Cj
z{WrP~q4hxX$N9e6<mq6sU-jtU&Np#a_{6>st=+G4>@t3ZgMMv;^Q)0oYknQk(Z22N
zTZorK@9)O_-K@#0H&a2rhhaBXch<i;NaXu{OJ#m{GgNnOmu~#Hf2Tz|9iD4#KIr|#
ztvhR{!yQM5_j<hoP90=oI^6l%(I)o&3;pPDSG&5iy9*sIONY-{hIZAB>F|9@vi<0A
z{pfJVsXL45aPy_Zkq-Adbhy`{!}X)X9Y=?I-{^3p!}t9}``?ldH*Pvyo(@MkeAi=1
zhs)F9NQWaG?sz&}+)g&6!^L!XY(18AxR?%i6df+!r*U@Ajp=ahbhvgpTug_H>2RdO
zkq);Gboj2v=IL-T9bUiIBi9${@XqIcFfko2PlsDCI$W&otREdNro*xO!H^CY)8R;m
zW1rNx-@g#k;Yf#@2OVDQelYP?@!TIbPls!#!}X`bkq(!q!&~>(13j<VJRPo`4wt9H
z#dNrs4tE?KUcUA4sh|77P~BNfhg%0ae6Np<>2U3IIMU%rha(+s-gLN_4o5oNdD^)q
zro;84!)57kq{ETAL#oES-ObTmOy2H|yKC+5ICniZPls!#!;ub0IvnY6{poP)LWh@c
zJ+6jN4$|TBbU4!CNQWCg9WJKB#dNrs4mV#qTug^+r^Cg)lS4XOOot;K9$Swk9WJKB
zkq);GbhwxfM>-toaPy+W#dNs-bhwxfM>-toaHPYL4%eR!FK#`&vil?M_b<f0e<4<3
z*vj?xb0-)3hJ!P7Ux+>joA>?Z+MD0ByAMp<uO^4x5A<(7+ur?P^4$+6-~C`>-}~tG
z8~5h<0q5;LfQ{Qq88@yk*l};n7wE?q_@)V8;4jm-BXJ;e=ZzGJdGH11%NIDGdiegu
zN1Xe>#40WF>f!wowt3>#!^P_1V!lAk7u3J^ar1mZ<LG_F`5s>MIp21^K%OsfJYS$c
zU*J4^0rCZ2hc7U0zM%f@14F(*o-dH+3y?2Bz5w|G<O`55KzFcR5A;57ey_~A4@^J4
zK!3i#`^py-_r5Rrg3i+@x1BH0k1xRP1Jj=`(2p;W=L?*NFF?Kk`2y{HftW8qz5w}x
z*n0Tn%za?U7l`=+^Wh7`e1UoL1!BIS^EZ+uUm(vHIF2t6^9A~iVk`gqPpW#jym#C<
z`2yq%yw7|=$G09!zCg?u=*Jg``2yq%kS{>K0Qmys3mnH6i1`BK3#=z!P~3XhLFfc@
zU)&vqFWB{1@&#hPz;S$m{(OPs`2y{H0rCaN7wBgOj@uo}z9-&#xN-6Y#-|>Rd;xYJ
z81e;Tz5u%qME6B>eQcgD5c384@dd~i=+763`2yq%kS{P!zM#1ESn>t(d;zM5Yv&7g
zJvPr5n9o*3tjG4_3-sp;kS}l^BNy+^y}m%q7sS?M$rp&*-G+Uthh5EauEIF0JNdE`
z^9AyJf#dlC<O`55(9RbiUx0jpcD?{rxm_K;-9Z)fyZ*S}mfqO6^&U6!u7%qD%5n3<
zqV|w}KhsQ)_NCu*>gV^IoqvAM={&83eA!{=Tkc;U{QUNE;?Mkk=Qw`*``xGG`W?@l
zuTR=>o?+)%`t69<y*%i5qGEra#_@h9I_Ei<b1DA3_jU7Ksngy&guO3If4x?GdGP%~
zzcZEh_idcl?@ZC(x4|6IFvl=#M;P`=z|Oz)*S*A-2j3s`J5_nVQ*}N*uDjK|V`A?V
z@^SKf99CbOyyqI)`MKPC*C+Dvn|B3h=jYr7`8QYj{<Q;l(`j#a-FE)1{#{2){>|C=
zH`NjT&GEiRuOA<We4KIdaoGJky3%mIw>h!rDSf)!zvI;Prk#%ycSo6+kL&3``_Yn*
z+xczG$2m_sOx*7ec|AVPIQcl^=Hq5HhVEC>zxgitxQ=i4K%ef7`8db%an8!e>Bq;3
z`8ed`kdM>O$5|gf&batE<K*Ma$M=VjkCW%)#C#m`amdG^=PBmR$BFqk<m2S|IP>P?
zc0D%c<MiX>V(T&Ot;fcEoTK<S?R*^aamdG+2OlTq<B*SY93Lm<<MiX>#C#ljo}wQg
zx9frG6rMiPcc^ZI^bD?#Lq1MBA1CJHkdH$?4*59b<B*R-J`S7FkdO1ad|c;kJ#gxJ
z+WS0Ad+UMLV`Dx}e?Cs0j}!B8$j9w^Y&##PA0H>r#~~jl&&MGjXFPmdaqF?<<HUTN
zc0Nw*c?$Az@_Zcfaq@f|@^Ou;^}wm?_3zxjhrP3L?%zW`uDJDB@^NB54*59b<B*R-
zJ`VY~&fj`$?0JejABTJ#@^Q$=>CeZB`8ed`jGK=uZatQKobmH<@_d|_j}!B8$j3RJ
zj}!B8$j2cchkP9Jao7x^9b;oYu6*l(_77ZlgsaL|Eo&b&X7#7v@72THf9E(pPCq^l
z`8en2<B*R-K2AFyC+6d@r?TDa?55S0n!Ufvb2+=}y(1pZv9-@Tec9^FZ>6Sx?@jc3
z+RN^P{XIDGoO}CE-0qEz+xY!KzrWq%hwk%p{KH}Q)gz{W^z%1ou>1Y6`+fZE_Wcq2
z-R_=m*!g;f(s=xSw|Vv#m^Zek%KOBkoy@%bZ5qe>jVh)ChVKvh{ja>=|2od^f6?!M
zQ6&>S=|IXAz2mX#ewiMaI6W{-4-EZXBK`bbBFFjtF#7#4s*s|c1zkZ%8OP4QOb<+)
z9vG$vhJJsnpWh!lj*q|WKElU~TY(|}e%Y#c&L;1Uj(oekCs|^jWaQs3XEey=PrmDU
z+5La={Z$wJ`&=VkzA^tU?|%ou@t)^hcHQ&yVt!sbKac#paq#o?a|Ors^XNHW<EiJi
z^Yi-g^T^Mew>!4}K6&!|yqFWGCHeWCFZ$*kx+<~%Y}~sg-v50B>%h+&H$RX3eCO};
zjP|$9^Yika^L0LYAWmI3`aEyU&tEnge%|r?yng&VrU$U~_^7@0K>BE7e%}1}dF#T@
zBR{V{Kac!8^7F{gqZuGS?>u%Wv7H<FdF1Dfo1Zr?e!hI`f$QhB^Yiljyng&V^7DIL
zY|PK=$Il}_?|6P*%+Dh~?>K&5%+JTx<66G;z<thV{QSI_pGSUPKYkwhd3k;wy>s&X
zyqKRye%?CTsh!u1^yBB{`T6>_9uv178}sw#%g<})=aHXBe!lb214Dk^y!m;@@$>re
z^T^NZ&(DkbdF1Ei`FZ2v=gYSq==#{0pO^QX5BYiX;pfHtJo5AC9YcQJc`01v=aJ(?
zGjSe%UhFwv$F&|yeqPMaBR_Av{JfZ-M}8jpdF}kXn4d>}9{G9X=aHZ9bz6@mKQHFz
zjfbB{ejfSxj-v-Awo{4udGwr5KYm{99TK~8#r!<-^VXN*7xVLI2B?y!ou4mmJ(m2u
zn4dRKeqPMaV|pNt9+)^6KIG^1=jZj~=Nnh^-<Y3w96zs}pGSTk`T5u#@?Q5y_i60@
zW3G15gYSp_UZ4DD?)yi-u95otJFxh0s4gJp(k4Hz;e6fy_3J!KKHqWvZWH?Zv6v1(
z_x&NCFSa*h_x&NiFZOqyV&~~QB6FT)_x*`m@nJhvocq1l{eEaq7k9rO^8aG~-}(4|
z^!I6z|405G`G4#k#oosy|1akMk^e{jANl{-`F|Yp|6=|h`G4g9k^hgKf64!g`G4g9
zk^e{jKX$#}#P$DTD}em}!`@5(`xn+q9YCxOpj{mR)d9S>{(9rXKG*62&Zi!ry(@R9
z9w6`eZvDEx(fx7qjT_yam+AvzfAvj&&wG3Q=CgVA0`2Mroww_HsZJoTPJrqJURRyK
zI4N86aRthI-utl6op)U9N;ePBd*>P%@;&0I^AFVt^j9a)&-X5!N1Z^Pl9u<p*Xybi
zlyBZkb%OdgZ?x~DyCwQu<JJkRlRCl9fAi`D`l%Dhs}nT7_PK3WCy-Ys@H*-Q`lkyb
z-}6y>>w#M*Ky?CCC(y1=U|#A3^6CVrPM}?#K)X7DygC7@6QDW)wqp&|3B>9IvGrK0
z6NuFbj9Z;RtWJRH1gK7c>ICMcPN2U!fxJ2asuNgObpo+Efqv=)Vs!$?rwhcb$MsO1
zK&(!H>ICR{FRBxmw>p7XodDGdP@MqP2~eE?)d^6Y0GrWJoj|Nk5L=I>=e@?OPJrqJ
zs7`?D1p2EJn1?!nSe*dX3DEOi>!41cpE`lOIsvK^pgIAn6U5fzLv($hy2(<VKwh1o
z^R*tES0`|sIsvK^=+~WTs7@fSPJo{GYEKtL&U5pg_i9%sh^@!8w@+-WP9U#Nfa(P1
zr%r(C1oG+xs7_$s>I7nS0#qkJbppq!6NuFbP@SOhwH_0<9#`_M$5NfZ_|*weodDGd
zP@TZKsS}8Mhob9aV|4=aRws~GC(vJ=0Gq+&)d|Gv1jeOKfa(P3DQ4}h2f99RpE{vB
zfqts<=y@-y6QDYQ<J1Yn>IA4xfa(OOPN1JUf$==)HQ$dKz%Tl54`TPDgHM{-#>;fX
z#QnYa=}#GIH}ly4qq=^d<?{aS?;gMO$<c5AHp}$iy!yiSU%Has_xym;l=n&7<Cf|S
z^6CnE+>$~Ut1BQy7JI#=dV<*B7v6E^&FZI)fRr0jwCD<s-F?tqW@B{&dG!MQ)C*9(
z0M!dny#P5U^v=iL@1=TySiJz%3sAiP)eB<h|8b~ZAXYCx^#W8cKvz`k{7dx$v3dcj
z7od6psu#r0e=}4k5PRNF%cUFQ=!VEYZM!?3ekxq=yHBbgpq)<M6&*V}>b<eLfxNmw
z{kxu*>IL%Z1*l%2U7f&ttxh1XP7wPXf0A$9NZ;eu2jnRb8d81Web>4Afbpph=tqI;
z=M(36^#SDU%~O3qKRdR5b}CdKa31x6_wz1KzIiUy2RcvxBA1Qa;<l>~$g2-DuHKiW
z`hdLW{ram9n7{gfe(D3LK7i^2UPpbvc+>}sUwr`82T*-r*JG(Z(D8J@P<_CBIkR1l
z%^SIX>I3rX188S*UOTo}eE=z**wu=z%8k_r<UQ|~S0CtjI$-kZ17h_7{XFkS^#N2L
z(5^m!>I3rX1E@ZL>I2TNK2Y3xTo2U;#GdzeeCvU9;>PL&+SLb8eLz1uulc(p$*T{b
z`herr2hdFPr);#V51@D4`=mZ#-0B0yr#>LBK2X0#yHp?0PklgMeL$=}fa(MC>I0}g
zfa(LNK7i^2`l}D1`at>C<HJyWK&(E1>I0}gU_R;t=B+*;uReh8K<Lhl>I3>yw!Kd4
zv3WBPQ#7bPpuhS+Y(19h1IDL5Ag?}v>I3rX1E@YAuRb7FA3*g1>!?1UU41}aeZV@a
z4~W$V^iv<uPkq4r)CX$s^Mcl6sXic9A3*g1R3AX~0i@KNhof;GpJ;hInsrehkauOv
zn}Plu0ICldpZY-UT^~#J0kQgkd8iN6zx6=tvF+*u^6CTns}G?10ICn@uRb7FA3*g1
zR3Ff;J`h`vn|=kcPyG8eg#F*IBAWM-Uwl-*uHfm%FKXu#kxz6ypD5-N{gnp3u(<bm
zW4^HSG_TF`gWCDPj&FP$S0^ss@BKOtKd2u+XdHZCdHcV9y??kq5Z&>$^MS_22kPf}
z@uS`Ur@c?&kPp<457dtjbe?wdVeiP04|HBW(0KX4&euGbe4v;QG+sUs`9So%*!=lG
zvFF9+$p?!0K;#3RhY!@w2g>t-@_ZojfwA@QSBR{~((__5ABcRQ`SF2bJ`nl9eP1``
z1I2vct_RNdz2f>n?2|e%A1LMnjgt>VKCpc6`^J2rdGmqV`9SS_Ao79MlMmF74@5pt
zJ0GZ>4;1r(+WA1_1LgU^*m_*Y`5nl_e4soZSpU{zV?I!x4@5rDaeN>)(#i9I+WA0v
zKG1pEsiNzCV?IzjA6Wm^W61}K`9SmF1C5&xL_SbEABcS5uE)lFpqLNT&IckNh<qUO
zfyf6U9~fH?zjAVYEcrm==L6;WK;z~Ekq?yT1Cb9zJ`njp$Mb<=J`mfXhJ2uy57dtj
zG=4s?eAma44;1r($Or1j2a5SX<O7ipL_W~E@qx$(%JYH92RaWQDCPr^4~(tH)sPP~
zUp`Qt4>VprP|OD+ABcP)@`1<)_B!_eiTOZzJ`njp=Whnl{c!VqpmFno^=mzre4v;Q
zL_ToWV`DzhaeQFswSP~{2kOrUA|Hr+p#FTIm=8og5c$B^dfeQ;Yro?I-ZdXSK+Ffc
zYuuh2iYXYR``>k(o&8-poBo$~M@Lt>^LTz(+&ppWgcI`t@_az&Z$2B-|MK*I=WiZ3
z-yfPhA0W>M=vQ4Z`o8O@=zfm-yin|Up_m`2zx%<&{D7Drc-Q;m6KOt_ndA5Yd451Y
ze!zJsd;Ppa+W7&r;~S6Xh4phk81e&RegOFa<Oe#={UA~e=zhHI{D7Dr(4QYLZ+^gW
z{D7Dr(2pN*9)6(yt;fgcevb6bk{>W$4oo{gV7~l-e*6GZ9`c?SiunQbj>+=_Xa|#b
zrHc6hv6&XP9!q|peDBth9}x2c$PXYtfc$`Y@&k?2{UFZ$VA}Zs?fk&52U?FMKOp7@
z%$FZ1ZatR#fS4aZeqh&QV}3x)4`{a|p*t7y1KQo$#r(jo$I^_n^8?zw<FWOaeAfs1
zv@H1n?fd}p1IQ0_p4MYye!zVB0qy*N^Y8;=en89*i1`8J2OP%_7$-kazV%r017dyv
z`2pky^yde}{D67!1M;q5>&p-9df?m-CQq@7%>?-Y$MFN^#SfHsKN#`@wRaUS`2p?x
z0P+Lc`2jIMAm#_0j~|fd2aq3-=LgK6ACTt<kROPx$JLM@Fg|`jo*zJdK%O5!egOFa
z^Y#uQKcGK9fIivC51^5wD;)U&<OgEwvE&Cjf7i#x{D5|T0Qmvr2ljo%`5w@a575pB
YARmBy0P+FI2RM!oa2~$Gy!y|-1B_sVod5s;

literal 0
HcmV?d00001

diff --git a/objects/trees/oak/generic1.iob b/objects/trees/oak/generic1.iob
new file mode 100644
index 0000000000000000000000000000000000000000..17e7fd6f471b305e1945c6427bc9a3383800e240
GIT binary patch
literal 33070
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

literal 0
HcmV?d00001

diff --git a/objects/trees/oak/generic2.iob b/objects/trees/oak/generic2.iob
new file mode 100644
index 0000000000000000000000000000000000000000..d008bdaf4317c073db07d41c15499dc5e73aadf1
GIT binary patch
literal 22957
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
YRP5ObF12qQ0{b2(uqP`5+YAB!187()egFUf

literal 0
HcmV?d00001

diff --git a/objects/trees/oak/generic3.iob b/objects/trees/oak/generic3.iob
new file mode 100644
index 0000000000000000000000000000000000000000..51b7323ef8d2df74809233d7ef58fa06dd3bc956
GIT binary patch
literal 5386
zcmbW5(MrQW5Je}cp!f&=gD-s*@+GB|Sho_asWd^fzpggkyN^O6ds^~P*poYRH#;+F
zL|jM2t*#qgkGigOEnmAnZIA74d^of(n|*5E)3AE#hOzCpsaf8?rQ@JqsUMqNyC2dz
zs#q{EAUI7Bj9OoqBLo8~Do3U`ogpYsD`rkj!HR;B!Mi`t>fw3Sesn|gxt4n@7rDp4
zY&v|j<T^Qb#v*1-@PhIaEfXO41Hq`YV<gmw49=Or?`#`p@9YKT_9|xkbotI&@crL{
zulWV4$;z9=MnRQUrdUx>r4=a(VxTJ|QdDt(peiI&RE0#KAPP?Uphu2^3KS{2zA;cm
z3V}MT5L7o}ikcn}=njZLrRWKwyyi%afjU+mJ<1gYLD1tIQB;l$%otHrnEnEDJX{e_
zIYQ7w7g3Zs4i@C-ArFD#5GZpX=ploInuiPm=E6~3oKH@guJcxx+diEsIOV~-Tv5)|
zLIJ4ii9kWYKsOf_Dh1tKkfNIl0lobQ^ci5FDhmTWUcwyRm%t<E4uL=y2m<EQNI-3e
zJ7IZ_QuNzTIcPx$Y8O$cE>;M1c_g4RG<fO7@T9-m;GJaw-!GI)?hy;L(aMp5%8`J-
D6%W{K

literal 0
HcmV?d00001

diff --git a/objects/trees/oak/generic4.iob b/objects/trees/oak/generic4.iob
new file mode 100644
index 0000000000000000000000000000000000000000..a313dca0d4b3de6c266a1e4218502e83d3a3b951
GIT binary patch
literal 16513
zcmbW7&1xGl6h<{OcCsm@+rC3L*%tC7ArzB3B{WS!97_A<iDO$mpOyt{@F^5pMo0JR
zlScPvTuS*^O8La!52XwjWhm$T`{LK#!}{iVb^G%5arN`t{d)C#y}9~+w|QAT+^jDz
zzC5j;H~eq?@N#*(y5Fp?fgD(?1j|^?oU4Nciv(GtbG05Mh&W3tjs%Oeh&aw7;y4g-
z7FHYy7HJW2oJGWu;9i1U9g|bFNDy(HMZ}TdUV;cSDsfn&1P>P6S+H^hO8NX>?0Ecf
zwfb|nx%_*L>=|%+aH)F<w%sxon*<8X3Ju6c=g)EV%7A{o0kzh*xdE@;0jPYAAE$2+
zvpNuK4rGJQoU25C2NL}Ok8cnU-OTK(0})~A)-qU-C_g8Ha|sa~hzJWSf&_`?b0WBz
z5kZ1PZ6^Z3cWx~iaQdCVS|mu2RTfEHMh8w794$ClkVIl`znlo{mjp=|oa_TJ%^WSl
zO~B4oyt6ZtY&n;R`wnC={k4!7sF}%{92l(c(xJZg2h{liZ*wzj=LWpb4cN^M*mnn@
z!|Z@Ve}?oZ261@;NiaPMW07@8Fg*%m5oqbav>J>>*62X2EtExGZU^G31F<+MSFtF;
zRMToZQcW9>HI52ojS@^XJ@g{Z-p-tITZxdjPJwv`6qpmKz-+SuBaH#sXbGlAp)96H
zp+IsK2fj;?w~hqLM5VN%6qv4v0+U(x-a8(ilewN=p5TxJamazZ=V#8<v@GNr9mpCb
zm{x{zHLVN<rj?<<v@#5cI1)^Y!&u~yFC3Uog|WyQC72F|vX~Br0lCd42aXm@&&0Tj
zsuD~u#aL`D5e23tqQJC76quHX0@D&vAZdvMNlP3^qzCLYF32L(%rzYkBSPIukZ@L%
zMQ*cz9T5)H-Q59oZUB6L1|IhZQ2EackjrOQryIA214(rxm<oM#$&~{WTb;#J=+adO
zCPXTW8~`p?qiUp4U>sFo3T*=-js#O^D~l<>6_^6tfUWJNz!cyLOaZRI)X@q|*=9fv
zxdTx(hfWl9`7w|J^FtX0rj8yvfsBW8=G4o|rId<$qh7vl8<00$f+-b^MGn@|fvNb6
z#Y80qvWp7^Cb%fDRYPWt9Jk3?<ab{VOc`ZdMH~mVYRFhjz*erJYQW>UZf;38GZ%yc
z>$?TF5=8bvxr*!(Oo660It7{mfh3s1O<AP<>%dfe$|B!W0goSMYDqqsis-|cl;Ey`
z9hdSET)C7o&4Aqb5=>oeEb_BIx1p_onZ$mz0>*$`-NYGTk$h5usSAw7mfkBc>AeDz
z-cOzPi-&UN<p0X0e40{VvT+3_8&_bmaRnyXR$#KbojJ_O?hKft>_B$Wfk>mkmZYgQ
z(yUMx*+U5?NmH&Sc~fALHv<AmFj=3nn5@r$Y{%fhByY-Mk~agkyhVY@TNIeQMS)36
z6qqDIfk_t?m;`m#31>W%Gbh<LF13VbA#Uv4Ex@WPmCm#PlME;@NrD0svK5$+t-yqA
z369hZLe*UL3d~inz+CkP<bXS{UA)F3M|^Ou<{C5>S)&9~)+vj*%@mm1Oo6%O6qs91
zf&64jfxL|pOypIr<^XKPi;T6wf!PjaG23Clrm6y?ssi&OD=@KRDYk=K+=2f9?WlNo

literal 0
HcmV?d00001

diff --git a/objects/trees/oak/generic5.iob b/objects/trees/oak/generic5.iob
new file mode 100644
index 0000000000000000000000000000000000000000..837a6f3061867ae7204ef3dee19be485477fe0fc
GIT binary patch
literal 19039
zcmbW8(QeZ~5JlIqlk$R)c;g><=_^vdq>8Gjq^P2_sHsrPk3$<f<{m#HWg{P?N}%r9
zS<kL_=FXT>%7;?Q$Nao6rMVi%@-BZr|8aZ2y?)%>JbiiCe80NeZhmcdmtSvpPn-Me
z?Zx@$pWDY>{<Xb-y13cg?Y8UElrskw31+Fz;&_l?S(KG~#>Rq0f^m*pYMdj%!GgU6
zvmHyj9TF_kVz$Fs%yvj{uwXC2V4d5J&Vr2viv+We?isU>5*#epOE8yX>-KSF!KDQ|
z3$_+)ELbM+(|>{W;oIfr`F3~lvd+<RZqLz@;2^=g=?iy4It#WIY%EwNu)1H)3E3|P
z#^p_ZDoZ*{1Lh}h;~>H50I75l7btMzYEBsC%-I+I%=ca?d3US(GEM{L&paM1I9RZk
zV4Q&eDu;7CHQ+D}5MCN{eygSrrw8<>X4uyUL^s8A^B134&lDI)f{{PUVy>-~10#PN
z82O{XK!BCg7@6Z{j?8gjWR3!JH7^|)wW7d4fK~6wnWIYFlA=l!7;V`(FmlF$kuwgA
zoN-{}i~<7zRySJC9NFTQ6xpIcWQzkMTO1hK67ab9BEaO#ktc3R3kycqIE&FW3Je5z
z+<VCe<jm1EYDu{(77mOca$p2e)d@+k<;)8UM);^_2_(S?B4shoX)4}(UMFLz4R~2o
zBC)0=7~$hAM*CGBHqVkn?`Dqo9T?|Um&C8t%m^O`j^m%|lH$brfY|+eYKHoN%<y_@
zhWdca@K&861NQX+5r7#W^ay>N#(?y3447p~kUoyFh>&q0eH>+xK8^w790}6LQ5Nar
z7%*O4IxqsqfwW`HQsY$#(vDFUX~!s#c8meD9i0Q|swj(eRScNzkRV+ZWs$Cm0_mz4
zFfUcI6?3oB<4_<y4h7QVP#`@H1Lgooklu%}n6g`PL$MuEB@!GgIA)=8sS>0epe*(l
z+*^>!yILyMY6VhjRv-zP0_g%MkS>4%=>jN_BEJGD{wr{pz~g0v?ABR^%+G}50tr%J
zHx{$hl>)O=2~q}^OI<23OO;?!FK3aOvw6mmnzI3uv2_llbgV447Nm4+EM^}in4Ha7
zq%v%lO6ui63cSi9g<l0y_*Ec<Uj<V5RUn051LovNkb<zXNI}?uIXMdlQV>=aDF`c&
zvaJEL9TrR_?NBS=Q%S20h+*=D`Jp+P0-qZQkm{=f^NE!MsW2;x)UJ<v@Ao>tbQ>4%
z<y;%@QN=P~&X@yZjc?7wMpIK#AT=ce<{2FrYkU@`o>77nYK+A^qXa3`D2sgrz5>zd
z3Ph(Xu(#mef`~M=RJ4`?sSGHP%76l?3@Gr;f|L}LMM??^q@=K@MAC$iL}_tFOidsK
zQgcusHHX@>jMNs?%#;WeNQpp!$m&74J<3smh+G9Cat)ZE)j1HYsw|>a6_`NjKt8Ne
z7E#9r%n_F$>R4IigDV53huS(2S*<K0s}+c>Rv@xkfyinJ76&3Ul*NQe2lA!RP>DYI
zrE@~AT?tYmP)?vIp+L$Y3PdloCPu`o4kRU37WWn;B~}(mi4{mntiU%5k`gP6q{Ip&
zC2ni)9jULHnbcQ-{4a>wlBPsd%}n!4fh3{|BoS303911jal7;kgpemAQXm<T0?CLJ
zNYGax;YopnCk689tO5xl3d~#QK+=r9auwt}%9%--)U%MJ88A?evv><e!jl5uEJ$2a
z7Kv*LB(8OpjUI_#YUWo968Mxw0-pj2d<rBW*1VTrFLI2;4a_B@KrR^ta>*!=yF!87
zAqwOUQDBa;0||)6VqPD8wAv){^G{Ah13ilQU>4eDxdP+>D3AkSz{#uT8MBA<Vdg($
gf`|mU29-rFUIlWcD-eq-;~Xq1kg%md4!HsU0mt%3ZvX%Q

literal 0
HcmV?d00001

diff --git a/objects/trees/oak/generic6.iob b/objects/trees/oak/generic6.iob
new file mode 100644
index 0000000000000000000000000000000000000000..183d51704e2730ed2c6d0cfe53f56e8bc70cf674
GIT binary patch
literal 21799
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
Np1<jU`2gX3@LwYu!6X0x

literal 0
HcmV?d00001

diff --git a/regions/temperate.json b/regions/temperate.json
index 6baeca24..7a965011 100644
--- a/regions/temperate.json
+++ b/regions/temperate.json
@@ -3,15 +3,14 @@
     "color": "#8BD03C",
     "landBiomes": [
         "temperate/plateau",
-        "temperate/flower-forest",
         "temperate/stranged-plains",
         "temperate/longtree-forest",
         "temperate/sakura-pink-forest",
-        "temperate/oak",
+        "temperate/combo-forest",
         "temperate/plains",
         "temperate/oak-forest",
-        "temperate/wilds",
-        "temperate/birch-forest"
+        "temperate/birch-forest",
+        "temperate/lush-plains"
     ],
     "shoreBiomes": [
         "temperate/shore/beach",

From 92fe98776eb6ed431a1226c256df82f0b9908da8 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Fri, 23 Jul 2021 20:07:26 +0200
Subject: [PATCH 10/14] rename & reorder oceans to match naming conventions

---
 biomes/ocean/{oce-deep.json => deep.json}               | 0
 biomes/ocean/{oce-ocean.json => ocean.json}             | 0
 biomes/ocean/{oce-beach.json => shore/beach.json}       | 0
 biomes/ocean/{oce-warm-bottom.json => warm-bottom.json} | 0
 biomes/ocean/{oce-warm.json => warm.json}               | 2 +-
 regions/temperate.json                                  | 2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename biomes/ocean/{oce-deep.json => deep.json} (100%)
 rename biomes/ocean/{oce-ocean.json => ocean.json} (100%)
 rename biomes/ocean/{oce-beach.json => shore/beach.json} (100%)
 rename biomes/ocean/{oce-warm-bottom.json => warm-bottom.json} (100%)
 rename biomes/ocean/{oce-warm.json => warm.json} (99%)

diff --git a/biomes/ocean/oce-deep.json b/biomes/ocean/deep.json
similarity index 100%
rename from biomes/ocean/oce-deep.json
rename to biomes/ocean/deep.json
diff --git a/biomes/ocean/oce-ocean.json b/biomes/ocean/ocean.json
similarity index 100%
rename from biomes/ocean/oce-ocean.json
rename to biomes/ocean/ocean.json
diff --git a/biomes/ocean/oce-beach.json b/biomes/ocean/shore/beach.json
similarity index 100%
rename from biomes/ocean/oce-beach.json
rename to biomes/ocean/shore/beach.json
diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/warm-bottom.json
similarity index 100%
rename from biomes/ocean/oce-warm-bottom.json
rename to biomes/ocean/warm-bottom.json
diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/warm.json
similarity index 99%
rename from biomes/ocean/oce-warm.json
rename to biomes/ocean/warm.json
index 245c7120..42e49be3 100644
--- a/biomes/ocean/oce-warm.json
+++ b/biomes/ocean/warm.json
@@ -3,7 +3,7 @@
     "derivative": "WARM_OCEAN",
     "vanillaDerivative": "WARM_OCEAN",
     "color": "#2A2180",
-    "children": ["ocean/oce-warm-bottom"],
+    "children": ["ocean/warm-bottom"],
     "generators": [{
         "generator": "plain",
         "max": -10,
diff --git a/regions/temperate.json b/regions/temperate.json
index 6baeca24..833f00d8 100644
--- a/regions/temperate.json
+++ b/regions/temperate.json
@@ -19,7 +19,7 @@
     ],
     "seaBiomes": [
         "temperate/sea/river",
-        "ocean/oce-deep"
+        "ocean/deep"
     ],
     "caveBiomes": [
         "cave/old-cavern",

From 16552b7565fc8cff9cf4ce6786b67bcb01b5f3dc Mon Sep 17 00:00:00 2001
From: StrangeOne101 <strange.toby@gmail.com>
Date: Sat, 24 Jul 2021 06:18:28 +1200
Subject: [PATCH 11/14] Fixed incorrect generic trees spawning in plains

I started making these temperate changes weeks ago. Had to translate them all to the latest overworld with all the new object names and sometimes I leave the wrong ones in
---
 biomes/temperate/plains.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json
index 740ce3e5..a314ed46 100644
--- a/biomes/temperate/plains.json
+++ b/biomes/temperate/plains.json
@@ -257,12 +257,12 @@
         },
         {
             "place": [
-                "trees/oak/truegeneric1",
-                "trees/oak/truegeneric2",
-                "trees/oak/truegeneric3",
-                "trees/oak/truegeneric4",
-                "trees/oak/truegeneric5",
-                "trees/oak/truegeneric6"
+                "trees/oak/generic1",
+                "trees/oak/generic2",
+                "trees/oak/generic3",
+                "trees/oak/generic4",
+                "trees/oak/generic5",
+                "trees/oak/generic6"
             ],
             "chance": 0.07,
             "rotation": {

From 72d9751784f66d4ae6a8d1a88f215d6d423cd02d Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 14:24:07 -0400
Subject: [PATCH 12/14] Actual version codes are nice.

---
 dimensions/overworld.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dimensions/overworld.json b/dimensions/overworld.json
index ce7af173..46421c1c 100644
--- a/dimensions/overworld.json
+++ b/dimensions/overworld.json
@@ -1,5 +1,5 @@
 {
-    "version": 2,
+    "version": 2001,
     "OVERWORLD-VERSION": 3.134,
     "name": "Overworld",
     "environment": "NORMAL",

From cd375cba065eda81e4efd9941d5ec3753eb3339f Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 17:49:50 -0400
Subject: [PATCH 13/14] Fix acacia objects placing badly, don't double replace?
 fixes #153

---
 biomes/savanna/acacia-denmyre.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json
index 46e6af12..1a08e35c 100644
--- a/biomes/savanna/acacia-denmyre.json
+++ b/biomes/savanna/acacia-denmyre.json
@@ -116,10 +116,6 @@
             {
                 "find": [{"block": "acacia_planks"}],
                 "replace": {"palette": [{"block": "stripped_acacia_wood"}]}
-            },
-            {
-                "find": [{"block": "acacia_leaves"}],
-                "replace": {"palette": [{"block": "acacia_leaves"}]}
             }
         ],
         "rotation": {

From 994d56292fdb30ed3091516baa0e927f8a33cdf3 Mon Sep 17 00:00:00 2001
From: Brian Neumann-Fopiano <29320316+NextdoorPsycho@users.noreply.github.com>
Date: Fri, 23 Jul 2021 14:57:37 -0700
Subject: [PATCH 14/14] Removed just to mitigate the merge conflicts

---
 biomes/ocean/oce-beach.json | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/biomes/ocean/oce-beach.json b/biomes/ocean/oce-beach.json
index b85b0263..228f5ead 100644
--- a/biomes/ocean/oce-beach.json
+++ b/biomes/ocean/oce-beach.json
@@ -65,20 +65,6 @@
         {
             "chance": 0.5,
             "palette": [{"block": "grass"}]
-        },
-        {
-            "partOf": "SHORE_LINE",
-            "chance": 0.09,
-            "stackMin": 1,
-            "stackMax": 4,
-            "palette": [{"block": "sugar_cane"}],
-            "style": {
-                "style": "IRIS",
-                "zoom": 0.65
-            },
-            "heightVariance": {
-                "style": "STATIC"
-            }
         }
     ],
     "objects": [{