author: Mattes D <github@xoft.cz> 2016-12-01 22:17:18 +0100
committer: GitHub <noreply@github.com> 2016-12-01 22:17:18 +0100
commit: 27718cca45b26e66867fac2238ae81381c672a96 (patch)
tree: 33615f07c5a1f7043962cd56c2f09c497a4b2213 /Server
parent: Merge pull request #3469 from QuImUfu/patch-1 (diff)
parent: Fixed villages generating under-water. (diff)
download: cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar
cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.gz
cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.bz2
cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.lz
cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.xz
cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.zst
cuberite-27718cca45b26e66867fac2238ae81381c672a96.zip
6 files changed, 666 insertions, 667 deletions
diff --git a/Server/Prefabs/PieceStructures/NetherFort.cubeset b/Server/Prefabs/PieceStructures/NetherFort.cubeset
index 569335401..2fad9d773 100644
--- a/Server/Prefabs/PieceStructures/NetherFort.cubeset
+++ b/Server/Prefabs/PieceStructures/NetherFort.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2016-11-23 15:07:34",
+		ExportDate = "2016-11-30 13:45:43",
 		["GridSizeX"] = "512",
 		["GridSizeZ"] = "512",
 		["IntendedUse"] = "PieceStructures",
@@ -82,7 +82,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "5",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -90,11 +90,11 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 6",  -- netherbrickstairs
 				"c:114: 4",  -- netherbrickstairs
 				"d:114: 5",  -- netherbrickstairs
-				"e: 44:14",  -- step
+				"e: 44:14",  -- stone_slab
 				"f:114: 7",  -- netherbrickstairs
 				"m: 19: 0",  -- sponge
 			},
@@ -335,7 +335,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -343,7 +343,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 2",  -- netherbrickstairs
 				"d:114: 3",  -- netherbrickstairs
@@ -460,7 +460,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -468,7 +468,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"m: 19: 0",  -- sponge
 			},
@@ -590,7 +590,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|3:0|5:0|7:0|9:0|11:0|13:0|15:0",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -598,7 +598,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"m: 19: 0",  -- sponge
 			},
@@ -761,7 +761,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -769,7 +769,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 2",  -- netherbrickstairs
 				"d:114: 0",  -- netherbrickstairs
@@ -924,7 +924,7 @@ 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",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -932,7 +932,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 0",  -- netherbrickstairs
 				"c:113: 0",  -- netherbrickfence
 				"d:114: 2",  -- netherbrickstairs
@@ -1085,7 +1085,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "500",
 				["DepthWeight"] = "4:-3000|8:-3000|12:-3000|16:-3000|20:-3000",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -1093,10 +1093,10 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 5",  -- netherbrickstairs
 				"c:114: 4",  -- netherbrickstairs
-				"d: 44:14",  -- step
+				"d: 44:14",  -- stone_slab
 				"e:114: 6",  -- netherbrickstairs
 				"f:114: 7",  -- netherbrickstairs
 				"m: 19: 0",  -- sponge
@@ -1226,7 +1226,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "1:1000",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -1234,12 +1234,12 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 7",  -- netherbrickstairs
 				"c:114: 5",  -- netherbrickstairs
 				"d:114: 4",  -- netherbrickstairs
 				"e:114: 6",  -- netherbrickstairs
-				"f: 44:14",  -- step
+				"f: 44:14",  -- stone_slab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -1433,7 +1433,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|2:0|3:0|4:0|5:0",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -1441,9 +1441,9 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 5",  -- netherbrickstairs
-				"c: 44:14",  -- step
+				"c: 44:14",  -- stone_slab
 				"d:114: 6",  -- netherbrickstairs
 				"e:114: 7",  -- netherbrickstairs
 				"m: 19: 0",  -- sponge
@@ -1545,7 +1545,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|2:0|3:0|4:0|5:0",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -1553,9 +1553,9 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 5",  -- netherbrickstairs
-				"c: 44:14",  -- step
+				"c: 44:14",  -- stone_slab
 				"d:114: 6",  -- netherbrickstairs
 				"e:114: 7",  -- netherbrickstairs
 				"m: 19: 0",  -- sponge
@@ -1650,7 +1650,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|2:0|3:0|4:0|5:0",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -1658,9 +1658,9 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 5",  -- netherbrickstairs
-				"c: 44:14",  -- step
+				"c: 44:14",  -- stone_slab
 				"d:114: 6",  -- netherbrickstairs
 				"e:114: 7",  -- netherbrickstairs
 				"f:114: 0",  -- netherbrickstairs
@@ -1830,7 +1830,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -1839,7 +1839,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b: 10: 0",  -- lava
 				"c:113: 0",  -- netherbrickfence
 				"m: 19: 0",  -- sponge
@@ -2048,7 +2048,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -2056,9 +2056,9 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b: 88: 0",  -- soulsand
-				"c:115: 3",  -- netherwartblock
+				"c:115: 3",  -- 115
 				"d:114: 3",  -- netherbrickstairs
 				"e:114: 0",  -- netherbrickstairs
 				"f:114: 1",  -- netherbrickstairs
@@ -2235,7 +2235,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|2:0|3:0|4:0|5:0",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -2243,7 +2243,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b: 52: 0",  -- mobspawner
 				"c:113: 0",  -- netherbrickfence
 				"m: 19: 0",  -- sponge
@@ -2366,7 +2366,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:0|3:0|5:0|7:0|9:0|11:0|13:0|15:0",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -2374,7 +2374,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"m: 19: 0",  -- sponge
 			},
@@ -2551,7 +2551,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -2559,7 +2559,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c: 10: 0",  -- lava
 				"m: 19: 0",  -- sponge
@@ -2834,7 +2834,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -2842,15 +2842,15 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c: 10: 0",  -- lava
 				"d:114: 2",  -- netherbrickstairs
 				"e:114: 3",  -- netherbrickstairs
 				"f:114: 7",  -- netherbrickstairs
-				"g: 44:14",  -- step
+				"g: 44:14",  -- stone_slab
 				"h:114: 6",  -- netherbrickstairs
-				"i: 44: 6",  -- step
+				"i: 44: 6",  -- stone_slab
 				"j:114: 0",  -- netherbrickstairs
 				"m: 19: 0",  -- sponge
 			},
@@ -3127,7 +3127,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -3135,7 +3135,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b: 10: 0",  -- lava
 				"c:113: 0",  -- netherbrickfence
 				"m: 19: 0",  -- sponge
@@ -3464,7 +3464,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "300",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -3472,7 +3472,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 2",  -- netherbrickstairs
 				"d:114: 3",  -- netherbrickstairs
@@ -3589,7 +3589,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "300",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -3597,7 +3597,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 2",  -- netherbrickstairs
 				"d:114: 3",  -- netherbrickstairs
@@ -3714,7 +3714,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -3722,11 +3722,11 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 4",  -- netherbrickstairs
 				"c:114: 7",  -- netherbrickstairs
 				"d:114: 5",  -- netherbrickstairs
-				"e: 44: 6",  -- step
+				"e: 44: 6",  -- stone_slab
 				"f:113: 0",  -- netherbrickfence
 				"g:114: 2",  -- netherbrickstairs
 				"h:114: 3",  -- netherbrickstairs
@@ -3894,7 +3894,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -3902,11 +3902,11 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 4",  -- netherbrickstairs
 				"c:114: 7",  -- netherbrickstairs
 				"d:114: 5",  -- netherbrickstairs
-				"e: 44: 6",  -- step
+				"e: 44: 6",  -- stone_slab
 				"f:113: 0",  -- netherbrickfence
 				"g:114: 0",  -- netherbrickstairs
 				"h:114: 1",  -- netherbrickstairs
@@ -4067,7 +4067,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "1:500",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -4075,11 +4075,11 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 5",  -- netherbrickstairs
 				"c:114: 4",  -- netherbrickstairs
 				"d:114: 6",  -- netherbrickstairs
-				"e: 44:14",  -- step
+				"e: 44:14",  -- stone_slab
 				"f:114: 7",  -- netherbrickstairs
 				"m: 19: 0",  -- sponge
 			},
@@ -4262,7 +4262,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -4270,7 +4270,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 0",  -- netherbrickstairs
 				"d:114: 1",  -- netherbrickstairs
@@ -4415,7 +4415,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -4423,7 +4423,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 0",  -- netherbrickstairs
 				"d:114: 1",  -- netherbrickstairs
@@ -4566,7 +4566,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -4574,7 +4574,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b: 54: 5",  -- chest
 				"c:113: 0",  -- netherbrickfence
 				"d:114: 0",  -- netherbrickstairs
@@ -4716,7 +4716,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -4724,7 +4724,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 7",  -- netherbrickstairs
 				"c:114: 6",  -- netherbrickstairs
 				"d:114: 4",  -- netherbrickstairs
@@ -4926,7 +4926,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "5",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -4934,7 +4934,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 7",  -- netherbrickstairs
 				"c:114: 5",  -- netherbrickstairs
 				"d:114: 4",  -- netherbrickstairs
@@ -5146,7 +5146,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -5154,10 +5154,10 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 5",  -- netherbrickstairs
 				"c:114: 4",  -- netherbrickstairs
-				"d: 44:14",  -- step
+				"d: 44:14",  -- stone_slab
 				"e:114: 6",  -- netherbrickstairs
 				"f:114: 7",  -- netherbrickstairs
 				"m: 19: 0",  -- sponge
@@ -5511,7 +5511,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -5519,7 +5519,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 0",  -- netherbrickstairs
 				"d:114: 1",  -- netherbrickstairs
@@ -5690,7 +5690,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "1:200|2:400|3:0|4:500",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -5698,7 +5698,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 2",  -- netherbrickstairs
 				"c:114: 0",  -- netherbrickstairs
 				"d:114: 1",  -- netherbrickstairs
@@ -5815,7 +5815,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "500",
 				["DepthWeight"] = "6:0|12:0|18:0",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -5823,7 +5823,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 2",  -- netherbrickstairs
 				"d:114: 3",  -- netherbrickstairs
@@ -5940,7 +5940,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -5948,7 +5948,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:113: 0",  -- netherbrickfence
 				"c:114: 2",  -- netherbrickstairs
 				"d:114: 1",  -- netherbrickstairs
@@ -6066,7 +6066,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -6074,7 +6074,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b: 54: 4",  -- chest
 				"c:113: 0",  -- netherbrickfence
 				"d:114: 2",  -- netherbrickstairs
@@ -6207,7 +6207,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -6215,7 +6215,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 7",  -- netherbrickstairs
 				"c:114: 6",  -- netherbrickstairs
 				"d:114: 4",  -- netherbrickstairs
@@ -6223,7 +6223,7 @@ Cubeset =
 				"f:114: 2",  -- netherbrickstairs
 				"g:114: 3",  -- netherbrickstairs
 				"h:114: 1",  -- netherbrickstairs
-				"i: 44:14",  -- step
+				"i: 44:14",  -- stone_slab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -6583,7 +6583,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "RepeatTillNonAir",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -6591,13 +6591,13 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:112: 0",  -- netherbrick
+				"a:112: 0",  -- netherbrickblock
 				"b:114: 5",  -- netherbrickstairs
 				"c:114: 4",  -- netherbrickstairs
