author: Mattes D <github@xoft.cz> 2016-11-26 11:19:25 +0100
committer: GitHub <noreply@github.com> 2016-11-26 11:19:25 +0100
commit: 4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc (patch)
tree: ab87c4a6c9f58fdfe2495c4fef939f4940df7d96
parent: Merge pull request #3442 from Seadragon91/luacheck_config (diff)
parent: Prefabs: Implemented support for ExpandFloorStrategy. (diff)
download: cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar
cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.gz
cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.bz2
cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.lz
cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.xz
cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.zst
cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.zip
13 files changed, 1019 insertions, 928 deletions
diff --git a/Server/Prefabs/PieceStructures/NetherFort.cubeset b/Server/Prefabs/PieceStructures/NetherFort.cubeset
index 708fa39da..569335401 100644
--- a/Server/Prefabs/PieceStructures/NetherFort.cubeset
+++ b/Server/Prefabs/PieceStructures/NetherFort.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-11-28 16:54:10",
+		ExportDate = "2016-11-23 15:07:34",
 		["GridSizeX"] = "512",
 		["GridSizeZ"] = "512",
 		["IntendedUse"] = "PieceStructures",
@@ -82,10 +82,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "5",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -335,10 +335,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -460,10 +460,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -590,10 +590,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|3:0|5:0|7:0|9:0|11:0|13:0|15:0",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -761,10 +761,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -924,10 +924,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "1000",
 				["DepthWeight"] = "0:0|2:0|4:0|6:0|8:0|10:0|12:0|14:0|16:0|18:0",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1085,10 +1085,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "500",
 				["DepthWeight"] = "4:-3000|8:-3000|12:-3000|16:-3000|20:-3000",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1226,10 +1226,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "1:1000",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1433,10 +1433,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|2:0|3:0|4:0|5:0",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1545,10 +1545,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|2:0|3:0|4:0|5:0",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1650,10 +1650,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|2:0|3:0|4:0|5:0",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1830,10 +1830,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalStrategy"] = "Range|40|100",
 			},
 			BlockDefinitions =
@@ -2048,17 +2048,17 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
 				"a:112: 0",  -- netherbrick
 				"b: 88: 0",  -- soulsand
-				"c:115: 7",  -- netherwartblock
+				"c:115: 3",  -- netherwartblock
 				"d:114: 3",  -- netherbrickstairs
 				"e:114: 0",  -- netherbrickstairs
 				"f:114: 1",  -- netherbrickstairs
@@ -2235,10 +2235,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|2:0|3:0|4:0|5:0",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2366,10 +2366,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|3:0|5:0|7:0|9:0|11:0|13:0|15:0",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2551,10 +2551,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2834,10 +2834,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -3127,10 +3127,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -3464,10 +3464,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "300",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -3589,10 +3589,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "300",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -3714,10 +3714,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -3894,10 +3894,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -4067,10 +4067,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "1:500",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -4262,10 +4262,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -4415,10 +4415,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -4566,10 +4566,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -4716,10 +4716,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -4926,10 +4926,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "5",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -5146,10 +5146,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -5511,10 +5511,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -5690,10 +5690,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:200|2:400|3:0|4:500",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -5815,10 +5815,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "500",
 				["DepthWeight"] = "6:0|12:0|18:0",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -5940,10 +5940,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -6066,10 +6066,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -6207,10 +6207,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -6583,10 +6583,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/PieceStructures/RainbowRoad.cubeset b/Server/Prefabs/PieceStructures/RainbowRoad.cubeset
index 1504a2dea..58f347550 100644
--- a/Server/Prefabs/PieceStructures/RainbowRoad.cubeset
+++ b/Server/Prefabs/PieceStructures/RainbowRoad.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-11-28 16:54:39",
+		ExportDate = "2016-11-23 15:08:00",
 		["GridSizeX"] = "512",
 		["GridSizeZ"] = "512",
 		["IntendedUse"] = "PieceStructures",
@@ -75,10 +75,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 				["VerticalStrategy"] = "Range|120|140",
 			},
 			BlockDefinitions =
@@ -155,10 +155,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -239,10 +239,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -374,10 +374,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -563,10 +563,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -662,10 +662,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -763,10 +763,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -960,10 +960,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1173,10 +1173,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1260,10 +1260,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1344,10 +1344,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1479,10 +1479,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/PieceStructures/TestRails.cubeset b/Server/Prefabs/PieceStructures/TestRails.cubeset
index 281f2c017..b438aaac9 100644
--- a/Server/Prefabs/PieceStructures/TestRails.cubeset
+++ b/Server/Prefabs/PieceStructures/TestRails.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-11-28 16:54:47",
+		ExportDate = "2016-11-23 15:08:09",
 		["GridSizeX"] = "10",
 		["GridSizeZ"] = "10",
 		["IntendedUse"] = "PieceStructures",
@@ -117,10 +117,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -278,10 +278,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -421,10 +421,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "RepeatTillNonAir",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalStrategy"] = "TerrainOrOceanTop|1",
 			},
 			BlockDefinitions =
@@ -566,10 +566,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -709,10 +709,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "0",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/PieceStructures/TreePaths.cubeset b/Server/Prefabs/PieceStructures/TreePaths.cubeset
index ce2907c9e..1cb10f528 100644
--- a/Server/Prefabs/PieceStructures/TreePaths.cubeset
+++ b/Server/Prefabs/PieceStructures/TreePaths.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-11-28 16:54:48",
+		ExportDate = "2016-11-23 15:08:10",
 		["AllowedBiomes"] = "Jungle, JungleM, JungleHills, JungleEdge, JungleEdgeM",
 		["GridSizeX"] = "256",
 		["GridSizeZ"] = "256",
@@ -104,10 +104,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "2",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalLimit"] = "AboveTerrainAndOcean|20|60",
 			},
 			BlockDefinitions =
@@ -475,10 +475,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "4",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalLimit"] = "AboveTerrainAndOcean|20|60",
 			},
 			BlockDefinitions =
@@ -791,10 +791,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalLimit"] = "AboveTerrainAndOcean|20|60",
 			},
 			BlockDefinitions =
@@ -1100,10 +1100,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "8:10000|9:10000",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalLimit"] = "AboveTerrainAndOcean|10|70",
 			},
 			BlockDefinitions =
@@ -1368,10 +1368,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalLimit"] = "AboveTerrainAndOcean|20|60",
 			},
 			BlockDefinitions =
@@ -1622,10 +1622,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1738,10 +1738,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalStrategy"] = "TerrainOrOceanTop|30|40",
 			},
 			BlockDefinitions =
@@ -2116,10 +2116,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "5",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalLimit"] = "AboveTerrainAndOcean|20|60",
 			},
 			BlockDefinitions =
@@ -2466,10 +2466,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "500",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2554,10 +2554,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2642,10 +2642,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2782,10 +2782,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalLimit"] = "AboveTerrainAndOcean|20|60",
 			},
 			BlockDefinitions =
@@ -2881,10 +2881,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalLimit"] = "AboveTerrainAndOcean|20|60",
 			},
 			BlockDefinitions =
@@ -3006,10 +3006,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "2",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -3028,9 +3028,10 @@ Cubeset =
 				"l: 50: 3",  -- torch
 				"m: 19: 0",  -- sponge
 				"n: 18: 7",  -- leaves
