Huge update - lots of mods:

areas, biome_lib, blox, bobblocks, boost_cart, homedecor, mobs,
coloredwood, ilights, inbox, item_tweaks, moreblocks, moreores,
pipeworks, plasticbox, signs_lib, stainedglass, roads, unifieddyes,
vines, worldedit, xban2, maybe some others I didn't think about ;-)

6 files changed, 63 insertions, 63 deletions

diff --git a/moreblocks/stairsplus/conversion.lua b/moreblocks/stairsplus/conversion.lua
index 13966b6..37f2a25 100644
--- a/moreblocks/stairsplus/conversion.lua
+++ b/moreblocks/stairsplus/conversion.lua
@@ -80,8 +80,9 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
 			chance = 1,
 			action = function(pos, node, active_object_count, active_object_count_wider)
 				local fdir = node.param2 or 0
+				local nfdir
 
-				if flip_upside_down and not flip_to_wall then 
+				if flip_upside_down and not flip_to_wall then
 					nfdir = dirs1[fdir + 2]
 				elseif flip_to_wall and not flip_upside_down then
 					nfdir = dirs2[fdir + 1]
@@ -125,7 +126,7 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
 				local fdir = node.param2
 				local nfdir = 20
 
-				if flip_upside_down and not flip_to_wall then 
+				if flip_upside_down and not flip_to_wall then
 					nfdir = dirs1[fdir + 1]
 				elseif flip_to_wall and not flip_upside_down then
 					nfdir = dirs2[fdir + 2]
@@ -136,4 +137,3 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
 		})
 	end
 end
-
diff --git a/moreblocks/stairsplus/microblocks.lua b/moreblocks/stairsplus/microblocks.lua
index a457d10..a3b94d3 100644
--- a/moreblocks/stairsplus/microblocks.lua
+++ b/moreblocks/stairsplus/microblocks.lua
@@ -88,7 +88,7 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "nodebox"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.groups = stairsplus:prepare_groups(fields.groups)
 		def.description = desc
@@ -98,53 +98,53 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
 		minetest.register_node(":" ..modname.. ":micro_" ..subname..alternate, def)
 	end
 	minetest.register_alias(modname.. ":micro_" ..subname.. "_bottom", modname.. ":micro_" ..subname)
-	
+
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
 
 	-- Some saw-less recipes:
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 7",
 		recipe = {modname .. ":stair_" .. subname .. "_inner"},
 	})