-				"d: 44:14",  -- step
+				"d: 44:14",  -- stone_slab
 				"e:114: 6",  -- netherbrickstairs
 				"f:114: 7",  -- netherbrickstairs
-				"g: 44: 6",  -- step
+				"g: 44: 6",  -- stone_slab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
diff --git a/Server/Prefabs/Villages/AlchemistVillage.cubeset b/Server/Prefabs/Villages/AlchemistVillage.cubeset
index f050655af..23392dd45 100644
--- a/Server/Prefabs/Villages/AlchemistVillage.cubeset
+++ b/Server/Prefabs/Villages/AlchemistVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2016-11-23 15:08:03",
+		ExportDate = "2016-11-30 13:46:13",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -62,7 +62,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -75,10 +75,10 @@ Cubeset =
 				"c: 24: 0",  -- sandstone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 3",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
 				"g: 61: 2",  -- furnace
 				"h: 65: 2",  -- ladder
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j:101: 0",  -- ironbars
 				"k: 50: 4",  -- torch
 				"l:128: 2",  -- sandstonestairs
@@ -87,7 +87,7 @@ Cubeset =
 				"o:128: 4",  -- sandstonestairs
 				"p:128: 5",  -- sandstonestairs
 				"q:128: 7",  -- sandstonestairs
-				"r: 44: 1",  -- step
+				"r: 44: 1",  -- stone_slab
 				"s: 96: 2",  -- trapdoor
 			},
 			BlockData =
@@ -192,7 +192,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -205,9 +205,9 @@ Cubeset =
 				"c: 24: 0",  -- sandstone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 3",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
 				"g: 65: 2",  -- ladder
-				"h: 64: 9",  -- wooddoorblock
+				"h: 64: 9",  -- woodendoorblock
 				"i:101: 0",  -- ironbars
 				"j: 50: 4",  -- torch
 				"k:128: 2",  -- sandstonestairs
@@ -216,7 +216,7 @@ Cubeset =
 				"n:128: 4",  -- sandstonestairs
 				"o:128: 5",  -- sandstonestairs
 				"p:128: 7",  -- sandstonestairs
-				"q: 44: 1",  -- step
+				"q: 44: 1",  -- stone_slab
 				"r: 96: 2",  -- trapdoor
 			},
 			BlockData =
@@ -321,7 +321,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -334,9 +334,9 @@ Cubeset =
 				"c: 24: 0",  -- sandstone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 3",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
 				"g: 65: 2",  -- ladder
-				"h: 64: 9",  -- wooddoorblock
+				"h: 64: 9",  -- woodendoorblock
 				"i:101: 0",  -- ironbars
 				"j: 50: 2",  -- torch
 				"k: 50: 1",  -- torch
@@ -347,7 +347,7 @@ Cubeset =
 				"p:128: 6",  -- sandstonestairs
 				"q:128: 4",  -- sandstonestairs
 				"r:128: 7",  -- sandstonestairs
-				"s: 44: 1",  -- step
+				"s: 44: 1",  -- stone_slab
 				"t: 96: 2",  -- trapdoor
 			},
 			BlockData =
@@ -476,7 +476,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -489,9 +489,9 @@ Cubeset =
 				"c: 24: 0",  -- sandstone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 3",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
 				"g: 65: 2",  -- ladder
-				"h: 64: 9",  -- wooddoorblock
+				"h: 64: 9",  -- woodendoorblock
 				"i:101: 0",  -- ironbars
 				"j: 50: 1",  -- torch
 				"k: 50: 4",  -- torch
@@ -502,7 +502,7 @@ Cubeset =
 				"p:128: 5",  -- sandstonestairs
 				"q:128: 4",  -- sandstonestairs
 				"r:128: 7",  -- sandstonestairs
-				"s: 44: 1",  -- step
+				"s: 44: 1",  -- stone_slab
 				"t: 96: 2",  -- trapdoor
 			},
 			BlockData =
@@ -619,7 +619,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -637,13 +637,13 @@ Cubeset =
 				"g:  2: 0",  -- grass
 				"h:  5: 0",  -- planks
 				"i: 85: 0",  -- fence
-				"j: 64: 3",  -- wooddoorblock
+				"j: 64: 3",  -- woodendoorblock
 				"k: 38: 1",  -- rose
 				"l: 38: 2",  -- rose
 				"m: 19: 0",  -- sponge
 				"n: 38: 5",  -- rose
 				"o: 65: 2",  -- ladder
-				"p: 64: 9",  -- wooddoorblock
+				"p: 64: 9",  -- woodendoorblock
 				"q:101: 0",  -- ironbars
 				"r: 50: 1",  -- torch
 				"s: 50: 4",  -- torch
@@ -653,7 +653,7 @@ Cubeset =
 				"w:128: 5",  -- sandstonestairs
 				"x:128: 4",  -- sandstonestairs
 				"y:128: 7",  -- sandstonestairs
-				"z: 44: 1",  -- step
+				"z: 44: 1",  -- stone_slab
 			},
 			BlockData =
 			{
@@ -769,7 +769,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -782,7 +782,7 @@ Cubeset =
 				"c: 24: 0",  -- sandstone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 3",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
 				"g: 65: 5",  -- ladder
 				"h:134: 3",  -- sprucewoodstairs
 				"i: 85: 0",  -- fence
@@ -791,7 +791,7 @@ Cubeset =
 				"l:134: 6",  -- sprucewoodstairs
 				"m: 19: 0",  -- sponge
 				"n:134: 4",  -- sprucewoodstairs
-				"o: 64: 9",  -- wooddoorblock
+				"o: 64: 9",  -- woodendoorblock
 				"p: 50: 2",  -- torch
 				"q:101: 0",  -- ironbars
 				"r:171: 8",  -- carpet
@@ -800,7 +800,7 @@ Cubeset =
 				"u:128: 4",  -- sandstonestairs
 				"v:128: 5",  -- sandstonestairs
 				"w:128: 7",  -- sandstonestairs
-				"x: 44: 1",  -- step
+				"x: 44: 1",  -- stone_slab
 				"y: 96: 1",  -- trapdoor
 			},
 			BlockData =
@@ -929,7 +929,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "80",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -943,20 +943,20 @@ Cubeset =
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
 				"f: 12: 0",  -- sand
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h: 85: 0",  -- fence
-				"i: 64: 0",  -- wooddoorblock
+				"i: 64: 0",  -- woodendoorblock
 				"j: 65: 5",  -- ladder
-				"k: 64: 9",  -- wooddoorblock
+				"k: 64: 9",  -- woodendoorblock
 				"l:101: 0",  -- ironbars
 				"m: 19: 0",  -- sponge
-				"n: 64: 8",  -- wooddoorblock
+				"n: 64: 8",  -- woodendoorblock
 				"o: 50: 4",  -- torch
 				"p:128: 2",  -- sandstonestairs
 				"q:126: 8",  -- woodenslab
 				"r:128: 4",  -- sandstonestairs
 				"s:128: 7",  -- sandstonestairs
-				"t: 44: 1",  -- step
+				"t: 44: 1",  -- stone_slab
 				"u: 50: 3",  -- torch
 				"v:128: 6",  -- sandstonestairs
 			},
@@ -1107,7 +1107,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1121,11 +1121,11 @@ Cubeset =
 				"d: 12: 0",  -- sand
 				"e: 13: 0",  -- gravel
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h: 65: 5",  -- ladder
 				"i: 85: 0",  -- fence
 				"j:101: 0",  -- ironbars
-				"k: 64: 9",  -- wooddoorblock
+				"k: 64: 9",  -- woodendoorblock
 				"l: 50: 3",  -- torch
 				"m: 19: 0",  -- sponge
 				"n:128: 2",  -- sandstonestairs
@@ -1134,7 +1134,7 @@ Cubeset =
 				"q:128: 4",  -- sandstonestairs
 				"r:128: 5",  -- sandstonestairs
 				"s:128: 7",  -- sandstonestairs
-				"t: 44: 1",  -- step
+				"t: 44: 1",  -- stone_slab
 				"u: 96: 0",  -- trapdoor
 			},
 			BlockData =
@@ -1263,7 +1263,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1276,10 +1276,10 @@ Cubeset =
 				"c: 24: 0",  -- sandstone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 3",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
 				"g: 65: 2",  -- ladder
 				"h:101: 0",  -- ironbars
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j: 50: 1",  -- torch
 				"k: 50: 2",  -- torch
 				"l:128: 2",  -- sandstonestairs
@@ -1289,7 +1289,7 @@ Cubeset =
 				"p:128: 4",  -- sandstonestairs
 				"q:128: 5",  -- sandstonestairs
 				"r:128: 7",  -- sandstonestairs
-				"s: 44: 1",  -- step
+				"s: 44: 1",  -- stone_slab
 				"t: 96: 2",  -- trapdoor
 			},
 			BlockData =
@@ -1418,7 +1418,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "80",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1427,7 +1427,7 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"A:128: 7",  -- sandstonestairs
-				"B: 44: 1",  -- step
+				"B: 44: 1",  -- stone_slab
 				"C: 96: 3",  -- trapdoor
 				"D: 96: 2",  -- trapdoor
 				"E:128: 2",  -- sandstonestairs
@@ -1436,7 +1436,7 @@ Cubeset =
 				"H:128: 1",  -- sandstonestairs
 				"I:128: 3",  -- sandstonestairs
 				"J: 51: 0",  -- fire
-				"K: 44: 9",  -- step
+				"K: 44: 9",  -- stone_slab
 				"a: 24: 2",  -- sandstone
 				"b: 24: 0",  -- sandstone
 				"c:  4: 0",  -- cobblestone
@@ -1445,7 +1445,7 @@ Cubeset =
 				"f:  5: 0",  -- planks
 				"g: 65: 3",  -- ladder
 				"h: 85: 0",  -- fence
-				"i: 64: 3",  -- wooddoorblock
+				"i: 64: 3",  -- woodendoorblock
 				"j:134: 1",  -- sprucewoodstairs
 				"k:134: 2",  -- sprucewoodstairs
 				"l: 61: 2",  -- furnace
@@ -1456,7 +1456,7 @@ Cubeset =
 				"q:101: 0",  -- ironbars
 				"r: 50: 2",  -- torch
 				"s: 47: 0",  -- bookshelf
-				"t: 64: 9",  -- wooddoorblock
+				"t: 64: 9",  -- woodendoorblock
 				"u: 50: 3",  -- torch
 				"v:171: 8",  -- carpet
 				"w:128: 6",  -- sandstonestairs
@@ -1622,7 +1622,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "80",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1638,21 +1638,21 @@ Cubeset =
 				"f:  2: 0",  -- grass
 				"g:  5: 0",  -- planks
 				"h: 85: 0",  -- fence
-				"i: 64: 3",  -- wooddoorblock
-				"j: 64: 2",  -- wooddoorblock
+				"i: 64: 3",  -- woodendoorblock
+				"j: 64: 2",  -- woodendoorblock
 				"k: 65: 4",  -- ladder
 				"l: 65: 2",  -- ladder
 				"m: 19: 0",  -- sponge
 				"n: 50: 1",  -- torch
 				"o: 50: 2",  -- torch
 				"p:101: 0",  -- ironbars