-				"o: 18:11",  -- leaves
-				"p: 17:11",  -- tree
-				"q: 17: 7",  -- tree
+				"o: 18: 3",  -- leaves
+				"p: 18:11",  -- leaves
+				"q: 17:11",  -- tree
+				"r: 17: 7",  -- tree
 			},
 			BlockData =
 			{
@@ -3197,8 +3198,8 @@ Cubeset =
 				"mmmnoobbboonmmm",  --  6
 				"mmmnoobbboonmmm",  --  7
 				"mmmnoobbboonmmm",  --  8
-				"mmmmooooooommmm",  --  9
-				"mmmmnooooonmmmm",  -- 10
+				"mmmmoopoooommmm",  --  9
+				"mmmmnoooopnmmmm",  -- 10
 				"mmmmmmnnnmmmmmm",  -- 11
 				"mmmmmmmmmmmmmmm",  -- 12
 				"mmmmmmmmmmmmmmm",  -- 13
@@ -3207,16 +3208,16 @@ Cubeset =
 				-- Level 10
 				"mmmmmmmmmmmmmmm",  --  0
 				"mmmmmmmmmmmmmmm",  --  1
-				"mmmmm.ooo.mmmmm",  --  2
-				"mmmmnooooonmmmm",  --  3
-				"mmmnnoopoonnmmm",  --  4
-				"mm.oooopoooo.mm",  --  5
-				"mmoooobbboooomm",  --  6
-				"mmooqqbbbqqoomm",  --  7
-				"mmoooobbboooomm",  --  8
-				"mm.oooopoooo.mm",  --  9
-				"mmmnnoopoonnmmm",  -- 10
-				"mmmmnooooonmmmm",  -- 11
+				"mmmmm.poo.mmmmm",  --  2
+				"mmmmnpooponmmmm",  --  3
+				"mmmnnopqoonnmmm",  --  4
+				"mm.ooooqoooo.mm",  --  5
+				"mmooopbbboooomm",  --  6
+				"mmoorrbbbrropmm",  --  7
+				"mmpoopbbboooomm",  --  8
+				"mm.poooqoooo.mm",  --  9
+				"mmmnnooqopnnmmm",  -- 10
+				"mmmmnoopoonmmmm",  -- 11
 				"mmmmm.ooo.mmmmm",  -- 12
 				"mmmmmmmmmmmmmmm",  -- 13
 				"mmmmmmmmmmmmmmm",  -- 14
@@ -3226,15 +3227,15 @@ Cubeset =
 				"mmmmmmmmmmmmmmm",  --  1
 				"mmmmm.ooo.mmmmm",  --  2
 				"mmm.ooooooo.mmm",  --  3
-				"mmmooooooooommm",  --  4
-				"mm.ooboooboo.mm",  --  5
-				"mmooooobooooomm",  --  6
-				"mmoooobbboooomm",  --  7
-				"mmooooobooooomm",  --  8
+				"mmmpooopooopmmm",  --  4
+				"mm.oobooobop.mm",  --  5
+				"mmooooobopopomm",  --  6
+				"mmpooobbboooomm",  --  7
+				"mmooopobooooomm",  --  8
 				"mm.ooboooboo.mm",  --  9
 				"mmmooooooooommm",  -- 10
 				"mmm.ooooooo.mmm",  -- 11
-				"mmmmm.ooo.mmmmm",  -- 12
+				"mmmmm.opp.mmmmm",  -- 12
 				"mmmmmmmmmmmmmmm",  -- 13
 				"mmmmmmmmmmmmmmm",  -- 14
 
@@ -3242,12 +3243,12 @@ Cubeset =
 				"mmmmmmmmmmmmmmm",  --  0
 				"mmmmmmmmmmmmmmm",  --  1
 				"mmmmmmmmmmmmmmm",  --  2
-				"mmm.ooooooo.mmm",  --  3
-				"mmmooooooooommm",  --  4
-				"mmmooooooooommm",  --  5
-				"mmmooooboooommm",  --  6
-				"mmmooobbbooommm",  --  7
-				"mmmooooboooommm",  --  8
+				"mmm.opoooop.mmm",  --  3
+				"mmmopooooopommm",  --  4
+				"mmmppooooooommm",  --  5
+				"mmmoooobooopmmm",  --  6
+				"mmmpopbbbopommm",  --  7
+				"mmmoooobpooommm",  --  8
 				"mmmooooooooommm",  --  9
 				"mmmooooooooommm",  -- 10
 				"mmm.ooooooo.mmm",  -- 11
@@ -3263,9 +3264,9 @@ Cubeset =
 				"mmmmmooooommmmm",  --  4
 				"mmmmooooooommmm",  --  5
 				"mmmmooobooommmm",  --  6
-				"mmmmoobbboommmm",  --  7
+				"mmmmoobbbopmmmm",  --  7
 				"mmmmooobooommmm",  --  8
-				"mmmmooooooommmm",  --  9
+				"mmmmopooooommmm",  --  9
 				"mmmmmooooommmmm",  -- 10
 				"mmmmmmmmmmmmmmm",  -- 11
 				"mmmmmmmmmmmmmmm",  -- 12
@@ -3279,11 +3280,11 @@ Cubeset =
 				"mmmmm.ooo.mmmmm",  --  3
 				"mmmmmooooommmmm",  --  4
 				"mmm.ooobooo.mmm",  --  5
-				"mmmooooooooommm",  --  6
-				"mmmooboboboommm",  --  7
+				"mmmoooopoooommm",  --  6
+				"mmmoobpboboommm",  --  7
 				"mmmooooooooommm",  --  8
-				"mmm.ooobooo.mmm",  --  9
-				"mmmmmooooommmmm",  -- 10
+				"mmm.opobooo.mmm",  --  9
+				"mmmmmopoppmmmmm",  -- 10
 				"mmmmm.ooo.mmmmm",  -- 11
 				"mmmmmmmmmmmmmmm",  -- 12
 				"mmmmmmmmmmmmmmm",  -- 13
@@ -3295,12 +3296,12 @@ Cubeset =
 				"mmmmmmmmmmmmmmm",  --  2
 				"mmmmm.ooo.mmmmm",  --  3
 				"mmmmmooooommmmm",  --  4
-				"mmm.ooooooo.mmm",  --  5
-				"mmmooooooooommm",  --  6
-				"mmmooooboooommm",  --  7
+				"mmm.pooopoo.mmm",  --  5
+				"mmmoooopoooommm",  --  6
+				"mmmopooboooommm",  --  7
 				"mmmooooooooommm",  --  8
-				"mmm.ooooooo.mmm",  --  9
-				"mmmmmooooommmmm",  -- 10
+				"mmm.oooopoo.mmm",  --  9
+				"mmmmmpoooommmmm",  -- 10
 				"mmmmm.ooo.mmmmm",  -- 11
 				"mmmmmmmmmmmmmmm",  -- 12
 				"mmmmmmmmmmmmmmm",  -- 13
@@ -3313,10 +3314,10 @@ Cubeset =
 				"mmmmmmmmmmmmmmm",  --  3
 				"mmmmmmmommmmmmm",  --  4
 				"mmmmm.ooo.mmmmm",  --  5
-				"mmmmmooooommmmm",  --  6
+				"mmmmmopopommmmm",  --  6
 				"mmmmooobooommmm",  --  7
-				"mmmmmooooommmmm",  --  8
-				"mmmmm.ooo.mmmmm",  --  9
+				"mmmmmpoooommmmm",  --  8
+				"mmmmm.opo.mmmmm",  --  9
 				"mmmmmmmommmmmmm",  -- 10
 				"mmmmmmmmmmmmmmm",  -- 11
 				"mmmmmmmmmmmmmmm",  -- 12
@@ -3331,8 +3332,8 @@ Cubeset =
 				"mmmmmmmmmmmmmmm",  --  4
 				"mmmmm.ooo.mmmmm",  --  5
 				"mmmmmooooommmmm",  --  6
-				"mmmmmooooommmmm",  --  7
-				"mmmmmooooommmmm",  --  8
+				"mmmmmpoooommmmm",  --  7
+				"mmmmmooppommmmm",  --  8
 				"mmmmm.ooo.mmmmm",  --  9
 				"mmmmmmmmmmmmmmm",  -- 10
 				"mmmmmmmmmmmmmmm",  -- 11
@@ -3403,10 +3404,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10000",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -3417,9 +3418,10 @@ Cubeset =
 				"d: 65: 5",  -- ladder
 				"e: 65: 3",  -- ladder
 				"f: 18: 7",  -- leaves
-				"g: 18:11",  -- leaves
-				"h: 17:11",  -- tree
-				"i: 17: 7",  -- tree
+				"g: 18: 3",  -- leaves
+				"h: 18:11",  -- leaves
+				"i: 17:11",  -- tree
+				"j: 17: 7",  -- tree
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -3544,104 +3546,104 @@ Cubeset =
 				-- Level 9
 				"mmmmmmmmmmm",  --  0
 				"mmmmfffmmmm",  --  1
-				"mmfgggggfmm",  --  2
-				"mmgggggggmm",  --  3
-				"mfggbbbggfm",  --  4
-				"mfggbbbggfm",  --  5
-				"mfggbbbggfm",  --  6
-				"mmgggggggmm",  --  7
-				"mmfgggggfmm",  --  8
+				"mmfghhghfmm",  --  2
+				"mmghghhggmm",  --  3
+				"mfghbbbhhfm",  --  4
+				"mfghbbbhhfm",  --  5
+				"mfhhbbbhhfm",  --  6
+				"mmhgghhhgmm",  --  7
+				"mmfhhghhfmm",  --  8
 				"mmmmfffmmmm",  --  9
 				"mmmmmmmmmmm",  -- 10
 
 				-- Level 10
-				"mmm.ggg.mmm",  --  0
-				"mmfgggggfmm",  --  1
-				"mffgghggffm",  --  2
-				".gggghgggg.",  --  3
-				"ggggbbbgggg",  --  4
-				"ggiibbbiigg",  --  5
-				"ggggbbbgggg",  --  6
-				".gggghgggg.",  --  7
-				"mffgghggffm",  --  8
-				"mmfgggggfmm",  --  9
-				"mmm.ggg.mmm",  -- 10
+				"mmm.ghg.mmm",  --  0
+				"mmfhhhhgfmm",  --  1
+				"mffhgihgffm",  --  2
+				".ggggihhhh.",  --  3
+				"hhhhbbbhhhh",  --  4
+				"hhjjbbbjjgg",  --  5
+				"hhghbbbghhh",  --  6
+				".gghgighgh.",  --  7
+				"mffggihhffm",  --  8
+				"mmfgghhhfmm",  --  9
+				"mmm.hhh.mmm",  -- 10
 
 				-- Level 11
-				"mmm.ggg.mmm",  --  0
-				"m.ggggggg.m",  --  1
-				"mgggggggggm",  --  2
-				".ggbgggbgg.",  --  3
-				"gggggbggggg",  --  4
-				"ggggbbbgggg",  --  5
-				"gggggbggggg",  --  6
-				".ggbgggbgg.",  --  7
-				"mgggggggggm",  --  8
-				"m.ggggggg.m",  --  9
-				"mmm.ggg.mmm",  -- 10
+				"mmm.hhg.mmm",  --  0
+				"m.hhghhgg.m",  --  1
+				"mhghggghhhm",  --  2
+				".hgbgggbhh.",  --  3
+				"hghghbhghhh",  --  4
+				"ghhhbbbhhhh",  --  5
+				"hhhhhbhhghh",  --  6
+				".ggbhghbgh.",  --  7
+				"mhghhgghghm",  --  8
+				"m.hhhhghg.m",  --  9
+				"mmm.hhh.mmm",  -- 10
 
 				-- Level 12
 				"mmmmmmmmmmm",  --  0
-				"m.ggggggg.m",  --  1
-				"mgggggggggm",  --  2
-				"mgggggggggm",  --  3
-				"mggggbggggm",  --  4
-				"mgggbbbgggm",  --  5
-				"mggggbggggm",  --  6
-				"mgggggggggm",  --  7
-				"mgggggggggm",  --  8
-				"m.ggggggg.m",  --  9
+				"m.ghghggg.m",  --  1
+				"mghhhgghhgm",  --  2
+				"mghhhghhhgm",  --  3
+				"mhghhbhghhm",  --  4
+				"mghgbbbghhm",  --  5
+				"mgghgbhhhhm",  --  6
+				"mhghhghhghm",  --  7
+				"mhghhhgghhm",  --  8
+				"m.gghghgh.m",  --  9
 				"mmmmmmmmmmm",  -- 10
 
 				-- Level 13
 				"mmmmmmmmmmm",  --  0
 				"mmmmmmmmmmm",  --  1
-				"mmmgggggmmm",  --  2
-				"mmgggggggmm",  --  3
-				"mmgggbgggmm",  --  4
-				"mmggbbbggmm",  --  5
-				"mmgggbgggmm",  --  6
-				"mmgggggggmm",  --  7
-				"mmmgggggmmm",  --  8
+				"mmmhgghhmmm",  --  2
+				"mmggghhhgmm",  --  3
+				"mmghgbhghmm",  --  4
+				"mmggbbbghmm",  --  5
+				"mmgghbhhhmm",  --  6
+				"mmhghhhhhmm",  --  7
+				"mmmhhhhhmmm",  --  8
 				"mmmmmmmmmmm",  --  9
 				"mmmmmmmmmmm",  -- 10
 
 				-- Level 14
 				"mmmmmmmmmmm",  --  0
-				"mmm.ggg.mmm",  --  1
-				"mmmgggggmmm",  --  2
-				"m.gggbggg.m",  --  3
-				"mgggggggggm",  --  4
-				"mggbgbgbggm",  --  5
-				"mgggggggggm",  --  6
-				"m.gggbggg.m",  --  7
-				"mmmgggggmmm",  --  8
-				"mmm.ggg.mmm",  --  9
+				"mmm.ghh.mmm",  --  1
+				"mmmhhghhmmm",  --  2
+				"m.hggbhgh.m",  --  3
+				"mghhhghhhhm",  --  4
+				"mhhbgbhbggm",  --  5
+				"mhhhghghhgm",  --  6
+				"m.hghbghh.m",  --  7
+				"mmmhhhggmmm",  --  8
+				"mmm.hhg.mmm",  --  9
 				"mmmmmmmmmmm",  -- 10
 
 				-- Level 15
 				"mmmmmmmmmmm",  --  0
-				"mmm.ggg.mmm",  --  1
-				"mmmgggggmmm",  --  2
-				"m.ggggggg.m",  --  3
-				"mgggggggggm",  --  4
-				"mggggbggggm",  --  5
-				"mgggggggggm",  --  6
-				"m.ggggggg.m",  --  7
-				"mmmgggggmmm",  --  8
-				"mmm.ggg.mmm",  --  9
+				"mmm.ggh.mmm",  --  1
+				"mmmghghgmmm",  --  2
+				"m.ghghghh.m",  --  3
+				"mhghhhghhhm",  --  4
+				"mgghhbhhghm",  --  5
+				"mhhghhghhhm",  --  6
+				"m.ghgghhh.m",  --  7
+				"mmmhhhhhmmm",  --  8
+				"mmm.hhh.mmm",  --  9
 				"mmmmmmmmmmm",  -- 10
 
 				-- Level 16
 				"mmmmmmmmmmm",  --  0
 				"mmmmmmmmmmm",  --  1
 				"mmmmmgmmmmm",  --  2
-				"mmm.ggg.mmm",  --  3
-				"mmmgggggmmm",  --  4
-				"mmgggbgggmm",  --  5
-				"mmmgggggmmm",  --  6
-				"mmm.ggg.mmm",  --  7
-				"mmmmmgmmmmm",  --  8
+				"mmm.hhh.mmm",  --  3
+				"mmmhhhhhmmm",  --  4
+				"mmgghbhhhmm",  --  5
+				"mmmhhhghmmm",  --  6
+				"mmm.hhg.mmm",  --  7
+				"mmmmmhmmmmm",  --  8
 				"mmmmmmmmmmm",  --  9
 				"mmmmmmmmmmm",  -- 10
 
@@ -3649,11 +3651,11 @@ Cubeset =
 				"mmmmmmmmmmm",  --  0
 				"mmmmmmmmmmm",  --  1
 				"mmmmmmmmmmm",  --  2
-				"mmm.ggg.mmm",  --  3
-				"mmmgggggmmm",  --  4
-				"mmmgggggmmm",  --  5
-				"mmmgggggmmm",  --  6
-				"mmm.ggg.mmm",  --  7
+				"mmm.hhg.mmm",  --  3
+				"mmmghghgmmm",  --  4
+				"mmmhhghgmmm",  --  5
+				"mmmhhghgmmm",  --  6
+				"mmm.hhh.mmm",  --  7
 				"mmmmmmmmmmm",  --  8
 				"mmmmmmmmmmm",  --  9
 				"mmmmmmmmmmm",  -- 10
@@ -3663,8 +3665,8 @@ Cubeset =
 				"mmmmmmmmmmm",  --  1
 				"mmmmmmmmmmm",  --  2
 				"mmmmmmmmmmm",  --  3
-				"mmmmmgmmmmm",  --  4
-				"mmmmgggmmmm",  --  5
+				"mmmmmhmmmmm",  --  4
+				"mmmmhggmmmm",  --  5
 				"mmmmmgmmmmm",  --  6
 				"mmmmmmmmmmm",  --  7
 				"mmmmmmmmmmm",  --  8
@@ -3717,10 +3719,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10000",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -3728,8 +3730,9 @@ Cubeset =
 				"a: 17: 3",  -- tree
 				"b: 18: 7",  -- leaves
 				"c: 18:11",  -- leaves
-				"d: 17:11",  -- tree
-				"e: 17: 7",  -- tree
+				"d: 18: 3",  -- leaves
+				"e: 17:11",  -- tree
+				"f: 17: 7",  -- tree
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -3856,61 +3859,61 @@ Cubeset =
 				"mmmmbbbmmmm",  --  1
 				"mmbcccccbmm",  --  2
 				"mmcccccccmm",  --  3
-				"mbccaaaccbm",  --  4
-				"mbccaaaccbm",  --  5
+				"mbdcaaacdbm",  --  4
+				"mbdcaaaccbm",  --  5
 				"mbccaaaccbm",  --  6
-				"mmcccccccmm",  --  7
-				"mmbcccccbmm",  --  8
+				"mmccdcdccmm",  --  7
+				"mmbcdcdcbmm",  --  8
 				"mmmmbbbmmmm",  --  9
 				"mmmmmmmmmmm",  -- 10
 
 				-- Level 10
 				"mmm.ccc.mmm",  --  0
-				"mmbcccccbmm",  --  1
-				"mbbccdccbbm",  --  2
-				".ccccdcccc.",  --  3
+				"mmbccdccbmm",  --  1
+				"mbbcceccbbm",  --  2
+				".cdccecccc.",  --  3
 				"ccccaaacccc",  --  4
-				"cceeaaaeecc",  --  5
-				"ccccaaacccc",  --  6
-				".ccccdcccc.",  --  7
-				"mbbccdccbbm",  --  8
+				"ccffaaaffcc",  --  5
+				"cdccaaaccdc",  --  6
+				".ccccedccc.",  --  7
+				"mbbcceccbbm",  --  8
 				"mmbcccccbmm",  --  9
-				"mmm.ccc.mmm",  -- 10
+				"mmm.ccd.mmm",  -- 10
 
 				-- Level 11
 				"mmm.ccc.mmm",  --  0
-				"m.ccccccc.m",  --  1
-				"mcccccccccm",  --  2
-				".ccacccacc.",  --  3
+				"m.cccdccc.m",  --  1
+				"mccdccccccm",  --  2
+				".ccacccacd.",  --  3
 				"cccccaccccc",  --  4
 				"ccccaaacccc",  --  5
-				"cccccaccccc",  --  6
-				".ccacccacc.",  --  7
-				"mcccccccccm",  --  8
+				"dccccaccccc",  --  6
+				".dcacccacc.",  --  7
+				"mcdccdccccm",  --  8
 				"m.ccccccc.m",  --  9
 				"mmm.ccc.mmm",  -- 10
 
 				-- Level 12
 				"mmmmmmmmmmm",  --  0
-				"m.ccccccc.m",  --  1
-				"mcccccccccm",  --  2
+				"m.ccccccd.m",  --  1
+				"mdcdccccccm",  --  2
 				"mcccccccccm",  --  3
 				"mccccaccccm",  --  4
-				"mcccaaacccm",  --  5
-				"mccccaccccm",  --  6
+				"mdccaaacdcm",  --  5
+				"mccdcaccccm",  --  6
 				"mcccccccccm",  --  7
-				"mcccccccccm",  --  8
+				"mcdcccccccm",  --  8
 				"m.ccccccc.m",  --  9
 				"mmmmmmmmmmm",  -- 10
 
 				-- Level 13
 				"mmmmmmmmmmm",  --  0
 				"mmmmmmmmmmm",  --  1
-				"mmmcccccmmm",  --  2
-				"mmcccccccmm",  --  3
-				"mmcccacccmm",  --  4
+				"mmmddccdmmm",  --  2
+				"mmccccccdmm",  --  3
+				"mmdccacccmm",  --  4
 				"mmccaaaccmm",  --  5
-				"mmcccacccmm",  --  6
+				"mmcdcacccmm",  --  6
 				"mmcccccccmm",  --  7
 				"mmmcccccmmm",  --  8
 				"mmmmmmmmmmm",  --  9
@@ -3918,27 +3921,27 @@ Cubeset =
 
 				-- Level 14
 				"mmmmmmmmmmm",  --  0
-				"mmm.ccc.mmm",  --  1
-				"mmmcccccmmm",  --  2
+				"mmm.ccd.mmm",  --  1
+				"mmmcdcccmmm",  --  2
 				"m.cccaccc.m",  --  3
-				"mcccccccccm",  --  4
-				"mccacacaccm",  --  5
-				"mcccccccccm",  --  6
-				"m.cccaccc.m",  --  7
+				"mdcccccdccm",  --  4
+				"mcdadacaccm",  --  5
+				"mccccccccdm",  --  6
+				"m.ccdaccc.m",  --  7
 				"mmmcccccmmm",  --  8
 				"mmm.ccc.mmm",  --  9
 				"mmmmmmmmmmm",  -- 10
 
 				-- Level 15
 				"mmmmmmmmmmm",  --  0
-				"mmm.ccc.mmm",  --  1
+				"mmm.dcc.mmm",  --  1
 				"mmmcccccmmm",  --  2
 				"m.ccccccc.m",  --  3
-				"mcccccccccm",  --  4
-				"mccccaccccm",  --  5
+				"mcdcdcccccm",  --  4
+				"mccccacccdm",  --  5
 				"mcccccccccm",  --  6
-				"m.ccccccc.m",  --  7
-				"mmmcccccmmm",  --  8
+				"m.dcccccc.m",  --  7
+				"mmmcccdcmmm",  --  8
 				"mmm.ccc.mmm",  --  9
 				"mmmmmmmmmmm",  -- 10
 
@@ -3948,8 +3951,8 @@ Cubeset =
 				"mmmmmcmmmmm",  --  2
 				"mmm.ccc.mmm",  --  3
 				"mmmcccccmmm",  --  4
-				"mmcccacccmm",  --  5
-				"mmmcccccmmm",  --  6
+				"mmccdacccmm",  --  5
+				"mmmcdcccmmm",  --  6
 				"mmm.ccc.mmm",  --  7
 				"mmmmmcmmmmm",  --  8
 				"mmmmmmmmmmm",  --  9
@@ -3961,7 +3964,7 @@ Cubeset =
 				"mmmmmmmmmmm",  --  2
 				"mmm.ccc.mmm",  --  3
 				"mmmcccccmmm",  --  4
-				"mmmcccccmmm",  --  5
+				"mmmcccdcmmm",  --  5
 				"mmmcccccmmm",  --  6
 				"mmm.ccc.mmm",  --  7
 				"mmmmmmmmmmm",  --  8
diff --git a/Server/Prefabs/PieceStructures/UnderwaterBase.cubeset b/Server/Prefabs/PieceStructures/UnderwaterBase.cubeset
index 25cc7a2d1..5f451215b 100644
--- a/Server/Prefabs/PieceStructures/UnderwaterBase.cubeset
+++ b/Server/Prefabs/PieceStructures/UnderwaterBase.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-11-28 16:54:44",
+		ExportDate = "2016-11-23 15:08:06",
 		["GridSizeX"] = "384",
 		["GridSizeZ"] = "384",
 		["IntendedUse"] = "PieceStructures",
@@ -117,10 +117,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 				["VerticalStrategy"] = "TerrainOrOceanTop|-11",
 			},
 			BlockDefinitions =
