Merge remote-tracking branch 'upstream/master'

Update to mt5 translation system (#12 )
2025-07-17 15:50:39 +02:00 · 2023-06-07 22:24:51 +02:00 · 2022-10-29 21:41:24 +02:00 · 2021-01-05 22:08:27 +01:00 · 2021-01-04 19:08:21 +01:00 · 2019-12-22 14:54:47 +01:00
10 changed files with 131 additions and 69 deletions
--- a/README.txt
+++ b/README.txt
@ -12,10 +12,10 @@ 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:
-https://github.com/4Evergreen4/quartz/issues/
+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.
--- a/depends.txt
+++ b/depends.txt
@ -1,3 +0,0 @@
-default
-stairs
-moreblocks?
--- a/description.txt
+++ b/description.txt
@ -1 +0,0 @@
-Adds quartz ore and some decorative quartz blocks
--- a/init.lua
+++ b/init.lua
@ -1,4 +1,6 @@
-dofile(minetest.get_modpath("quartz").."/settings.txt")
+local settings = Settings(minetest.get_modpath("quartz").."/settings.txt")
+
+local S = minetest.get_translator("quartz")

 --
 --  Item Registration
@ -6,11 +8,11 @@ dofile(minetest.get_modpath("quartz").."/settings.txt")

 --  Quartz Crystal
 minetest.register_craftitem("quartz:quartz_crystal", {
-	description = "Quartz Crystal",
+	description = S("Quartz Crystal"),
 	inventory_image = "quartz_crystal_full.png",
 })
 minetest.register_craftitem("quartz:quartz_crystal_piece", {
-	description = "Quartz Crystal Piece",
+	description = S("Quartz Crystal Piece"),
 	inventory_image = "quartz_crystal_piece.png",
 })

@ -20,7 +22,7 @@ minetest.register_craftitem("quartz:quartz_crystal_piece", {

 --  Ore
 minetest.register_node("quartz:quartz_ore", {
-	description = "Quartz Ore",
+	description = S("Quartz Ore"),
 	tiles = {"default_stone.png^quartz_ore.png"},
 	groups = {cracky=3, stone=1},
 	drop = 'quartz:quartz_crystal',
@ -40,7 +42,7 @@ minetest.register_ore({

 -- Quartz Block
 minetest.register_node("quartz:block", {
-	description = "Quartz Block",
+	description = S("Quartz Block"),
 	tiles = {"quartz_block.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
@ -48,7 +50,7 @@ minetest.register_node("quartz:block", {

 -- Chiseled Quartz
 minetest.register_node("quartz:chiseled", {
-	description = "Chiseled Quartz",
+	description = S("Chiseled Quartz"),
 	tiles = {"quartz_chiseled.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
@ -56,9 +58,10 @@ minetest.register_node("quartz:chiseled", {

 -- Quartz Pillar
 minetest.register_node("quartz:pillar", {
-	description = "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
@ -68,15 +71,16 @@ minetest.register_node("quartz:pillar", {
 stairs.register_stair_and_slab("quartzblock", "quartz:block",
 		{cracky=3, oddly_breakable_by_hand=1},
 		{"quartz_block.png"},
-		"Quartz stair",
-		"Quartz slab",
+		S("Quartz stair"),
+		S("Quartz slab"),
 		default.node_sound_glass_defaults())

-stairs.register_slab("quartzstair", "quartz:pillar",
+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"},
-		"Quartz Pillar stair",
-		"Quartz Pillar slab",
+		{"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())

 --
@ -103,20 +107,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', ''},
 		{'',             '',             ''},
 	}
 })
@ -153,49 +147,55 @@ minetest.register_abm({
 -- Compatibility with stairsplus
 --

-if minetest.get_modpath("moreblocks") and enable_stairsplus then
-	register_stair_slab_panel_micro("quartz", "block", "quartz:block",
-		{cracky=3},
-		{"quartz_block.png"},
-		"Quartz Block",
-		"block",
-		0
-	)
+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()
+	})

-	register_stair_slab_panel_micro("quartz", "chiseled", "quartz:chiseled",
-		{cracky=3},
-		{"quartz_chiseled.png"},
-		"Chiseled Quartz",
-		"chiseled",
-		0
-	)
+	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()
+	})

-	register_stair_slab_panel_micro("quartz", "pillar", "quartz:pillar",
-		{cracky=3},
-		{"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
-		"Quartz Pillar",
-		"pillar",
-		0
-	)
+	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()
+	})

-	table.insert(circular_saw.known_stairs, "quartz:block")
-	table.insert(circular_saw.known_stairs, "quartz:chiseled")
-	table.insert(circular_saw.known_stairs, "quartz:pillar")
 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
 --

-if enable_horizontal_pillar then
+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
+
+minetest.log("action", "[quartz] loaded.")
--- a/locale/quartz.es.tr
+++ b/locale/quartz.es.tr
@ -0,0 +1,15 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Cuarzo cincelado
+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
--- a/locale/quartz.fr.tr
+++ b/locale/quartz.fr.tr
@ -0,0 +1,15 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Quartz ciselé
+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
--- a/locale/quartz.pt_BR.tr
+++ b/locale/quartz.pt_BR.tr
@ -0,0 +1,15 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Quartzo Cinzelado
+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
--- a/locale/template.txt
+++ b/locale/template.txt
@ -0,0 +1,15 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=
+Quartz Block=
+Quartz Crystal=
+Quartz Crystal Piece=
+Quartz Ore=
+Quartz Pillar=
+Quartz Pillar slab=
+Quartz Pillar stair=
+Quartz slab=
+Quartz stair=
--- a/mod.conf
+++ b/mod.conf
@ -1 +1,4 @@
 name             = quartz
+description      = Adds quartz ore and some decorative quartz blocks.
+depends          = default,stairs
+optional_depends = moreblocks,stairsplus
--- a/settings.txt
+++ b/settings.txt
@ -1,7 +1,7 @@
-- Set this to true to allow usage of the stairsplus mod in moreblocks
+# 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)
+# This enables the old horizontal pillar block(deprecated, be sure to convert them back to normal pillars)

-enable_horizontal_pillar = true
+ENABLE_HORIZONTAL_PILLAR = true
Author	SHA1	Message	Date
sys4	0693b2b079	Merge remote-tracking branch 'upstream/master'	2023-06-07 22:24:51 +02:00
Louis Royer	b61d3a9398	Update to mt5 translation system (#12 )	2022-10-29 21:41:24 +02:00
sys4	3b520ff47a	Merge remote-tracking branch 'upstream/master'	2021-01-05 22:08:27 +01:00
Andrey Kozlovskiy	72ec06fff6	Allow to break `stairsplus` blocks by hand (#14 ) Add `stairsplus` blocks in `oddly_breakable_by_hand=1` group to make them consistent with the original blocks.	2021-01-04 19:08:21 +01:00
sys4	f7a7a9988c	Merge branch 'master' of yunohost.local:minetest-mods/quartz into nalc-1.2-dev	2019-12-22 14:54:47 +01:00
obl3pplifp	7b5d74cfdf	Change recipe for chiseled quartz (#11 ) The existing recipe(s) never seem to work. I can craft multiple kinds of quartz slabs using the crafting UI, a circular saw, or an xdecor Work Bench, but none of fit back together to form chiselled quartz.	2019-06-09 20:49:39 +02:00
sys4	ee4467b5cb	Merge branch 'master' into nalc-1.2	2019-05-10 01:40:08 +02:00
luk3yx	cdda5c8a03	Add stairsplus note into README.txt.	2019-03-01 13:05:50 -08:00
luk3yx	0fc7dd0d0d	Add "stairsplus" as an optional dependency. • Add "stairsplus" as an optional dependency. • Sort the optional dependencies in alphabetical order.	2019-03-01 13:05:50 -08:00
luk3yx	fcb319631f	Add description and depends to mod.conf.	2019-03-01 13:05:50 -08:00
luk3yx	8b83145c6c	Fix whitespace	2019-03-01 13:05:50 -08:00
luk3yx	8c60a1f77d	Allow quartz to be used in circular saws	2019-03-01 13:05:50 -08:00
sys4-fr	812730e229	Correction d'alias	2019-02-03 16:13:03 +01:00
sys4-fr	97e6203d61	Ajoute message de chargement du mod dans le journal "action"	2019-01-05 23:03:05 +01:00
sys4-fr	7da66f5222	Fix support for stairsplus.	2018-10-02 21:34:37 +02:00
Free Educational Software for Mobile Devices - Translations to Brazilian Portuguese	1c5dca224d	Translation to Brazilian Portuguese (#9 ) * Translation to Brazilian Portuguese Translation to Brazilian Portuguese * Rename pt.po to pt_br.po	2017-10-03 09:10:21 -07:00
fat115	5fb0e07fb0	added french translation (#8 )	2017-10-03 09:09:55 -07:00
Diego Martínez	00ca4eb7fe	Add spanish locale. (#5 )	2017-02-28 22:00:47 -08:00
FaceDeer	6d5be4c515	add intllib support. Also fix bug with quartz pillar stair/slab registration (#4 ) * add intllib support. Also fix bug with quartz pillar stair/slab registration * add intllib to depends	2017-02-28 18:05:46 -08:00
EvergreenTree	ef865187a9	Merge pull request #3 from Rui914/patch-2 Use `Settings` to read the config file	2016-07-27 11:21:40 -04:00
Rui	71cf351384	Change "--" in the config file to "#"	2016-07-27 23:47:00 +09:00
Rui	5e9e219911	Use `Settings` to read the config file	2016-07-24 20:18:42 +09:00
4Evergreen4	4dc529e7c9	Change issue tracker link in README	2016-01-14 18:29:41 -05:00
4Evergreen4	193b5dcd5b	Use all caps in option names	2016-01-14 17:24:37 -05:00
EvergreenTree	198d6e53c3	Merge pull request #1 from minetest-mods/sofar-patch-1 Add mod.conf	2016-01-09 17:16:52 -05:00
				`@ -1 +0,0 @@`
				`Adds quartz ore and some decorative quartz blocks`