Merge remote-tracking branch 'origin/master'

overworld/biomes/swamp-willow-forest.json

@@ -86,6 +86,24 @@
         {
             "chance": 1,
             "density": 1,
+            "edit":[
+                {
+                    "find":"oak_log",
+                    "replace":"dark_oak_log"
+                 },
+                 {
+                    "find":"oak_wood",
+                    "replace":"dark_oak_wood"
+                 },
+                 {
+                    "find":"oak_fence",
+                    "replace":"dark_oak_fence"
+                 },
+                 {
+                    "find":"dark_oak_planks",
+                    "replace":"stripped_dark_oak_wood"
+                 }
+             ],
             "rotation": {
                 "yAxis": {
                     "min": 0,
@@ -105,7 +123,9 @@
                 "willwo/willwo-8",
                 "willwo/willwo-9",
                 "willwo/willwo-10",
-                "willwo/willwo-11"
+                "willwo/willwo-11",
+                "willwo/willowbutbigger-1",
+                "willwo/willowbutbigger-2"
             ],
             "translate": {
                 "x": 0,

overworld/biomes/temperate-oak-forest.json

@@ -142,7 +142,6 @@
                 "hazel-oak/taller-oak-2",
                 "hazel-oak/taller-oak-3",
                 "hazel-oak/taller-oak-4",
-
                 "hazel-oak/taller-oak-8",
                 "hazel-oak/taller-oak-10"
             ],

overworld/biomes/tropical-ocean.json

@@ -32,6 +32,134 @@
             ]
         }
     ],
+    "objects": [
+        {
+            "chance": 0.1,
+            "density": 1,
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.1,
+            "density": 1,
+            "edit":[
+                {
+                    "find":"horn_coral_block",
+                    "replace":"fire_coral_block"
+                 },
+                 {
+                    "find":"tube_coral_block",
+                    "replace":"brain_coral_block"
+                 }
+            ],
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.1,
+            "density": 1,
+            "edit":[
+                {
+                    "find":"horn_coral_block",
+                    "replace":"brain_coral_block"
+                 },
+                 {
+                    "find":"tube_coral_block",
+                    "replace":"bubble_coral_block"
+                 }
+            ],
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
+        {
+            "chance": 0.1,
+            "density": 1,
+            "edit":[
+                {
+                    "find":"horn_coral_block",
+                    "replace":"bubble_coral_block"
+                 },
+                 {
+                    "find":"tube_coral_block",
+                    "replace":"fire_coral_block"
+                 }
+            ],
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1",
+                "coral-rgb/coral-by-1"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        }
+    ],
     "effects":[
         {
             "interval": 350,