@@ -337,10 +337,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "500",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -449,10 +449,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "200",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -587,10 +587,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -729,10 +729,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -896,10 +896,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1060,10 +1060,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1231,10 +1231,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "50",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1463,10 +1463,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "75",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1680,10 +1680,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -1868,10 +1868,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "200",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2054,10 +2054,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2272,10 +2272,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -2484,10 +2484,10 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "5",
 				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["ShouldExpandFloor"] = "1",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/Villages/AlchemistVillage.cubeset b/Server/Prefabs/Villages/AlchemistVillage.cubeset
index f8df42805..f050655af 100644
--- a/Server/Prefabs/Villages/AlchemistVillage.cubeset
+++ b/Server/Prefabs/Villages/AlchemistVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-10-10 20:20:51",
+		ExportDate = "2016-11-23 15:08:03",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -58,14 +58,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -188,14 +188,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -317,14 +317,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -472,14 +472,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -615,14 +615,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -672,7 +672,7 @@ Cubeset =
 				"aaaabfffb",  --  0
 				"agggffffm",  --  1
 				"agggbeheb",  --  2
-				"agddehhhe",  --  3
+				"aggdehhhe",  --  3
 				"beeebhhhe",  --  4
 				"ehhhhhhhe",  --  5
 				"ehhhhhhhe",  --  6
