Merge remote-tracking branch 'upstream/master'

init.lua

@@ -71,25 +71,17 @@ minetest.register_node("quartz:pillar", {
 stairs.register_stair_and_slab("quartzblock", "quartz:block",
 		{cracky=3, oddly_breakable_by_hand=1},
 		{"quartz_block.png"},
-		S("Quartz Stair"),
+		S("Quartz stair"),
-		S("Quartz Slab"),
+		S("Quartz slab"),
-		default.node_sound_glass_defaults(),
+		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 stair"),
-		S("Quartz Pillar Slab"),
+		S("Quartz Pillar slab"),
-		default.node_sound_glass_defaults(),
+		default.node_sound_glass_defaults())
-		nil,
-		S("Inner Quartz Pillar Stair"),
-		S("Outer Quartz Pillar Stair")
-	)
 
 --
 -- Crafting
@@ -177,8 +169,15 @@ if minetest.global_exists("stairsplus") then
 		groups = {cracky=3, oddly_breakable_by_hand=1},
 		sounds = 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
 --
@@ -198,3 +197,5 @@ if settings:get_bool("ENABLE_HORIZONTAL_PILLAR") then
 			sounds = default.node_sound_glass_defaults(),
 	})
 end
+
+minetest.log("action", "[quartz] loaded.")

locale/quartz.es.tr

@@ -4,16 +4,12 @@
 ### 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 slab=Losa de pilar de cuarzo
-Quartz Pillar Stair=Escaleras de pilar de cuarzo
+Quartz Pillar stair=Escaleras de pilar de cuarzo
-Quartz Slab=Losa de cuarzo
+Quartz slab=Losa de cuarzo
-Quartz Stair=Escaleras de cuarzo
+Quartz stair=Escaleras de cuarzo

locale/quartz.fr.tr

@@ -4,16 +4,12 @@
 ### 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 slab=Dalle en pilier en quartz
-Quartz Pillar Stair=Escalier en pilier en quartz
+Quartz Pillar stair=Escalier en pilier en quartz
-Quartz Slab=Dalle en quartz
+Quartz slab=Dalle en quartz
-Quartz Stair=Escalier en quartz
+Quartz stair=Escalier en quartz

locale/quartz.pt_BR.tr

@@ -4,16 +4,12 @@
 ### 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 slab=Laje de Pilar de Quartzo
-Quartz Pillar Stair=Escada de Pilar de Quartzo
+Quartz Pillar stair=Escada de Pilar de Quartzo
-Quartz Slab=Laje de quartzo
+Quartz slab=Laje de quartzo
-Quartz Stair=Escada de quartzo
+Quartz stair=Escada de quartzo

locale/template.txt

@@ -4,16 +4,12 @@
 ### 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 slab=
-Quartz Pillar Stair=
+Quartz Pillar stair=
-Quartz Slab=
+Quartz slab=
-Quartz Stair=
+Quartz stair=

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)