Auto stash before merge of "master" and "origin/master"

regions/tundra.json

@@ -22,6 +22,21 @@
     "riverBiomes": [
         "tundra-river"
     ],
+    "structures": [
+        {
+            "tileset": "ruins",
+            "rarity": 87,
+            "zoom": 1
+        },
+        {
+            "tileset": "village-stone",
+            "zoom": 1,
+            "ratio": 0.05,
+            "rarity": 5,
+            "shuffle": 5
+
+        }
+    ],
     "riverRarity": 1,
     "riverStyle": {
         "style": "VASCULAR",
@@ -32,20 +47,6 @@
             "multiplier": 240
         }
     },
-    "structures": [
-        {
-            "tileset": "village-stone",
-            "zoom": 1,
-            "ratio": 0.05,
-            "rarity": 5,
-            "shuffle": 5
-        },
-        {
-            "tileset": "ruins",
-            "rarity": 87,
-            "zoom": 1
-        }
-    ],
     "riverThickness": 0.025,
     "caveBiomes": [
         "tundra-cavern",

structures/cottage-lot.json

@@ -0,0 +1,135 @@
+{
+    "gridHeight": 25,
+    "maxLayers": 1,
+    "bore": true,
+    "wallStyle": {
+        "multiplier": 1,
+        "style": "STATIC",
+        "zoom": 1,
+        "exponent": 1
+    },
+    "tiles": [
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "NEVER",
+            "entitySpawns": [],
+            "placeMode": "CENTER_HEIGHT",
+            "south": "NEVER",
+            "rareObjects": [],
+            "north": "NEVER",
+            "objects": ["structure/cottage-lot/cross-1"],
+            "west": "NEVER",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "NEVER",
+            "entitySpawns": [],
+            "placeMode": "CENTER_HEIGHT",
+            "south": "NEVER",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": ["structure/cottage-lot/t-connect-1"],
+            "west": "NEVER",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "NEVER",
+            "entitySpawns": [],
+            "placeMode": "CENTER_HEIGHT",
+            "south": "REQUIRED",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": ["structure/cottage-lot/hall-1"],
+            "west": "NEVER",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "REQUIRED",
+            "entitySpawns": [],
+            "placeMode": "CENTER_HEIGHT",
+            "south": "NEVER",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": ["structure/cottage-lot/corner-1"],
+            "west": "NEVER",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "REQUIRED",
+            "entitySpawns": [],
+            "placeMode": "CENTER_HEIGHT",
+            "south": "NEVER",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": [
+                "structure/cottage-lot/room-1",
+                "structure/cottage-lot/room-2",
+                "structure/cottage-lot/room-3",
+                "structure/cottage-lot/room-4"
+            ],
+            "west": "REQUIRED",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "REQUIRED",
+            "entitySpawns": [],
+            "placeMode": "CENTER_HEIGHT",
+            "south": "REQUIRED",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": ["structure/cottage-lot/walled-room-1"],
+            "west": "REQUIRED",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        }
+    ],
+    "entitySpawns": [],
+    "gridSize": 15,
+    "wallChance": 0.35,
+    "name": "Cottage Lot",
+    "underwater": false,
+    "loot": {
+        "mode": "ADD",
+        "tables": [],
+        "multiplier": 1
+    },
+    "clamp": {
+        "minimumHeight": 0,
+        "maximumHeight": 255
+    },
+    "mergeEdges": false
+}

structures/murky-stronghold.json

@@ -97,7 +97,11 @@
                 "structure/ogMurkyCavern/room-1",
                 "structure/ogMurkyCavern/room-2",
                 "structure/ogMurkyCavern/room-3",
-                "structure/ogMurkyCavern/room-4"
+                "structure/ogMurkyCavern/room-4",
+                "structure/ogMurkyCavern/room-5",
+                "structure/ogMurkyCavern/room-6-o",
+                "structure/ogMurkyCavern/room-7"
+
             ],
             "west": "REQUIRED",
             "loot": {