From bc61f33a22ab188a2d7fb158cf3a6b7d0be2929d Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Mon, 19 Jul 2021 00:31:54 -0700 Subject: [PATCH] More Fixes --- biomes/frozen/fzn-beach.json | 18 +++--- biomes/frozen/fzn-pine-hills.json | 18 +++--- biomes/frozen/fzn-pine-plains.json | 18 +++--- biomes/frozen/fzn-vander.json | 18 +++--- biomes/hot/msa-valleys.json | 56 +++++++++--------- biomes/hot/sav-cliff.json | 56 +++++++++--------- biomes/hot/sav-plateau.json | 56 +++++++++--------- biomes/hot/sav-savanna.json | 56 +++++++++--------- biomes/mushroom/mus-crimson-forest.json | 20 +++---- biomes/mushroom/mus-forest-hills.json | 20 +++---- biomes/mushroom/mus-forest.json | 20 +++---- biomes/mushroom/mus-plains.json | 20 +++---- biomes/mushroom/mus-warped-forest.json | 20 +++---- biomes/ocean/oce-fzn-ocean.json | 18 +++--- biomes/ocean/oce-mus-lake.json | 20 +++---- biomes/ocean/oce-mus-ocean.json | 4 +- biomes/temperate/tem-birch-forest.json | 16 ++--- biomes/tundra/tun-forest-cliffs.json | 24 ++++---- biomes/tundra/tun-forest.json | 24 ++++---- biomes/tundra/tun-mountains-cliffs.json | 24 ++++---- biomes/tundra/tun-mountains.json | 24 ++++---- biomes/tundra/tun-redwood-cliffs.json | 24 ++++---- biomes/tundra/tun-sequia-redwoods.json | 24 ++++---- biomes/tundra/tun-taiga.json | 24 ++++---- .../{brichclutt1.iob => birchclutt1.iob} | Bin .../{brichclutt2.iob => birchclutt2.iob} | Bin .../{brichclutt3.iob => birchclutt3.iob} | Bin .../{brichclutt4.iob => birchclutt4.iob} | Bin .../{brichclutt5.iob => birchclutt5.iob} | Bin objects/clutter/{hive.iob => hive1.iob} | Bin objects/{ => jigsaw}/void/gvoid.iob | Bin objects/{ => jigsaw}/void/void.iob | Bin .../{crimsonwood-1.iob => crimsonwood1.iob} | Bin .../{crimsonwood-2.iob => crimsonwood2.iob} | Bin .../{crimsonwood-3.iob => crimsonwood3.iob} | Bin .../{crimsonwood-4.iob => crimsonwood4.iob} | Bin .../{crimsonwood-5.iob => crimsonwood5.iob} | Bin .../{froShroom-1.iob => froShroom1.iob} | Bin .../{froShroom-2.iob => froShroom2.iob} | Bin .../{froShroom-3.iob => froShroom3.iob} | Bin .../{froShroom-4.iob => froShroom4.iob} | Bin .../{froShroom-5.iob => froShroom5.iob} | Bin .../{froShroom-6.iob => froShroom6.iob} | Bin .../{froShroom-7.iob => froShroom7.iob} | Bin .../{froShroom-8.iob => froShroom8.iob} | Bin .../{froShroom-9.iob => froShroom9.iob} | Bin 46 files changed, 311 insertions(+), 311 deletions(-) rename objects/clutter/{brichclutt1.iob => birchclutt1.iob} (100%) rename objects/clutter/{brichclutt2.iob => birchclutt2.iob} (100%) rename objects/clutter/{brichclutt3.iob => birchclutt3.iob} (100%) rename objects/clutter/{brichclutt4.iob => birchclutt4.iob} (100%) rename objects/clutter/{brichclutt5.iob => birchclutt5.iob} (100%) rename objects/clutter/{hive.iob => hive1.iob} (100%) rename objects/{ => jigsaw}/void/gvoid.iob (100%) rename objects/{ => jigsaw}/void/void.iob (100%) rename objects/trees/mushroom/{crimsonwood-1.iob => crimsonwood1.iob} (100%) rename objects/trees/mushroom/{crimsonwood-2.iob => crimsonwood2.iob} (100%) rename objects/trees/mushroom/{crimsonwood-3.iob => crimsonwood3.iob} (100%) rename objects/trees/mushroom/{crimsonwood-4.iob => crimsonwood4.iob} (100%) rename objects/trees/mushroom/{crimsonwood-5.iob => crimsonwood5.iob} (100%) rename objects/trees/mushroom/{froShroom-1.iob => froShroom1.iob} (100%) rename objects/trees/mushroom/{froShroom-2.iob => froShroom2.iob} (100%) rename objects/trees/mushroom/{froShroom-3.iob => froShroom3.iob} (100%) rename objects/trees/mushroom/{froShroom-4.iob => froShroom4.iob} (100%) rename objects/trees/mushroom/{froShroom-5.iob => froShroom5.iob} (100%) rename objects/trees/mushroom/{froShroom-6.iob => froShroom6.iob} (100%) rename objects/trees/mushroom/{froShroom-7.iob => froShroom7.iob} (100%) rename objects/trees/mushroom/{froShroom-8.iob => froShroom8.iob} (100%) rename objects/trees/mushroom/{froShroom-9.iob => froShroom9.iob} (100%) diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/fzn-beach.json index 5957779b..7ee6854a 100644 --- a/biomes/frozen/fzn-beach.json +++ b/biomes/frozen/fzn-beach.json @@ -83,15 +83,15 @@ "enabled": true }, "place": [ - "clutter/smolicespike1", - "clutter/smolicespike2", - "clutter/smolicespike3", - "clutter/smolicespike4", - "clutter/smolicespike5", - "clutter/smolicespike6", - "clutter/smolicespike7", - "clutter/smolicespike8", - "clutter/smolicespike9" + "clutter/smoleicespike1", + "clutter/smoleicespike2", + "clutter/smoleicespike3", + "clutter/smoleicespike4", + "clutter/smoleicespike5", + "clutter/smoleicespike6", + "clutter/smoleicespike7", + "clutter/smoleicespike8", + "clutter/smoleicespike9" ], "translate": { "x": 0, diff --git a/biomes/frozen/fzn-pine-hills.json b/biomes/frozen/fzn-pine-hills.json index 8164de53..320c56fd 100644 --- a/biomes/frozen/fzn-pine-hills.json +++ b/biomes/frozen/fzn-pine-hills.json @@ -86,15 +86,15 @@ } ], "place": [ - "pine/pine1", - "pine/pine2", - "pine/pine3", - "pine/pine4", - "pine/pine5", - "pine/pine6", - "pine/pine7", - "pine/pine8", - "pine/pine9" + "trees/spruce/pine1", + "trees/spruce/pine2", + "trees/spruce/pine3", + "trees/spruce/pine4", + "trees/spruce/pine5", + "trees/spruce/pine6", + "trees/spruce/pine7", + "trees/spruce/pine8", + "trees/spruce/pine9" ], "chance": 0.9, "rotation": { diff --git a/biomes/frozen/fzn-pine-plains.json b/biomes/frozen/fzn-pine-plains.json index 6d1587ae..05e3b9c1 100644 --- a/biomes/frozen/fzn-pine-plains.json +++ b/biomes/frozen/fzn-pine-plains.json @@ -95,15 +95,15 @@ } ], "place": [ - "pine/pine1", - "pine/pine2", - "pine/pine3", - "pine/pine4", - "pine/pine5", - "pine/pine6", - "pine/pine7", - "pine/pine8", - "pine/pine9" + "trees/spruce/pine1", + "trees/spruce/pine2", + "trees/spruce/pine3", + "trees/spruce/pine4", + "trees/spruce/pine5", + "trees/spruce/pine6", + "trees/spruce/pine7", + "trees/spruce/pine8", + "trees/spruce/pine9" ], "chance": 0.09, "rotation": { diff --git a/biomes/frozen/fzn-vander.json b/biomes/frozen/fzn-vander.json index d96ebbe4..b012f92e 100644 --- a/biomes/frozen/fzn-vander.json +++ b/biomes/frozen/fzn-vander.json @@ -130,15 +130,15 @@ "enabled": true }, "place": [ - "wonderland/froShroom-1", - "wonderland/froShroom-2", - "wonderland/froShroom-3", - "wonderland/froShroom-4", - "wonderland/froShroom-5", - "wonderland/froShroom-6", - "wonderland/froShroom-7", - "wonderland/froShroom-8", - "wonderland/froShroom-9" + "wonderland/froShroom1", + "wonderland/froShroom2", + "wonderland/froShroom3", + "wonderland/froShroom4", + "wonderland/froShroom5", + "wonderland/froShroom6", + "wonderland/froShroom7", + "wonderland/froShroom8", + "wonderland/froShroom9" ], "translate": { "x": 0, diff --git a/biomes/hot/msa-valleys.json b/biomes/hot/msa-valleys.json index 78e9f7e0..e529f779 100644 --- a/biomes/hot/msa-valleys.json +++ b/biomes/hot/msa-valleys.json @@ -209,9 +209,9 @@ "enabled": true }, "place": [ - "savanna-gen/savannaD-1", - "savanna-gen/savannaD-2", - "savanna-gen/savannaD-3" + "trees/acacia/savannaD1", + "trees/acacia/savannaD2", + "trees/acacia/savannaD3" ], "translate": { "x": 0, @@ -231,19 +231,19 @@ "enabled": true }, "place": [ - "savanna-gen/savannaF-1", - "savanna-gen/savannaF-2", - "savanna-gen/savannaF-3", - "savanna-gen/savannaF-4", - "savanna-gen/savannaF-5", - "savanna-gen/savannaF-6", - "savanna-gen/savannaF-7", - "savanna-gen/savannaF-8", - "savanna-gen/savannaF-9", - "savanna-gen/savannaF-10", - "savanna-gen/savannaF-11", - "savanna-gen/savannaF-13", - "savanna-gen/savannaF-14" + "trees/acacia/savannaF1", + "trees/acacia/savannaF2", + "trees/acacia/savannaF3", + "trees/acacia/savannaF4", + "trees/acacia/savannaF5", + "trees/acacia/savannaF6", + "trees/acacia/savannaF7", + "trees/acacia/savannaF8", + "trees/acacia/savannaF9", + "trees/acacia/savannaF10", + "trees/acacia/savannaF11", + "trees/acacia/savannaF13", + "trees/acacia/savannaF14" ], "translate": { "x": 0, @@ -263,18 +263,18 @@ "enabled": true }, "place": [ - "savanna-gen/savannaS-1", - "savanna-gen/savannaS-2", - "savanna-gen/savannaS-3", - "savanna-gen/savannaS-4", - "savanna-gen/savannaS-5", - "savanna-gen/savannaS-6", - "savanna-gen/savannaS-7", - "savanna-gen/savannaS-8", - "savanna-gen/savannas-9", - "savanna-gen/savannas-10", - "savanna-gen/savannas-11", - "savanna-gen/savannas-12" + "trees/acacia/savannaS1", + "trees/acacia/savannaS2", + "trees/acacia/savannaS3", + "trees/acacia/savannaS4", + "trees/acacia/savannaS5", + "trees/acacia/savannaS6", + "trees/acacia/savannaS7", + "trees/acacia/savannaS8", + "trees/acacia/savannas9", + "trees/acacia/savannas10", + "trees/acacia/savannas11", + "trees/acacia/savannas12" ], "translate": { "x": 0, diff --git a/biomes/hot/sav-cliff.json b/biomes/hot/sav-cliff.json index 9b0ad7ff..36ac589b 100644 --- a/biomes/hot/sav-cliff.json +++ b/biomes/hot/sav-cliff.json @@ -117,9 +117,9 @@ "enabled": true }, "place": [ - "savanna-gen/savannaD-1", - "savanna-gen/savannaD-2", - "savanna-gen/savannaD-3" + "trees/acacia/savannaD1", + "trees/acacia/savannaD2", + "trees/acacia/savannaD3" ], "translate": { "x": 0, @@ -139,19 +139,19 @@ "enabled": true }, "place": [ - "savanna-gen/savannaF-1", - "savanna-gen/savannaF-2", - "savanna-gen/savannaF-3", - "savanna-gen/savannaF-4", - "savanna-gen/savannaF-5", - "savanna-gen/savannaF-6", - "savanna-gen/savannaF-7", - "savanna-gen/savannaF-8", - "savanna-gen/savannaF-9", - "savanna-gen/savannaF-10", - "savanna-gen/savannaF-11", - "savanna-gen/savannaF-13", - "savanna-gen/savannaF-14" + "trees/acacia/savannaF1", + "trees/acacia/savannaF2", + "trees/acacia/savannaF3", + "trees/acacia/savannaF4", + "trees/acacia/savannaF5", + "trees/acacia/savannaF6", + "trees/acacia/savannaF7", + "trees/acacia/savannaF8", + "trees/acacia/savannaF9", + "trees/acacia/savannaF10", + "trees/acacia/savannaF11", + "trees/acacia/savannaF13", + "trees/acacia/savannaF14" ], "translate": { "x": 0, @@ -171,18 +171,18 @@ "enabled": true }, "place": [ - "savanna-gen/savannaS-1", - "savanna-gen/savannaS-2", - "savanna-gen/savannaS-3", - "savanna-gen/savannaS-4", - "savanna-gen/savannaS-5", - "savanna-gen/savannaS-6", - "savanna-gen/savannaS-7", - "savanna-gen/savannaS-8", - "savanna-gen/savannas-9", - "savanna-gen/savannas-10", - "savanna-gen/savannas-11", - "savanna-gen/savannas-12" + "trees/acacia/savannaS1", + "trees/acacia/savannaS2", + "trees/acacia/savannaS3", + "trees/acacia/savannaS4", + "trees/acacia/savannaS5", + "trees/acacia/savannaS6", + "trees/acacia/savannaS7", + "trees/acacia/savannaS8", + "trees/acacia/savannas9", + "trees/acacia/savannas10", + "trees/acacia/savannas11", + "trees/acacia/savannas12" ], "translate": { "x": 0, diff --git a/biomes/hot/sav-plateau.json b/biomes/hot/sav-plateau.json index 27562262..c8e07878 100644 --- a/biomes/hot/sav-plateau.json +++ b/biomes/hot/sav-plateau.json @@ -149,9 +149,9 @@ "enabled": true }, "place": [ - "savanna-gen/savannaD-1", - "savanna-gen/savannaD-2", - "savanna-gen/savannaD-3" + "trees/acacia/savannaD1", + "trees/acacia/savannaD2", + "trees/acacia/savannaD3" ], "translate": { "x": 0, @@ -171,19 +171,19 @@ "enabled": true }, "place": [ - "savanna-gen/savannaF-1", - "savanna-gen/savannaF-2", - "savanna-gen/savannaF-3", - "savanna-gen/savannaF-4", - "savanna-gen/savannaF-5", - "savanna-gen/savannaF-6", - "savanna-gen/savannaF-7", - "savanna-gen/savannaF-8", - "savanna-gen/savannaF-9", - "savanna-gen/savannaF-10", - "savanna-gen/savannaF-11", - "savanna-gen/savannaF-13", - "savanna-gen/savannaF-14" + "trees/acacia/savannaF1", + "trees/acacia/savannaF2", + "trees/acacia/savannaF3", + "trees/acacia/savannaF4", + "trees/acacia/savannaF5", + "trees/acacia/savannaF6", + "trees/acacia/savannaF7", + "trees/acacia/savannaF8", + "trees/acacia/savannaF9", + "trees/acacia/savannaF10", + "trees/acacia/savannaF11", + "trees/acacia/savannaF13", + "trees/acacia/savannaF14" ], "translate": { "x": 0, @@ -203,18 +203,18 @@ "enabled": true }, "place": [ - "savanna-gen/savannaS-1", - "savanna-gen/savannaS-2", - "savanna-gen/savannaS-3", - "savanna-gen/savannaS-4", - "savanna-gen/savannaS-5", - "savanna-gen/savannaS-6", - "savanna-gen/savannaS-7", - "savanna-gen/savannaS-8", - "savanna-gen/savannas-9", - "savanna-gen/savannas-10", - "savanna-gen/savannas-11", - "savanna-gen/savannas-12" + "trees/acacia/savannaS1", + "trees/acacia/savannaS2", + "trees/acacia/savannaS3", + "trees/acacia/savannaS4", + "trees/acacia/savannaS5", + "trees/acacia/savannaS6", + "trees/acacia/savannaS7", + "trees/acacia/savannaS8", + "trees/acacia/savannas9", + "trees/acacia/savannas10", + "trees/acacia/savannas11", + "trees/acacia/savannas12" ], "translate": { "x": 0, diff --git a/biomes/hot/sav-savanna.json b/biomes/hot/sav-savanna.json index e46754ce..06277680 100644 --- a/biomes/hot/sav-savanna.json +++ b/biomes/hot/sav-savanna.json @@ -157,9 +157,9 @@ "enabled": true }, "place": [ - "savanna-gen/savannaD-1", - "savanna-gen/savannaD-2", - "savanna-gen/savannaD-3" + "trees/acacia/savannaD1", + "trees/acacia/savannaD2", + "trees/acacia/savannaD3" ], "translate": { "x": 0, @@ -179,19 +179,19 @@ "enabled": true }, "place": [ - "savanna-gen/savannaF-1", - "savanna-gen/savannaF-2", - "savanna-gen/savannaF-3", - "savanna-gen/savannaF-4", - "savanna-gen/savannaF-5", - "savanna-gen/savannaF-6", - "savanna-gen/savannaF-7", - "savanna-gen/savannaF-8", - "savanna-gen/savannaF-9", - "savanna-gen/savannaF-10", - "savanna-gen/savannaF-11", - "savanna-gen/savannaF-13", - "savanna-gen/savannaF-14" + "trees/acacia/savannaF1", + "trees/acacia/savannaF2", + "trees/acacia/savannaF3", + "trees/acacia/savannaF4", + "trees/acacia/savannaF5", + "trees/acacia/savannaF6", + "trees/acacia/savannaF7", + "trees/acacia/savannaF8", + "trees/acacia/savannaF9", + "trees/acacia/savannaF10", + "trees/acacia/savannaF11", + "trees/acacia/savannaF13", + "trees/acacia/savannaF14" ], "translate": { "x": 0, @@ -211,18 +211,18 @@ "enabled": true }, "place": [ - "savanna-gen/savannaS-1", - "savanna-gen/savannaS-2", - "savanna-gen/savannaS-3", - "savanna-gen/savannaS-4", - "savanna-gen/savannaS-5", - "savanna-gen/savannaS-6", - "savanna-gen/savannaS-7", - "savanna-gen/savannaS-8", - "savanna-gen/savannas-9", - "savanna-gen/savannas-10", - "savanna-gen/savannas-11", - "savanna-gen/savannas-12" + "trees/acacia/savannaS1", + "trees/acacia/savannaS2", + "trees/acacia/savannaS3", + "trees/acacia/savannaS4", + "trees/acacia/savannaS5", + "trees/acacia/savannaS6", + "trees/acacia/savannaS7", + "trees/acacia/savannaS8", + "trees/acacia/savannas9", + "trees/acacia/savannas10", + "trees/acacia/savannas11", + "trees/acacia/savannas12" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-crimson-forest.json b/biomes/mushroom/mus-crimson-forest.json index 7b4c820d..bd3a7568 100644 --- a/biomes/mushroom/mus-crimson-forest.json +++ b/biomes/mushroom/mus-crimson-forest.json @@ -263,11 +263,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, @@ -298,11 +298,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-forest-hills.json b/biomes/mushroom/mus-forest-hills.json index efe9fb63..5fcc56a3 100644 --- a/biomes/mushroom/mus-forest-hills.json +++ b/biomes/mushroom/mus-forest-hills.json @@ -311,11 +311,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, @@ -336,11 +336,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-forest.json b/biomes/mushroom/mus-forest.json index 45eed73b..f257d7ad 100644 --- a/biomes/mushroom/mus-forest.json +++ b/biomes/mushroom/mus-forest.json @@ -312,11 +312,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, @@ -337,11 +337,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-plains.json b/biomes/mushroom/mus-plains.json index a35561e7..b258d0fd 100644 --- a/biomes/mushroom/mus-plains.json +++ b/biomes/mushroom/mus-plains.json @@ -174,11 +174,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, @@ -199,11 +199,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-warped-forest.json b/biomes/mushroom/mus-warped-forest.json index 9b56c990..54b7fad7 100644 --- a/biomes/mushroom/mus-warped-forest.json +++ b/biomes/mushroom/mus-warped-forest.json @@ -287,11 +287,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, @@ -326,11 +326,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-fzn-ocean.json b/biomes/ocean/oce-fzn-ocean.json index 732e828a..2c6d5850 100644 --- a/biomes/ocean/oce-fzn-ocean.json +++ b/biomes/ocean/oce-fzn-ocean.json @@ -119,15 +119,15 @@ }, "onwater": true, "place": [ - "clutter/smolicespike1", - "clutter/smolicespike2", - "clutter/smolicespike3", - "clutter/smolicespike4", - "clutter/smolicespike5", - "clutter/smolicespike6", - "clutter/smolicespike7", - "clutter/smolicespike8", - "clutter/smolicespike9" + "clutter/smoleicespike1", + "clutter/smoleicespike2", + "clutter/smoleicespike3", + "clutter/smoleicespike4", + "clutter/smoleicespike5", + "clutter/smoleicespike6", + "clutter/smoleicespike7", + "clutter/smoleicespike8", + "clutter/smoleicespike9" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-mus-lake.json b/biomes/ocean/oce-mus-lake.json index ad9125d0..20b87d80 100644 --- a/biomes/ocean/oce-mus-lake.json +++ b/biomes/ocean/oce-mus-lake.json @@ -162,11 +162,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, @@ -187,11 +187,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "trees/mushroom/smolshroom1", + "trees/mushroom/smolshroom2", + "trees/mushroom/smolshroom3", + "trees/mushroom/smolshroom4", + "trees/mushroom/smolshroom5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-mus-ocean.json b/biomes/ocean/oce-mus-ocean.json index 4ef2d9ec..92325b7c 100644 --- a/biomes/ocean/oce-mus-ocean.json +++ b/biomes/ocean/oce-mus-ocean.json @@ -155,7 +155,7 @@ "trees/mushroom/lumo7", "trees/mushroom/lumo8", "trees/mushroom/lumo9", - "trees/mushroom/lumo0" + "trees/mushroom/lumo10" ], "translate": { "x": 0, @@ -185,7 +185,7 @@ "trees/mushroom/lumo7", "trees/mushroom/lumo8", "trees/mushroom/lumo9", - "trees/mushroom/lumo0" + "trees/mushroom/lumo10" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-birch-forest.json b/biomes/temperate/tem-birch-forest.json index cc153c72..ae8176e9 100644 --- a/biomes/temperate/tem-birch-forest.json +++ b/biomes/temperate/tem-birch-forest.json @@ -146,10 +146,10 @@ "enabled": true }, "place": [ - "birch-remade/b1", - "birch-remade/b2", - "birch-remade/b3", - "birch-remade/b4" + "trees/birch/forest1", + "trees/birch/forest2", + "trees/birch/forest3", + "trees/birch/forest4" ], "translate": { "x": 0, @@ -170,10 +170,10 @@ "enabled": true }, "place": [ - "trees/birch/antioch3-b", - "trees/birch/antioch4-b", - "trees/birch/antioch5-b", - "trees/birch/antioch6-b" + "trees/birch/antioch3b", + "trees/birch/antioch4b", + "trees/birch/antioch5b", + "trees/birch/antioch6b" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-forest-cliffs.json b/biomes/tundra/tun-forest-cliffs.json index dc716186..4f5977da 100644 --- a/biomes/tundra/tun-forest-cliffs.json +++ b/biomes/tundra/tun-forest-cliffs.json @@ -244,18 +244,18 @@ { "chance": 0.125, "place": [ - "pine/pine1", - "pine/pine2", - "pine/pine3", - "pine/pine4", - "pine/pine5", - "pine/pine6", - "pine/pine7", - "pine/pine8", - "pine/pine9", - "pine/pine10", - "pine/pine11", - "pine/pine12" + "trees/spruce/pine1", + "trees/spruce/pine2", + "trees/spruce/pine3", + "trees/spruce/pine4", + "trees/spruce/pine5", + "trees/spruce/pine6", + "trees/spruce/pine7", + "trees/spruce/pine8", + "trees/spruce/pine9", + "trees/spruce/pine10", + "trees/spruce/pine11", + "trees/spruce/pine12" ] } ], diff --git a/biomes/tundra/tun-forest.json b/biomes/tundra/tun-forest.json index 183a0d90..0b4a50db 100644 --- a/biomes/tundra/tun-forest.json +++ b/biomes/tundra/tun-forest.json @@ -133,18 +133,18 @@ { "chance": 0.25, "place": [ - "pine/pine1", - "pine/pine2", - "pine/pine3", - "pine/pine4", - "pine/pine5", - "pine/pine6", - "pine/pine7", - "pine/pine8", - "pine/pine9", - "pine/pine10", - "pine/pine11", - "pine/pine12" + "trees/spruce/pine1", + "trees/spruce/pine2", + "trees/spruce/pine3", + "trees/spruce/pine4", + "trees/spruce/pine5", + "trees/spruce/pine6", + "trees/spruce/pine7", + "trees/spruce/pine8", + "trees/spruce/pine9", + "trees/spruce/pine10", + "trees/spruce/pine11", + "trees/spruce/pine12" ] } ], diff --git a/biomes/tundra/tun-mountains-cliffs.json b/biomes/tundra/tun-mountains-cliffs.json index efd704c9..428e6b1e 100644 --- a/biomes/tundra/tun-mountains-cliffs.json +++ b/biomes/tundra/tun-mountains-cliffs.json @@ -253,18 +253,18 @@ { "chance": 0.125, "place": [ - "pine/pine1", - "pine/pine2", - "pine/pine3", - "pine/pine4", - "pine/pine5", - "pine/pine6", - "pine/pine7", - "pine/pine8", - "pine/pine9", - "pine/pine10", - "pine/pine11", - "pine/pine12" + "trees/spruce/pine1", + "trees/spruce/pine2", + "trees/spruce/pine3", + "trees/spruce/pine4", + "trees/spruce/pine5", + "trees/spruce/pine6", + "trees/spruce/pine7", + "trees/spruce/pine8", + "trees/spruce/pine9", + "trees/spruce/pine10", + "trees/spruce/pine11", + "trees/spruce/pine12" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-mountains.json b/biomes/tundra/tun-mountains.json index d466f596..4d088163 100644 --- a/biomes/tundra/tun-mountains.json +++ b/biomes/tundra/tun-mountains.json @@ -137,18 +137,18 @@ { "chance": 0.25, "place": [ - "pine/pine1", - "pine/pine2", - "pine/pine3", - "pine/pine4", - "pine/pine5", - "pine/pine6", - "pine/pine7", - "pine/pine8", - "pine/pine9", - "pine/pine10", - "pine/pine11", - "pine/pine12" + "trees/spruce/pine1", + "trees/spruce/pine2", + "trees/spruce/pine3", + "trees/spruce/pine4", + "trees/spruce/pine5", + "trees/spruce/pine6", + "trees/spruce/pine7", + "trees/spruce/pine8", + "trees/spruce/pine9", + "trees/spruce/pine10", + "trees/spruce/pine11", + "trees/spruce/pine12" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/tun-redwood-cliffs.json index 10367d48..edf2a1bd 100644 --- a/biomes/tundra/tun-redwood-cliffs.json +++ b/biomes/tundra/tun-redwood-cliffs.json @@ -236,18 +236,18 @@ "enabled": true }, "place": [ - "pine/sup-pine-1", - "pine/sup-pine-2", - "pine/sup-pine-3", - "pine/sup-pine-4", - "pine/sup-pine-5", - "pine/sup-pine-6", - "pine/sup-pine-7", - "pine/sup-pine-8", - "pine/sup-pine-9", - "pine/sup-pine-10", - "pine/sup-pine-11", - "pine/sup-pine-12" + "trees/spruce/sup-pine-1", + "trees/spruce/sup-pine-2", + "trees/spruce/sup-pine-3", + "trees/spruce/sup-pine-4", + "trees/spruce/sup-pine-5", + "trees/spruce/sup-pine-6", + "trees/spruce/sup-pine-7", + "trees/spruce/sup-pine-8", + "trees/spruce/sup-pine-9", + "trees/spruce/sup-pine-10", + "trees/spruce/sup-pine-11", + "trees/spruce/sup-pine-12" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-sequia-redwoods.json b/biomes/tundra/tun-sequia-redwoods.json index 98447d26..fe5f7b40 100644 --- a/biomes/tundra/tun-sequia-redwoods.json +++ b/biomes/tundra/tun-sequia-redwoods.json @@ -229,18 +229,18 @@ "enabled": true }, "place": [ - "pine/sup-pine-1", - "pine/sup-pine-2", - "pine/sup-pine-3", - "pine/sup-pine-4", - "pine/sup-pine-5", - "pine/sup-pine-6", - "pine/sup-pine-7", - "pine/sup-pine-8", - "pine/sup-pine-9", - "pine/sup-pine-10", - "pine/sup-pine-11", - "pine/sup-pine-12" + "trees/spruce/sup-pine-1", + "trees/spruce/sup-pine-2", + "trees/spruce/sup-pine-3", + "trees/spruce/sup-pine-4", + "trees/spruce/sup-pine-5", + "trees/spruce/sup-pine-6", + "trees/spruce/sup-pine-7", + "trees/spruce/sup-pine-8", + "trees/spruce/sup-pine-9", + "trees/spruce/sup-pine-10", + "trees/spruce/sup-pine-11", + "trees/spruce/sup-pine-12" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-taiga.json b/biomes/tundra/tun-taiga.json index ad0771ad..39e41064 100644 --- a/biomes/tundra/tun-taiga.json +++ b/biomes/tundra/tun-taiga.json @@ -242,18 +242,18 @@ "enabled": true }, "place": [ - "pine/pine1", - "pine/pine2", - "pine/pine3", - "pine/pine4", - "pine/pine5", - "pine/pine6", - "pine/pine7", - "pine/pine8", - "pine/pine9", - "pine/pine10", - "pine/pine11", - "pine/pine12" + "trees/spruce/pine1", + "trees/spruce/pine2", + "trees/spruce/pine3", + "trees/spruce/pine4", + "trees/spruce/pine5", + "trees/spruce/pine6", + "trees/spruce/pine7", + "trees/spruce/pine8", + "trees/spruce/pine9", + "trees/spruce/pine10", + "trees/spruce/pine11", + "trees/spruce/pine12" ], "translate": { "x": 0, diff --git a/objects/clutter/brichclutt1.iob b/objects/clutter/birchclutt1.iob similarity index 100% rename from objects/clutter/brichclutt1.iob rename to objects/clutter/birchclutt1.iob diff --git a/objects/clutter/brichclutt2.iob b/objects/clutter/birchclutt2.iob similarity index 100% rename from objects/clutter/brichclutt2.iob rename to objects/clutter/birchclutt2.iob diff --git a/objects/clutter/brichclutt3.iob b/objects/clutter/birchclutt3.iob similarity index 100% rename from objects/clutter/brichclutt3.iob rename to objects/clutter/birchclutt3.iob diff --git a/objects/clutter/brichclutt4.iob b/objects/clutter/birchclutt4.iob similarity index 100% rename from objects/clutter/brichclutt4.iob rename to objects/clutter/birchclutt4.iob diff --git a/objects/clutter/brichclutt5.iob b/objects/clutter/birchclutt5.iob similarity index 100% rename from objects/clutter/brichclutt5.iob rename to objects/clutter/birchclutt5.iob diff --git a/objects/clutter/hive.iob b/objects/clutter/hive1.iob similarity index 100% rename from objects/clutter/hive.iob rename to objects/clutter/hive1.iob diff --git a/objects/void/gvoid.iob b/objects/jigsaw/void/gvoid.iob similarity index 100% rename from objects/void/gvoid.iob rename to objects/jigsaw/void/gvoid.iob diff --git a/objects/void/void.iob b/objects/jigsaw/void/void.iob similarity index 100% rename from objects/void/void.iob rename to objects/jigsaw/void/void.iob diff --git a/objects/trees/mushroom/crimsonwood-1.iob b/objects/trees/mushroom/crimsonwood1.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-1.iob rename to objects/trees/mushroom/crimsonwood1.iob diff --git a/objects/trees/mushroom/crimsonwood-2.iob b/objects/trees/mushroom/crimsonwood2.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-2.iob rename to objects/trees/mushroom/crimsonwood2.iob diff --git a/objects/trees/mushroom/crimsonwood-3.iob b/objects/trees/mushroom/crimsonwood3.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-3.iob rename to objects/trees/mushroom/crimsonwood3.iob diff --git a/objects/trees/mushroom/crimsonwood-4.iob b/objects/trees/mushroom/crimsonwood4.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-4.iob rename to objects/trees/mushroom/crimsonwood4.iob diff --git a/objects/trees/mushroom/crimsonwood-5.iob b/objects/trees/mushroom/crimsonwood5.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-5.iob rename to objects/trees/mushroom/crimsonwood5.iob diff --git a/objects/trees/mushroom/froShroom-1.iob b/objects/trees/mushroom/froShroom1.iob similarity index 100% rename from objects/trees/mushroom/froShroom-1.iob rename to objects/trees/mushroom/froShroom1.iob diff --git a/objects/trees/mushroom/froShroom-2.iob b/objects/trees/mushroom/froShroom2.iob similarity index 100% rename from objects/trees/mushroom/froShroom-2.iob rename to objects/trees/mushroom/froShroom2.iob diff --git a/objects/trees/mushroom/froShroom-3.iob b/objects/trees/mushroom/froShroom3.iob similarity index 100% rename from objects/trees/mushroom/froShroom-3.iob rename to objects/trees/mushroom/froShroom3.iob diff --git a/objects/trees/mushroom/froShroom-4.iob b/objects/trees/mushroom/froShroom4.iob similarity index 100% rename from objects/trees/mushroom/froShroom-4.iob rename to objects/trees/mushroom/froShroom4.iob diff --git a/objects/trees/mushroom/froShroom-5.iob b/objects/trees/mushroom/froShroom5.iob similarity index 100% rename from objects/trees/mushroom/froShroom-5.iob rename to objects/trees/mushroom/froShroom5.iob diff --git a/objects/trees/mushroom/froShroom-6.iob b/objects/trees/mushroom/froShroom6.iob similarity index 100% rename from objects/trees/mushroom/froShroom-6.iob rename to objects/trees/mushroom/froShroom6.iob diff --git a/objects/trees/mushroom/froShroom-7.iob b/objects/trees/mushroom/froShroom7.iob similarity index 100% rename from objects/trees/mushroom/froShroom-7.iob rename to objects/trees/mushroom/froShroom7.iob diff --git a/objects/trees/mushroom/froShroom-8.iob b/objects/trees/mushroom/froShroom8.iob similarity index 100% rename from objects/trees/mushroom/froShroom-8.iob rename to objects/trees/mushroom/froShroom8.iob diff --git a/objects/trees/mushroom/froShroom-9.iob b/objects/trees/mushroom/froShroom9.iob similarity index 100% rename from objects/trees/mushroom/froShroom-9.iob rename to objects/trees/mushroom/froShroom9.iob