Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sys Quatre 2021-01-05 22:08:27 +01:00
commit 3b520ff47a
1 changed files with 41 additions and 35 deletions

View File

@ -69,6 +69,22 @@ minetest.register_node("quartz:pillar", {
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())
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())
--
-- Crafting
--
@ -134,46 +150,36 @@ minetest.register_abm({
--
if minetest.global_exists("stairsplus") then
local nodename = "quartz:block"
local ndef = table.copy(minetest.registered_nodes[nodename])
ndef.sunlight_propagates = true
ndef.place_param2 = nil
stairsplus:register_all("quartz", "block", nodename, ndef)
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()
})
nodename = "quartz:chiseled"
ndef = table.copy(minetest.registered_nodes[nodename])
ndef.sunlight_propagates = true
ndef.place_param2 = nil
stairsplus:register_all("quartz", "chiseled", nodename, ndef)
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()
})
nodename = "quartz:pillar"
ndef = table.copy(minetest.registered_nodes[nodename])
ndef.sunlight_propagates = true
ndef.place_param2 = nil
stairsplus:register_all("quartz", "pillar", nodename, ndef)
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",
stairsplus:register_all("quartz", "pillar", "quartz:pillar", {
description = "Quartz Pillar",
tiles = {"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())
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
--