Merge remote-tracking branch 'IrisDimensions/master'

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",

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",

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",

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,

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,

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,

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": [
         {

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,

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,

biomes/mesa/plateau.json

@@ -9,7 +9,7 @@
         "BADLANDS_PLATEAU",
         "ERODED_BADLANDS"
     ],
-    "children": ["hot/msa-plateau-dirt"],
+    "children": ["mesa/plateau-dirt"],
     "generators": [
         {
             "min": 35,

biomes/mesa/yellow.json

@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BDBF05",
     "vanillaDerivative": "BADLANDS",
-    "children": ["hot/msa-dark"],
+    "children": ["mesa/dark"],
     "generators": [
         {
             "min": 9,

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,

biomes/mountain/main.json

@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#2B2E32",
     "vanillaDerivative": "PLAINS",
-    "children": ["mountain/mtn-middle"],
+    "children": ["mountain/middle"],
     "generators": [
         {
             "min": 70,

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",

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,

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",

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",

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",

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,

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,

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,

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,

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,

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,

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,

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",

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,

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",

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,