5 files changed, 248 insertions, 235 deletions

diff --git a/Server/Prefabs/Villages/AlchemistVillage.cubeset b/Server/Prefabs/Villages/AlchemistVillage.cubeset
index eac51e176..f8df42805 100644
--- a/Server/Prefabs/Villages/AlchemistVillage.cubeset
+++ b/Server/Prefabs/Villages/AlchemistVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-06-20 10:17:14",
+		ExportDate = "2015-10-10 20:20:51",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -672,7 +672,7 @@ Cubeset =
 				"aaaabfffb",  --  0
 				"agggffffm",  --  1
 				"agggbeheb",  --  2
-				"agggehhhe",  --  3
+				"agddehhhe",  --  3
 				"beeebhhhe",  --  4
 				"ehhhhhhhe",  --  5
 				"ehhhhhhhe",  --  6
@@ -3105,14 +3105,15 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
-				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "1",
+				["DepthWeight"] = "",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-16",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/Villages/JapaneseVillage.cubeset b/Server/Prefabs/Villages/JapaneseVillage.cubeset
index b3e545e52..b013aa2ce 100644
--- a/Server/Prefabs/Villages/JapaneseVillage.cubeset
+++ b/Server/Prefabs/Villages/JapaneseVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-06-20 10:17:02",
+		ExportDate = "2015-10-10 20:20:57",
 		["AllowedBiomes"] = "Plains, Savanna, SavannaM, SunflowerPlains",
 		["IntendedUse"] = "Village",
 	},
@@ -690,20 +690,20 @@ Cubeset =
 
 				-- Level 1
 				"mmmmmmmmmccmmmmm",  --  0
-				"ccbbbbbbbbbbcccm",  --  1
-				"ccbbbbbbbbbbcccm",  --  2
-				"ccbbbbbbbbbbcccm",  --  3
-				"ccbbbbbbbbbbcccm",  --  4
-				"ccbbbbbbbbbbcccm",  --  5
-				"ccbbbbbbbbbbcccm",  --  6
-				"ccbbbbbbbbbbcccm",  --  7
-				"ccbbbbbbbbbbcccm",  --  8
-				"ccbbbbbbbbbbcccm",  --  9
-				"cccccccccccccccm",  -- 10
-				"cccccccccccccccm",  -- 11
-				"cccccccccccccccm",  -- 12
-				"cccccccccccccacm",  -- 13
-				"cccccccccccccccm",  -- 14
+				"aabbbbbbbbbbaacm",  --  1
+				"acbbbbbbbbbbccam",  --  2
+				"acbbbbbbbbbbcaam",  --  3
+				"acbbbbbbbbbbccam",  --  4
+				"acbbbbbbbbbbaacm",  --  5
+				"acbbbbbbbbbbcaam",  --  6
+				"acbbbbbbbbbbccam",  --  7
+				"acbbbbbbbbbbccam",  --  8
+				"acbbbbbbbbbbcaam",  --  9
+				"acccccccccccccam",  -- 10
+				"aaaaaccaacccacam",  -- 11
+				"acacaccacaccccam",  -- 12
+				"accaaccaccaccaam",  -- 13
+				"cccaccacaccacaam",  -- 14
 				"mmmmmmmmmmmmmmmm",  -- 15
 
 				-- Level 2
@@ -1015,14 +1015,15 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
-				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "1",
+				["DepthWeight"] = "",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-1",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{
@@ -1716,20 +1717,20 @@ Cubeset =
 				"aaaaaaaaaaaaa",  -- 14
 
 				-- Level 1
