Merge remote-tracking branch 'upstream/master'

Change case of Stairs/Slab first character to be consistent with the `stairs` mod.

README.txt

@@ -12,9 +12,9 @@ License: MIT (see LICENSE.txt)
 Dependencies:
 default (found in minetest_game)
 stairs (found in minetest_game)
-moreblocks (optional, for stairsplus support)
+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 +80,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 +0,0 @@
-default
-stairs
-moreblocks?
-intllib?

description.txt

@@ -1 +0,0 @@
-Adds quartz ore and some decorative quartz blocks

init.lua

@@ -1,8 +1,6 @@
 local settings = Settings(minetest.get_modpath("quartz").."/settings.txt")
 
--- internationalization boilerplate
+local S = minetest.get_translator("quartz")
-local MP = minetest.get_modpath(minetest.get_current_modname())
-local S, NS = dofile(MP.."/intllib.lua")
 
 --
 --  Item Registration
@@ -62,12 +60,37 @@ 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(),
+		nil,
+		S("Inner Quartz Stair"),
+		S("Outer Quartz Stair")
+	)
+
+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(),
+		nil,
+		S("Inner Quartz Pillar Stair"),
+		S("Outer Quartz Pillar Stair")
+	)
+
 --
 -- Crafting
 --
@@ -92,21 +115,11 @@ minetest.register_craft({
 
 -- Chiseled Quartz
 minetest.register_craft({
-	output = 'quartz:chiseled 2',
+	output = 'quartz:chiseled 4',
 	recipe = {
-		{'stairs:slab_quartzblock', '', ''},
+		{'quartz:block', 'quartz:block', ''},
-		{'stairs:slab_quartzblock', '', ''},
+		{'quartz:block', 'quartz:block', ''},
-		{'', '', ''},
+		{'',             '',             ''},
-	}
-})
-
--- Chiseled Quartz (for stairsplus)
-minetest.register_craft({
-	output = 'quartz:chiseled 2',
-	recipe = {
-		{'quartz:slab_block', '', ''},
-		{'quartz:slab_block', '', ''},
-		{'', '', ''},
 	}
 })
 
@@ -142,46 +155,37 @@ minetest.register_abm({
 -- Compatibility with stairsplus
 --
 
-if minetest.get_modpath("moreblocks") then
+if minetest.global_exists("stairsplus") then
-	local nodename = "quartz:block"
+	stairsplus:register_all("quartz", "block", "quartz:block", {
-	local ndef = table.copy(minetest.registered_nodes[nodename])
+		description = "Quartz Block",
-	ndef.sunlight_propagates = true
+		tiles  = {"quartz_block.png"},
-	ndef.place_param2 = nil
+		groups = {cracky=3, oddly_breakable_by_hand=1},
-	stairsplus:register_all("quartz", "block", nodename, ndef)
+		sounds = default.node_sound_glass_defaults()
+	})
 
-	nodename = "quartz:chiseled"
+	stairsplus:register_all("quartz", "chiseled", "quartz:chiseled", {
-	ndef = table.copy(minetest.registered_nodes[nodename])
+		description = "Chiseled Quartz",
-	ndef.sunlight_propagates = true
+		tiles  = {"quartz_chiseled.png"},
-	ndef.place_param2 = nil
+		groups = {cracky=3, oddly_breakable_by_hand=1},
-	stairsplus:register_all("quartz", "chiseled", nodename, ndef)
+		sounds = default.node_sound_glass_defaults()
+	})
 
-	nodename = "quartz:pillar"
+	stairsplus:register_all("quartz", "pillar", "quartz:pillar", {
-	ndef = table.copy(minetest.registered_nodes[nodename])
+		description = "Quartz Pillar",
-	ndef.sunlight_propagates = true
+		tiles  = {"quartz_pillar_top.png", "quartz_pillar_top.png",
-	ndef.place_param2 = nil
+			"quartz_pillar_side.png"},
-	stairsplus:register_all("quartz", "pillar", nodename, ndef)
+		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 +194,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",
+			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png",
-			"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png", "quartz_pillar_top.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

intllib.lua

@@ -1,45 +0,0 @@
-
--- Fallback functions for when `intllib` is not installed.
--- Code released under Unlicense <http://unlicense.org>.
-
--- Get the latest version of this file at:
---   https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
-
-local function format(str, ...)
-	local args = { ... }
-	local function repl(escape, open, num, close)
-		if escape == "" then
-			local replacement = tostring(args[tonumber(num)])
-			if open == "" then
-				replacement = replacement..close
-			end
-			return replacement
-		else
-			return "@"..open..num..close
-		end
-	end
-	return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
-end
-
-local gettext, ngettext
-if minetest.get_modpath("intllib") then
-	if intllib.make_gettext_pair then
-		-- New method using gettext.
-		gettext, ngettext = intllib.make_gettext_pair()
-	else
-		-- Old method using text files.
-		gettext = intllib.Getter()
-	end
-end
-
--- Fill in missing functions.
-
-gettext = gettext or function(msgid, ...)
-	return format(msgid, ...)
-end
-
-ngettext = ngettext or function(msgid, msgid_plural, n, ...)
-	return format(n==1 and msgid or msgid_plural, ...)
-end
-
-return gettext, ngettext

locale/es.po

@@ -1,59 +0,0 @@
-# Spanish translations for PACKAGE package
-# Traducciones al español para el paquete PACKAGE.
-# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Diego Martínez <kaeza@users.noreply.github.com>, 2017.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-19 21:50-0700\n"
-"PO-Revision-Date: 2017-02-20 15:03-0300\n"
-"Last-Translator: Diego Martínez <kaeza@users.noreply.github.com>\n"
-"Language-Team: Spanish\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: init.lua:13
-msgid "Quartz Crystal"
-msgstr "Cristal de cuarzo"
-
-#: init.lua:17
-msgid "Quartz Crystal Piece"
-msgstr "Trozo de cristal de cuarzo"
-
-#: init.lua:27
-msgid "Quartz Ore"
-msgstr "Mineral de cuarzo"
-
-#: init.lua:47
-msgid "Quartz Block"
-msgstr "Bloque de cuarzo"
-
-#: init.lua:55
-msgid "Chiseled Quartz"
-msgstr "Cuarzo cincelado"
-
-#: init.lua:63
-msgid "Quartz Pillar"
-msgstr "Pilar de cuarzo"
-
-#: init.lua:75
-msgid "Quartz stair"
-msgstr "Escaleras de cuarzo"
-
-#: init.lua:76
-msgid "Quartz slab"
-msgstr "Losa de cuarzo"
-
-#: init.lua:82
-msgid "Quartz Pillar stair"
-msgstr "Escaleras de pilar de cuarzo"
-
-#: init.lua:83
-msgid "Quartz Pillar slab"
-msgstr "Losa de pilar de cuarzo"

locale/fr.po

@@ -1,54 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-04 07:46+0100\n"
-"PO-Revision-Date: 2017-03-04 07:48+0100\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
-"Last-Translator: Peppy <peppy@twang-factory.com>\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Language: fr\n"
-
-#: init.lua:13
-msgid "Quartz Crystal"
-msgstr "Cristal de quartz"
-
-#: init.lua:17
-msgid "Quartz Crystal Piece"
-msgstr "Morceau de cristal de quartz"
-
-#: init.lua:27
-msgid "Quartz Ore"
-msgstr "Minerai de quartz"
-
-#: init.lua:47
-msgid "Quartz Block"
-msgstr "Bloc de quartz"
-
-#: init.lua:55
-msgid "Chiseled Quartz"
-msgstr "Quartz ciselé"
-
-#: init.lua:63
-msgid "Quartz Pillar"
-msgstr "Pilier en quartz"
-
-#: init.lua:75
-msgid "Quartz stair"
-msgstr "Escalier en quartz"
-
-#: init.lua:76
-msgid "Quartz slab"
-msgstr "Dalle en quartz"
-
-#: init.lua:82
-msgid "Quartz Pillar stair"
-msgstr "Escalier en pilier en quartz"
-
-#: init.lua:83
-msgid "Quartz Pillar slab"
-msgstr "Dalle en pilier en quartz"

locale/pt_br.po

@@ -1,57 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-19 21:50-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: init.lua:13
-msgid "Quartz Crystal"
-msgstr "Cristal de Quartzo"
-
-#: init.lua:17
-msgid "Quartz Crystal Piece"
-msgstr "Pedaço de Cristal de Quartzo"
-
-#: init.lua:27
-msgid "Quartz Ore"
-msgstr "Minério de Quartzo"
-
-#: init.lua:47
-msgid "Quartz Block"
-msgstr "Bloco de Quartzo"
-
-#: init.lua:55
-msgid "Chiseled Quartz"
-msgstr "Quartzo Cinzelado"
-
-#: init.lua:63
-msgid "Quartz Pillar"
-msgstr "Pilar de Quartzo"
-
-#: init.lua:75
-msgid "Quartz stair"
-msgstr "Escada de quartzo"
-
-#: init.lua:76
-msgid "Quartz slab"
-msgstr "Laje de quartzo"
-
-#: init.lua:82
-msgid "Quartz Pillar stair"
-msgstr "Escada de Pilar de Quartzo"
-
-#: init.lua:83
-msgid "Quartz Pillar slab"
-msgstr "Laje de Pilar de Quartzo"

locale/quartz.es.tr

@@ -0,0 +1,19 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Cuarzo cincelado
+Inner Quartz Pillar Stair=
+Inner Quartz Stair=
+Outer Quartz Pillar Stair=
+Outer Quartz Stair=
+Quartz Block=Bloque de cuarzo
+Quartz Crystal=Cristal de cuarzo
+Quartz Crystal Piece=Trozo de cristal de cuarzo
+Quartz Ore=Mineral de cuarzo
+Quartz Pillar=Pilar de cuarzo
+Quartz Pillar Slab=Losa de pilar de cuarzo
+Quartz Pillar Stair=Escaleras de pilar de cuarzo
+Quartz Slab=Losa de cuarzo
+Quartz Stair=Escaleras de cuarzo

locale/quartz.fr.tr

@@ -0,0 +1,19 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Quartz ciselé
+Inner Quartz Pillar Stair=Escalier intérieur en pilier en quartz
+Inner Quartz Stair=Escalier intérieur en quartz
+Outer Quartz Pillar Stair=Escalier extérieur en pilier de quartz
+Outer Quartz Stair=Escalier extérieur en quartz
+Quartz Block=Bloc de quartz
+Quartz Crystal=Cristal de quartz
+Quartz Crystal Piece=Morceau de cristal de quartz
+Quartz Ore=Minerai de quartz
+Quartz Pillar=Pilier en quartz
+Quartz Pillar Slab=Dalle en pilier en quartz
+Quartz Pillar Stair=Escalier en pilier en quartz
+Quartz Slab=Dalle en quartz
+Quartz Stair=Escalier en quartz

locale/quartz.pt_BR.tr

@@ -0,0 +1,19 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Quartzo Cinzelado
+Inner Quartz Pillar Stair=
+Inner Quartz Stair=
+Outer Quartz Pillar Stair=
+Outer Quartz Stair=
+Quartz Block=Bloco de Quartzo
+Quartz Crystal=Cristal de Quartzo
+Quartz Crystal Piece=Pedaço de Cristal de Quartzo
+Quartz Ore=Minério de Quartzo
+Quartz Pillar=Pilar de Quartzo
+Quartz Pillar Slab=Laje de Pilar de Quartzo
+Quartz Pillar Stair=Escada de Pilar de Quartzo
+Quartz Slab=Laje de quartzo
+Quartz Stair=Escada de quartzo

locale/template.pot

@@ -1,57 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-19 21:50-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: init.lua:13
-msgid "Quartz Crystal"
-msgstr ""
-
-#: init.lua:17
-msgid "Quartz Crystal Piece"
-msgstr ""
-
-#: init.lua:27
-msgid "Quartz Ore"
-msgstr ""
-
-#: init.lua:47
-msgid "Quartz Block"
-msgstr ""
-
-#: init.lua:55
-msgid "Chiseled Quartz"
-msgstr ""
-
-#: init.lua:63
-msgid "Quartz Pillar"
-msgstr ""
-
-#: init.lua:75
-msgid "Quartz stair"
-msgstr ""
-
-#: init.lua:76
-msgid "Quartz slab"
-msgstr ""
-
-#: init.lua:82
-msgid "Quartz Pillar stair"
-msgstr ""
-
-#: init.lua:83
-msgid "Quartz Pillar slab"
-msgstr ""

locale/template.txt

@@ -0,0 +1,19 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=
+Inner Quartz Pillar Stair=
+Inner Quartz Stair=
+Outer Quartz Pillar Stair=
+Outer Quartz Stair=
+Quartz Block=
+Quartz Crystal=
+Quartz Crystal Piece=
+Quartz Ore=
+Quartz Pillar=
+Quartz Pillar Slab=
+Quartz Pillar Stair=
+Quartz Slab=
+Quartz Stair=

mod.conf

@@ -1 +1,4 @@
-name = quartz
+name             = quartz
+description      = Adds quartz ore and some decorative quartz blocks.
+depends          = default,stairs
+optional_depends = 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)