Merge remote-tracking branch 'upstream/master'

Add `stairsplus` blocks in `oddly_breakable_by_hand=1` group to make them consistent with the original blocks.

README.txt

@@ -12,9 +12,10 @@ License: MIT (see LICENSE.txt)
 Dependencies:
 default (found in minetest_game)
 stairs (found in minetest_game)
-moreblocks (optional, for stairsplus support)
+intllib (optional, for translations)
+moreblocks or stairsplus (optional, for stairsplus support)
 
-Please report bugs at the github issue tracker:
+Please report bugs at the GitHub issue tracker:
 https://github.com/minetest-mods/quartz/issues/
 
 Crafting:
@@ -80,3 +81,6 @@ x|x|x
 x|c|x
 -----
 x|x|x
+
+If you have stairsplus (or moreblocks) installed, you will be able to use
+circular saws to cut quartz blocks.

depends.txt

@@ -1,4 +1,5 @@
 default
 stairs
-moreblocks?
 intllib?
+moreblocks?
+stairsplus?

description.txt

@@ -1 +1 @@
-Adds quartz ore and some decorative quartz blocks
+Adds quartz ore and some decorative quartz blocks.

init.lua

@@ -62,12 +62,29 @@ minetest.register_node("quartz:chiseled", {
 minetest.register_node("quartz:pillar", {
 	description = S("Quartz Pillar"),
 	paramtype2 = "facedir",
-	tiles = {"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
+	tiles = {"quartz_pillar_top.png", "quartz_pillar_top.png",
+		"quartz_pillar_side.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
 	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
 --
@@ -92,20 +109,10 @@ minetest.register_craft({
 
 -- Chiseled Quartz
 minetest.register_craft({
-	output = 'quartz:chiseled 2',
+	output = 'quartz:chiseled 4',
 	recipe = {
-		{'stairs:slab_quartzblock', '', ''},
-		{'stairs:slab_quartzblock', '', ''},
-		{'', '', ''},
-	}
-})
-
--- Chiseled Quartz (for stairsplus)
-minetest.register_craft({
-	output = 'quartz:chiseled 2',
-	recipe = {
-		{'quartz:slab_block', '', ''},
-		{'quartz:slab_block', '', ''},
+		{'quartz:block', 'quartz:block', ''},
+		{'quartz:block', 'quartz:block', ''},
 		{'',             '',             ''},
 	}
 })
@@ -142,46 +149,37 @@ minetest.register_abm({
 -- Compatibility with stairsplus
 --
 
-if minetest.get_modpath("moreblocks") then
-	local nodename = "quartz:block"
-	local ndef = table.copy(minetest.registered_nodes[nodename])
-	ndef.sunlight_propagates = true
-	ndef.place_param2 = nil
-	stairsplus:register_all("quartz", "block", nodename, ndef)
+if minetest.global_exists("stairsplus") then
+	stairsplus:register_all("quartz", "block", "quartz:block", {
+		description = "Quartz Block",
+		tiles  = {"quartz_block.png"},
+		groups = {cracky=3, oddly_breakable_by_hand=1},
+		sounds = default.node_sound_glass_defaults()
+	})
 
-	nodename = "quartz:chiseled"
-	ndef = table.copy(minetest.registered_nodes[nodename])
-	ndef.sunlight_propagates = true
-	ndef.place_param2 = nil
-	stairsplus:register_all("quartz", "chiseled", nodename, ndef)
+	stairsplus:register_all("quartz", "chiseled", "quartz:chiseled", {
+		description = "Chiseled Quartz",
+		tiles  = {"quartz_chiseled.png"},
+		groups = {cracky=3, oddly_breakable_by_hand=1},
+		sounds = default.node_sound_glass_defaults()
+	})
 
-	nodename = "quartz:pillar"
-	ndef = table.copy(minetest.registered_nodes[nodename])
-	ndef.sunlight_propagates = true
-	ndef.place_param2 = nil
-	stairsplus:register_all("quartz", "pillar", nodename, ndef)
+	stairsplus:register_all("quartz", "pillar", "quartz:pillar", {
+		description = "Quartz Pillar",
+		tiles  = {"quartz_pillar_top.png", "quartz_pillar_top.png",
+			"quartz_pillar_side.png"},
+		groups = {cracky=3, oddly_breakable_by_hand=1},
+		sounds = default.node_sound_glass_defaults()
+	})
 
-	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"},
-		S("Quartz Pillar stair"),
-		S("Quartz Pillar slab"),
-		default.node_sound_glass_defaults())
 end
 
+-- NALC aliases
+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")
+
 --
 -- Deprecated
 --
@@ -190,11 +188,14 @@ if settings:get_bool("ENABLE_HORIZONTAL_PILLAR") then
 	-- Quartz Pillar (horizontal)
 	minetest.register_node("quartz:pillar_horizontal", {
 			description = "Quartz Pillar Horizontal",
-			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png", "quartz_pillar_side.png^[transformR90",
-			"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png", "quartz_pillar_top.png"},
+			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png",
+				"quartz_pillar_side.png^[transformR90",
+				"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png",
+				"quartz_pillar_top.png"},
 			paramtype2 = "facedir",
 			drop = 'quartz:pillar',
-			groups = {cracky=3, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+			groups = {cracky=3, oddly_breakable_by_hand=1,
+				not_in_creative_inventory=1},
 			sounds = default.node_sound_glass_defaults(),
 	})
 end

mod.conf

@@ -1 +1,4 @@
 name             = quartz
+description      = Adds quartz ore and some decorative quartz blocks.
+depends          = default,stairs
+optional_depends = intllib,moreblocks,stairsplus

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)