From e2435845437296ff766e91c80c7982fdb9249b82 Mon Sep 17 00:00:00 2001 From: Jat15 Date: Wed, 23 Aug 2017 16:34:30 +0200 Subject: [PATCH 01/11] Add compatibility with Stairs, Moreblocks Update sound. --- depends.txt | 2 ++ init.lua | 20 +++++++++++++++++++- locale/de.txt | 2 ++ locale/es.txt | 2 ++ locale/fr.txt | 2 ++ locale/it.txt | 2 ++ locale/pt_br.txt | 2 ++ locale/tr.txt | 2 ++ 8 files changed, 33 insertions(+), 1 deletion(-) diff --git a/depends.txt b/depends.txt index 0219052..cd75305 100644 --- a/depends.txt +++ b/depends.txt @@ -1,2 +1,4 @@ default mg? +moreblocks? +stairs? \ No newline at end of file diff --git a/init.lua b/init.lua index 0a85392..0353dff 100644 --- a/init.lua +++ b/init.lua @@ -118,8 +118,26 @@ local function add_ore(modname, description, mineral_name, oredef) description = S("%s Block"):format(S(description)), tiles = { img_base .. "_block.png" }, groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, - sounds = default_metal_sounds, + sounds = default.node_sound_metal_defaults(), }) + if minetest.get_modpath("moreblocks") then + stairsplus:register_all("moreores", mineral_name.."_block", block_item, { + description = S("%s Block"):format(S(description)), + tiles = { img_base .. "_block.png" }, + groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, + sounds = default.node_sound_metal_defaults() + }) + elseif minetest.get_modpath("stairs") then + stairs.register_stair_and_slab( + mineral_name.."_block", + block_item, + {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, + { img_base .. "_block.png"}, + S("%s Block Stair"):format(S(description)), + S("%s Block Slab"):format(S(description)), + default.node_sound_metal_defaults() + ) + end minetest.register_alias(mineral_name.."_block", block_item) if oredef.makes.ingot then minetest.register_craft( { diff --git a/locale/de.txt b/locale/de.txt index 2eb6075..0fcb8af 100644 --- a/locale/de.txt +++ b/locale/de.txt @@ -6,6 +6,8 @@ %s Lump = %sklumpen %s Ingot = %sbarren %s Block = %sblock +%s Block Slab = +%s Block Stair = %s Pickaxe = %sspitzhacke %s Shovel = %sschaufel %s Axe = %saxt diff --git a/locale/es.txt b/locale/es.txt index 1344a5a..1c8b430 100644 --- a/locale/es.txt +++ b/locale/es.txt @@ -6,6 +6,8 @@ %s Lump = Pepita de %s %s Ingot = Lingote de %s %s Block = Bloque de %s +%s Block Slab = +%s Block Stair = %s Pickaxe = Pico de %s %s Shovel = Pala de %s %s Axe = Hacha de %s diff --git a/locale/fr.txt b/locale/fr.txt index 65687fa..7c41c7c 100644 --- a/locale/fr.txt +++ b/locale/fr.txt @@ -6,6 +6,8 @@ %s Lump = Roche en %s %s Ingot = Lingot en %s %s Block = Bloc en %s +%s Block Slab = Demi-dalle en %s +%s Block Stair = Escaliers en %s %s Pickaxe = Pioche en %s %s Shovel = Pelle en %s %s Axe = Hache en %s diff --git a/locale/it.txt b/locale/it.txt index dcd8c52..bb5f4b6 100644 --- a/locale/it.txt +++ b/locale/it.txt @@ -6,6 +6,8 @@ %s Lump = %s grezzo %s Ingot = Lingotto di %s %s Block = Blocco di %s +%s Block Slab = +%s Block Stair = %s Pickaxe = Piccone di %s %s Shovel = Badile di %s %s Axe = Ascia di %s diff --git a/locale/pt_br.txt b/locale/pt_br.txt index ab84eeb..700805a 100644 --- a/locale/pt_br.txt +++ b/locale/pt_br.txt @@ -6,6 +6,8 @@ %s Lump = Pepita de %s %s Ingot = Lingote de %s %s Block = Bloco de %s +%s Block Slab = +%s Block Stair = %s Pickaxe = Picareta de %s %s Shovel = Pá de %s %s Axe = Machado de %s diff --git a/locale/tr.txt b/locale/tr.txt index 4f20286..842b989 100644 --- a/locale/tr.txt +++ b/locale/tr.txt @@ -10,6 +10,8 @@ %s Lump = %s yığını %s Ingot = %s külçesi %s Block = %s blok +%s Block Slab = +%s Block Stair = %s Pickaxe = %s kazma %s Shovel = %s kürek %s Axe = %s balta From 52f0b0fabe3eec6e68b6f0bdc68529a0e5790b22 Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 16:33:04 +0100 Subject: [PATCH 02/11] [Mod.conf ] Add moreblocks and stairs --- mod.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod.conf b/mod.conf index 341e834..b0805e6 100644 --- a/mod.conf +++ b/mod.conf @@ -1,5 +1,5 @@ name = moreores description = Adds new ore types. depends = default -optional_depends = carts,farming,frame,mg,toolranks +optional_depends = carts,farming,frame,mg,toolranks,moreblocks,stairs min_minetest_version = 5.0.0 From cdc2195e9659a465b7eb65f0e525091330ffc9d7 Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 16:34:01 +0100 Subject: [PATCH 03/11] [init.lua] Update Description and add inner and outer for stairs --- init.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index a3fdc4e..9e96882 100644 --- a/init.lua +++ b/init.lua @@ -107,7 +107,7 @@ local function add_ore(modname, description, mineral_name, oredef) }) if minetest.get_modpath("moreblocks") then stairsplus:register_all("moreores", mineral_name.."_block", block_item, { - description = S("%s Block"):format(S(description)), + description = S("@1 Block", S(description)), tiles = { img_base .. "_block.png" }, groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, sounds = default.node_sound_metal_defaults() @@ -118,9 +118,12 @@ local function add_ore(modname, description, mineral_name, oredef) block_item, {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, { img_base .. "_block.png"}, - S("%s Block Stair"):format(S(description)), - S("%s Block Slab"):format(S(description)), - default.node_sound_metal_defaults() + S("@1 Block Stair", S(description)), + S("@1 Block Slab", S(description)), + default.node_sound_metal_defaults(), + false, + S("@1 Block Inner Stair", S(description)), + S("@1 Block Outer Stair", S(description)), ) end minetest.register_alias(mineral_name.."_block", block_item) From 5d5ed2779d374a4ce4048060c161d69583620d48 Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 16:44:46 +0100 Subject: [PATCH 04/11] [init.lua] Reformulation of the description translation --- init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index 9e96882..40826c7 100644 --- a/init.lua +++ b/init.lua @@ -118,12 +118,12 @@ local function add_ore(modname, description, mineral_name, oredef) block_item, {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, { img_base .. "_block.png"}, - S("@1 Block Stair", S(description)), - S("@1 Block Slab", S(description)), + S("@1 Stair", S(description)), + S("@1 Slab", S(description)), default.node_sound_metal_defaults(), false, - S("@1 Block Inner Stair", S(description)), - S("@1 Block Outer Stair", S(description)), + S("Inner @1 Stair", S(description)), + S("Outer @1 Stair", S(description)), ) end minetest.register_alias(mineral_name.."_block", block_item) From 3545b5401903495a8814a1fae36f6f6499fa12b7 Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 16:48:29 +0100 Subject: [PATCH 05/11] [local/*.tr] Add phrases in files for translating --- locale/moreores.de.tr | 5 +++++ locale/moreores.en.tr | 5 +++++ locale/moreores.es.tr | 5 +++++ locale/moreores.fr.tr | 5 +++++ locale/moreores.hu.tr | 5 +++++ locale/moreores.it.tr | 5 +++++ locale/moreores.nl.tr | 5 +++++ locale/moreores.pl.tr | 5 +++++ locale/moreores.pt_br.tr | 5 +++++ locale/moreores.tr.tr | 5 +++++ 10 files changed, 50 insertions(+) diff --git a/locale/moreores.de.tr b/locale/moreores.de.tr index aac97be..2613ba7 100644 --- a/locale/moreores.de.tr +++ b/locale/moreores.de.tr @@ -20,3 +20,8 @@ Silver=Silber Gold=Gold Mithril=Mithril Copper Rail=Kupferschiene + +@1 Slab= +@1 Stair= +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file diff --git a/locale/moreores.en.tr b/locale/moreores.en.tr index b13188d..444e65c 100644 --- a/locale/moreores.en.tr +++ b/locale/moreores.en.tr @@ -19,3 +19,8 @@ Silver=Silver Gold=Gold Mithril=Mithril Copper Rail=Copper Rail + +@1 Slab= +@1 Stair= +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file diff --git a/locale/moreores.es.tr b/locale/moreores.es.tr index 3b709a3..f95aa62 100644 --- a/locale/moreores.es.tr +++ b/locale/moreores.es.tr @@ -20,3 +20,8 @@ Silver=plata Gold=oro Mithril=mitrilo Copper Rail=Riel de Cobre + +@1 Slab=Losa de @1 +@1 Stair=Escalera de @1 +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file diff --git a/locale/moreores.fr.tr b/locale/moreores.fr.tr index 2ac45a8..6bea616 100644 --- a/locale/moreores.fr.tr +++ b/locale/moreores.fr.tr @@ -21,3 +21,8 @@ Silver=argent Gold=or Mithril=mithril Copper Rail=Rail en cuivre + +@1 Slab=Dalle en @1 +@1 Stair=Escalier en @1 +Inner @1 Stair=Escalier intérieur de @1 +Outer @1 Stair=Escalier extérieur de @1 \ No newline at end of file diff --git a/locale/moreores.hu.tr b/locale/moreores.hu.tr index 820ece7..3b8d836 100644 --- a/locale/moreores.hu.tr +++ b/locale/moreores.hu.tr @@ -20,3 +20,8 @@ Silver=Ezüst Gold=Arany Mithril=Mithril Copper Rail=Réz sín + +@1 Slab= +@1 Stair= +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file diff --git a/locale/moreores.it.tr b/locale/moreores.it.tr index 96541f7..1ed2c38 100644 --- a/locale/moreores.it.tr +++ b/locale/moreores.it.tr @@ -20,3 +20,8 @@ Silver=Argento Gold=Oro Mithril=Mithril Copper Rail=Binario di rame + +@1 Slab= +@1 Stair= +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file diff --git a/locale/moreores.nl.tr b/locale/moreores.nl.tr index e572ff3..f65152a 100644 --- a/locale/moreores.nl.tr +++ b/locale/moreores.nl.tr @@ -17,3 +17,8 @@ Bronze=Brons Silver=Silver Gold=Goud Mithril=Mithril + +@1 Slab= +@1 Stair= +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file diff --git a/locale/moreores.pl.tr b/locale/moreores.pl.tr index 2eb2993..f4a17e7 100644 --- a/locale/moreores.pl.tr +++ b/locale/moreores.pl.tr @@ -20,3 +20,8 @@ Silver=Srebro Gold=Złoto Mithril=Mithril Copper Rail=Miedziany tor + +@1 Slab= +@1 Stair= +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file diff --git a/locale/moreores.pt_br.tr b/locale/moreores.pt_br.tr index 613209d..477a941 100644 --- a/locale/moreores.pt_br.tr +++ b/locale/moreores.pt_br.tr @@ -21,3 +21,8 @@ Gold=Ouro Mithril=Mitrilo Copper Rail=Trilho de Cobre + +@1 Slab= +@1 Stair= +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file diff --git a/locale/moreores.tr.tr b/locale/moreores.tr.tr index e41f8e3..2a9a0c3 100644 --- a/locale/moreores.tr.tr +++ b/locale/moreores.tr.tr @@ -26,3 +26,8 @@ Gold=Altın Mithril=Mithril Copper Rail=Bakır ray + +@1 Slab= +@1 Stair= +Inner @1 Stair= +Outer @1 Stair= \ No newline at end of file From 23ef740637e54e89febfe5180a3b0357da80fe2d Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 17:07:24 +0100 Subject: [PATCH 06/11] [local\*.tr] Add some translation (copy paste with mod stairs) --- locale/moreores.de.tr | 8 ++++---- locale/moreores.en.tr | 8 ++++---- locale/moreores.es.tr | 4 ++-- locale/moreores.it.tr | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/locale/moreores.de.tr b/locale/moreores.de.tr index 2613ba7..6839d16 100644 --- a/locale/moreores.de.tr +++ b/locale/moreores.de.tr @@ -21,7 +21,7 @@ Gold=Gold Mithril=Mithril Copper Rail=Kupferschiene -@1 Slab= -@1 Stair= -Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +@1 Slab= @1treppe +@1 Stair= @1platte +Inner @1 Stair=Innere @1treppe +Outer @1 Stair=Äußere @1treppe \ No newline at end of file diff --git a/locale/moreores.en.tr b/locale/moreores.en.tr index 444e65c..cdb8709 100644 --- a/locale/moreores.en.tr +++ b/locale/moreores.en.tr @@ -20,7 +20,7 @@ Gold=Gold Mithril=Mithril Copper Rail=Copper Rail -@1 Slab= -@1 Stair= -Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +@1 Slab=@1 Slab +@1 Stair=@1 Stair +Inner @1 Stair=Inner @1 Stair +Outer @1 Stair=Outer @1 Stair \ No newline at end of file diff --git a/locale/moreores.es.tr b/locale/moreores.es.tr index f95aa62..8635dd7 100644 --- a/locale/moreores.es.tr +++ b/locale/moreores.es.tr @@ -23,5 +23,5 @@ Copper Rail=Riel de Cobre @1 Slab=Losa de @1 @1 Stair=Escalera de @1 -Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +Inner @1 Stair=Escalera interior de @1 +Outer @1 Stair=Escalera exterior de @1 \ No newline at end of file diff --git a/locale/moreores.it.tr b/locale/moreores.it.tr index 1ed2c38..e1161de 100644 --- a/locale/moreores.it.tr +++ b/locale/moreores.it.tr @@ -21,7 +21,7 @@ Gold=Oro Mithril=Mithril Copper Rail=Binario di rame -@1 Slab= -@1 Stair= -Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +@1 Slab=Scala di @1 +@1 Stair=Lastra di @1 +Inner @1 Stair=Scala di @1 interna +Outer @1 Stair=Scala di @1 esterna \ No newline at end of file From 08ec51b1ee4332572b39d91dd0c40677e0783341 Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 17:14:09 +0100 Subject: [PATCH 07/11] [init.lua] Fix --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 40826c7..3a0ca62 100644 --- a/init.lua +++ b/init.lua @@ -123,7 +123,7 @@ local function add_ore(modname, description, mineral_name, oredef) default.node_sound_metal_defaults(), false, S("Inner @1 Stair", S(description)), - S("Outer @1 Stair", S(description)), + S("Outer @1 Stair", S(description)) ) end minetest.register_alias(mineral_name.."_block", block_item) From 01a5ce54469a6c0a0eb0b59684dfa1e349069eec Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 17:26:47 +0100 Subject: [PATCH 08/11] [init.lua] Use variable default_metal_sounds --- init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 3a0ca62..bc540e4 100644 --- a/init.lua +++ b/init.lua @@ -103,14 +103,14 @@ local function add_ore(modname, description, mineral_name, oredef) description = S("@1 Block", S(description)), tiles = {img_base .. "_block.png"}, groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, - sounds = default.node_sound_metal_defaults(), + sounds = default_metal_sounds, }) if minetest.get_modpath("moreblocks") then stairsplus:register_all("moreores", mineral_name.."_block", block_item, { description = S("@1 Block", S(description)), tiles = { img_base .. "_block.png" }, groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, - sounds = default.node_sound_metal_defaults() + sounds = default_metal_sounds }) elseif minetest.get_modpath("stairs") then stairs.register_stair_and_slab( @@ -120,7 +120,7 @@ local function add_ore(modname, description, mineral_name, oredef) { img_base .. "_block.png"}, S("@1 Stair", S(description)), S("@1 Slab", S(description)), - default.node_sound_metal_defaults(), + default_metal_sounds, false, S("Inner @1 Stair", S(description)), S("Outer @1 Stair", S(description)) From f08503c1b48afbe9fcee28da4a8046e83b7f523d Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 17:32:30 +0100 Subject: [PATCH 09/11] [/local/*.tr] Fix --- locale/moreores.de.tr | 2 +- locale/moreores.en.tr | 2 +- locale/moreores.es.tr | 2 +- locale/moreores.fr.tr | 2 +- locale/moreores.hu.tr | 2 +- locale/moreores.it.tr | 2 +- locale/moreores.nl.tr | 2 +- locale/moreores.pl.tr | 2 +- locale/moreores.pt_br.tr | 2 +- locale/moreores.tr.tr | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/locale/moreores.de.tr b/locale/moreores.de.tr index 6839d16..ffa3359 100644 --- a/locale/moreores.de.tr +++ b/locale/moreores.de.tr @@ -24,4 +24,4 @@ Copper Rail=Kupferschiene @1 Slab= @1treppe @1 Stair= @1platte Inner @1 Stair=Innere @1treppe -Outer @1 Stair=Äußere @1treppe \ No newline at end of file +Outer @1 Stair=Äußere @1treppe diff --git a/locale/moreores.en.tr b/locale/moreores.en.tr index cdb8709..ea73555 100644 --- a/locale/moreores.en.tr +++ b/locale/moreores.en.tr @@ -23,4 +23,4 @@ Copper Rail=Copper Rail @1 Slab=@1 Slab @1 Stair=@1 Stair Inner @1 Stair=Inner @1 Stair -Outer @1 Stair=Outer @1 Stair \ No newline at end of file +Outer @1 Stair=Outer @1 Stair diff --git a/locale/moreores.es.tr b/locale/moreores.es.tr index 8635dd7..6b2f483 100644 --- a/locale/moreores.es.tr +++ b/locale/moreores.es.tr @@ -24,4 +24,4 @@ Copper Rail=Riel de Cobre @1 Slab=Losa de @1 @1 Stair=Escalera de @1 Inner @1 Stair=Escalera interior de @1 -Outer @1 Stair=Escalera exterior de @1 \ No newline at end of file +Outer @1 Stair=Escalera exterior de @1 diff --git a/locale/moreores.fr.tr b/locale/moreores.fr.tr index 6bea616..416dcbf 100644 --- a/locale/moreores.fr.tr +++ b/locale/moreores.fr.tr @@ -25,4 +25,4 @@ Copper Rail=Rail en cuivre @1 Slab=Dalle en @1 @1 Stair=Escalier en @1 Inner @1 Stair=Escalier intérieur de @1 -Outer @1 Stair=Escalier extérieur de @1 \ No newline at end of file +Outer @1 Stair=Escalier extérieur de @1 diff --git a/locale/moreores.hu.tr b/locale/moreores.hu.tr index 3b8d836..e9d2ed5 100644 --- a/locale/moreores.hu.tr +++ b/locale/moreores.hu.tr @@ -24,4 +24,4 @@ Copper Rail=Réz sín @1 Slab= @1 Stair= Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +Outer @1 Stair= diff --git a/locale/moreores.it.tr b/locale/moreores.it.tr index e1161de..b659e38 100644 --- a/locale/moreores.it.tr +++ b/locale/moreores.it.tr @@ -24,4 +24,4 @@ Copper Rail=Binario di rame @1 Slab=Scala di @1 @1 Stair=Lastra di @1 Inner @1 Stair=Scala di @1 interna -Outer @1 Stair=Scala di @1 esterna \ No newline at end of file +Outer @1 Stair=Scala di @1 esterna diff --git a/locale/moreores.nl.tr b/locale/moreores.nl.tr index f65152a..621c92a 100644 --- a/locale/moreores.nl.tr +++ b/locale/moreores.nl.tr @@ -21,4 +21,4 @@ Mithril=Mithril @1 Slab= @1 Stair= Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +Outer @1 Stair= diff --git a/locale/moreores.pl.tr b/locale/moreores.pl.tr index f4a17e7..46cec55 100644 --- a/locale/moreores.pl.tr +++ b/locale/moreores.pl.tr @@ -24,4 +24,4 @@ Copper Rail=Miedziany tor @1 Slab= @1 Stair= Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +Outer @1 Stair= diff --git a/locale/moreores.pt_br.tr b/locale/moreores.pt_br.tr index 477a941..603bbec 100644 --- a/locale/moreores.pt_br.tr +++ b/locale/moreores.pt_br.tr @@ -25,4 +25,4 @@ Copper Rail=Trilho de Cobre @1 Slab= @1 Stair= Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +Outer @1 Stair= diff --git a/locale/moreores.tr.tr b/locale/moreores.tr.tr index 2a9a0c3..e27b83b 100644 --- a/locale/moreores.tr.tr +++ b/locale/moreores.tr.tr @@ -30,4 +30,4 @@ Copper Rail=Bakır ray @1 Slab= @1 Stair= Inner @1 Stair= -Outer @1 Stair= \ No newline at end of file +Outer @1 Stair= From b208c89e8c0d01565cde7b534e9d71f02a1c4b10 Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 17:42:52 +0100 Subject: [PATCH 10/11] [init.lua] Delete whitespace --- init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index bc540e4..7fec77d 100644 --- a/init.lua +++ b/init.lua @@ -105,10 +105,10 @@ local function add_ore(modname, description, mineral_name, oredef) groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, sounds = default_metal_sounds, }) - if minetest.get_modpath("moreblocks") then + if minetest.get_modpath("moreblocks") then stairsplus:register_all("moreores", mineral_name.."_block", block_item, { description = S("@1 Block", S(description)), - tiles = { img_base .. "_block.png" }, + tiles = {img_base .. "_block.png"}, groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, sounds = default_metal_sounds }) @@ -117,7 +117,7 @@ local function add_ore(modname, description, mineral_name, oredef) mineral_name.."_block", block_item, {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, - { img_base .. "_block.png"}, + {img_base .. "_block.png"}, S("@1 Stair", S(description)), S("@1 Slab", S(description)), default_metal_sounds, From 49f8d3b578c603993e11e0b86625f244fa7a6ac3 Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sun, 27 Dec 2020 18:04:59 +0100 Subject: [PATCH 11/11] [.luacheckrc] Add stairsplus and stairs variable global --- .luacheckrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.luacheckrc b/.luacheckrc index 16e7350..187bab7 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -30,4 +30,6 @@ read_globals = { "frame", "mg", "toolranks", + "stairs", + "stairsplus", }