@@ -765,14 +765,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -925,14 +925,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "80",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "80",
 			},
 			BlockDefinitions =
 			{
@@ -1103,14 +1103,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1259,14 +1259,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1414,14 +1414,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "80",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "80",
 			},
 			BlockDefinitions =
 			{
@@ -1618,14 +1618,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "80",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "80",
 			},
 			BlockDefinitions =
 			{
@@ -1831,14 +1831,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "60",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "60",
 			},
 			BlockDefinitions =
 			{
@@ -2107,14 +2107,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2264,14 +2264,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2453,14 +2453,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "80",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "80",
 			},
 			BlockDefinitions =
 			{
@@ -2649,14 +2649,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "70",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "70",
 			},
 			BlockDefinitions =
 			{
@@ -2889,14 +2889,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "50",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "50",
 			},
 			BlockDefinitions =
 			{
@@ -3106,14 +3106,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["ShouldExpandFloor"] = "1",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-16",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "1",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "100",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-16",
 			},
 			BlockDefinitions =
 			{
@@ -3366,14 +3366,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "50",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["DefaultWeight"] = "50",
 			},
 			BlockDefinitions =
 			{
@@ -3539,14 +3539,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/Villages/JapaneseVillage.cubeset b/Server/Prefabs/Villages/JapaneseVillage.cubeset
index b013aa2ce..8db2d3179 100644
--- a/Server/Prefabs/Villages/JapaneseVillage.cubeset
+++ b/Server/Prefabs/Villages/JapaneseVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-10-10 20:20:57",
+		ExportDate = "2016-11-23 15:07:49",
 		["AllowedBiomes"] = "Plains, Savanna, SavannaM, SunflowerPlains",
 		["IntendedUse"] = "Village",
 	},
@@ -58,14 +58,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -307,14 +307,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -480,14 +480,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -631,14 +631,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -874,14 +874,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1016,14 +1016,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["ShouldExpandFloor"] = "1",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "1",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "100",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-1",
 			},
 			BlockDefinitions =
 			{
@@ -1341,14 +1341,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1458,14 +1458,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1665,14 +1665,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1888,14 +1888,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2014,14 +2014,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2273,14 +2273,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2395,14 +2395,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2544,14 +2544,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["ShouldExpandFloor"] = "1",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "1",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "100",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
 			},
 			BlockDefinitions =
 			{
@@ -2747,14 +2747,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2876,14 +2876,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -3001,14 +3001,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -3158,14 +3158,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -3315,28 +3315,29 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
 				"a:  3: 0",  -- dirt
 				"b: 60: 7",  -- tilleddirt
-				"c:  8: 0",  -- water
-				"d: 60: 6",  -- tilleddirt
-				"e: 43: 0",  -- doublestep
-				"f: 44: 0",  -- step
-				"g: 59: 7",  -- crops
-				"h: 83: 0",  -- reedblock
-				"i:113: 0",  -- netherbrickfence
-				"j: 50: 5",  -- torch
+				"c: 60: 6",  -- tilleddirt
+				"d:  8: 0",  -- water
+				"e: 60: 5",  -- tilleddirt
+				"f: 43: 0",  -- doublestep
+				"g: 44: 0",  -- step
+				"h: 59: 7",  -- crops
+				"i: 83: 0",  -- reedblock
+				"j:113: 0",  -- netherbrickfence
+				"k: 50: 5",  -- torch
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -3360,65 +3361,65 @@ Cubeset =
 				"mmmmmmmmmmm",  --  0
 				"maaaaaaaaam",  --  1
 				"mabbbbbbbam",  --  2
-				"mabbbbbbbam",  --  3
-				"mabbbbbbbam",  --  4
-				"mabbbbbbbam",  --  5
-				"mabcccccaam",  --  6
-				"mabbbbbbbam",  --  7
-				"madbbbbbbam",  --  8
-				"mabbbbbbbam",  --  9
+				"macbbbbbbam",  --  3
+				"mabbbccbbam",  --  4
+				"maccbbbbbam",  --  5
+				"macdddddaam",  --  6
+				"macbcbcbbam",  --  7
+				"macebbcbbam",  --  8
+				"maebbcbcbam",  --  9
 				"mabbbbbbbam",  -- 10
 				"maaaaaaaaam",  -- 11
 				"mmmmmmmmmmm",  -- 12
 
 				-- Level 2
 				"...........",  --  0
-				".efffffffe.",  --  1
-				".fgggggggf.",  --  2
-				".fgggggggf.",  --  3
-				".fgggggggf.",  --  4
-				".fghhhhhgf.",  --  5
-				".fh.....hf.",  --  6
-				".fghhhhhgf.",  --  7
-				".fgggggggf.",  --  8
-				".fgggggggf.",  --  9
-				".fgggggggf.",  -- 10
-				".efffffffe.",  -- 11
+				".fgggggggf.",  --  1
+				".ghhhhhhhg.",  --  2
+				".ghhhhhhhg.",  --  3
+				".ghhhhhhhg.",  --  4
+				".ghiiiiihg.",  --  5
+				".gi.....ig.",  --  6
+				".ghiiiiihg.",  --  7
+				".ghhhhhhhg.",  --  8
+				".ghhhhhhhg.",  --  9
+				".ghhhhhhhg.",  -- 10
+				".fgggggggf.",  -- 11
 				"...........",  -- 12
 
 				-- Level 3
 				"...........",  --  0
-				".i.......i.",  --  1
+				".j.......j.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
-				"...hhhhh...",  --  5
-				"..h.....h..",  --  6
-				"...hhhhh...",  --  7
+				"...iiiii...",  --  5
+				"..i.....i..",  --  6
+				"...iiiii...",  --  7
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".i.......i.",  -- 11
+				".j.......j.",  -- 11
 				"...........",  -- 12
 
 				-- Level 4
 				"...........",  --  0
-				".i.......i.",  --  1
+				".j.......j.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
-				"...hhhhh...",  --  5
-				"..h.....h..",  --  6
-				"...hhhhh...",  --  7
+				"...iiiii...",  --  5
+				"..i.....i..",  --  6
+				"...iiiii...",  --  7
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".i.......i.",  -- 11
+				".j.......j.",  -- 11
 				"...........",  -- 12
 
 				-- Level 5
 				"...........",  --  0
-				".i.......i.",  --  1
+				".j.......j.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
@@ -3428,13 +3429,13 @@ Cubeset =
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".i.......i.",  -- 11
+				".j.......j.",  -- 11
 				"...........",  -- 12
 
 				-- Level 6
-				".i.......i.",  --  0
-				"iii.....iii",  --  1
-				".i.......i.",  --  2
+				".j.......j.",  --  0
+				"jjj.....jjj",  --  1
+				".j.......j.",  --  2
 				"...........",  --  3
 				"...........",  --  4
 				"...........",  --  5
@@ -3442,14 +3443,14 @@ Cubeset =
 				"...........",  --  7
 				"...........",  --  8
 				"...........",  --  9
-				".i.......i.",  -- 10
-				"iii.....iii",  -- 11
-				".i.......i.",  -- 12
+				".j.......j.",  -- 10
+				"jjj.....jjj",  -- 11
+				".j.......j.",  -- 12
 
 				-- Level 7
-				".j.......j.",  --  0
-				"j.j.....j.j",  --  1
-				".j.......j.",  --  2
+				".k.......k.",  --  0
+				"k.k.....k.k",  --  1
+				".k.......k.",  --  2
 				"...........",  --  3
 				"...........",  --  4
 				"...........",  --  5
@@ -3457,9 +3458,9 @@ Cubeset =
 				"...........",  --  7
 				"...........",  --  8
 				"...........",  --  9
-				".j.......j.",  -- 10
-				"j.j.....j.j",  -- 11
-				".j.......j.",  -- 12
+				".k.......k.",  -- 10
+				"k.k.....k.k",  -- 11
+				".k.......k.",  -- 12
 
 			},
 		},  -- Farm
