9
0
mirror of https://github.com/IrisDimensions/overworld.git synced 2025-12-29 19:59:20 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Brian Fopiano
2020-07-22 01:31:29 -07:00
3 changed files with 35 additions and 2 deletions

View File

@@ -1,11 +1,19 @@
{
<<<<<<< HEAD
"name": "Winter Wonderland",
=======
"name": "Ice Wonderland",
>>>>>>> master
"layers": [
{
"minHeight": 1,
"maxHeight": 1,
"dispersion": "WISPY",
<<<<<<< HEAD
"terrainZoom": 1,
=======
"terrainZoom": 0.6,
>>>>>>> master
"palette": [
"minecraft:snow[layers=1]",
"minecraft:snow[layers=2]",
@@ -19,6 +27,7 @@
},
{
"minHeight": 2,
<<<<<<< HEAD
"maxHeight": 4,
"palette": [
"PACKED_ICE",
@@ -50,6 +59,8 @@
},
{
"minHeight": 2,
=======
>>>>>>> master
"maxHeight": 3,
"palette": [
"SNOW_BLOCK"
@@ -143,7 +154,11 @@
},
{
"chance": 0.35,
<<<<<<< HEAD
"density": 3,
=======
"density": 2,
>>>>>>> master
"rotation": {
"yAxis": {
"min": 0,
@@ -154,6 +169,7 @@
"enabled": true
},
"place": [
<<<<<<< HEAD
"frosted-sproak/med-1",
"frosted-sproak/med-2",
"frosted-sproak/med-3",
@@ -168,6 +184,18 @@
"frosted-sproak/med-12",
"frosted-sproak/med-13"
=======
"wonderland/twirlSpruce-1",
"wonderland/twirlSpruce-2",
"wonderland/twirlSpruce-3",
"wonderland/twirlSpruce-4",
"wonderland/twirlSpruce-5",
"wonderland/twirlSpruce-6",
"wonderland/twirlSpruce-7",
"wonderland/twirlSpruce-8",
"wonderland/twirlSpruce-9",
"wonderland/twirlSpruce-10"
>>>>>>> master
],
"translate": {
@@ -197,7 +225,11 @@
"childShrinkFactor": 20,
"derivative": "SNOWY_TAIGA_MOUNTAINS",
"biomeDispersion": "WISPY",
<<<<<<< HEAD
"biomeZoom": 50,
=======
"biomeZoom": 30,
>>>>>>> master
"biomeScatter": [
"SNOWY_TAIGA_MOUNTAINS",
"TAIGA_HILLS",

View File

@@ -6,7 +6,8 @@
"shoreHeightZoom": 1.14,
"landBiomes": [
"frozen-plains",
"frozen-mountains"
"frozen-mountains",
"frozen-wonderland"
],
"seaBiomes": [
"frozen-ocean"

View File

@@ -20,7 +20,7 @@
"roughnessZoom": 1,
"caveScale": 0.5,
"caves": false,
"focus": "",
"focus": "frozen-wonderland",
"regions": [
"temperate",
"tundra",