-				"q: 64: 9",  -- wooddoorblock
+				"q: 64: 9",  -- woodendoorblock
 				"r:128: 2",  -- sandstonestairs
 				"s:128: 6",  -- sandstonestairs
 				"t:126: 8",  -- woodenslab
 				"u:128: 5",  -- sandstonestairs
 				"v:128: 7",  -- sandstonestairs
-				"w: 44: 1",  -- step
+				"w: 44: 1",  -- stone_slab
 				"x: 96: 0",  -- trapdoor
 				"y:126: 0",  -- woodenslab
 				"z:128: 4",  -- sandstonestairs
@@ -1835,7 +1835,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "60",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1847,13 +1847,13 @@ Cubeset =
 				"B:128: 4",  -- sandstonestairs
 				"C:128: 5",  -- sandstonestairs
 				"D:128: 7",  -- sandstonestairs
-				"E: 44: 1",  -- step
+				"E: 44: 1",  -- stone_slab
 				"F:128: 2",  -- sandstonestairs
 				"G:128: 0",  -- sandstonestairs
 				"H: 87: 0",  -- netherstone
 				"I:128: 3",  -- sandstonestairs
 				"J: 51: 0",  -- fire
-				"K: 44: 9",  -- step
+				"K: 44: 9",  -- stone_slab
 				"a: 24: 2",  -- sandstone
 				"b: 24: 0",  -- sandstone
 				"c: 12: 0",  -- sand
@@ -1862,8 +1862,8 @@ Cubeset =
 				"f: 13: 0",  -- gravel
 				"g: 85: 0",  -- fence
 				"h:  5: 1",  -- planks
-				"i: 64: 2",  -- wooddoorblock
-				"j: 64: 0",  -- wooddoorblock
+				"i: 64: 2",  -- woodendoorblock
+				"j: 64: 0",  -- woodendoorblock
 				"k: 61: 2",  -- furnace
 				"l:118: 0",  -- cauldronblock
 				"m: 19: 0",  -- sponge
@@ -1872,12 +1872,12 @@ Cubeset =
 				"p:101: 0",  -- ironbars
 				"q: 50: 1",  -- torch
 				"r:140: 0",  -- flowerpotblock
-				"s: 64: 9",  -- wooddoorblock
+				"s: 64: 9",  -- woodendoorblock
 				"t: 50: 3",  -- torch
 				"u: 69:12",  -- lever
 				"v: 50: 4",  -- torch
 				"w:128: 6",  -- sandstonestairs
-				"x: 44:10",  -- step
+				"x: 44:10",  -- stone_slab
 				"y:128: 1",  -- sandstonestairs
 				"z: 47: 0",  -- bookshelf
 			},
@@ -2111,7 +2111,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2124,9 +2124,9 @@ Cubeset =
 				"c: 24: 0",  -- sandstone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 3",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
 				"g: 65: 5",  -- ladder
-				"h: 64: 9",  -- wooddoorblock
+				"h: 64: 9",  -- woodendoorblock
 				"i:101: 0",  -- ironbars
 				"j: 50: 4",  -- torch
 				"k:128: 2",  -- sandstonestairs
@@ -2136,7 +2136,7 @@ Cubeset =
 				"o:128: 5",  -- sandstonestairs
 				"p:128: 7",  -- sandstonestairs
 				"q:128: 6",  -- sandstonestairs
-				"r: 44: 1",  -- step
+				"r: 44: 1",  -- stone_slab
 				"s: 96: 1",  -- trapdoor
 			},
 			BlockData =
@@ -2268,7 +2268,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2298,7 +2298,7 @@ Cubeset =
 				"t:128: 7",  -- sandstonestairs
 				"u: 85: 0",  -- fence
 				"v: 24: 1",  -- sandstone
-				"w: 44: 1",  -- step
+				"w: 44: 1",  -- stone_slab
 				"x: 89: 0",  -- lightstone
 			},
 			BlockData =
@@ -2457,7 +2457,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "80",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2467,8 +2467,8 @@ Cubeset =
 				".:  0: 0",  -- air
 				"A:126: 8",  -- woodenslab
 				"B:128: 7",  -- sandstonestairs
-				"C: 44: 1",  -- step
-				"D: 64: 3",  -- wooddoorblock
+				"C: 44: 1",  -- stone_slab
+				"D: 64: 3",  -- woodendoorblock
 				"E:128: 6",  -- sandstonestairs
 				"a: 24: 2",  -- sandstone
 				"b:  4: 0",  -- cobblestone
@@ -2487,15 +2487,15 @@ Cubeset =
 				"o:134: 7",  -- sprucewoodstairs
 				"p:134: 4",  -- sprucewoodstairs
 				"q:107: 3",  -- fencegate
-				"r: 64: 1",  -- wooddoorblock
+				"r: 64: 1",  -- woodendoorblock
 				"s: 65: 3",  -- ladder
 				"t: 50: 3",  -- torch
 				"u:171: 8",  -- carpet
 				"v:101: 0",  -- ironbars
-				"w: 64: 9",  -- wooddoorblock
+				"w: 64: 9",  -- woodendoorblock
 				"x:128: 2",  -- sandstonestairs
 				"y: 24: 1",  -- sandstone
-				"z: 44: 9",  -- step
+				"z: 44: 9",  -- stone_slab
 			},
 			BlockData =
 			{
@@ -2653,7 +2653,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "70",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2665,14 +2665,14 @@ Cubeset =
 				"B: 50: 3",  -- torch
 				"C:171: 8",  -- carpet
 				"D:101: 0",  -- ironbars
-				"E: 64: 9",  -- wooddoorblock
+				"E: 64: 9",  -- woodendoorblock
 				"F:128: 2",  -- sandstonestairs
 				"G: 24: 1",  -- sandstone
-				"H: 44: 9",  -- step
+				"H: 44: 9",  -- stone_slab
 				"I:126: 8",  -- woodenslab
 				"J:128: 7",  -- sandstonestairs
-				"K: 44: 1",  -- step
-				"L: 64: 3",  -- wooddoorblock
+				"K: 44: 1",  -- stone_slab
+				"L: 64: 3",  -- woodendoorblock
 				"M:128: 6",  -- sandstonestairs
 				"a: 24: 2",  -- sandstone
 				"b:  1: 0",  -- stone
@@ -2699,7 +2699,7 @@ Cubeset =
 				"w: 85: 0",  -- fence
 				"x:134: 7",  -- sprucewoodstairs
 				"y:107: 1",  -- fencegate
-				"z: 64: 1",  -- wooddoorblock
+				"z: 64: 1",  -- woodendoorblock
 			},
 			BlockData =
 			{
@@ -2893,7 +2893,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "50",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2902,13 +2902,13 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"A: 51: 0",  -- fire
-				"B: 44: 9",  -- step
+				"B: 44: 9",  -- stone_slab
 				"a: 24: 2",  -- sandstone
 				"b:  4: 0",  -- cobblestone
 				"c: 24: 0",  -- sandstone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 3",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
 				"g: 17: 0",  -- tree
 				"h:128: 5",  -- sandstonestairs
 				"i:128: 4",  -- sandstonestairs
@@ -2917,14 +2917,14 @@ Cubeset =
 				"l:118: 3",  -- cauldronblock
 				"m: 19: 0",  -- sponge
 				"n:155: 1",  -- quartzblock
-				"o: 64: 9",  -- wooddoorblock
+				"o: 64: 9",  -- woodendoorblock
 				"p: 50: 3",  -- torch
 				"q:101: 0",  -- ironbars
 				"r:140: 0",  -- flowerpotblock
 				"s: 24: 1",  -- sandstone
 				"t:128: 2",  -- sandstonestairs
 				"u:126: 8",  -- woodenslab
-				"v: 44: 1",  -- step
+				"v: 44: 1",  -- stone_slab
 				"w:128: 0",  -- sandstonestairs
 				"x: 87: 0",  -- netherstone
 				"y:128: 1",  -- sandstonestairs
@@ -3125,11 +3125,11 @@ Cubeset =
 				"e:  4: 0",  -- cobblestone
 				"f: 13: 0",  -- gravel
 				"g:128: 1",  -- sandstonestairs
-				"h: 44: 1",  -- step
+				"h: 44: 1",  -- stone_slab
 				"i:128: 0",  -- sandstonestairs
 				"j:128: 3",  -- sandstonestairs
 				"k:128: 2",  -- sandstonestairs
-				"l: 44: 9",  -- step
+				"l: 44: 9",  -- stone_slab
 				"m: 19: 0",  -- sponge
 				"n:126: 0",  -- woodenslab
 			},
@@ -3370,7 +3370,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "50",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "0",
@@ -3384,26 +3384,26 @@ Cubeset =
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
 				"f: 12: 0",  -- sand
-				"g: 64: 3",  -- wooddoorblock
-				"h: 43: 0",  -- doublestep
+				"g: 64: 3",  -- woodendoorblock
+				"h: 43: 0",  -- doublestoneslab
 				"i: 53: 5",  -- woodstairs
 				"j: 53: 4",  -- woodstairs
 				"k: 10: 0",  -- lava
 				"l: 54: 5",  -- chest
 				"m: 19: 0",  -- sponge
-				"n: 64: 9",  -- wooddoorblock
+				"n: 64: 9",  -- woodendoorblock
 				"o: 50: 3",  -- torch
 				"p:101: 0",  -- ironbars
 				"q: 50: 1",  -- torch
 				"r: 50: 2",  -- torch
 				"s:128: 2",  -- sandstonestairs
-				"t: 44: 9",  -- step
+				"t: 44: 9",  -- stone_slab
 				"u:126: 8",  -- woodenslab
 				"v:128: 4",  -- sandstonestairs
 				"w:128: 5",  -- sandstonestairs
 				"x:128: 7",  -- sandstonestairs
-				"y: 44: 1",  -- step
-				"z: 43: 1",  -- doublestep
+				"y: 44: 1",  -- stone_slab
+				"z: 43: 1",  -- doublestoneslab
 			},
 			BlockData =
 			{
@@ -3543,7 +3543,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3556,10 +3556,10 @@ Cubeset =
 				"c:  4: 0",  -- cobblestone
 				"d: 13: 0",  -- gravel
 				"e:  5: 0",  -- planks
-				"f: 64: 2",  -- wooddoorblock
+				"f: 64: 2",  -- woodendoorblock
 				"g: 65: 2",  -- ladder
 				"h:101: 0",  -- ironbars
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j: 50: 1",  -- torch
 				"k:128: 6",  -- sandstonestairs
 				"l:126: 8",  -- woodenslab
@@ -3567,7 +3567,7 @@ Cubeset =
 				"n:128: 5",  -- sandstonestairs
 				"o:128: 4",  -- sandstonestairs
 				"p:128: 7",  -- sandstonestairs
-				"q: 44: 1",  -- step
+				"q: 44: 1",  -- stone_slab
 				"r: 96: 2",  -- trapdoor
 			},
 			BlockData =