diff --git a/Server/Prefabs/Villages/PlainsVillage.cubeset b/Server/Prefabs/Villages/PlainsVillage.cubeset
index 8f7704966..6f3d05d80 100644
--- a/Server/Prefabs/Villages/PlainsVillage.cubeset
+++ b/Server/Prefabs/Villages/PlainsVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-10-10 20:21:06",
+		ExportDate = "2016-11-23 15:07:39",
 		["AllowedBiomes"] = "Plains, Savanna, SavannaM, SunflowerPlains",
 		["IntendedUse"] = "Village",
 	},
@@ -58,14 +58,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -305,14 +305,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["ShouldExpandFloor"] = "1",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "1",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "100",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
 			},
 			BlockDefinitions =
 			{
@@ -445,14 +445,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -462,15 +462,11 @@ Cubeset =
 				"c: 17: 0",  -- tree
 				"d: 60: 7",  -- tilleddirt
 				"e:  8: 0",  -- water
-				"f: 60: 5",  -- tilleddirt
-				"g: 60: 2",  -- tilleddirt
-				"h: 60: 6",  -- tilleddirt
-				"i: 60: 4",  -- tilleddirt
-				"j: 60: 3",  -- tilleddirt
-				"k: 60: 0",  -- tilleddirt
-				"l: 50: 5",  -- torch
+				"f: 60: 6",  -- tilleddirt
+				"g: 60: 5",  -- tilleddirt
+				"h: 50: 5",  -- torch
+				"i: 59: 7",  -- crops
 				"m: 19: 0",  -- sponge
-				"n: 59: 7",  -- crops
 			},
 			BlockData =
 			{
@@ -498,25 +494,25 @@ Cubeset =
 
 				-- Level 2
 				"ccccccc.ccccccc",  --  0
-				"cddeddc.cfdegfc",  --  1
-				"cddeddc.chdeddc",  --  2
-				"cddeddc.cdhedic",  --  3
-				"cddeddc.cjhehdc",  --  4
-				"cddeddc.cddeddc",  --  5
-				"cddeddc.cfheddc",  --  6
-				"cddeddc.cdiefkc",  --  7
+				"cddeddc.cddeddc",  --  1
+				"cddeddc.cddeddc",  --  2
+				"cddeddc.cddeddc",  --  3
+				"cfdeddc.cdfedfc",  --  4
+				"cddeddc.cdfeddc",  --  5
+				"cddeddc.cdfeddc",  --  6
+				"cddeddc.cdgeddc",  --  7
 				"ccccccc.ccccccc",  --  8
 
 				-- Level 3
-				"l.....l.l.....l",  --  0
-				".nn.nn...nn.nn.",  --  1
-				".nn.nn...nn.nn.",  --  2
-				".nn.nn...nn.nn.",  --  3
-				".nn.nn...nn.nn.",  --  4
-				".nn.nn...nn.nn.",  --  5
-				".nn.nn...nn.nn.",  --  6
-				".nn.nn...nn.nn.",  --  7
-				"l.....l.l.....l",  --  8
+				"h.....h.h.....h",  --  0
+				".ii.ii...ii.ii.",  --  1
+				".ii.ii...ii.ii.",  --  2
+				".ii.ii...ii.ii.",  --  3
+				".ii.ii...ii.ii.",  --  4
+				".ii.ii...ii.ii.",  --  5
+				".ii.ii...ii.ii.",  --  6
+				".ii.ii...ii.ii.",  --  7
+				"h.....h.h.....h",  --  8
 
 				-- Level 4
 				"...............",  --  0
@@ -604,22 +600,22 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
 				"b:  3: 0",  -- dirt
-				"c:  5: 0",  -- planks
-				"d:  2: 0",  -- grass
+				"c:  2: 0",  -- grass
+				"d:  5: 0",  -- planks
 				"e: 67: 2",  -- stairs
 				"f: 43: 0",  -- doublestep
 				"g: 67: 0",  -- stairs
@@ -647,37 +643,37 @@ Cubeset =
 				"maaaaammmm",  --  2
 				"maaaaabbbb",  --  3
 				"aaaaaabbbb",  --  4
-				"aaaaaabbbb",  --  5
+				"aaaaaabbcb",  --  5
 				"aaaaaabbbb",  --  6
 				"maaaaabbbb",  --  7
-				"maaaaabbbb",  --  8
+				"maaaaabbcb",  --  8
 				"maaaaammmm",  --  9
 				"mmmmmmmmmm",  -- 10
 
 				-- Level 1
 				"......mmmm",  --  0
 				".aaaaammmm",  --  1
-				".acccammmm",  --  2
-				".acccadddd",  --  3
-				"eafffadddd",  --  4
-				"gaffffdddd",  --  5
-				"hafffadddd",  --  6
-				".afffadddd",  --  7
-				".afffadddd",  --  8
+				".adddammmm",  --  2
+				".adddacccc",  --  3
+				"eafffacccc",  --  4
+				"gaffffcccc",  --  5
+				"hafffacccc",  --  6
+				".afffacccc",  --  7
+				".afffacccc",  --  8
 				".aaaaammmm",  --  9
 				"......mmmm",  -- 10
 
 				-- Level 2
 				"......mmmm",  --  0
-				".icccimmmm",  --  1
-				".cjklcmmmm",  --  2
-				".c...ckkkk",  --  3
-				".c...c...k",  --  4
+				".idddimmmm",  --  1
+				".djkldmmmm",  --  2
+				".d...dkkkk",  --  3
+				".d...d...k",  --  4
 				".n...o...k",  --  5
-				".c...c...k",  --  6
-				".cff.c...k",  --  7
-				".c...ckkkk",  --  8
-				".icccimmmm",  --  9
+				".d...d...k",  --  6
+				".dff.d...k",  --  7
+				".d...dkkkk",  --  8
+				".idddimmmm",  --  9
 				"......mmmm",  -- 10
 
 				-- Level 3
@@ -685,9 +681,9 @@ Cubeset =
 				".ipppimmmm",  --  1
 				".p.q.pmmmm",  --  2
 				".p...p....",  --  3
-				".c...c....",  --  4
+				".d...d....",  --  4
 				".r...r....",  --  5
-				".c...c....",  --  6
+				".d...d....",  --  6
 				".p...p....",  --  7
 				".p...p....",  --  8
 				".ipppimmmm",  --  9
@@ -695,42 +691,42 @@ Cubeset =
 
 				-- Level 4
 				"ls...tjmmm",  --  0
-				"licccijmmm",  --  1
-				"lc...cjmmm",  --  2
-				"lc...cj...",  --  3
-				"lcu.vcj...",  --  4
-				"lc...cj...",  --  5
-				"lcu.vcj...",  --  6
-				"lc...cj...",  --  7
-				"lc...cj...",  --  8
-				"licccijmmm",  --  9
+				"lidddijmmm",  --  1
+				"ld...djmmm",  --  2
+				"ld...dj...",  --  3
+				"ldu.vdj...",  --  4
+				"ld...dj...",  --  5
+				"ldu.vdj...",  --  6
+				"ld...dj...",  --  7
+				"ld...dj...",  --  8
+				"lidddijmmm",  --  9
 				"ls...tjmmm",  -- 10
 
 				-- Level 5
 				".ls.tj.mmm",  --  0
-				".lcccj.mmm",  --  1
-				".lc.cj.mmm",  --  2
-				".lc.cj....",  --  3
-				".lc.cj....",  --  4
-				".lc.cj....",  --  5
-				".lc.cj....",  --  6
-				".lc.cj....",  --  7
-				".lc.cj....",  --  8
-				".lcccj.mmm",  --  9
+				".ldddj.mmm",  --  1
+				".ld.dj.mmm",  --  2
+				".ld.dj....",  --  3
+				".ld.dj....",  --  4
+				".ld.dj....",  --  5
+				".ld.dj....",  --  6
+				".ld.dj....",  --  7
+				".ld.dj....",  --  8
+				".ldddj.mmm",  --  9
 				".ls.tj.mmm",  -- 10
 
 				-- Level 6
-				"..lcj..mmm",  --  0
-				"..lcj..mmm",  --  1
-				"..lcj..mmm",  --  2
-				"..lcj.....",  --  3
-				"..lcj.....",  --  4
-				"..lcj.....",  --  5
-				"..lcj.....",  --  6
-				"..lcj.....",  --  7
-				"..lcj.....",  --  8
-				"..lcj..mmm",  --  9
-				"..lcj..mmm",  -- 10
+				"..ldj..mmm",  --  0
+				"..ldj..mmm",  --  1
+				"..ldj..mmm",  --  2
+				"..ldj.....",  --  3
+				"..ldj.....",  --  4
+				"..ldj.....",  --  5
+				"..ldj.....",  --  6
+				"..ldj.....",  --  7
+				"..ldj.....",  --  8
+				"..ldj..mmm",  --  9
+				"..ldj..mmm",  -- 10
 
 			},
 		},  -- WoodenHouse9x5Fence
