Merge branch 'master' of yunohost.local:minetest-mods/quartz into nalc-1.2-dev

init.lua

@@ -69,22 +69,6 @@ minetest.register_node("quartz:pillar", {
 	on_place = minetest.rotate_node
 })
 
--- Stairs & Slabs
-stairs.register_stair_and_slab("quartzblock", "quartz:block",
-		{cracky=3, oddly_breakable_by_hand=1},
-		{"quartz_block.png"},
-		S("Quartz stair"),
-		S("Quartz slab"),
-		default.node_sound_glass_defaults())
-
-stairs.register_stair_and_slab("quartzstair", "quartz:pillar",
-		{cracky=3, oddly_breakable_by_hand=1},
-		{"quartz_pillar_top.png", "quartz_pillar_top.png",
-			"quartz_pillar_side.png"},
-		S("Quartz Pillar stair"),
-		S("Quartz Pillar slab"),
-		default.node_sound_glass_defaults())
-
 --
 -- Crafting
 --
@@ -150,27 +134,44 @@ minetest.register_abm({
 --
 
 if minetest.global_exists("stairsplus") then
-	stairsplus:register_all("quartz", "block", "quartz:block", {
+	local nodename = "quartz:block"
-		description = "Quartz Block",
+	local ndef = table.copy(minetest.registered_nodes[nodename])
-		tiles  = {"quartz_block.png"},
+	ndef.sunlight_propagates = true
-		groups = {cracky=3},
+	ndef.place_param2 = nil
-		sounds = default.node_sound_glass_defaults()
+	stairsplus:register_all("quartz", "block", nodename, ndef)
-	})
 
-	stairsplus:register_all("quartz", "chiseled", "quartz:chiseled", {
+	nodename = "quartz:chiseled"
-		description = "Chiseled Quartz",
+	ndef = table.copy(minetest.registered_nodes[nodename])
-		tiles  = {"quartz_chiseled.png"},
+	ndef.sunlight_propagates = true
-		groups = {cracky=3},
+	ndef.place_param2 = nil
-		sounds = default.node_sound_glass_defaults()
+	stairsplus:register_all("quartz", "chiseled", nodename, ndef)
-	})
 
-	stairsplus:register_all("quartz", "pillar", "quartz:pillar", {
+	nodename = "quartz:pillar"
-		description = "Quartz Pillar",
+	ndef = table.copy(minetest.registered_nodes[nodename])
-		tiles  = {"quartz_pillar_top.png", "quartz_pillar_top.png",
+	ndef.sunlight_propagates = true
+	ndef.place_param2 = nil
+	stairsplus:register_all("quartz", "pillar", nodename, ndef)
+
+	minetest.register_alias("stairs:stair_quartzblock", "quartz:stair_block")
+	minetest.register_alias("stairs:slab_quartzblock", "quartz:slab_block")
+	minetest.register_alias("stairs:stair_quartzstair", "quartz:stair_pillar")
+	minetest.register_alias("stairs:slab_quartzstair", "quartz:slab_pillar")
+else
+	-- Stairs & Slabs
+	stairs.register_stair_and_slab("quartzblock", "quartz:block",
+		{cracky=3, oddly_breakable_by_hand=1},
+		{"quartz_block.png"},
+		S("Quartz stair"),
+		S("Quartz slab"),
+		default.node_sound_glass_defaults())
+
+	stairs.register_stair_and_slab("quartzstair", "quartz:pillar",
+		{cracky=3, oddly_breakable_by_hand=1},
+		{"quartz_pillar_top.png", "quartz_pillar_top.png",
 			"quartz_pillar_side.png"},
-		groups = {cracky=3},
+		S("Quartz Pillar stair"),
-		sounds = default.node_sound_glass_defaults()
+		S("Quartz Pillar slab"),
-	})
+		default.node_sound_glass_defaults())
 end
 
 --
@@ -192,3 +193,5 @@ if settings:get_bool("ENABLE_HORIZONTAL_PILLAR") then
 			sounds = default.node_sound_glass_defaults(),
 	})
 end
+
+minetest.log("action", "[quartz] loaded.")

settings.txt

@@ -1,6 +1,6 @@
 # Set this to true to allow usage of the stairsplus mod in moreblocks
 
-ENABLE_STAIRSPLUS = false
+ENABLE_STAIRSPLUS = true
 
 # This enables the old horizontal pillar block(deprecated, be sure to convert them back to normal pillars)