diff --git a/Server/Prefabs/Villages/JapaneseVillage.cubeset b/Server/Prefabs/Villages/JapaneseVillage.cubeset
index 8db2d3179..aa57a9586 100644
--- a/Server/Prefabs/Villages/JapaneseVillage.cubeset
+++ b/Server/Prefabs/Villages/JapaneseVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2016-11-23 15:07:49",
+		ExportDate = "2016-11-30 13:45:59",
 		["AllowedBiomes"] = "Plains, Savanna, SavannaM, SunflowerPlains",
 		["IntendedUse"] = "Village",
 	},
@@ -62,7 +62,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -88,9 +88,9 @@ Cubeset =
 				"p: 50: 1",  -- torch
 				"q: 50: 4",  -- torch
 				"r: 35:14",  -- wool
-				"s: 44: 8",  -- step
-				"t: 43: 0",  -- doublestep
-				"u: 44: 0",  -- step
+				"s: 44: 8",  -- stone_slab
+				"t: 43: 0",  -- doublestoneslab
+				"u: 44: 0",  -- stone_slab
 				"v: 17: 5",  -- tree
 			},
 			BlockData =
@@ -311,7 +311,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -333,9 +333,9 @@ Cubeset =
 				"l:124: 0",  -- redstonelampon
 				"m: 19: 0",  -- sponge
 				"n: 69: 9",  -- lever
-				"o: 44: 8",  -- step
-				"p: 43: 0",  -- doublestep
-				"q: 44: 0",  -- step
+				"o: 44: 8",  -- stone_slab
+				"p: 43: 0",  -- doublestoneslab
+				"q: 44: 0",  -- stone_slab
 			},
 			BlockData =
 			{
@@ -484,7 +484,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -497,11 +497,11 @@ Cubeset =
 				"c: 35: 0",  -- wool
 				"d:171: 0",  -- carpet
 				"e:126: 1",  -- woodenslab
-				"f: 64: 1",  -- wooddoorblock
+				"f: 64: 1",  -- woodendoorblock
 				"g: 85: 0",  -- fence
 				"h: 50: 1",  -- torch
 				"i: 50: 2",  -- torch
-				"j: 64: 9",  -- wooddoorblock
+				"j: 64: 9",  -- woodendoorblock
 				"k:126:11",  -- woodenslab
 				"l: 17: 5",  -- tree
 				"m: 19: 0",  -- sponge
@@ -635,7 +635,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -661,12 +661,12 @@ Cubeset =
 				"p: 85: 0",  -- fence
 				"q:140: 0",  -- flowerpotblock
 				"r: 50: 3",  -- torch
-				"s: 44: 8",  -- step
+				"s: 44: 8",  -- stone_slab
 				"t: 50: 1",  -- torch
 				"u: 50: 2",  -- torch
-				"v: 43: 0",  -- doublestep
-				"w: 44: 0",  -- step
-				"x: 18:10",  -- leaves
+				"v: 43: 0",  -- doublestoneslab
+				"w: 44: 0",  -- stone_slab
+				"x: 18: 2",  -- leaves
 			},
 			BlockData =
 			{
@@ -703,7 +703,7 @@ Cubeset =
 				"aaaaaccaacccacam",  -- 11
 				"acacaccacaccccam",  -- 12
 				"accaaccaccaccaam",  -- 13
-				"cccaccacaccacaam",  -- 14
+				"cccaccccaccacaam",  -- 14
 				"mmmmmmmmmmmmmmmm",  -- 15
 
 				-- Level 2
@@ -878,7 +878,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -891,9 +891,9 @@ Cubeset =
 				"c: 35: 0",  -- wool
 				"d: 50: 4",  -- torch
 				"e: 85: 0",  -- fence
-				"f: 44: 8",  -- step
-				"g: 43: 0",  -- doublestep
-				"h: 44: 0",  -- step
+				"f: 44: 8",  -- stone_slab
+				"g: 43: 0",  -- doublestoneslab
+				"h: 44: 0",  -- stone_slab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -1019,7 +1019,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1043,9 +1043,9 @@ Cubeset =
 				"m: 19: 0",  -- sponge
 				"n:124: 0",  -- redstonelampon
 				"o: 69: 9",  -- lever
-				"p: 44: 8",  -- step
-				"q: 43: 0",  -- doublestep
-				"r: 44: 0",  -- step
+				"p: 44: 8",  -- stone_slab
+				"q: 43: 0",  -- doublestoneslab
+				"r: 44: 0",  -- stone_slab
 				"s: 50: 4",  -- torch
 				"t: 50: 1",  -- torch
 				"u: 50: 3",  -- torch
@@ -1345,7 +1345,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1362,9 +1362,9 @@ Cubeset =
 				"g:135: 2",  -- whitewoodstairs
 				"h: 50: 4",  -- torch
 				"i: 85: 0",  -- fence
-				"j: 44: 8",  -- step
-				"k: 43: 0",  -- doublestep
-				"l: 44: 0",  -- step
+				"j: 44: 8",  -- stone_slab
+				"k: 43: 0",  -- doublestoneslab
+				"l: 44: 0",  -- stone_slab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -1462,7 +1462,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1480,18 +1480,18 @@ Cubeset =
 				"h: 17: 1",  -- tree
 				"i: 35: 0",  -- wool
 				"j:171:12",  -- carpet
-				"k: 64: 6",  -- wooddoorblock
+				"k: 64: 6",  -- woodendoorblock
 				"l:126: 2",  -- woodenslab
 				"m: 19: 0",  -- sponge
 				"n:135: 2",  -- whitewoodstairs
-				"o: 64: 7",  -- wooddoorblock
+				"o: 64: 7",  -- woodendoorblock
 				"p: 50: 4",  -- torch
 				"q: 85: 0",  -- fence
-				"r: 64:12",  -- wooddoorblock
+				"r: 64:12",  -- woodendoorblock
 				"s: 50: 3",  -- torch
-				"t: 44: 8",  -- step
-				"u: 43: 0",  -- doublestep
-				"v: 44: 0",  -- step
+				"t: 44: 8",  -- stone_slab
+				"u: 43: 0",  -- doublestoneslab
+				"v: 44: 0",  -- stone_slab
 			},
 			BlockData =
 			{
@@ -1669,7 +1669,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1692,10 +1692,10 @@ Cubeset =
 				"m: 19: 0",  -- sponge
 				"n: 50: 4",  -- torch
 				"o: 85: 0",  -- fence
-				"p: 44: 8",  -- step
+				"p: 44: 8",  -- stone_slab
 				"q: 35: 6",  -- wool
-				"r: 43: 0",  -- doublestep
-				"s: 44: 0",  -- step
+				"r: 43: 0",  -- doublestoneslab
+				"s: 44: 0",  -- stone_slab
 			},
 			BlockData =
 			{
@@ -1892,7 +1892,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2018,7 +2018,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2028,15 +2028,15 @@ Cubeset =
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
 				"b: 17: 1",  -- tree
-				"c: 67: 0",  -- stairs
+				"c: 67: 0",  -- stonestairs
 				"d:  5: 2",  -- planks
-				"e: 67: 2",  -- stairs
+				"e: 67: 2",  -- stonestairs
 				"f:113: 0",  -- netherbrickfence
 				"g:118: 2",  -- cauldronblock
-				"h: 67: 6",  -- stairs
-				"i: 67: 4",  -- stairs
+				"h: 67: 6",  -- stonestairs
+				"i: 67: 4",  -- stonestairs
 				"j: 87: 0",  -- netherstone
-				"k: 67: 7",  -- stairs
+				"k: 67: 7",  -- stonestairs
 				"l: 54: 5",  -- chest
 				"m: 19: 0",  -- sponge
 				"n: 61: 2",  -- furnace
@@ -2045,11 +2045,11 @@ Cubeset =
 				"q: 50: 4",  -- torch
 				"r: 50: 2",  -- torch
 				"s: 35: 0",  -- wool
-				"t: 67: 3",  -- stairs
+				"t: 67: 3",  -- stonestairs
 				"u: 50: 3",  -- torch
-				"v: 44: 8",  -- step
-				"w: 43: 0",  -- doublestep
-				"x: 44: 0",  -- step
+				"v: 44: 8",  -- stone_slab
+				"w: 43: 0",  -- doublestoneslab
+				"x: 44: 0",  -- stone_slab
 				"y: 17: 5",  -- tree
 				"z: 17: 9",  -- tree
 			},
@@ -2277,7 +2277,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2288,13 +2288,13 @@ Cubeset =
 				"a:  5: 2",  -- planks
 				"b: 17: 1",  -- tree
 				"c: 35: 0",  -- wool
-				"d: 64: 3",  -- wooddoorblock
+				"d: 64: 3",  -- woodendoorblock
 				"e: 50: 4",  -- torch
-				"f: 64: 9",  -- wooddoorblock
+				"f: 64: 9",  -- woodendoorblock
 				"g: 85: 0",  -- fence
-				"h: 44: 8",  -- step
-				"i: 43: 0",  -- doublestep
-				"j: 44: 0",  -- step
+				"h: 44: 8",  -- stone_slab
+				"i: 43: 0",  -- doublestoneslab
+				"j: 44: 0",  -- stone_slab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -2399,7 +2399,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2411,18 +2411,18 @@ Cubeset =
 				"b: 17: 9",  -- tree
 				"c: 17: 1",  -- tree
 				"d: 35: 0",  -- wool
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:171:12",  -- carpet
 				"g:135: 1",  -- whitewoodstairs
 				"h:126: 2",  -- woodenslab
 				"i:135: 2",  -- whitewoodstairs
 				"j: 50: 4",  -- torch
-				"k: 64: 9",  -- wooddoorblock
+				"k: 64: 9",  -- woodendoorblock
 				"l: 85: 0",  -- fence
 				"m: 19: 0",  -- sponge
