Merge remote-tracking branch 'upstream/master'

Merge branch 'master' of yunohost.local:minetest-mods/quartz into nalc-1.2-dev
Merge branch 'master' into nalc-1.2
2025-09-09 17:55:24 +02:00 · 2021-01-05 22:08:27 +01:00 · 2019-12-22 14:54:47 +01:00 · 2019-05-10 01:40:08 +02:00 · 2019-02-03 16:13:03 +01:00 · 2019-01-05 23:03:05 +01:00
2 changed files with 10 additions and 1 deletions
--- a/init.lua
+++ b/init.lua
@@ -171,8 +171,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
 --
@@ -192,3 +199,5 @@ if settings:get_bool("ENABLE_HORIZONTAL_PILLAR") then
 			sounds = default.node_sound_glass_defaults(),
 	})
 end
+
+minetest.log("action", "[quartz] loaded.")
--- a/settings.txt
+++ b/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)
Author	SHA1	Message	Date
sys4	3b520ff47a	Merge remote-tracking branch 'upstream/master'	2021-01-05 22:08:27 +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
sys4	ee4467b5cb	Merge branch 'master' into nalc-1.2	2019-05-10 01:40:08 +02: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