@@ -774,14 +770,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -790,7 +786,8 @@ Cubeset =
 				"b: 17: 0",  -- tree
 				"c: 60: 7",  -- tilleddirt
 				"d:  8: 0",  -- water
-				"e: 59: 7",  -- crops
+				"e: 60: 6",  -- tilleddirt
+				"f: 59: 7",  -- crops
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -809,17 +806,17 @@ Cubeset =
 				"bccccccccb",  --  1
 				"bccccccccb",  --  2
 				"bddddddddb",  --  3
-				"bccccccccb",  --  4
+				"bccccceccb",  --  4
 				"bccccccccb",  --  5
 				"bbbbbbbbbb",  --  6
 
 				-- Level 2
 				"..........",  --  0
-				".eeeeeeee.",  --  1
-				".eeeeeeee.",  --  2
+				".ffffffff.",  --  1
+				".ffffffff.",  --  2
 				"..........",  --  3
-				".eeeeeeee.",  --  4
-				".eeeeeeee.",  --  5
+				".ffffffff.",  --  4
+				".ffffffff.",  --  5
 				"..........",  --  6
 
 				-- Level 3
@@ -900,14 +897,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1042,14 +1039,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1060,7 +1057,7 @@ Cubeset =
 				"d: 17: 0",  -- tree
 				"e: 60: 7",  -- tilleddirt
 				"f:  8: 0",  -- water
-				"g: 60: 6",  -- tilleddirt
+				"g: 60: 5",  -- tilleddirt
 				"h: 85: 0",  -- fence
 				"i: 59: 7",  -- crops
 				"j: 50: 5",  -- torch
@@ -1098,8 +1095,8 @@ Cubeset =
 
 				-- Level 2
 				"ddddddddddddd",  --  0
-				"deefeefeefeed",  --  1
-				"dgefeefeefeed",  --  2
+				"deefgefeefeed",  --  1
+				"deefeefeefeed",  --  2
 				"deefeefeefeed",  --  3
 				"deefeefeefeed",  --  4
 				"deefeefeefeed",  --  5
@@ -1222,14 +1219,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1322,14 +1319,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1487,14 +1484,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1736,14 +1733,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1871,14 +1868,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2006,14 +2003,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2176,14 +2173,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2344,14 +2341,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2486,14 +2483,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2654,25 +2651,25 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
 				"b:  3: 0",  -- dirt
-				"c:  2: 0",  -- grass
-				"d: 67: 0",  -- stairs
-				"e: 67: 2",  -- stairs
-				"f: 67: 1",  -- stairs
-				"g: 43: 0",  -- doublestep
+				"c: 67: 0",  -- stairs
+				"d: 67: 2",  -- stairs
+				"e: 67: 1",  -- stairs
+				"f: 43: 0",  -- doublestep
+				"g:  2: 0",  -- grass
 				"h: 17: 0",  -- tree
 				"i:  5: 0",  -- planks
 				"j: 64: 3",  -- wooddoorblock
@@ -2703,30 +2700,30 @@ Cubeset =
 				"mmbbbbbbbmm",  --  8
 				"mmbbbbbbbmm",  --  9
 				"mmbbbbbbbmm",  -- 10
-				"mmcbbbbbbmm",  -- 11
+				"mmbbbbbbbmm",  -- 11
 				"mmbbbbbbbmm",  -- 12
 
 				-- Level 1
-				"....def....",  --  0
+				"....cde....",  --  0
 				".aaaaaaaaa.",  --  1
-				".aggggaaaa.",  --  2
-				".aggggaaaa.",  --  3
-				".aggggaaaa.",  --  4
-				".aggggaaaa.",  --  5
-				".aggggaaaa.",  --  6
+				".affffaaaa.",  --  2
+				".affffaaaa.",  --  3
+				".affffaaaa.",  --  4
+				".affffaaaa.",  --  5
+				".affffaaaa.",  --  6
 				".aaaaaaaaa.",  --  7
-				"..ccccccc..",  --  8
-				"mmcccccccmm",  --  9
-				"mmcccccccmm",  -- 10
-				"mmcccccccmm",  -- 11
-				"mmcccccccmm",  -- 12
+				"..ggggggg..",  --  8
+				"mmgggggggmm",  --  9
+				"mmgggggggmm",  -- 10
+				"mmgggggggmm",  -- 11
+				"mmgggggggmm",  -- 12
 
 				-- Level 2
 				"...........",  --  0
 				".hiiijiiih.",  --  1
-				".i.g....ki.",  --  2
-				".i.g....li.",  --  3
-				".i.g....ni.",  --  4
+				".i.f....ki.",  --  2
+				".i.f....li.",  --  3
+				".i.f....ni.",  --  4
 				".i.......i.",  --  5
 				".i.......i.",  --  6
 				".hiiioiiih.",  --  7
@@ -2853,14 +2850,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2988,14 +2985,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -3185,14 +3182,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -3346,14 +3343,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "20",
 			},
 			BlockDefinitions =
 			{
@@ -3496,14 +3493,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -3673,14 +3670,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "20",
 			},
 			BlockDefinitions =
 			{
@@ -3983,14 +3980,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -4338,14 +4335,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["ShouldExpandFloor"] = "1",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "1",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "100",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
 			},
 			BlockDefinitions =
 			{
@@ -4416,12 +4413,12 @@ Cubeset =
 
 				-- Level 5
 				"ddddddd",  --  0
-				"ebbbbbd",  --  1
+				"dbbbbbd",  --  1
 				"dbcccbd",  --  2
 				"dbcccbd",  --  3
 				"dbcccbd",  --  4
 				"dbbbbbd",  --  5
-				"edddddd",  --  6
+				"ddddddd",  --  6
 
 				-- Level 6
 				"ddddddd",  --  0
@@ -4575,14 +4572,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["MoveToGround"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-32",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "1",
-				["DefaultWeight"] = "100",
+				["MergeStrategy"] = "msSpongePrint",
+				["MoveToGround"] = "1",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-32",
 			},
 			BlockDefinitions =
 			{
@@ -5004,14 +5001,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "200",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
 				["MoveToGround"] = "0",
-				["AddWeightIfSame"] = "200",
 			},
 			BlockDefinitions =
 			{
@@ -5087,14 +5084,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "10",
 			},
 			BlockDefinitions =
 			{
@@ -5230,14 +5227,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "1",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["DefaultWeight"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -5424,14 +5421,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "1",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["DefaultWeight"] = "1",
 			},
 			BlockDefinitions =
 			{
@@ -5590,14 +5587,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["DefaultWeight"] = "10",
 			},
 			BlockDefinitions =
 			{
@@ -5743,14 +5740,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["DefaultWeight"] = "20",
 			},
 			BlockDefinitions =
 			{
@@ -5866,14 +5863,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
 				["MoveToGround"] = "0",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -5990,14 +5987,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
 				["MoveToGround"] = "0",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -6220,14 +6217,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "30",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
-				["DefaultWeight"] = "30",
 			},
 			BlockDefinitions =
 			{
@@ -6475,14 +6472,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "0",
 				["MoveToGround"] = "0",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
index a6cd9f97a..e60bdb7fa 100644
--- a/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
+++ b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-10-10 20:21:16",
+		ExportDate = "2016-11-23 15:07:52",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -58,14 +58,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -178,14 +178,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -305,14 +305,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -432,14 +432,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -559,14 +559,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -700,14 +700,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -842,14 +842,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -984,14 +984,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1134,14 +1134,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "5",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "5",
 			},
 			BlockDefinitions =
 			{
@@ -1253,14 +1253,14 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
 				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
+				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "0",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "20",
 			},
 			BlockDefinitions =
 			{
@@ -1418,14 +1418,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["ShouldExpandFloor"] = "1",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-11",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "1",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "100",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-11",
 			},
 			BlockDefinitions =
 			{
@@ -1600,14 +1600,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/Villages/SandVillage.cubeset b/Server/Prefabs/Villages/SandVillage.cubeset
index edfe78f5f..4513187c4 100644
--- a/Server/Prefabs/Villages/SandVillage.cubeset
+++ b/Server/Prefabs/Villages/SandVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-10-10 20:21:27",
+		ExportDate = "2016-11-23 15:07:32",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -80,14 +80,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["ShouldExpandFloor"] = "1",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-8",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "1",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "100",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-8",
 			},
 			BlockDefinitions =
 			{
@@ -220,14 +220,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -334,14 +334,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -349,8 +349,8 @@ Cubeset =
 				"a: 24: 0",  -- sandstone
 				"b: 60: 7",  -- tilleddirt
 				"c:  8: 0",  -- water
-				"d: 60: 5",  -- tilleddirt
-				"e: 60: 6",  -- tilleddirt
+				"d: 60: 6",  -- tilleddirt
+				"e: 60: 5",  -- tilleddirt
 				"f: 50: 5",  -- torch
 				"g: 59: 7",  -- crops
 				"m: 19: 0",  -- sponge
@@ -373,10 +373,10 @@ Cubeset =
 				"abbcbbabbcbba",  --  1
 				"abbcbbabbcbba",  --  2
 				"abbcbbabbcbba",  --  3
-				"abbcdbabbcbba",  --  4
+				"abbcbbabbcbba",  --  4
 				"abbcbbabbcbba",  --  5
-				"abbceeabbcbba",  --  6
-				"abbcbbabbcbba",  --  7
+				"abbcbbadbcbba",  --  6
+				"abbcbeabbcbba",  --  7
 				"aaaaaaaaaaaaa",  --  8
 
 				-- Level 2
@@ -432,14 +432,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -567,14 +567,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -739,14 +739,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -871,14 +871,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1004,14 +1004,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1162,14 +1162,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1320,14 +1320,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1478,14 +1478,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1636,14 +1636,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1824,14 +1824,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -1957,14 +1957,14 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
@@ -2115,23 +2115,25 @@ Cubeset =
 			},
 			Metadata =
 			{
+				["AddWeightIfSame"] = "0",
+				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
+				["DepthWeight"] = "",
+				["ExpandFloorStrategy"] = "None",
 				["IsStarting"] = "0",
-				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["DepthWeight"] = "",
-				["ShouldExpandFloor"] = "1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
 			},
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
 				"a: 24: 0",  -- sandstone
-				"b: 60: 7",  -- tilleddirt
-				"c:  8: 0",  -- water
-				"d: 50: 5",  -- torch
-				"e: 59: 7",  -- crops
+				"b: 60: 5",  -- tilleddirt
+				"c: 60: 7",  -- tilleddirt
+				"d: 60: 6",  -- tilleddirt
+				"e:  8: 0",  -- water
+				"f: 50: 5",  -- torch
+				"g: 59: 7",  -- crops
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -2147,21 +2149,21 @@ Cubeset =
 
 				-- Level 1
 				"aaaaaaaaaa",  --  0
-				"abbbbbbbba",  --  1
-				"abbbbbbbba",  --  2
-				"acccccccca",  --  3
-				"abbbbbbbba",  --  4
-				"abbbbbbbba",  --  5
+				"abccdcccca",  --  1
+				"accdccccca",  --  2
+				"aeeeeeeeea",  --  3
+				"accdccccca",  --  4
+				"acdcdcccca",  --  5
 				"aaaaaaaaaa",  --  6
 
 				-- Level 2
-				"d........d",  --  0
-				".eeeeeeee.",  --  1
-				".eeeeeeee.",  --  2
+				"f........f",  --  0
+				".gggggggg.",  --  1
+				".gggggggg.",  --  2
 				"..........",  --  3
-				".eeeeeeee.",  --  4
-				".eeeeeeee.",  --  5
-				"d........d",  --  6
+				".gggggggg.",  --  4
+				".gggggggg.",  --  5
+				"f........f",  --  6
 
 			},
 		},  -- SingleField