-				"n: 44: 8",  -- step
-				"o: 43: 0",  -- doublestep
-				"p: 44: 0",  -- step
+				"n: 44: 8",  -- stone_slab
+				"o: 43: 0",  -- doublestoneslab
+				"p: 44: 0",  -- stone_slab
 			},
 			BlockData =
 			{
@@ -2547,7 +2547,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2560,14 +2560,14 @@ Cubeset =
 				"b:  4: 0",  -- cobblestone
 				"c:  8: 0",  -- water
 				"d: 13: 0",  -- gravel
-				"e: 67: 1",  -- stairs
-				"f: 67: 2",  -- stairs
-				"g: 67: 0",  -- stairs
-				"h: 67: 3",  -- stairs
+				"e: 67: 1",  -- stonestairs
+				"f: 67: 2",  -- stonestairs
+				"g: 67: 0",  -- stonestairs
+				"h: 67: 3",  -- stonestairs
 				"i: 85: 0",  -- fence
-				"j: 44: 8",  -- step
-				"k: 44: 0",  -- step
-				"l: 43: 0",  -- doublestep
+				"j: 44: 8",  -- stone_slab
+				"k: 44: 0",  -- stone_slab
+				"l: 43: 0",  -- doublestoneslab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -2751,7 +2751,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2764,9 +2764,9 @@ Cubeset =
 				"c: 13: 0",  -- gravel
 				"d:113: 0",  -- netherbrickfence
 				"e: 50: 5",  -- torch
-				"f: 44: 8",  -- step
-				"g: 44: 0",  -- step
-				"h: 43: 0",  -- doublestep
+				"f: 44: 8",  -- stone_slab
+				"g: 44: 0",  -- stone_slab
+				"h: 43: 0",  -- doublestoneslab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -2880,7 +2880,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3005,7 +3005,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3162,7 +3162,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3190,10 +3190,10 @@ Cubeset =
 				"aaaaaaaaaaaaaaaa",  --  3
 				"aaaaaaaaaaaaaaaa",  --  4
 				"aaaaaaaaaaaaaaaa",  --  5
-				"aaaaabaaaaaaaaaa",  --  6
-				"aaabbaaaaaaaaaaa",  --  7
-				"aaabbaaaaaaaaaaa",  --  8
-				"aaaabaaaaaaaaaaa",  --  9
+				"aaaaaaaaaaaaaaaa",  --  6
+				"aaaaaaaaaaaaaaaa",  --  7
+				"aaabaaaaaaaaaaaa",  --  8
+				"aaaaaaaaaaaaaaaa",  --  9
 				"aaaaaaaaaaaaaaaa",  -- 10
 				"aaaaaaaaaaaaaaaa",  -- 11
 				"aaaaaaaaaaaaaaaa",  -- 12
@@ -3207,11 +3207,11 @@ Cubeset =
 				"aaaaaaaaaaaaaaaa",  --  2
 				"aaaaaaaaaaaaaaaa",  --  3
 				"aaaaaaaaaaaaaaaa",  --  4
-				"aaabbbbaaaaaaaaa",  --  5
-				"aaaaccbaaaaaaaaa",  --  6
-				"aabcccbaaaaaaaaa",  --  7
-				"aabccabaaaaaaaaa",  --  8
-				"aabbcbaaaaaaaaaa",  --  9
+				"aaaaaaaaaaaaaaaa",  --  5
+				"aaaaccaaaaaaaaaa",  --  6
+				"aaacccaaaaaaaaaa",  --  7
+				"aabccaaaaaaaaaaa",  --  8
+				"aaaacaaaaaaaaaaa",  --  9
 				"aaaabaaaaaaaaaaa",  -- 10
 				"aaaaaaaaaaaaaaaa",  -- 11
 				"aaaaaaaaaaaaaaaa",  -- 12
@@ -3319,7 +3319,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3331,13 +3331,12 @@ Cubeset =
 				"b: 60: 7",  -- tilleddirt
 				"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
+				"e: 43: 0",  -- doublestoneslab
+				"f: 44: 0",  -- stone_slab
+				"g: 59: 7",  -- wheatblock
+				"h: 83: 0",  -- reedsblock
+				"i:113: 0",  -- netherbrickfence
+				"j: 50: 5",  -- torch
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -3361,65 +3360,65 @@ Cubeset =
 				"mmmmmmmmmmm",  --  0
 				"maaaaaaaaam",  --  1
 				"mabbbbbbbam",  --  2
-				"macbbbbbbam",  --  3
-				"mabbbccbbam",  --  4
-				"maccbbbbbam",  --  5
-				"macdddddaam",  --  6
-				"macbcbcbbam",  --  7
-				"macebbcbbam",  --  8
-				"maebbcbcbam",  --  9
+				"mabbbbbbbam",  --  3
+				"mabbbbbcbam",  --  4
+				"mabbbbbbcam",  --  5
+				"mabdddddaam",  --  6
+				"mabbcbbbbam",  --  7
+				"mabbbbbbcam",  --  8
+				"mabbbbbbbam",  --  9
 				"mabbbbbbbam",  -- 10
 				"maaaaaaaaam",  -- 11
 				"mmmmmmmmmmm",  -- 12
 
 				-- Level 2
 				"...........",  --  0
-				".fgggggggf.",  --  1
-				".ghhhhhhhg.",  --  2
-				".ghhhhhhhg.",  --  3
-				".ghhhhhhhg.",  --  4
-				".ghiiiiihg.",  --  5
-				".gi.....ig.",  --  6
-				".ghiiiiihg.",  --  7
-				".ghhhhhhhg.",  --  8
-				".ghhhhhhhg.",  --  9
-				".ghhhhhhhg.",  -- 10
-				".fgggggggf.",  -- 11
+				".efffffffe.",  --  1
+				".fgggggggf.",  --  2
+				".fgggggggf.",  --  3
+				".fgggggggf.",  --  4
+				".fghhhhhgf.",  --  5
+				".fh.....hf.",  --  6
+				".fghhhhhgf.",  --  7
+				".fgggggggf.",  --  8
+				".fgggggggf.",  --  9
+				".fgggggggf.",  -- 10
+				".efffffffe.",  -- 11
 				"...........",  -- 12
 
 				-- Level 3
 				"...........",  --  0
-				".j.......j.",  --  1
+				".i.......i.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
-				"...iiiii...",  --  5
-				"..i.....i..",  --  6
-				"...iiiii...",  --  7
+				"...hhhhh...",  --  5
+				"..h.....h..",  --  6
+				"...hhhhh...",  --  7
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".j.......j.",  -- 11
+				".i.......i.",  -- 11
 				"...........",  -- 12
 
 				-- Level 4
 				"...........",  --  0
-				".j.......j.",  --  1
+				".i.......i.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
-				"...iiiii...",  --  5
-				"..i.....i..",  --  6
-				"...iiiii...",  --  7
+				"...hhhhh...",  --  5
+				"..h.....h..",  --  6
+				"...hhhhh...",  --  7
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".j.......j.",  -- 11
+				".i.......i.",  -- 11
 				"...........",  -- 12
 
 				-- Level 5
 				"...........",  --  0
-				".j.......j.",  --  1
+				".i.......i.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
@@ -3429,13 +3428,13 @@ Cubeset =
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".j.......j.",  -- 11
+				".i.......i.",  -- 11
 				"...........",  -- 12
 
 				-- Level 6
-				".j.......j.",  --  0
-				"jjj.....jjj",  --  1
-				".j.......j.",  --  2
+				".i.......i.",  --  0
+				"iii.....iii",  --  1
+				".i.......i.",  --  2
 				"...........",  --  3
 				"...........",  --  4
 				"...........",  --  5
@@ -3443,14 +3442,14 @@ Cubeset =
 				"...........",  --  7
 				"...........",  --  8
 				"...........",  --  9
-				".j.......j.",  -- 10
-				"jjj.....jjj",  -- 11
-				".j.......j.",  -- 12
+				".i.......i.",  -- 10
+				"iii.....iii",  -- 11
+				".i.......i.",  -- 12
 
 				-- Level 7
-				".k.......k.",  --  0
-				"k.k.....k.k",  --  1
-				".k.......k.",  --  2
+				".j.......j.",  --  0
+				"j.j.....j.j",  --  1
+				".j.......j.",  --  2
 				"...........",  --  3
 				"...........",  --  4
 				"...........",  --  5
@@ -3458,9 +3457,9 @@ Cubeset =
 				"...........",  --  7
 				"...........",  --  8
 				"...........",  --  9
-				".k.......k.",  -- 10
-				"k.k.....k.k",  -- 11
-				".k.......k.",  -- 12
+				".j.......j.",  -- 10
+				"j.j.....j.j",  -- 11
+				".j.......j.",  -- 12
 
 			},
 		},  -- Farm
diff --git a/Server/Prefabs/Villages/PlainsVillage.cubeset b/Server/Prefabs/Villages/PlainsVillage.cubeset
index 6f3d05d80..df67ea795 100644
--- a/Server/Prefabs/Villages/PlainsVillage.cubeset
+++ b/Server/Prefabs/Villages/PlainsVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2016-11-23 15:07:39",
+		ExportDate = "2016-11-30 13:45:48",
 		["AllowedBiomes"] = "Plains, Savanna, SavannaM, SunflowerPlains",
 		["IntendedUse"] = "Village",
 	},
@@ -62,7 +62,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -71,16 +71,16 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e:  5: 0",  -- planks
-				"f: 67: 3",  -- stairs
+				"f: 67: 3",  -- stonestairs
 				"g: 17: 0",  -- tree
-				"h: 64: 3",  -- wooddoorblock
-				"i: 64: 1",  -- wooddoorblock
+				"h: 64: 3",  -- woodendoorblock
+				"i: 64: 1",  -- woodendoorblock
 				"j:102: 0",  -- glasspane
-				"k: 64: 9",  -- wooddoorblock
+				"k: 64: 9",  -- woodendoorblock
 				"l: 53: 2",  -- woodstairs
 				"m: 19: 0",  -- sponge
 				"n: 53: 1",  -- woodstairs
@@ -449,7 +449,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -463,9 +463,8 @@ Cubeset =
 				"d: 60: 7",  -- tilleddirt
 				"e:  8: 0",  -- water
 				"f: 60: 6",  -- tilleddirt
-				"g: 60: 5",  -- tilleddirt
-				"h: 50: 5",  -- torch
-				"i: 59: 7",  -- crops
+				"g: 50: 5",  -- torch
+				"h: 59: 7",  -- wheatblock
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -478,8 +477,8 @@ Cubeset =
 				"aaaaaaabaaaaaaa",  --  4
 				"aaaaaaabaaaaaaa",  --  5
 				"aaaaaaabaaaaaaa",  --  6
-				"aaaaaaabaaaaaaa",  --  7
-				"aaaaaaabaaaaaaa",  --  8
+				"aaaaaaaaaaaaaaa",  --  7
+				"aaaaaaaaaaaaaaa",  --  8
 
 				-- Level 1
 				"aaaaaaamaaaaaaa",  --  0
@@ -497,22 +496,22 @@ Cubeset =
 				"cddeddc.cddeddc",  --  1
 				"cddeddc.cddeddc",  --  2
 				"cddeddc.cddeddc",  --  3
-				"cfdeddc.cdfedfc",  --  4
-				"cddeddc.cdfeddc",  --  5
+				"cddeddc.cddeddc",  --  4
+				"cddeddc.cddeddc",  --  5
 				"cddeddc.cdfeddc",  --  6
-				"cddeddc.cdgeddc",  --  7
+				"cddeddc.cddeddc",  --  7
 				"ccccccc.ccccccc",  --  8
 
 				-- Level 3
-				"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
+				"g.....g.g.....g",  --  0
+				".hh.hh...hh.hh.",  --  1
+				".hh.hh...hh.hh.",  --  2
+				".hh.hh...hh.hh.",  --  3
+				".hh.hh...hh.hh.",  --  4
+				".hh.hh...hh.hh.",  --  5
+				".hh.hh...hh.hh.",  --  6
+				".hh.hh...hh.hh.",  --  7
+				"g.....g.g.....g",  --  8
 
 				-- Level 4
 				"...............",  --  0
@@ -604,7 +603,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -614,22 +613,22 @@ Cubeset =
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
 				"b:  3: 0",  -- dirt
-				"c:  2: 0",  -- grass
-				"d:  5: 0",  -- planks
-				"e: 67: 2",  -- stairs
-				"f: 43: 0",  -- doublestep
-				"g: 67: 0",  -- stairs
-				"h: 67: 3",  -- stairs
+				"c:  5: 0",  -- planks
+				"d:  2: 0",  -- grass
+				"e: 67: 2",  -- stonestairs
+				"f: 43: 0",  -- doublestoneslab
+				"g: 67: 0",  -- stonestairs
+				"h: 67: 3",  -- stonestairs
 				"i: 17: 0",  -- tree
 				"j: 53: 1",  -- woodstairs
 				"k: 85: 0",  -- fence
 				"l: 53: 0",  -- woodstairs
 				"m: 19: 0",  -- sponge