-				"bbbbbbbbbbbbb",  --  0
-				"bbbbbbbbbbbbb",  --  1
-				"bbbaccdabbbbb",  --  2
-				"bbbedddebbbbb",  --  3
-				"bbbedddebbbbb",  --  4
-				"bbbedddebbbbb",  --  5
-				"bbbacccabbbbb",  --  6
-				"bbbbbbbbbbbbb",  --  7
-				"bbbbbbbbbbbbb",  --  8
-				"bbbbbbbbbbbbb",  --  9
-				"bbbbbbbbbbabb",  -- 10
-				"bbbbbbbbbbbbb",  -- 11
-				"bbbbbbbbbbbbb",  -- 12
-				"bbbbbbbbbbbbb",  -- 13
+				"aaaabbbaaaaaa",  --  0
+				"abbbbbbbbbbba",  --  1
+				"abbaccdabbaba",  --  2
+				"abbedddebbaba",  --  3
+				"abbedddebbbba",  --  4
+				"aabedddebbaba",  --  5
+				"abbacccabbbbb",  --  6
+				"abbbbbbbbbaba",  --  7
+				"aaabbbbbbbbba",  --  8
+				"ababbbbabbbba",  --  9
+				"aababbabbbaba",  -- 10
+				"ababbbbabbbba",  -- 11
+				"ababbbbbbbbba",  -- 12
+				"abbbbbbbbbbba",  -- 13
 				"bbbbbbbbbbbbb",  -- 14
 
 				-- Level 2