-	
+
 	minetest.register_craft({
 	output = modname .. ":micro_" .. subname .. " 6",
 		type = "shapeless",
 	recipe = {modname .. ":stair_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 5",
 		recipe = {modname .. ":stair_" .. subname .. "_outer"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 4",
 		recipe = {modname .. ":slab_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 4",
 		recipe = {modname .. ":stair_" .. subname .. "_alt"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 3",
 		recipe = {modname .. ":stair_" .. subname .. "_right_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":micro_" .. subname .. " 2",
 		recipe = {modname .. ":panel_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
diff --git a/moreblocks/stairsplus/panels.lua b/moreblocks/stairsplus/panels.lua
index 314939b..66e736d 100644
--- a/moreblocks/stairsplus/panels.lua
+++ b/moreblocks/stairsplus/panels.lua
@@ -88,7 +88,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "nodebox"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.description = desc
 		def.groups = stairsplus:prepare_groups(fields.groups)
@@ -98,7 +98,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 		minetest.register_node(":" ..modname.. ":panel_" ..subname..alternate, def)
 	end
 	minetest.register_alias(modname.. ":panel_" ..subname.. "_bottom", modname.. ":panel_" ..subname)
-	
+
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
 
 	-- Some saw-less recipes:
@@ -110,7 +110,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 			{recipeitem, recipeitem},
 		},
 	})
-	
+
 	minetest.register_craft({
 		output = modname .. ":panel_" .. subname .. " 12",
 		recipe = {
@@ -118,13 +118,13 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 			{recipeitem, recipeitem},
 		},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":panel_" .. subname,
 		recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
diff --git a/moreblocks/stairsplus/slabs.lua b/moreblocks/stairsplus/slabs.lua
index 2acdd41..9fa2494 100644
--- a/moreblocks/stairsplus/slabs.lua
+++ b/moreblocks/stairsplus/slabs.lua
@@ -59,7 +59,7 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "nodebox"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.description = ("%s (%d/16)"):format(desc_base, num)
 		def.groups = stairsplus:prepare_groups(fields.groups)
@@ -78,27 +78,27 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 			output = modname .. ":slab_" .. subname .. " 6",
 			recipe = {{recipeitem, recipeitem, recipeitem}},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname,
 			recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
 		})
-		
+
 		-- uncomment this rule when conflict is no longer likely to happen
-		-- 	https://github.com/minetest/minetest/issues/2881
+		--	https://github.com/minetest/minetest/issues/2881
 		-- minetest.register_craft({
-		-- 	type = "shapeless",
-		-- 	output = modname .. ":slab_" .. subname,
-		-- 	recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
+		--	type = "shapeless",
+		--	output = modname .. ":slab_" .. subname,
+		--	recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
 		-- })
-		
+
 		-- then remove these two
 		minetest.register_craft({
 			output = modname .. ":slab_" .. subname,
 			recipe = {{modname .. ":panel_" .. subname, modname .. ":panel_" .. subname}},
 		})
-		
+
 		minetest.register_craft({
 			output = modname .. ":slab_" .. subname,
 			recipe = {
@@ -113,109 +113,109 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = recipeitem,
 			recipe = {modname .. ":slab_" .. subname .. "_15", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname,
 			recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname,
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname,
 			recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_quarter",
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_quarter",
 			recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_2",
 			recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_three_quarter",
 			recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_three_quarter",
 			recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_three_quarter",
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_14",
 			recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_14",
 			recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. "_15",
 			recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_1"},
 		})
-		
+
 		minetest.register_craft({
 			type = "shapeless",
 			output = modname .. ":slab_" .. subname .. " 3",
diff --git a/moreblocks/stairsplus/slopes.lua b/moreblocks/stairsplus/slopes.lua
index da524b6..1868cb3 100644
--- a/moreblocks/stairsplus/slopes.lua
+++ b/moreblocks/stairsplus/slopes.lua
@@ -242,7 +242,7 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "mesh"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.description = desc
 		def.groups = stairsplus:prepare_groups(fields.groups)
@@ -261,99 +261,99 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname, modname .. ":slope_" .. subname},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half_raised"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half",
 				   modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer", modname .. ":slope_" .. subname .. "_inner"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half_raised"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_half_raised", modname .. ":slope_" .. subname .. "_inner_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_cut", modname .. ":slope_" .. subname .. "_inner_cut"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half_raised"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = recipeitem,
 		recipe =  {modname .. ":slope_" .. subname .. "_cut", modname .. ":slope_" .. subname .. "_cut"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slab_" .. subname,
 		recipe =  {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slab_" .. subname,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slab_" .. subname,
 		recipe =  {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_half_raised",
 		recipe =  {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half",
 				   modname .. ":slope_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_half_raised",
 		recipe =  {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_inner_half_raised",
 		recipe =  {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_inner_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_outer_half_raised",
 		recipe =  {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_outer_half"},
 	})
-	
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = modname .. ":slope_" .. subname .. "_inner_cut_half_raised",
diff --git a/moreblocks/stairsplus/stairs.lua b/moreblocks/stairsplus/stairs.lua
index 6609466..fc47dbd 100644
--- a/moreblocks/stairsplus/stairs.lua
+++ b/moreblocks/stairsplus/stairs.lua
@@ -128,7 +128,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 		end
 		def.drawtype = "nodebox"
 		def.paramtype = "light"
-		def.paramtype2 = "facedir"
+		def.paramtype2 = def.paramtype2 or "facedir"
 		def.on_place = minetest.rotate_node
 		def.description = desc
 		def.groups = stairsplus:prepare_groups(fields.groups)