-				"n: 64: 2",  -- wooddoorblock
-				"o: 64: 0",  -- wooddoorblock
+				"n: 64: 2",  -- woodendoorblock
+				"o: 64: 0",  -- woodendoorblock
 				"p:102: 0",  -- glasspane
 				"q: 72: 0",  -- woodplate
-				"r: 64: 9",  -- wooddoorblock
+				"r: 64: 9",  -- woodendoorblock
 				"s: 53: 5",  -- woodstairs
 				"t: 53: 4",  -- woodstairs
 				"u: 50: 1",  -- torch
@@ -643,37 +642,37 @@ Cubeset =
 				"maaaaammmm",  --  2
 				"maaaaabbbb",  --  3
 				"aaaaaabbbb",  --  4
-				"aaaaaabbcb",  --  5
+				"aaaaaabbbb",  --  5
 				"aaaaaabbbb",  --  6
 				"maaaaabbbb",  --  7
-				"maaaaabbcb",  --  8
+				"maaaaabbbb",  --  8
 				"maaaaammmm",  --  9
 				"mmmmmmmmmm",  -- 10
 
 				-- Level 1
 				"......mmmm",  --  0
 				".aaaaammmm",  --  1
-				".adddammmm",  --  2
-				".adddacccc",  --  3
-				"eafffacccc",  --  4
-				"gaffffcccc",  --  5
-				"hafffacccc",  --  6
-				".afffacccc",  --  7
-				".afffacccc",  --  8
+				".acccammmm",  --  2
+				".acccadddd",  --  3
+				"eafffadddd",  --  4
+				"gaffffdddd",  --  5
+				"hafffadddd",  --  6
+				".afffadddd",  --  7
+				".afffadddd",  --  8
 				".aaaaammmm",  --  9
 				"......mmmm",  -- 10
 
 				-- Level 2
 				"......mmmm",  --  0
-				".idddimmmm",  --  1
-				".djkldmmmm",  --  2
-				".d...dkkkk",  --  3
-				".d...d...k",  --  4
+				".icccimmmm",  --  1
+				".cjklcmmmm",  --  2
+				".c...ckkkk",  --  3
+				".c...c...k",  --  4
 				".n...o...k",  --  5
-				".d...d...k",  --  6
-				".dff.d...k",  --  7
-				".d...dkkkk",  --  8
-				".idddimmmm",  --  9
+				".c...c...k",  --  6
+				".cff.c...k",  --  7
+				".c...ckkkk",  --  8
+				".icccimmmm",  --  9
 				"......mmmm",  -- 10
 
 				-- Level 3
@@ -681,9 +680,9 @@ Cubeset =
 				".ipppimmmm",  --  1
 				".p.q.pmmmm",  --  2
 				".p...p....",  --  3
-				".d...d....",  --  4
+				".c...c....",  --  4
 				".r...r....",  --  5
-				".d...d....",  --  6
+				".c...c....",  --  6
 				".p...p....",  --  7
 				".p...p....",  --  8
 				".ipppimmmm",  --  9
@@ -691,42 +690,42 @@ Cubeset =
 
 				-- Level 4
 				"ls...tjmmm",  --  0
-				"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
+				"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
 				"ls...tjmmm",  -- 10
 
 				-- Level 5
 				".ls.tj.mmm",  --  0
-				".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
+				".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
 				".ls.tj.mmm",  -- 10
 
 				-- Level 6
-				"..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
+				"..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
 
 			},
 		},  -- WoodenHouse9x5Fence
@@ -774,7 +773,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -785,9 +784,9 @@ Cubeset =
 				"a:  3: 0",  -- dirt
 				"b: 17: 0",  -- tree
 				"c: 60: 7",  -- tilleddirt
-				"d:  8: 0",  -- water
-				"e: 60: 6",  -- tilleddirt
-				"f: 59: 7",  -- crops
+				"d: 60: 6",  -- tilleddirt
+				"e:  8: 0",  -- water
+				"f: 59: 7",  -- wheatblock
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -804,9 +803,9 @@ Cubeset =
 				-- Level 1
 				"bbbbbbbbbb",  --  0
 				"bccccccccb",  --  1
-				"bccccccccb",  --  2
-				"bddddddddb",  --  3
-				"bccccceccb",  --  4
+				"bccccccdcb",  --  2
+				"beeeeeeeeb",  --  3
+				"bcccccdccb",  --  4
 				"bccccccccb",  --  5
 				"bbbbbbbbbb",  --  6
 
@@ -901,7 +900,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -910,17 +909,17 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
-				"e: 64: 3",  -- wooddoorblock
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
+				"e: 64: 3",  -- woodendoorblock
 				"f: 53: 3",  -- woodstairs
 				"g: 53: 1",  -- woodstairs
 				"h: 85: 0",  -- fence
 				"i: 53: 0",  -- woodstairs
 				"j: 53: 2",  -- woodstairs
 				"k:102: 0",  -- glasspane
-				"l: 64: 9",  -- wooddoorblock
+				"l: 64: 9",  -- woodendoorblock
 				"m: 19: 0",  -- sponge
 				"n: 50: 3",  -- torch
 				"o: 72: 0",  -- woodplate
@@ -1043,7 +1042,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1057,10 +1056,11 @@ Cubeset =
 				"d: 17: 0",  -- tree
 				"e: 60: 7",  -- tilleddirt
 				"f:  8: 0",  -- water
-				"g: 60: 5",  -- tilleddirt
-				"h: 85: 0",  -- fence
-				"i: 59: 7",  -- crops
-				"j: 50: 5",  -- torch
+				"g: 60: 6",  -- tilleddirt
+				"h: 60: 4",  -- tilleddirt
+				"i: 85: 0",  -- fence
+				"j: 59: 7",  -- wheatblock
+				"k: 50: 5",  -- torch
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -1095,34 +1095,34 @@ Cubeset =
 
 				-- Level 2
 				"ddddddddddddd",  --  0
-				"deefgefeefeed",  --  1
+				"deefeefeefeed",  --  1
 				"deefeefeefeed",  --  2
-				"deefeefeefeed",  --  3
+				"deefeefegfged",  --  3
 				"deefeefeefeed",  --  4
-				"deefeefeefeed",  --  5
-				"deefeefeefeed",  --  6
-				"deefeefeefeed",  --  7
+				"deefgefeefged",  --  5
+				"degfeefegfhed",  --  6
+				"deefeefeefggd",  --  7
 				"deefeefeefeed",  --  8
 				"deefeefeefeed",  --  9
 				"deefeefeefeed",  -- 10
 				"ddddddddddddd",  -- 11
 
 				-- Level 3
-				"h..h..h..h..h",  --  0
-				"hii.i..ii.iih",  --  1
-				"hii..i.ii.iih",  --  2
-				"hii.i..i..iih",  --  3
-				"hii.ii.i..iih",  --  4
-				"hii.i..ii.iih",  --  5
-				"hii.ii.ii.iih",  --  6
-				"hii....i..iih",  --  7
-				"hii..i....iih",  --  8
-				"hii.....i.iih",  --  9
-				"hii.ii.i..iih",  -- 10
-				"h..h..h..h..h",  -- 11
+				"i..i..i..i..i",  --  0
+				"ijj.j..jj.jji",  --  1
+				"ijj..j.jj.jji",  --  2
+				"ijj.j..j..jji",  --  3
+				"ijj.jj.j..jji",  --  4
+				"ijj.j..jj.jji",  --  5
+				"ijj.jj.jj.jji",  --  6
+				"ijj....j..jji",  --  7
+				"ijj..j....jji",  --  8
+				"ijj.....j.jji",  --  9
+				"ijj.jj.j..jji",  -- 10
+				"i..i..i..i..i",  -- 11
 
 				-- Level 4
-				"j..j..j..j..j",  --  0
+				"k..k..k..k..k",  --  0
 				".............",  --  1
 				".............",  --  2
 				".............",  --  3
@@ -1133,7 +1133,7 @@ Cubeset =
 				".............",  --  8
 				".............",  --  9
 				".............",  -- 10
-				"j..j..j..j..j",  -- 11
+				"k..k..k..k..k",  -- 11
 
 				-- Level 5
 				".............",  --  0