@@ -2227,14 +2229,14 @@ Cubeset =
 			Metadata =
 			{
 				["AddWeightIfSame"] = "0",
-				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
-				["MergeStrategy"] = "msSpongePrint",
-				["ShouldExpandFloor"] = "1",
+				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["VerticalStrategy"] = "TerrainOrOceanTop|-8",
+				["ExpandFloorStrategy"] = "None",
+				["IsStarting"] = "1",
+				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
-				["DefaultWeight"] = "100",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-8",
 			},
 			BlockDefinitions =
 			{
diff --git a/src/Generating/Prefab.cpp b/src/Generating/Prefab.cpp
index 6805167a9..9af01d6a4 100644
--- a/src/Generating/Prefab.cpp
+++ b/src/Generating/Prefab.cpp
@@ -97,8 +97,8 @@ static const cPrefab::sDef g_TestPrefabDef =
 	// Merge strategy:
 	cBlockArea::msImprint,
 
-	// ShouldExtendFloor:
-	false,
+	// ExtendFloorStrategy:
+	cPrefab::efsNone,
 
 	// DefaultWeight:
 	10,
@@ -128,7 +128,7 @@ cPrefab::cPrefab(const cPrefab::sDef & a_Def) :
 	),
 	m_AllowedRotations(a_Def.m_AllowedRotations),
 	m_MergeStrategy(a_Def.m_MergeStrategy),
-	m_ShouldExtendFloor(a_Def.m_ShouldExtendFloor),
+	m_ExtendFloorStrategy(a_Def.m_ExtendFloorStrategy),
 	m_DefaultWeight(a_Def.m_DefaultWeight),
 	m_AddWeightIfSame(a_Def.m_AddWeightIfSame),
 	m_MoveToGround(a_Def.m_MoveToGround)
@@ -151,7 +151,7 @@ cPrefab::cPrefab(const cBlockArea & a_Image, int a_AllowedRotations) :
 	m_Size(a_Image.GetSize()),
 	m_AllowedRotations(a_AllowedRotations),
 	m_MergeStrategy(cBlockArea::msOverwrite),
-	m_ShouldExtendFloor(false),
+	m_ExtendFloorStrategy(efsNone),
 	m_DefaultWeight(1),
 	m_AddWeightIfSame(0),
 	m_MoveToGround(false)
@@ -170,7 +170,7 @@ cPrefab::cPrefab(const cBlockArea & a_Image) :
 	m_Size(a_Image.GetSize()),
 	m_AllowedRotations(0),
 	m_MergeStrategy(cBlockArea::msOverwrite),
-	m_ShouldExtendFloor(false),
+	m_ExtendFloorStrategy(efsNone),
 	m_DefaultWeight(1),
 	m_AddWeightIfSame(0),
 	m_MoveToGround(false)
@@ -188,7 +188,7 @@ cPrefab::cPrefab(const AString & a_BlockDefinitions, const AString & a_BlockData
 	m_Size(a_SizeX, a_SizeY, a_SizeZ),
 	m_AllowedRotations(0),
 	m_MergeStrategy(cBlockArea::msOverwrite),
-	m_ShouldExtendFloor(false),
+	m_ExtendFloorStrategy(efsNone),
 	m_DefaultWeight(1),
 	m_AddWeightIfSame(0),
 	m_MoveToGround(false)
@@ -264,46 +264,94 @@ void cPrefab::Draw(cChunkDesc & a_Dest, const Vector3i & a_Placement, int a_NumR
 	a_Dest.WriteBlockArea(Image, Placement.x, Placement.y, Placement.z, m_MergeStrategy);
 
 	// If requested, draw the floor (from the bottom of the prefab down to the nearest non-air)
-	if (m_ShouldExtendFloor)
+	switch (m_ExtendFloorStrategy)
 	{
-		int MaxX = Image.GetSizeX();
-		int MaxZ = Image.GetSizeZ();
-		for (int z = 0; z < MaxZ; z++)
+		case efsNone: break;  // Nothing needed
+		case efsRepeatBottomTillNonAir:
 		{
-			int RelZ = Placement.z + z;
-			if ((RelZ < 0) || (RelZ >= cChunkDef::Width))
-			{
-				// Z coord outside the chunk
-				continue;
-			}
-			for (int x = 0; x < MaxX; x++)
+			int MaxX = Image.GetSizeX();
+			int MaxZ = Image.GetSizeZ();
+			for (int z = 0; z < MaxZ; z++)
 			{
-				int RelX = Placement.x + x;
-				if ((RelX < 0) || (RelX >= cChunkDef::Width))
+				int RelZ = Placement.z + z;
+				if ((RelZ < 0) || (RelZ >= cChunkDef::Width))
 				{
-					// X coord outside the chunk
+					// Z coord outside the chunk
 					continue;
 				}
-				BLOCKTYPE BlockType;
-				NIBBLETYPE BlockMeta;
-				Image.GetRelBlockTypeMeta(x, 0, z, BlockType, BlockMeta);
-				if ((BlockType == E_BLOCK_AIR) || (BlockType == E_BLOCK_SPONGE))
+				for (int x = 0; x < MaxX; x++)
+				{
+					int RelX = Placement.x + x;
+					if ((RelX < 0) || (RelX >= cChunkDef::Width))
+					{
+						// X coord outside the chunk
+						continue;
+					}
+					BLOCKTYPE BlockType;
+					NIBBLETYPE BlockMeta;
+					Image.GetRelBlockTypeMeta(x, 0, z, BlockType, BlockMeta);
+					if ((BlockType == E_BLOCK_AIR) || (BlockType == E_BLOCK_SPONGE))
+					{
+						// Do not expand air nor sponge blocks
+						continue;
+					}
+					for (int y = Placement.y - 1; y >= 0; y--)
+					{
+						BLOCKTYPE ExistingBlock = a_Dest.GetBlockType(RelX, y, RelZ);
+						if (ExistingBlock != E_BLOCK_AIR)
+						{
+							// End the expansion for this column, reached the end
+							break;
+						}
+						a_Dest.SetBlockTypeMeta(RelX, y, RelZ, BlockType, BlockMeta);
+					}  // for y
+				}  // for x
+			}  // for z
+			break;
+		}  // efsRepeatBottomTillNonAir
+
+		case efsRepeatBottomTillSolid:
+		{
+			int MaxX = Image.GetSizeX();
+			int MaxZ = Image.GetSizeZ();
+			for (int z = 0; z < MaxZ; z++)
+			{
+				int RelZ = Placement.z + z;
+				if ((RelZ < 0) || (RelZ >= cChunkDef::Width))
 				{
-					// Do not expand air nor sponge blocks
+					// Z coord outside the chunk
 					continue;
 				}
-				for (int y = Placement.y - 1; y >= 0; y--)
+				for (int x = 0; x < MaxX; x++)
 				{
-					BLOCKTYPE ExistingBlock = a_Dest.GetBlockType(RelX, y, RelZ);
-					if (ExistingBlock != E_BLOCK_AIR)
+					int RelX = Placement.x + x;
+					if ((RelX < 0) || (RelX >= cChunkDef::Width))
 					{
-						// End the expansion for this column, reached the end
-						break;
+						// X coord outside the chunk
+						continue;
 					}
-					a_Dest.SetBlockTypeMeta(RelX, y, RelZ, BlockType, BlockMeta);
-				}  // for y
-			}  // for x
-		}  // for z
+					BLOCKTYPE BlockType;
+					NIBBLETYPE BlockMeta;
+					Image.GetRelBlockTypeMeta(x, 0, z, BlockType, BlockMeta);
+					if ((BlockType == E_BLOCK_AIR) || (BlockType == E_BLOCK_SPONGE))
+					{
+						// Do not expand air nor sponge blocks
+						continue;
+					}
+					for (int y = Placement.y - 1; y >= 0; y--)
+					{
+						BLOCKTYPE ExistingBlock = a_Dest.GetBlockType(RelX, y, RelZ);
+						if (cBlockInfo::IsSolid(ExistingBlock))
+						{
+							// End the expansion for this column, reached the end
+							break;
+						}
+						a_Dest.SetBlockTypeMeta(RelX, y, RelZ, BlockType, BlockMeta);
+					}  // for y
+				}  // for x
+			}  // for z
+			break;
+		}  // efsRepeatBottomTillSolid
 	}
 }
 
