Update quartz mod to Git commit 72ec06f...

https://github.com/minetest-mods/quartz/tree/72ec06f
2021-04-18 20:45:05 -07:00 · 2021-04-18 20:45:05 -07:00 · defcd66a06
parent 190491ce87
commit defcd66a06
6 changed files with 50 additions and 53 deletions
--- a/README.md
+++ b/README.md
@ -66,7 +66,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 	* [gems_encrustable][] ([WTFPL][lic.wtfpl]) -- version: [81d513d Git][ver.gems_encrustable] *2012-07-31* ([patched][patch.gems_encrustable])
 	* [gems_tools][] ([GPL][lic.gpl3.0]) -- version: [b375432 Git][ver.gems_tools] *2016-09-03* ([patched][patch.gems_tools])
 	* [moreores][] ([zlib][lic.moreores] / [CC BY-SA][lic.ccbysa3.0]) -- version: [3fe0ba8 Git][ver.moreores] *2020-10-28* ([patched][patch.moreores])
-	* [quartz][] ([MIT][lic.quartz]) -- version: [1c5dca2 Git][ver.quartz] *2017-10-03* ([patched][patch.quartz]) ***UPDATES***
+	* [quartz][] ([MIT][lic.quartz]) -- version: [72ec06f Git][ver.quartz] *2021-01-04* ([patched][patch.quartz])
 	* [rainbow_ore][] ([LGPL][lic.rainbow_ore]) -- version: [6e77693 Git][ver.rainbow_ore] *2015-11-02* ([patched][patch.rainbow_ore])
 	* [unifieddyes][] ([GPL][lic.gpl2.0]) -- version: [2021-03-26-1][ver.unifieddyes] ([patched][patch.unifieddyes])
 * mobiles/
@ -497,7 +497,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.pipeworks]: https://gitlab.com/VanessaE/pipeworks/-/tags/2021-02-19
 [ver.privilegeareas]: https://github.com/minetest-mods/privilegeareas/tree/15eae20
 [ver.pvp_areas]: https://github.com/everamzah/pvp_areas/tree/0188945
-[ver.quartz]: https://github.com/minetest-mods/quartz/tree/1c5dca2
+[ver.quartz]: https://github.com/minetest-mods/quartz/tree/72ec06f
 [ver.rainbow_ore]: https://github.com/FsxShader2012/rainbow_ore/tree/6e77693
 [ver.sfinv_buttons]: http://repo.or.cz/minetest_sfinv_buttons.git/tree/ebb1f7c
 [ver.signs_lib]: https://gitlab.com/VanessaE/signs_lib/tree/a2f7f62
@ -559,7 +559,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [patch.mysheetmetal]: https://github.com/AntumMT/mod-mysheetmetal/tree/b7d644b
 [patch.nether]: https://github.com/AntumMT/mod-nether/tree/7a84ddd
 [patch.pvp_areas]: https://github.com/AntumMT/mod-pvp_areas/tree/7f2f5b2
-[patch.quartz]: https://github.com/AntumMT/mod-quartz/tree/c6813dc
+[patch.quartz]: https://github.com/AntumMT/mod-quartz/tree/adc759e
 [patch.rainbow_ore]: https://github.com/AntumMT/mod-rainbow_ore/tree/0227a86
 [patch.simple_protection]: https://github.com/AntumMT/mod-simple_protection/tree/95e6e59
 [patch.spawneggs]: https://github.com/AntumMT/mod-spawneggs/tree/f2cc4cc
--- a/mods/materials/quartz/README.txt
+++ b/mods/materials/quartz/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.
--- a/mods/materials/quartz/depends.txt
+++ b/mods/materials/quartz/depends.txt
@ -1,4 +1,5 @@
 default
 stairs
+intllib?
 moreblocks?
-intllib?
+stairsplus?
--- a/mods/materials/quartz/description.txt
+++ b/mods/materials/quartz/description.txt
@ -1 +1 @@
-Adds quartz ore and some decorative quartz blocks
+Adds quartz ore and some decorative quartz blocks.
--- a/mods/materials/quartz/init.lua
+++ b/mods/materials/quartz/init.lua
@ -62,7 +62,8 @@ 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
@ -78,7 +79,8 @@ stairs.register_stair_and_slab("quartzblock", "quartz:block",

 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_top.png", "quartz_pillar_top.png",
+			"quartz_pillar_side.png"},
 		S("Quartz Pillar stair"),
 		S("Quartz Pillar slab"),
 		default.node_sound_glass_defaults())
@ -107,21 +109,11 @@ 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', ''},
+		{'',             '',             ''},
 	}
 })

@ -157,34 +149,28 @@ minetest.register_abm({
 -- Compatibility with stairsplus
 --

-if minetest.get_modpath("moreblocks") and settings:get_bool("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
-	)
-
-	table.insert(circular_saw.known_stairs, "quartz:block")
-	table.insert(circular_saw.known_stairs, "quartz:chiseled")
-	table.insert(circular_saw.known_stairs, "quartz:pillar")
+	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()
+	})
 end

 --
@ -195,11 +181,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
--- a/mods/materials/quartz/mod.conf
+++ b/mods/materials/quartz/mod.conf
@ -1 +1,4 @@
-name = quartz
+name             = quartz
+description      = Adds quartz ore and some decorative quartz blocks.
+depends          = default,stairs
+optional_depends = intllib,moreblocks,stairsplus