@@ -1223,7 +1223,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1231,41 +1231,42 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  3: 0",  -- dirt
-				"b: 43: 0",  -- doublestep
-				"c:139: 0",  -- cobblestonewall
-				"d: 50: 4",  -- torch
-				"e: 50: 2",  -- torch
-				"f: 50: 1",  -- torch
-				"g: 50: 3",  -- torch
+				"a:  2: 0",  -- grass
+				"b:  3: 0",  -- dirt
+				"c: 43: 0",  -- doublestoneslab
+				"d:139: 0",  -- cobblestonewall
+				"e: 50: 4",  -- torch
+				"f: 50: 2",  -- torch
+				"g: 50: 1",  -- torch
+				"h: 50: 3",  -- torch
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
 			{
 				-- Level 0
-				"mmm",  --  0
-				"mam",  --  1
-				"mmm",  --  2
+				"aaa",  --  0
+				"aba",  --  1
+				"aaa",  --  2
 
 				-- Level 1
 				"...",  --  0
-				".b.",  --  1
+				".c.",  --  1
 				"...",  --  2
 
 				-- Level 2
 				"...",  --  0
-				".c.",  --  1
+				".d.",  --  1
 				"...",  --  2
 
 				-- Level 3
 				"...",  --  0
-				".c.",  --  1
+				".d.",  --  1
 				"...",  --  2
 
 				-- Level 4
-				".d.",  --  0
-				"ebf",  --  1
-				".g.",  --  2
+				".e.",  --  0
+				"fcg",  --  1
+				".h.",  --  2
 
 				-- Level 5
 				"...",  --  0
@@ -1323,7 +1324,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1332,16 +1333,16 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
-				"e: 67: 3",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
+				"e: 67: 3",  -- stonestairs
 				"f: 17: 0",  -- tree
 				"g:  5: 0",  -- planks
-				"h: 64: 7",  -- wooddoorblock
-				"i: 64: 1",  -- wooddoorblock
+				"h: 64: 7",  -- woodendoorblock
+				"i: 64: 1",  -- woodendoorblock
 				"j:102: 0",  -- glasspane
-				"k: 64: 9",  -- wooddoorblock
+				"k: 64: 9",  -- woodendoorblock
 				"l: 53: 2",  -- woodstairs
 				"m: 19: 0",  -- sponge
 				"n: 53: 7",  -- woodstairs
@@ -1488,7 +1489,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1501,13 +1502,13 @@ Cubeset =
 				"C: 53: 5",  -- woodstairs
 				"D: 53: 6",  -- woodstairs
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
-				"e: 43: 0",  -- doublestep
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
+				"e: 43: 0",  -- doublestoneslab
 				"f: 17: 0",  -- tree
 				"g:  5: 0",  -- planks
-				"h: 64: 3",  -- wooddoorblock
+				"h: 64: 3",  -- woodendoorblock
 				"i: 96: 8",  -- trapdoor
 				"j: 61: 2",  -- furnace
 				"k: 53: 3",  -- woodstairs
@@ -1518,7 +1519,7 @@ Cubeset =
 				"p: 53: 0",  -- woodstairs
 				"q: 47: 0",  -- bookshelf
 				"r:102: 0",  -- glasspane
-				"s: 64: 9",  -- wooddoorblock
+				"s: 64: 9",  -- woodendoorblock
 				"t: 72: 0",  -- woodplate
 				"u: 17: 4",  -- tree
 				"v: 17: 8",  -- tree
@@ -1737,7 +1738,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1746,14 +1747,14 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h:102: 0",  -- glasspane
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j: 53: 2",  -- woodstairs
 				"k: 53: 7",  -- woodstairs
 				"l: 50: 3",  -- torch
@@ -1872,7 +1873,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1881,14 +1882,14 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h:102: 0",  -- glasspane
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j: 53: 2",  -- woodstairs
 				"k: 53: 7",  -- woodstairs
 				"l: 50: 3",  -- torch
@@ -2007,7 +2008,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2016,14 +2017,14 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h:102: 0",  -- glasspane
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j: 53: 2",  -- woodstairs
 				"k: 53: 7",  -- woodstairs
 				"l: 53: 1",  -- woodstairs
@@ -2177,7 +2178,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2186,14 +2187,14 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h:102: 0",  -- glasspane
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j: 53: 2",  -- woodstairs
 				"k: 53: 0",  -- woodstairs
 				"l: 53: 1",  -- woodstairs
@@ -2345,7 +2346,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2354,12 +2355,12 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h: 53: 3",  -- woodstairs
 				"i: 85: 0",  -- fence
 				"j: 53: 2",  -- woodstairs
@@ -2367,7 +2368,7 @@ Cubeset =
 				"l: 53: 0",  -- woodstairs
 				"m: 19: 0",  -- sponge
 				"n:102: 0",  -- glasspane
-				"o: 64: 9",  -- wooddoorblock
+				"o: 64: 9",  -- woodendoorblock
 				"p: 50: 3",  -- torch
 				"q: 72: 0",  -- woodplate
 				"r: 53: 7",  -- woodstairs
@@ -2487,7 +2488,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2496,12 +2497,12 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h: 53: 3",  -- woodstairs
 				"i: 85: 0",  -- fence
 				"j: 53: 2",  -- woodstairs
@@ -2509,8 +2510,8 @@ Cubeset =
 				"l: 53: 0",  -- woodstairs
 				"m: 19: 0",  -- sponge
 				"n:102: 0",  -- glasspane
-				"o: 64: 8",  -- wooddoorblock
-				"p: 64: 9",  -- wooddoorblock
+				"o: 64: 8",  -- woodendoorblock
+				"p: 64: 9",  -- woodendoorblock
 				"q: 50: 3",  -- torch
 				"r: 72: 0",  -- woodplate
 				"s: 53: 7",  -- woodstairs
@@ -2655,7 +2656,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2665,21 +2666,21 @@ Cubeset =
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
 				"b:  3: 0",  -- dirt
-				"c: 67: 0",  -- stairs
-				"d: 67: 2",  -- stairs
-				"e: 67: 1",  -- stairs
-				"f: 43: 0",  -- doublestep
+				"c: 67: 0",  -- stonestairs
+				"d: 67: 2",  -- stonestairs
+				"e: 67: 1",  -- stonestairs
+				"f: 43: 0",  -- doublestoneslab
 				"g:  2: 0",  -- grass
 				"h: 17: 0",  -- tree
 				"i:  5: 0",  -- planks
-				"j: 64: 3",  -- wooddoorblock
+				"j: 64: 3",  -- woodendoorblock
 				"k: 53: 3",  -- woodstairs
 				"l: 85: 0",  -- fence
 				"m: 19: 0",  -- sponge
 				"n: 53: 2",  -- woodstairs
-				"o: 64: 1",  -- wooddoorblock
+				"o: 64: 1",  -- woodendoorblock
 				"p:102: 0",  -- glasspane
-				"q: 64: 9",  -- wooddoorblock
+				"q: 64: 9",  -- woodendoorblock
 				"r: 72: 0",  -- woodplate
 				"s: 53: 7",  -- woodstairs
 				"t: 50: 1",  -- torch
@@ -2854,7 +2855,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2863,13 +2864,13 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
-				"h: 64: 9",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
+				"h: 64: 9",  -- woodendoorblock
 				"i:102: 0",  -- glasspane
 				"j: 53: 2",  -- woodstairs
 				"k: 53: 7",  -- woodstairs
@@ -2989,7 +2990,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2998,17 +2999,17 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 0",  -- wooddoorblock
+				"g: 64: 0",  -- woodendoorblock
 				"h: 10: 0",  -- lava
 				"i: 54: 2",  -- chest
 				"j: 61: 2",  -- furnace
 				"k:102: 0",  -- glasspane
-				"l: 64: 9",  -- wooddoorblock
+				"l: 64: 9",  -- woodendoorblock
 				"m: 19: 0",  -- sponge
 				"n:139: 0",  -- cobblestonewall
 				"o:101: 0",  -- ironbars
@@ -3018,8 +3019,8 @@ Cubeset =
 				"s: 50: 1",  -- torch
 				"t: 53: 6",  -- woodstairs
 				"u: 53: 3",  -- woodstairs
-				"v: 43: 0",  -- doublestep
-				"w: 44: 0",  -- step
+				"v: 43: 0",  -- doublestoneslab
+				"w: 44: 0",  -- stone_slab
 			},
 			BlockData =
 			{
@@ -3186,7 +3187,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3195,14 +3196,14 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 3",  -- wooddoorblock
+				"g: 64: 3",  -- woodendoorblock
 				"h:102: 0",  -- glasspane
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j: 53: 2",  -- woodstairs
 				"k: 53: 7",  -- woodstairs
 				"l: 50: 3",  -- torch
@@ -3347,7 +3348,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3356,14 +3357,14 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b:170: 0",  -- haybale
-				"c: 67: 0",  -- stairs
-				"d: 67: 2",  -- stairs
-				"e: 67: 1",  -- stairs
+				"b:170: 0",  -- hayblock
+				"c: 67: 0",  -- stonestairs
+				"d: 67: 2",  -- stonestairs
+				"e: 67: 1",  -- stonestairs
 				"f: 17: 0",  -- tree
 				"g:  5: 0",  -- planks
-				"h:170: 4",  -- haybale
-				"i:170: 8",  -- haybale
+				"h:170: 4",  -- hayblock
+				"i:170: 8",  -- hayblock
 				"j: 54: 2",  -- chest
 				"k: 50: 4",  -- torch
 				"l: 53: 0",  -- woodstairs
@@ -3497,7 +3498,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3506,9 +3507,9 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e:  3: 0",  -- dirt
 				"f: 17: 0",  -- tree
 				"g:107: 0",  -- fencegate
@@ -3516,10 +3517,10 @@ Cubeset =
 				"i:  5: 0",  -- planks
 				"j:107: 6",  -- fencegate
 				"k: 85: 0",  -- fence
-				"l:170: 0",  -- haybale
+				"l:170: 0",  -- hayblock
 				"m: 19: 0",  -- sponge
-				"n:170: 4",  -- haybale
-				"o:170: 8",  -- haybale
+				"n:170: 4",  -- hayblock
+				"o:170: 8",  -- hayblock
 				"p: 50: 1",  -- torch
 				"q: 50: 2",  -- torch
 				"r: 53: 2",  -- woodstairs
@@ -3674,7 +3675,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3685,16 +3686,16 @@ Cubeset =
 				"A: 85: 0",  -- fence
 				"B:126: 8",  -- woodenslab
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 0",  -- stairs
-				"c: 67: 2",  -- stairs
-				"d: 67: 1",  -- stairs
+				"b: 67: 0",  -- stonestairs
+				"c: 67: 2",  -- stonestairs
+				"d: 67: 1",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
-				"g: 64: 1",  -- wooddoorblock
+				"g: 64: 1",  -- woodendoorblock
 				"h: 65: 3",  -- ladder
 				"i: 53: 3",  -- woodstairs
 				"j: 53: 7",  -- woodstairs
-				"k: 64: 9",  -- wooddoorblock
+				"k: 64: 9",  -- woodendoorblock
 				"l:102: 0",  -- glasspane
 				"m: 19: 0",  -- sponge
 				"n: 50: 1",  -- torch
@@ -3984,7 +3985,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -3993,17 +3994,17 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
-				"b: 67: 2",  -- stairs
-				"c: 67: 1",  -- stairs
-				"d: 67: 3",  -- stairs
+				"b: 67: 2",  -- stonestairs
+				"c: 67: 1",  -- stonestairs
+				"d: 67: 3",  -- stonestairs
 				"e: 17: 0",  -- tree
 				"f:  5: 0",  -- planks
 				"g: 54: 4",  -- chest
 				"h:154: 4",  -- hopper
-				"i: 64: 0",  -- wooddoorblock
+				"i: 64: 0",  -- woodendoorblock
 				"j:102: 0",  -- glasspane
 				"k: 85: 0",  -- fence
-				"l: 64: 9",  -- wooddoorblock
+				"l: 64: 9",  -- woodendoorblock
 				"m: 19: 0",  -- sponge
 				"n: 50: 2",  -- torch
 				"o: 35: 0",  -- wool
@@ -4338,7 +4339,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -4575,7 +4576,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -5088,7 +5089,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "10",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
diff --git a/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
index e60bdb7fa..bb661b467 100644
--- a/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
+++ b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2016-11-23 15:07:52",
+		ExportDate = "2016-11-30 13:46:02",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -62,7 +62,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -74,11 +74,11 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:171: 0",  -- carpet
 				"g:171:14",  -- carpet
 				"h: 24: 2",  -- sandstone
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j: 50: 3",  -- torch
 				"k:128: 4",  -- sandstonestairs
 				"l:128: 6",  -- sandstonestairs
@@ -182,7 +182,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -194,12 +194,12 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:171: 0",  -- carpet
 				"g:171:15",  -- carpet
 				"h:171:14",  -- carpet
 				"i: 24: 2",  -- sandstone
-				"j: 64: 9",  -- wooddoorblock
+				"j: 64: 9",  -- woodendoorblock
 				"k: 50: 3",  -- torch
 				"l:128: 4",  -- sandstonestairs
 				"m: 19: 0",  -- sponge
@@ -309,7 +309,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -321,12 +321,12 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:171:14",  -- carpet
 				"g:171: 0",  -- carpet
 				"h:171:15",  -- carpet
 				"i: 24: 2",  -- sandstone
-				"j: 64: 9",  -- wooddoorblock
+				"j: 64: 9",  -- woodendoorblock
 				"k: 50: 3",  -- torch
 				"l:128: 4",  -- sandstonestairs
 				"m: 19: 0",  -- sponge
@@ -436,7 +436,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -448,12 +448,12 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:171: 0",  -- carpet
 				"g:171:14",  -- carpet
 				"h:171:15",  -- carpet
 				"i: 24: 2",  -- sandstone
-				"j: 64: 9",  -- wooddoorblock
+				"j: 64: 9",  -- woodendoorblock
 				"k: 50: 3",  -- torch
 				"l:128: 4",  -- sandstonestairs
 				"m: 19: 0",  -- sponge
@@ -563,7 +563,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -575,12 +575,12 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:171: 0",  -- carpet
 				"g:171:14",  -- carpet
 				"h:171:15",  -- carpet
 				"i: 24: 2",  -- sandstone
-				"j: 64: 9",  -- wooddoorblock
+				"j: 64: 9",  -- woodendoorblock
 				"k: 50: 3",  -- torch
 				"l: 50: 1",  -- torch
 				"m: 19: 0",  -- sponge
@@ -704,7 +704,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -716,12 +716,12 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:171: 0",  -- carpet
 				"g:171:15",  -- carpet
 				"h:171:14",  -- carpet
 				"i: 24: 2",  -- sandstone
-				"j: 64: 9",  -- wooddoorblock
+				"j: 64: 9",  -- woodendoorblock
 				"k: 50: 3",  -- torch
 				"l: 50: 1",  -- torch
 				"m: 19: 0",  -- sponge
@@ -846,7 +846,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -858,12 +858,12 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:171: 0",  -- carpet
 				"g:171:15",  -- carpet
 				"h:171:14",  -- carpet
 				"i: 24: 2",  -- sandstone
-				"j: 64: 9",  -- wooddoorblock
+				"j: 64: 9",  -- woodendoorblock
 				"k: 50: 3",  -- torch
 				"l: 50: 1",  -- torch
 				"m: 19: 0",  -- sponge
@@ -988,7 +988,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1002,7 +1002,7 @@ Cubeset =
 				"d:128: 1",  -- sandstonestairs
 				"e:128: 3",  -- sandstonestairs
 				"f:171:15",  -- carpet
-				"g: 64: 2",  -- wooddoorblock
+				"g: 64: 2",  -- woodendoorblock
 				"h:171: 0",  -- carpet
 				"i:171:14",  -- carpet
 				"j: 61: 2",  -- furnace
@@ -1010,7 +1010,7 @@ Cubeset =
 				"l: 54: 2",  -- chest
 				"m: 19: 0",  -- sponge
 				"n: 24: 2",  -- sandstone
-				"o: 64: 9",  -- wooddoorblock
+				"o: 64: 9",  -- woodendoorblock
 				"p: 50: 1",  -- torch
 				"q:101: 0",  -- ironbars
 				"r:128: 4",  -- sandstonestairs
@@ -1138,7 +1138,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "5",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1257,7 +1257,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "20",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1421,7 +1421,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1441,7 +1441,7 @@ Cubeset =
 				"i:128: 4",  -- sandstonestairs
 				"j:128: 5",  -- sandstonestairs
 				"k:128: 7",  -- sandstonestairs
-				"l: 44: 1",  -- step
+				"l: 44: 1",  -- stone_slab
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -1604,7 +1604,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1616,14 +1616,14 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 43: 1",  -- doublestep
-				"f: 64: 3",  -- wooddoorblock
+				"e: 43: 1",  -- doublestoneslab
+				"f: 64: 3",  -- woodendoorblock
 				"g:171: 0",  -- carpet
 				"h:171:15",  -- carpet
 				"i:171:14",  -- carpet
 				"j: 58: 0",  -- workbench
 				"k: 24: 2",  -- sandstone
-				"l: 64: 9",  -- wooddoorblock
+				"l: 64: 9",  -- woodendoorblock
 				"m: 19: 0",  -- sponge
 				"n: 50: 3",  -- torch
 				"o: 50: 1",  -- torch
diff --git a/Server/Prefabs/Villages/SandVillage.cubeset b/Server/Prefabs/Villages/SandVillage.cubeset
index 4513187c4..0f18f55e9 100644
--- a/Server/Prefabs/Villages/SandVillage.cubeset
+++ b/Server/Prefabs/Villages/SandVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2016-11-23 15:07:32",
+		ExportDate = "2016-11-30 13:45:41",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -224,7 +224,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -238,8 +238,8 @@ Cubeset =
 				"d: 50: 5",  -- torch
 				"e: 26:10",  -- bedblock
 				"f: 26: 2",  -- bedblock
-				"g: 64: 1",  -- wooddoorblock
-				"h: 64: 9",  -- wooddoorblock
+				"g: 64: 1",  -- woodendoorblock
+				"h: 64: 9",  -- woodendoorblock
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -338,7 +338,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -348,11 +348,10 @@ Cubeset =
 				".:  0: 0",  -- air
 				"a: 24: 0",  -- sandstone
 				"b: 60: 7",  -- tilleddirt
-				"c:  8: 0",  -- water
-				"d: 60: 6",  -- tilleddirt
-				"e: 60: 5",  -- tilleddirt
-				"f: 50: 5",  -- torch
-				"g: 59: 7",  -- crops
+				"c: 60: 6",  -- tilleddirt
+				"d:  8: 0",  -- water
+				"e: 50: 5",  -- torch
+				"f: 59: 7",  -- wheatblock
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -370,25 +369,25 @@ Cubeset =
 
 				-- Level 1
 				"aaaaaaaaaaaaa",  --  0
-				"abbcbbabbcbba",  --  1
-				"abbcbbabbcbba",  --  2
-				"abbcbbabbcbba",  --  3
-				"abbcbbabbcbba",  --  4
-				"abbcbbabbcbba",  --  5
-				"abbcbbadbcbba",  --  6
-				"abbcbeabbcbba",  --  7
+				"abcdbbabbdbba",  --  1
+				"abbdbbabbdbba",  --  2
+				"abbdbbabbdbba",  --  3
+				"abbdbbabbdbba",  --  4
+				"abbdbbabbdbba",  --  5
+				"acbdbbabbdbba",  --  6
+				"abbdbbabbdbba",  --  7
 				"aaaaaaaaaaaaa",  --  8
 
 				-- Level 2
-				"f.....f.....f",  --  0
-				".gg.gg.gg.gg.",  --  1
-				".gg.gg.gg.gg.",  --  2
-				".gg.gg.gg.gg.",  --  3
-				".gg.gg.gg.gg.",  --  4
-				".gg.gg.gg.gg.",  --  5
-				".gg.gg.gg.gg.",  --  6
-				".gg.gg.gg.gg.",  --  7
-				"f.....f.....f",  --  8
+				"e.....e.....e",  --  0
+				".ff.ff.ff.ff.",  --  1
+				".ff.ff.ff.ff.",  --  2
+				".ff.ff.ff.ff.",  --  3
+				".ff.ff.ff.ff.",  --  4
+				".ff.ff.ff.ff.",  --  5
+				".ff.ff.ff.ff.",  --  6
+				".ff.ff.ff.ff.",  --  7
+				"e.....e.....e",  --  8
 
 			},
 		},  -- DoubleField
