diff --git a/biomes/frozen/fzn-vander.json b/biomes/frozen/fzn-vander.json index b012f92e..3fbf716a 100644 --- a/biomes/frozen/fzn-vander.json +++ b/biomes/frozen/fzn-vander.json @@ -99,16 +99,15 @@ }, "place": [ - "wonderland/wonder-1", - "wonderland/wonder-2", - "wonderland/wonder-3", - "wonderland/wonder-4", - "wonderland/wonder-5", - "wonderland/wonder-6", - "wonderland/wonder-7", - "wonderland/wonder-8", - "wonderland/wonder-9", - "wonderland/wonder-10" + "trees/mushroom/ice1", + "trees/mushroom/ice2", + "trees/mushroom/ice3", + "trees/mushroom/ice4", + "trees/mushroom/ice5", + "trees/mushroom/ice6", + "trees/mushroom/ice7", + "trees/mushroom/ice8", + "trees/mushroom/ice9" ], "translate": { "x": 0, @@ -130,15 +129,15 @@ "enabled": true }, "place": [ - "wonderland/froShroom1", - "wonderland/froShroom2", - "wonderland/froShroom3", - "wonderland/froShroom4", - "wonderland/froShroom5", - "wonderland/froShroom6", - "wonderland/froShroom7", - "wonderland/froShroom8", - "wonderland/froShroom9" + "trees/mushroom/froShroom1", + "trees/mushroom/froShroom2", + "trees/mushroom/froShroom3", + "trees/mushroom/froShroom4", + "trees/mushroom/froShroom5", + "trees/mushroom/froShroom6", + "trees/mushroom/froShroom7", + "trees/mushroom/froShroom8", + "trees/mushroom/froShroom9" ], "translate": { "x": 0, @@ -177,18 +176,17 @@ "enabled": true }, "place": [ - "frosted-trees/sproak/generic1", - "frosted-trees/sproak/generic2", - "frosted-trees/sproak/generic3", - "frosted-trees/sproak/generic4", - "frosted-trees/sproak/generic5", - "frosted-trees/sproak/generic7", - "frosted-trees/sproak/generic8", - "frosted-trees/sproak/generic9", - "frosted-trees/sproak/generic10", - "frosted-trees/sproak/generic11", - "frosted-trees/sproak/generic12", - "frosted-trees/sproak/generic13" + "trees/sproak/generic1", + "trees/sproak/generic2", + "trees/sproak/generic3", + "trees/sproak/generic4", + "trees/sproak/generic5", + "trees/sproak/generic7", + "trees/sproak/generic8", + "trees/sproak/generic9", + "trees/sproak/generic10", + "trees/sproak/generic11", + "trees/sproak/generic12" ], "translate": { "x": 0, diff --git a/biomes/mountain/mtn-plain-hills.json b/biomes/mountain/mtn-plain-hills.json index 2f1845bc..ac2b04bd 100644 --- a/biomes/mountain/mtn-plain-hills.json +++ b/biomes/mountain/mtn-plain-hills.json @@ -94,12 +94,12 @@ "objects": [ { "place": [ - "trees/oak/1", - "trees/oak/2", - "trees/oak/3", - "trees/oak/4", - "trees/oak/5", - "trees/oak/6" + "trees/oak/truegeneric1", + "trees/oak/truegeneric3", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5", + "trees/oak/truegeneric6" ], "chance": 0.07, "rotation": { diff --git a/biomes/swamp/swa-marsh-rotten.json b/biomes/swamp/swa-marsh-rotten.json index 37b888ab..32245b39 100644 --- a/biomes/swamp/swa-marsh-rotten.json +++ b/biomes/swamp/swa-marsh-rotten.json @@ -106,12 +106,12 @@ "enabled": true }, "place": [ - "wasteland/dead-1", - "wasteland/dead-2", - "wasteland/dead-3", - "wasteland/dead-4", - "wasteland/dead-5", - "wasteland/dead-6" + "trees/oak/dead1", + "trees/oak/dead2", + "trees/oak/dead3", + "trees/oak/dead4", + "trees/oak/dead5", + "trees/oak/dead6" ], "translate": { "x": 0, @@ -157,13 +157,13 @@ "enabled": true }, "place": [ - "wasteland/stone-1", - "wasteland/stone-2", - "wasteland/stone-3", - "wasteland/stone-4", - "wasteland/stone-5", - "wasteland/stone-6", - "wasteland/stone-7" + "clutter/stone1", + "clutter/stone2", + "clutter/stone3", + "clutter/stone4", + "clutter/stone5", + "clutter/stone6", + "clutter/stone7" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-flower-forest.json b/biomes/temperate/tem-flower-forest.json index 50283a09..e7254e96 100644 --- a/biomes/temperate/tem-flower-forest.json +++ b/biomes/temperate/tem-flower-forest.json @@ -305,24 +305,6 @@ "z": 0 } }, - { - "chance": 0.004, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["sakura/tronco"], - "translate": { - "x": 0, - "y": 1, - "z": 0 - } - }, { "chance": 0.001, "rotation": { diff --git a/biomes/temperate/tem-plain-hills.json b/biomes/temperate/tem-plain-hills.json index 3b7efefd..28d46bd0 100644 --- a/biomes/temperate/tem-plain-hills.json +++ b/biomes/temperate/tem-plain-hills.json @@ -101,12 +101,12 @@ "objects": [ { "place": [ - "trees/oak/1", - "trees/oak/2", - "trees/oak/3", - "trees/oak/4", - "trees/oak/5", - "trees/oak/6" + "trees/oak/truegeneric1", + "trees/oak/truegeneric3", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5", + "trees/oak/truegeneric6" ], "chance": 0.07, "rotation": { diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/tem-plains.json index 1394579a..ca43dbdb 100644 --- a/biomes/temperate/tem-plains.json +++ b/biomes/temperate/tem-plains.json @@ -223,27 +223,6 @@ "z": 0 } }, - { - "chance": 0.009, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "plains/tree1", - "plains/tree2" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - }, { "chance": 1.0E-4, "mode": "VACUUM", @@ -350,12 +329,12 @@ }, { "place": [ - "trees/oak/1", - "trees/oak/2", - "trees/oak/3", - "trees/oak/4", - "trees/oak/5", - "trees/oak/6" + "trees/oak/truegeneric1", + "trees/oak/truegeneric3", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5", + "trees/oak/truegeneric6" ], "chance": 0.07, "rotation": { diff --git a/biomes/temperate/tem-sakura-pink-child.json b/biomes/temperate/tem-sakura-pink-child.json index ca851540..76a01df2 100644 --- a/biomes/temperate/tem-sakura-pink-child.json +++ b/biomes/temperate/tem-sakura-pink-child.json @@ -123,11 +123,11 @@ "enabled": true }, "place": [ - "ob-sakura/sakura1", - "ob-sakura/sakura2", - "ob-sakura/sakura3", - "ob-sakura/sakura4", - "ob-sakura/sakura5" + "trees/sakura/genericsak1", + "trees/sakura/genericsak2", + "trees/sakura/genericsak3", + "trees/sakura/genericsak4", + "trees/sakura/genericsak5" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-sakura-pink-forest.json b/biomes/temperate/tem-sakura-pink-forest.json index f492e72b..47f535fb 100644 --- a/biomes/temperate/tem-sakura-pink-forest.json +++ b/biomes/temperate/tem-sakura-pink-forest.json @@ -137,11 +137,11 @@ "enabled": true }, "place": [ - "ob-sakura/sakura1", - "ob-sakura/sakura2", - "ob-sakura/sakura3", - "ob-sakura/sakura4", - "ob-sakura/sakura5" + "trees/sakura/genericsak1", + "trees/sakura/genericsak2", + "trees/sakura/genericsak3", + "trees/sakura/genericsak4", + "trees/sakura/genericsak5" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/tem-stranged-plains.json index 45987c80..6db26b84 100644 --- a/biomes/temperate/tem-stranged-plains.json +++ b/biomes/temperate/tem-stranged-plains.json @@ -115,27 +115,6 @@ "trees/oak/shoakgeneric2" ] }, - { - "chance": 0.009, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "plains/tree1", - "plains/tree2" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - }, { "chance": 2.0E-7, "rotation": { @@ -161,12 +140,12 @@ }, { "place": [ - "trees/oak/1", - "trees/oak/2", - "trees/oak/3", - "trees/oak/4", - "trees/oak/5", - "trees/oak/6" + "trees/oak/truegeneric1", + "trees/oak/truegeneric3", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5", + "trees/oak/truegeneric6" ], "chance": 0.07, "rotation": { diff --git a/objects/clutter/stone-1.iob b/objects/clutter/stone1.iob similarity index 100% rename from objects/clutter/stone-1.iob rename to objects/clutter/stone1.iob diff --git a/objects/clutter/stone-2.iob b/objects/clutter/stone2.iob similarity index 100% rename from objects/clutter/stone-2.iob rename to objects/clutter/stone2.iob diff --git a/objects/clutter/stone-3.iob b/objects/clutter/stone3.iob similarity index 100% rename from objects/clutter/stone-3.iob rename to objects/clutter/stone3.iob diff --git a/objects/clutter/stone-4.iob b/objects/clutter/stone4.iob similarity index 100% rename from objects/clutter/stone-4.iob rename to objects/clutter/stone4.iob diff --git a/objects/clutter/stone-5.iob b/objects/clutter/stone5.iob similarity index 100% rename from objects/clutter/stone-5.iob rename to objects/clutter/stone5.iob diff --git a/objects/clutter/stone-6.iob b/objects/clutter/stone6.iob similarity index 100% rename from objects/clutter/stone-6.iob rename to objects/clutter/stone6.iob diff --git a/objects/clutter/stone-7.iob b/objects/clutter/stone7.iob similarity index 100% rename from objects/clutter/stone-7.iob rename to objects/clutter/stone7.iob diff --git a/objects/trees/oak/dead-1.iob b/objects/trees/oak/dead1.iob similarity index 100% rename from objects/trees/oak/dead-1.iob rename to objects/trees/oak/dead1.iob diff --git a/objects/trees/oak/dead-2.iob b/objects/trees/oak/dead2.iob similarity index 100% rename from objects/trees/oak/dead-2.iob rename to objects/trees/oak/dead2.iob diff --git a/objects/trees/oak/dead-3.iob b/objects/trees/oak/dead3.iob similarity index 100% rename from objects/trees/oak/dead-3.iob rename to objects/trees/oak/dead3.iob diff --git a/objects/trees/oak/dead-4.iob b/objects/trees/oak/dead4.iob similarity index 100% rename from objects/trees/oak/dead-4.iob rename to objects/trees/oak/dead4.iob diff --git a/objects/trees/oak/dead-5.iob b/objects/trees/oak/dead5.iob similarity index 100% rename from objects/trees/oak/dead-5.iob rename to objects/trees/oak/dead5.iob diff --git a/objects/trees/oak/dead-6.iob b/objects/trees/oak/dead6.iob similarity index 100% rename from objects/trees/oak/dead-6.iob rename to objects/trees/oak/dead6.iob diff --git a/objects/void/gvoid.iob b/objects/void/gvoid.iob new file mode 100644 index 00000000..5372efef Binary files /dev/null and b/objects/void/gvoid.iob differ diff --git a/objects/void/void.iob b/objects/void/void.iob new file mode 100644 index 00000000..04869d44 Binary files /dev/null and b/objects/void/void.iob differ