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 1/2] 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 92fe98776eb6ed431a1226c256df82f0b9908da8 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Fri, 23 Jul 2021 20:07:26 +0200
Subject: [PATCH 2/2] 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",