@@ -436,7 +435,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -448,9 +447,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j: 50: 4",  -- torch
@@ -571,7 +570,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -584,10 +583,10 @@ Cubeset =
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
 				"e:128: 3",  -- sandstonestairs
-				"f: 64: 3",  -- wooddoorblock
-				"g: 64: 1",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
+				"g: 64: 1",  -- woodendoorblock
 				"h:102: 0",  -- glasspane
-				"i: 64: 9",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
 				"j:128: 7",  -- sandstonestairs
 				"k: 50: 3",  -- torch
 				"l: 50: 4",  -- torch
@@ -743,7 +742,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -755,9 +754,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j:128: 6",  -- sandstonestairs
@@ -875,7 +874,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -887,9 +886,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j: 50: 4",  -- torch
@@ -1008,7 +1007,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1020,9 +1019,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j: 50: 4",  -- torch
@@ -1166,7 +1165,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1178,9 +1177,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j: 50: 4",  -- torch
@@ -1324,7 +1323,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1336,9 +1335,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j: 50: 4",  -- torch
@@ -1482,7 +1481,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1494,9 +1493,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j: 50: 4",  -- torch
@@ -1640,7 +1639,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1653,11 +1652,11 @@ Cubeset =
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
 				"e:128: 3",  -- sandstonestairs
-				"f: 64: 3",  -- wooddoorblock
-				"g: 64: 1",  -- wooddoorblock
+				"f: 64: 3",  -- woodendoorblock
+				"g: 64: 1",  -- woodendoorblock
 				"h:102: 0",  -- glasspane
-				"i: 64: 9",  -- wooddoorblock
-				"j: 64: 8",  -- wooddoorblock
+				"i: 64: 9",  -- woodendoorblock
+				"j: 64: 8",  -- woodendoorblock
 				"k:128: 7",  -- sandstonestairs
 				"l: 50: 3",  -- torch
 				"m: 19: 0",  -- sponge
@@ -1828,7 +1827,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1840,9 +1839,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j: 50: 4",  -- torch
@@ -1961,7 +1960,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -1973,9 +1972,9 @@ Cubeset =
 				"b:128: 0",  -- sandstonestairs
 				"c:128: 2",  -- sandstonestairs
 				"d:128: 1",  -- sandstonestairs
-				"e: 64: 3",  -- wooddoorblock
+				"e: 64: 3",  -- woodendoorblock
 				"f:102: 0",  -- glasspane
-				"g: 64: 9",  -- wooddoorblock
+				"g: 64: 9",  -- woodendoorblock
 				"h:128: 7",  -- sandstonestairs
 				"i: 50: 3",  -- torch
 				"j: 50: 4",  -- torch
@@ -2119,7 +2118,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "0",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
@@ -2133,7 +2132,7 @@ Cubeset =
 				"d: 60: 6",  -- tilleddirt
 				"e:  8: 0",  -- water
 				"f: 50: 5",  -- torch
-				"g: 59: 7",  -- crops
+				"g: 59: 7",  -- wheatblock
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -2150,9 +2149,9 @@ Cubeset =
 				-- Level 1
 				"aaaaaaaaaa",  --  0
 				"abccdcccca",  --  1
-				"accdccccca",  --  2
+				"acccccccca",  --  2
 				"aeeeeeeeea",  --  3
-				"accdccccca",  --  4
+				"acccccccca",  --  4
 				"acdcdcccca",  --  5
 				"aaaaaaaaaa",  --  6
 
@@ -2232,7 +2231,7 @@ Cubeset =
 				["AllowedRotations"] = "7",
 				["DefaultWeight"] = "100",
 				["DepthWeight"] = "",
-				["ExpandFloorStrategy"] = "None",
+				["ExpandFloorStrategy"] = "RepeatBottomTillSolid",
 				["IsStarting"] = "1",
 				["MergeStrategy"] = "msSpongePrint",
 				["MoveToGround"] = "1",
author	Mattes D <github@xoft.cz>	2016-12-01 22:17:18 +0100
committer	GitHub <noreply@github.com>	2016-12-01 22:17:18 +0100
commit	27718cca45b26e66867fac2238ae81381c672a96 (patch)
tree	33615f07c5a1f7043962cd56c2f09c497a4b2213 /Server
parent	Merge pull request #3469 from QuImUfu/patch-1 (diff)
parent	Fixed villages generating under-water. (diff)
download	cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.gz cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.bz2 cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.lz cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.xz cuberite-27718cca45b26e66867fac2238ae81381c672a96.tar.zst cuberite-27718cca45b26e66867fac2238ae81381c672a96.zip