@@ -2542,14 +2543,15 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
-				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "1",
+				["DepthWeight"] = "",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{
@@ -2758,62 +2760,63 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  2: 0",  -- grass
-				"b: 13: 0",  -- gravel
-				"c:113: 0",  -- netherbrickfence
-				"d: 50: 5",  -- torch
-				"e: 44: 8",  -- step
-				"f: 44: 0",  -- step
-				"g: 43: 0",  -- doublestep
+				"b:  3: 0",  -- dirt
+				"c: 13: 0",  -- gravel
+				"d:113: 0",  -- netherbrickfence
+				"e: 50: 5",  -- torch
+				"f: 44: 8",  -- step
+				"g: 44: 0",  -- step
+				"h: 43: 0",  -- doublestep
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
 			{
 				-- Level 0
-				"aaaabbbaaaa",  --  0
-				"aaaabbbaaaa",  --  1
-				"aaaabbbaaaa",  --  2
-				"aaaabbbaaaa",  --  3
-				"aaaabbbaaaa",  --  4
+				"aabacccaaaa",  --  0
+				"aabacccabaa",  --  1
+				"aabacccaaaa",  --  2
+				"aaaacccaaaa",  --  3
+				"aaaacccaaaa",  --  4
 
 				-- Level 1
-				"..c.....c..",  --  0
-				"..c.....c..",  --  1
-				"..c.....c..",  --  2
-				"..c.....c..",  --  3
-				"..c.....c..",  --  4
+				"..d.....d..",  --  0
+				"..d.....d..",  --  1
+				"..d.....d..",  --  2
+				"..d.....d..",  --  3
+				"..d.....d..",  --  4
 
 				-- Level 2
-				"..c.....c..",  --  0
+				"..d.....d..",  --  0
 				"...........",  --  1
-				"..c.....c..",  --  2
+				"..d.....d..",  --  2
 				"...........",  --  3
-				"..c.....c..",  --  4
+				"..d.....d..",  --  4
 
 				-- Level 3
-				"..d.....d..",  --  0
+				"..e.....e..",  --  0
 				"...........",  --  1
-				"..c.....c..",  --  2
+				"..d.....d..",  --  2
 				"...........",  --  3
-				"..d.....d..",  --  4
+				"..e.....e..",  --  4
 
 				-- Level 4
-				"...eeeee...",  --  0
+				"...fffff...",  --  0
 				"...........",  --  1
-				"..c.....c..",  --  2
+				"..d.....d..",  --  2
 				"...........",  --  3
-				"...eeeee...",  --  4
+				"...fffff...",  --  4
 
 				-- Level 5
-				"..f.....f..",  --  0
-				".egfffffge.",  --  1
-				".egeeeeege.",  --  2
-				".egfffffge.",  --  3
-				"..f.....f..",  --  4
+				"..g.....g..",  --  0
+				".fhggggghf.",  --  1
+				".fhfffffhf.",  --  2
+				".fhggggghf.",  --  3
+				"..g.....g..",  --  4
 
 				-- Level 6
 				"...........",  --  0
 				"...........",  --  1
-				"gf.......fg",  --  2
+				"hg.......gh",  --  2
 				"...........",  --  3
 				"...........",  --  4
 
@@ -3034,11 +3037,11 @@ Cubeset =
 
 				-- Level 1
 				"bbbbbbb",  --  0
-				"bbbbbbb",  --  1
-				"bbbbbbb",  --  2
-				"bbbabbb",  --  3
-				"bbbbbbb",  --  4
-				"bbbbbbb",  --  5
+				"bbabbbb",  --  1
+				"bbabaab",  --  2
+				"bbbaabb",  --  3
+				"bbabaab",  --  4
+				"bbababb",  --  5
 				"bbbbbbb",  --  6
 
 				-- Level 2
@@ -3168,8 +3171,8 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  3: 0",  -- dirt
-				"b:  8: 0",  -- water
-				"c:  2: 0",  -- grass
+				"b:  2: 0",  -- grass
+				"c:  8: 0",  -- water
 				"d: 17: 1",  -- tree
 				"e: 13: 0",  -- gravel
 				"f: 31: 2",  -- tallgrass
@@ -3187,10 +3190,10 @@ Cubeset =
 				"aaaaaaaaaaaaaaaa",  --  3
 				"aaaaaaaaaaaaaaaa",  --  4
 				"aaaaaaaaaaaaaaaa",  --  5
-				"aaaaaaaaaaaaaaaa",  --  6
-				"aaaaaaaaaaaaaaaa",  --  7
-				"aaaaaaaaaaaaaaaa",  --  8
-				"aaaaaaaaaaaaaaaa",  --  9
+				"aaaaabaaaaaaaaaa",  --  6
+				"aaabbaaaaaaaaaaa",  --  7
+				"aaabbaaaaaaaaaaa",  --  8
+				"aaaabaaaaaaaaaaa",  --  9
 				"aaaaaaaaaaaaaaaa",  -- 10
 				"aaaaaaaaaaaaaaaa",  -- 11
 				"aaaaaaaaaaaaaaaa",  -- 12
@@ -3204,12 +3207,12 @@ Cubeset =
 				"aaaaaaaaaaaaaaaa",  --  2
 				"aaaaaaaaaaaaaaaa",  --  3
 				"aaaaaaaaaaaaaaaa",  --  4
-				"aaaaaaaaaaaaaaaa",  --  5
-				"aaaabbaaaaaaaaaa",  --  6
-				"aaabbbaaaaaaaaaa",  --  7
-				"aaabbaaaaaaaaaaa",  --  8
-				"aaaabaaaaaaaaaaa",  --  9
-				"aaaaaaaaaaaaaaaa",  -- 10
+				"aaabbbbaaaaaaaaa",  --  5
+				"aaaaccbaaaaaaaaa",  --  6
+				"aabcccbaaaaaaaaa",  --  7
+				"aabccabaaaaaaaaa",  --  8
+				"aabbcbaaaaaaaaaa",  --  9
+				"aaaabaaaaaaaaaaa",  -- 10
 				"aaaaaaaaaaaaaaaa",  -- 11
 				"aaaaaaaaaaaaaaaa",  -- 12
 				"aaaaaaaaaaaaaaaa",  -- 13
@@ -3217,22 +3220,22 @@ Cubeset =
 				"aaaaaaaaaaaaaaaa",  -- 15
 
 				-- Level 2
-				"cccccccccccccccc",  --  0
-				"ccdccccccccdcccc",  --  1
-				"cccccceecccccdcc",  --  2
-				"ccccccceeccccccc",  --  3
-				"cccccccceccccccc",  --  4
-				"cccbbbbceccccccc",  --  5
-				"cccbbbbceecccccc",  --  6
-				"ccbbbbbcceeeeccc",  --  7
-				"ccbbbbbccccceecc",  --  8
-				"ccbbbbcccccccecc",  --  9
-				"ccccbcccccccceec",  -- 10
-				"ccccccccccccccec",  -- 11
-				"ccccccccaaacccec",  -- 12
-				"cccccccccaccccec",  -- 13
-				"ccccccccccccceec",  -- 14
-				"cccccccccccceecc",  -- 15
+				"bbbbbbabbbbbbbbb",  --  0
+				"bbdbbbbbbbbdbbbb",  --  1
+				"abbbbbeebbbabdbb",  --  2
+				"bbbbbbbeebbbbbbb",  --  3
+				"bbbbbbbbebbabbbb",  --  4
+				"bbbccccbebbbbbab",  --  5
+				"bbbccccbeebbbaab",  --  6
+				"bbcccccbbeeeebba",  --  7
+				"bbcccccbbbbbeebb",  --  8
+				"bbccccbbababbebb",  --  9
+				"bbbbcbbaabbbbeeb",  -- 10
+				"bbbbbbbbbbbbabeb",  -- 11
+				"bbbbbbbbaaabbbeb",  -- 12
+				"bbbbbbbbbabbbbeb",  -- 13
+				"bbbbabbbbbbbbeeb",  -- 14
+				"bbbbbbbbbbbbeebb",  -- 15
 
 				-- Level 3
 				"......f...gg.g..",  --  0
@@ -3327,12 +3330,13 @@ Cubeset =
 				"a:  3: 0",  -- dirt
 				"b: 60: 7",  -- tilleddirt
 				"c:  8: 0",  -- water
-				"d: 43: 0",  -- doublestep
-				"e: 44: 0",  -- step
-				"f: 59: 7",  -- crops
-				"g: 83: 0",  -- reedblock
-				"h:113: 0",  -- netherbrickfence
-				"i: 50: 5",  -- torch
+				"d: 60: 6",  -- tilleddirt
+				"e: 43: 0",  -- doublestep
+				"f: 44: 0",  -- step
+				"g: 59: 7",  -- crops
+				"h: 83: 0",  -- reedblock
+				"i:113: 0",  -- netherbrickfence
+				"j: 50: 5",  -- torch
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -3361,7 +3365,7 @@ Cubeset =
 				"mabbbbbbbam",  --  5
 				"mabcccccaam",  --  6
 				"mabbbbbbbam",  --  7
-				"mabbbbbbbam",  --  8
+				"madbbbbbbam",  --  8
 				"mabbbbbbbam",  --  9
 				"mabbbbbbbam",  -- 10
 				"maaaaaaaaam",  -- 11
@@ -3369,52 +3373,52 @@ Cubeset =
 
 				-- Level 2
 				"...........",  --  0
-				".deeeeeeed.",  --  1
-				".efffffffe.",  --  2
-				".efffffffe.",  --  3
-				".efffffffe.",  --  4
-				".efgggggfe.",  --  5
-				".eg.....ge.",  --  6
-				".efgggggfe.",  --  7
-				".efffffffe.",  --  8
-				".efffffffe.",  --  9
-				".efffffffe.",  -- 10
-				".deeeeeeed.",  -- 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
-				".h.......h.",  --  1
+				".i.......i.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
-				"...ggggg...",  --  5
-				"..g.....g..",  --  6
-				"...ggggg...",  --  7
+				"...hhhhh...",  --  5
+				"..h.....h..",  --  6
+				"...hhhhh...",  --  7
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".h.......h.",  -- 11
+				".i.......i.",  -- 11
 				"...........",  -- 12
 
 				-- Level 4
 				"...........",  --  0
-				".h.......h.",  --  1
+				".i.......i.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
-				"...ggggg...",  --  5
-				"..g.....g..",  --  6
-				"...ggggg...",  --  7
+				"...hhhhh...",  --  5
+				"..h.....h..",  --  6
+				"...hhhhh...",  --  7
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".h.......h.",  -- 11
+				".i.......i.",  -- 11
 				"...........",  -- 12
 
 				-- Level 5
 				"...........",  --  0
-				".h.......h.",  --  1
+				".i.......i.",  --  1
 				"...........",  --  2
 				"...........",  --  3
 				"...........",  --  4
@@ -3424,13 +3428,13 @@ Cubeset =
 				"...........",  --  8
 				"...........",  --  9
 				"...........",  -- 10
-				".h.......h.",  -- 11
+				".i.......i.",  -- 11
 				"...........",  -- 12
 
 				-- Level 6
-				".h.......h.",  --  0
-				"hhh.....hhh",  --  1
-				".h.......h.",  --  2
+				".i.......i.",  --  0
+				"iii.....iii",  --  1
+				".i.......i.",  --  2
 				"...........",  --  3
 				"...........",  --  4
 				"...........",  --  5
@@ -3438,14 +3442,14 @@ Cubeset =
 				"...........",  --  7
 				"...........",  --  8
 				"...........",  --  9
-				".h.......h.",  -- 10
-				"hhh.....hhh",  -- 11
-				".h.......h.",  -- 12
+				".i.......i.",  -- 10
+				"iii.....iii",  -- 11
+				".i.......i.",  -- 12
 
 				-- Level 7
-				".i.......i.",  --  0
-				"i.i.....i.i",  --  1
-				".i.......i.",  --  2
+				".j.......j.",  --  0
+				"j.j.....j.j",  --  1
+				".j.......j.",  --  2
 				"...........",  --  3
 				"...........",  --  4
 				"...........",  --  5
@@ -3453,9 +3457,9 @@ Cubeset =
 				"...........",  --  7
 				"...........",  --  8
 				"...........",  --  9
-				".i.......i.",  -- 10
-				"i.i.....i.i",  -- 11
-				".i.......i.",  -- 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 e3326b4b8..8f7704966 100644
--- a/Server/Prefabs/Villages/PlainsVillage.cubeset
+++ b/Server/Prefabs/Villages/PlainsVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-10-05 21:08:55",
+		ExportDate = "2015-10-10 20:21:06",
 		["AllowedBiomes"] = "Plains, Savanna, SavannaM, SunflowerPlains",
 		["IntendedUse"] = "Village",
 	},
@@ -74,7 +74,7 @@ Cubeset =
 				"b: 67: 0",  -- stairs
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
-				"e:  5: 0",  -- wood
+				"e:  5: 0",  -- planks
 				"f: 67: 3",  -- stairs
 				"g: 17: 0",  -- tree
 				"h: 64: 3",  -- wooddoorblock
@@ -304,14 +304,15 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
-				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "1",
+				["DepthWeight"] = "",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{
@@ -464,9 +465,9 @@ Cubeset =
 				"f: 60: 5",  -- tilleddirt
 				"g: 60: 2",  -- tilleddirt
 				"h: 60: 6",  -- tilleddirt
-				"i: 60: 0",  -- tilleddirt
-				"j: 60: 4",  -- tilleddirt
-				"k: 60: 3",  -- tilleddirt
+				"i: 60: 4",  -- tilleddirt
+				"j: 60: 3",  -- tilleddirt
+				"k: 60: 0",  -- tilleddirt
 				"l: 50: 5",  -- torch
 				"m: 19: 0",  -- sponge
 				"n: 59: 7",  -- crops
@@ -497,13 +498,13 @@ Cubeset =
 
 				-- Level 2
 				"ccccccc.ccccccc",  --  0
-				"cddeddc.cffegfc",  --  1
+				"cddeddc.cfdegfc",  --  1
 				"cddeddc.chdeddc",  --  2
-				"cddeddc.cfheijc",  --  3
-				"cddeddc.ckhehdc",  --  4
-				"cddeddc.cdjedhc",  --  5
-				"cddeddc.cfhekdc",  --  6
-				"cddeddc.cdjefic",  --  7
+				"cddeddc.cdhedic",  --  3
+				"cddeddc.cjhehdc",  --  4
+				"cddeddc.cddeddc",  --  5
+				"cddeddc.cfheddc",  --  6
+				"cddeddc.cdiefkc",  --  7
 				"ccccccc.ccccccc",  --  8
 
 				-- Level 3
@@ -617,10 +618,10 @@ Cubeset =
 				".:  0: 0",  -- air
 				"a:  4: 0",  -- cobblestone
 				"b:  3: 0",  -- dirt
-				"c:  5: 0",  -- wood
+				"c:  5: 0",  -- planks
 				"d:  2: 0",  -- grass
 				"e: 67: 2",  -- stairs
-				"f: 43: 0",  -- doubleslab
+				"f: 43: 0",  -- doublestep
 				"g: 67: 0",  -- stairs
 				"h: 67: 3",  -- stairs
 				"i: 17: 0",  -- tree
@@ -932,7 +933,7 @@ Cubeset =
 				"s: 50: 1",  -- torch
 				"t: 50: 2",  -- torch
 				"u: 53: 6",  -- woodstairs
-				"v:  5: 0",  -- wood
+				"v:  5: 0",  -- planks
 			},
 			BlockData =
 			{
@@ -1054,7 +1055,7 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  3: 0",  -- dirt
-				"b:  5: 0",  -- wood
+				"b:  5: 0",  -- planks
 				"c: 13: 0",  -- gravel
 				"d: 17: 0",  -- tree
 				"e: 60: 7",  -- tilleddirt
@@ -1234,7 +1235,7 @@ Cubeset =
 			{
 				".:  0: 0",  -- air
 				"a:  3: 0",  -- dirt
-				"b: 43: 0",  -- doubleslab
+				"b: 43: 0",  -- doublestep
 				"c:139: 0",  -- cobblestonewall
 				"d: 50: 4",  -- torch
 				"e: 50: 2",  -- torch
@@ -1339,7 +1340,7 @@ Cubeset =
 				"d: 67: 1",  -- stairs
 				"e: 67: 3",  -- stairs
 				"f: 17: 0",  -- tree
-				"g:  5: 0",  -- wood
+				"g:  5: 0",  -- planks
 				"h: 64: 7",  -- wooddoorblock
 				"i: 64: 1",  -- wooddoorblock
 				"j:102: 0",  -- glasspane
@@ -1506,9 +1507,9 @@ Cubeset =
 				"b: 67: 0",  -- stairs
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
-				"e: 43: 0",  -- doubleslab
+				"e: 43: 0",  -- doublestep
 				"f: 17: 0",  -- tree
-				"g:  5: 0",  -- wood
+				"g:  5: 0",  -- planks
 				"h: 64: 3",  -- wooddoorblock
 				"i: 96: 8",  -- trapdoor
 				"j: 61: 2",  -- furnace
@@ -1752,7 +1753,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 3",  -- wooddoorblock
 				"h:102: 0",  -- glasspane
 				"i: 64: 9",  -- wooddoorblock
@@ -1887,7 +1888,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 3",  -- wooddoorblock
 				"h:102: 0",  -- glasspane
 				"i: 64: 9",  -- wooddoorblock
@@ -2022,7 +2023,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 3",  -- wooddoorblock
 				"h:102: 0",  -- glasspane
 				"i: 64: 9",  -- wooddoorblock
@@ -2192,7 +2193,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 3",  -- wooddoorblock
 				"h:102: 0",  -- glasspane
 				"i: 64: 9",  -- wooddoorblock
@@ -2360,7 +2361,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 3",  -- wooddoorblock
 				"h: 53: 3",  -- woodstairs
 				"i: 85: 0",  -- fence
@@ -2502,7 +2503,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 3",  -- wooddoorblock
 				"h: 53: 3",  -- woodstairs
 				"i: 85: 0",  -- fence
@@ -2671,9 +2672,9 @@ Cubeset =
 				"d: 67: 0",  -- stairs
 				"e: 67: 2",  -- stairs
 				"f: 67: 1",  -- stairs
-				"g: 43: 0",  -- doubleslab
+				"g: 43: 0",  -- doublestep
 				"h: 17: 0",  -- tree
-				"i:  5: 0",  -- wood
+				"i:  5: 0",  -- planks
 				"j: 64: 3",  -- wooddoorblock
 				"k: 53: 3",  -- woodstairs
 				"l: 85: 0",  -- fence
@@ -2869,7 +2870,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 3",  -- wooddoorblock
 				"h: 64: 9",  -- wooddoorblock
 				"i:102: 0",  -- glasspane
@@ -3004,7 +3005,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 0",  -- wooddoorblock
 				"h: 10: 0",  -- lava
 				"i: 54: 2",  -- chest
@@ -3020,7 +3021,7 @@ Cubeset =
 				"s: 50: 1",  -- torch
 				"t: 53: 6",  -- woodstairs
 				"u: 53: 3",  -- woodstairs
-				"v: 43: 0",  -- doubleslab
+				"v: 43: 0",  -- doublestep
 				"w: 44: 0",  -- step
 			},
 			BlockData =
@@ -3201,7 +3202,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 3",  -- wooddoorblock
 				"h:102: 0",  -- glasspane
 				"i: 64: 9",  -- wooddoorblock
@@ -3363,7 +3364,7 @@ Cubeset =
 				"d: 67: 2",  -- stairs
 				"e: 67: 1",  -- stairs
 				"f: 17: 0",  -- tree
-				"g:  5: 0",  -- wood
+				"g:  5: 0",  -- planks
 				"h:170: 4",  -- haybale
 				"i:170: 8",  -- haybale
 				"j: 54: 2",  -- chest
@@ -3515,7 +3516,7 @@ Cubeset =
 				"f: 17: 0",  -- tree
 				"g:107: 0",  -- fencegate
 				"h:107: 4",  -- fencegate
-				"i:  5: 0",  -- wood
+				"i:  5: 0",  -- planks
 				"j:107: 6",  -- fencegate
 				"k: 85: 0",  -- fence
 				"l:170: 0",  -- haybale
@@ -3691,7 +3692,7 @@ Cubeset =
 				"c: 67: 2",  -- stairs
 				"d: 67: 1",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 64: 1",  -- wooddoorblock
 				"h: 65: 3",  -- ladder
 				"i: 53: 3",  -- woodstairs
@@ -3999,7 +4000,7 @@ Cubeset =
 				"c: 67: 1",  -- stairs
 				"d: 67: 3",  -- stairs
 				"e: 17: 0",  -- tree
-				"f:  5: 0",  -- wood
+				"f:  5: 0",  -- planks
 				"g: 54: 4",  -- chest
 				"h:154: 4",  -- hopper
 				"i: 64: 0",  -- wooddoorblock
@@ -4336,14 +4337,15 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
-				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "1",
+				["DepthWeight"] = "",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-9",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{
@@ -4358,7 +4360,7 @@ Cubeset =
 				"h: 85: 0",  -- fence
 				"i: 53: 2",  -- woodstairs
 				"j: 53: 7",  -- woodstairs
-				"k:  5: 0",  -- wood
+				"k:  5: 0",  -- planks
 				"l: 53: 4",  -- woodstairs
 				"m: 19: 0",  -- sponge
 				"n: 53: 5",  -- woodstairs
@@ -4572,19 +4574,20 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["MoveToGround"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-32",
 				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "0",
-				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 77: 2",  -- stonebutton
 				"c: 66: 6",  -- tracks
 				"d: 27: 1",  -- poweredrail
@@ -5013,7 +5016,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 85: 0",  -- fence
 				"c: 66: 1",  -- tracks
 				"d: 50: 2",  -- torch
@@ -5101,7 +5104,7 @@ Cubeset =
 				"c:126: 4",  -- woodenslab
 				"d: 86: 1",  -- pumpkin
 				"e:139: 1",  -- cobblestonewall
-				"f:163: 4",  -- acaciawoodenstairs
+				"f:163: 4",  -- acaciawoodstairs
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -5239,7 +5242,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 66: 0",  -- tracks
 				"c: 66: 1",  -- tracks
 				"m: 19: 0",  -- sponge
@@ -5433,7 +5436,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 66: 0",  -- tracks
 				"c: 66: 1",  -- tracks
 				"m: 19: 0",  -- sponge
@@ -5599,7 +5602,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 66: 0",  -- tracks
 				"c: 85: 0",  -- fence
 				"d: 66: 1",  -- tracks
@@ -5752,7 +5755,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 66: 0",  -- tracks
 				"c: 85: 0",  -- fence
 				"d: 66: 1",  -- tracks
@@ -5875,7 +5878,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 66: 1",  -- tracks
 				"c: 66: 2",  -- tracks
 				"d: 85: 0",  -- fence
@@ -5999,7 +6002,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 85: 0",  -- fence
 				"c: 66: 4",  -- tracks
 				"d: 66: 0",  -- tracks
@@ -6229,7 +6232,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 66: 0",  -- tracks
 				"c: 66: 5",  -- tracks
 				"d: 85: 0",  -- fence
@@ -6484,7 +6487,7 @@ Cubeset =
 			BlockDefinitions =
 			{
 				".:  0: 0",  -- air
-				"a:  5: 0",  -- wood
+				"a:  5: 0",  -- planks
 				"b: 85: 0",  -- fence
 				"c: 66: 1",  -- tracks
 				"d: 50: 2",  -- torch
diff --git a/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
index cbaac332a..a6cd9f97a 100644
--- a/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
+++ b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-06-20 10:17:05",
+		ExportDate = "2015-10-10 20:21:16",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -1417,14 +1417,15 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
-				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "1",
+				["DepthWeight"] = "",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-11",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{
diff --git a/Server/Prefabs/Villages/SandVillage.cubeset b/Server/Prefabs/Villages/SandVillage.cubeset
index 63238fa6e..edfe78f5f 100644
--- a/Server/Prefabs/Villages/SandVillage.cubeset
+++ b/Server/Prefabs/Villages/SandVillage.cubeset
@@ -14,7 +14,7 @@ Cubeset =
 	Metadata =
 	{
 		CubesetFormatVersion = 1,
-		ExportDate = "2015-06-20 10:16:49",
+		ExportDate = "2015-10-10 20:21:27",
 		["AllowedBiomes"] = "Desert, DesertM",
 		["IntendedUse"] = "Village",
 	},
@@ -79,14 +79,15 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
-				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "1",
+				["DepthWeight"] = "",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-8",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{
@@ -348,8 +349,10 @@ Cubeset =
 				"a: 24: 0",  -- sandstone
 				"b: 60: 7",  -- tilleddirt
 				"c:  8: 0",  -- water
-				"d: 50: 5",  -- torch
-				"e: 59: 7",  -- crops
+				"d: 60: 5",  -- tilleddirt
+				"e: 60: 6",  -- tilleddirt
+				"f: 50: 5",  -- torch
+				"g: 59: 7",  -- crops
 				"m: 19: 0",  -- sponge
 			},
 			BlockData =
@@ -370,22 +373,22 @@ Cubeset =
 				"abbcbbabbcbba",  --  1
 				"abbcbbabbcbba",  --  2
 				"abbcbbabbcbba",  --  3
-				"abbcbbabbcbba",  --  4
+				"abbcdbabbcbba",  --  4
 				"abbcbbabbcbba",  --  5
-				"abbcbbabbcbba",  --  6
+				"abbceeabbcbba",  --  6
 				"abbcbbabbcbba",  --  7
 				"aaaaaaaaaaaaa",  --  8
 
 				-- Level 2
-				"d.....d.....d",  --  0
-				".ee.ee.ee.ee.",  --  1
-				".ee.ee.ee.ee.",  --  2
-				".ee.ee.ee.ee.",  --  3
-				".ee.ee.ee.ee.",  --  4
-				".ee.ee.ee.ee.",  --  5
-				".ee.ee.ee.ee.",  --  6
-				".ee.ee.ee.ee.",  --  7
-				"d.....d.....d",  --  8
+				"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
 
 			},
 		},  -- DoubleField
@@ -2223,14 +2226,15 @@ Cubeset =
 			},
 			Metadata =
 			{
-				["DefaultWeight"] = "100",
+				["AddWeightIfSame"] = "0",
+				["IsStarting"] = "1",
 				["AllowedRotations"] = "7",
 				["MergeStrategy"] = "msSpongePrint",
-				["IsStarting"] = "1",
-				["DepthWeight"] = "",
 				["ShouldExpandFloor"] = "1",
+				["DepthWeight"] = "",
+				["VerticalStrategy"] = "TerrainOrOceanTop|-8",
 				["MoveToGround"] = "1",
-				["AddWeightIfSame"] = "0",
+				["DefaultWeight"] = "100",
 			},
 			BlockDefinitions =
 			{