diff --git a/src/Generating/Prefab.h b/src/Generating/Prefab.h
index 5f937260d..bb961f2b3 100644
--- a/src/Generating/Prefab.h
+++ b/src/Generating/Prefab.h
@@ -32,6 +32,14 @@ class cPrefab :
 	public cPiece
 {
 public:
+	/** How to handle the space between the prefab bottom and the terrain top. */
+	enum eExtendFloorStrategy
+	{
+		efsNone,                    ///< No processing, the prefab is left "floating in the air"
+		efsRepeatBottomTillNonAir,  ///< Repeat the bottom-most block down until the first non-air block
+		efsRepeatBottomTillSolid,   ///< Repeat the bottom-most block down until the first solid block; non-solids are overwritten
+	};
+
 	struct sDef
 	{
 		int m_SizeX;
@@ -62,10 +70,9 @@ public:
 		/** The merge strategy to use while drawing the prefab. */
 		cBlockArea::eMergeStrategy m_MergeStrategy;
 
-		/** If set to true, the prefab will extend its lowermost blocks until a solid block is found,
-		thus creating a foundation for the prefab. This is used for houses to be "on the ground", as well as
-		nether fortresses not to float. */
-		bool m_ShouldExtendFloor;
+		/** How the prefab should handle not being on top of the ground.
+		This is used for houses to be "on the ground", as well as nether fortresses not to float. */
+		eExtendFloorStrategy m_ExtendFloorStrategy;
 
 		/** Chance of this piece being used, if no other modifier is active. */
 		int m_DefaultWeight;
@@ -143,8 +150,8 @@ public:
 	/** Sets the flag whether the prefab should be moved to ground level before being drawn. */
 	void SetMoveToGround(bool a_MoveToGround) { m_MoveToGround = a_MoveToGround; }
 
-	/** Sets the flag whether the lowest layer of the prefab should be repeated downwards until it hits a solid block. */
-	void SetExtendFloor(bool a_ShouldExtendFloor) { m_ShouldExtendFloor = a_ShouldExtendFloor; }
+	/** Sets the strategy to use between the bottom of the prefab and the terrain top. */
+	void SetExtendFloorStrategy(eExtendFloorStrategy a_Strategy) { m_ExtendFloorStrategy = a_Strategy; }
 
 	/** Sets the internal hitbox to the specified value. */
 	void SetHitBox(const cCuboid & a_HitBox) { m_HitBox = a_HitBox; }
@@ -183,10 +190,9 @@ protected:
 	/** The merge strategy to use when drawing the prefab into a block area */
 	cBlockArea::eMergeStrategy m_MergeStrategy;
 
-	/** If set to true, the prefab will extend its lowermost blocks until a solid block is found,
-	thus creating a foundation for the prefab. This is used for houses to be "on the ground", as well as
-	nether fortresses not to float. */
-	bool m_ShouldExtendFloor;
+	/** How the prefab should handle not being on top of the ground.
+	This is used for houses to be "on the ground", as well as nether fortresses not to float. */
+	eExtendFloorStrategy m_ExtendFloorStrategy;
 
 	/** Chance of this piece being used, if no other modifier is active. */
 	int m_DefaultWeight;
diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp
index 417f8ce7e..d6c2c8819 100644
--- a/src/Generating/PrefabPiecePool.cpp
+++ b/src/Generating/PrefabPiecePool.cpp
@@ -526,16 +526,15 @@ bool cPrefabPiecePool::ReadPieceMetadataCubesetVer1(
 	}
 
 	// Get the values:
-	int AddWeightIfSame = 0, DefaultWeight = 100, MoveToGround = 0, ShouldExpandFloor = 0;
+	int AddWeightIfSame = 0, DefaultWeight = 100, MoveToGround = 0;
 	AString DepthWeight, MergeStrategy, VerticalLimit, VerticalStrategy;
-	a_LuaState.GetNamedValue("AddWeightIfSame",   AddWeightIfSame);
-	a_LuaState.GetNamedValue("DefaultWeight",     DefaultWeight);
-	a_LuaState.GetNamedValue("DepthWeight",       DepthWeight);
-	a_LuaState.GetNamedValue("MergeStrategy",     MergeStrategy);
-	a_LuaState.GetNamedValue("MoveToGround",      MoveToGround);
-	a_LuaState.GetNamedValue("ShouldExpandFloor", ShouldExpandFloor);
-	a_LuaState.GetNamedValue("VerticalLimit",     VerticalLimit);
-	a_LuaState.GetNamedValue("VerticalStrategy",  VerticalStrategy);
+	a_LuaState.GetNamedValue("AddWeightIfSame",  AddWeightIfSame);
+	a_LuaState.GetNamedValue("DefaultWeight",    DefaultWeight);
+	a_LuaState.GetNamedValue("DepthWeight",      DepthWeight);
+	a_LuaState.GetNamedValue("MergeStrategy",    MergeStrategy);
+	a_LuaState.GetNamedValue("MoveToGround",     MoveToGround);
+	a_LuaState.GetNamedValue("VerticalLimit",    VerticalLimit);
+	a_LuaState.GetNamedValue("VerticalStrategy", VerticalStrategy);
 
 	// Apply the values:
 	a_Prefab->SetAddWeightIfSame(AddWeightIfSame);
@@ -555,7 +554,42 @@ bool cPrefabPiecePool::ReadPieceMetadataCubesetVer1(
 		a_Prefab->SetMergeStrategy(strategy->second);
 	}
 	a_Prefab->SetMoveToGround(MoveToGround != 0);
-	a_Prefab->SetExtendFloor(ShouldExpandFloor != 0);
+
+	AString ExpandFloorStrategyStr;
+	if (!a_LuaState.GetNamedValue("ExpandFloorStrategy", ExpandFloorStrategyStr))
+	{
+		// Check the older variant for ExpandFloorStrategy, ShouldExpandFloor:
+		int ShouldExpandFloor;
+		if (a_LuaState.GetNamedValue("ShouldExpandFloor", ShouldExpandFloor))
+		{
+			LOG("Piece \"%s\" in file \"%s\" is using the old \"ShouldExpandFloor\" attribute. Use the new \"ExpandFloorStrategy\" attribute instead for more options.",
+				a_PieceName.c_str(), a_FileName.c_str()
+			);
+			a_Prefab->SetExtendFloorStrategy((ShouldExpandFloor != 0) ? cPrefab::efsRepeatBottomTillNonAir : cPrefab::efsNone);
+		}
+	}
+	else
+	{
+		auto lcExpandFloorStrategyStr = StrToLower(ExpandFloorStrategyStr);
+		if (lcExpandFloorStrategyStr == "repeatbottomtillnonair")
+		{
+			a_Prefab->SetExtendFloorStrategy(cPrefab::efsRepeatBottomTillNonAir);
+		}
+		else if (lcExpandFloorStrategyStr == "repeatbottomtillsolid")
+		{
+			a_Prefab->SetExtendFloorStrategy(cPrefab::efsRepeatBottomTillSolid);
+		}
+		else
+		{
+			if (lcExpandFloorStrategyStr != "none")
+			{
+				LOGWARNING("Piece \"%s\" in file \"%s\" is using an unknown \"ExpandFloorStrategy\" attribute value: \"%s\"",
+					a_PieceName.c_str(), a_FileName.c_str(), ExpandFloorStrategyStr.c_str()
+				);
+			}
+			a_Prefab->SetExtendFloorStrategy(cPrefab::efsNone);
+		}
+	}
 	if (!VerticalLimit.empty())
 	{
 		if (!a_Prefab->SetVerticalLimitFromString(VerticalLimit, a_LogWarnings))
author	Mattes D <github@xoft.cz>	2016-11-26 11:19:25 +0100
committer	GitHub <noreply@github.com>	2016-11-26 11:19:25 +0100
commit	4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc (patch)
tree	ab87c4a6c9f58fdfe2495c4fef939f4940df7d96
parent	Merge pull request #3442 from Seadragon91/luacheck_config (diff)
parent	Prefabs: Implemented support for ExpandFloorStrategy. (diff)
download	cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.gz cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.bz2 cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.lz cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.xz cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.tar.zst cuberite-4e9da46a853f4c8b97cacafdde8e5f95a5c5b1cc.zip