Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add compatibility with Stairs, Moreblocks #27

Closed
wants to merge 12 commits into from
Closed

Add compatibility with Stairs, Moreblocks #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e243584
Add compatibility with Stairs, Moreblocks
Jat15 Aug 23, 2017
36aa878
Merge https://github.com/minetest-mods/moreores into Moreblocks-Patch
Jat15 Dec 27, 2020
52f0b0f
[Mod.conf ] Add moreblocks and stairs
Jat15 Dec 27, 2020
cdc2195
[init.lua] Update Description and add inner and outer for stairs
Jat15 Dec 27, 2020
5d5ed27
[init.lua] Reformulation of the description translation
Jat15 Dec 27, 2020
3545b54
[local/*.tr] Add phrases in files for translating
Jat15 Dec 27, 2020
23ef740
[local\*.tr] Add some translation (copy paste with mod stairs)
Jat15 Dec 27, 2020
08ec51b
[init.lua] Fix
Jat15 Dec 27, 2020
01a5ce5
[init.lua] Use variable default_metal_sounds
Jat15 Dec 27, 2020
f08503c
[/local/*.tr] Fix
Jat15 Dec 27, 2020
b208c89
[init.lua] Delete whitespace
Jat15 Dec 27, 2020
49f8d3b
[.luacheckrc] Add stairsplus and stairs variable global
Jat15 Dec 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .luacheckrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,6 @@ read_globals = {
"frame",
"mg",
"toolranks",
"stairs",
"stairsplus",
}
21 changes: 21 additions & 0 deletions init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,27 @@ 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
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_metal_sounds
})
elseif minetest.get_modpath("stairs") then
stairs.register_stair_and_slab(
Jat15 marked this conversation as resolved.
Show resolved Hide resolved
mineral_name.."_block",
block_item,
{snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2},
{img_base .. "_block.png"},
S("@1 Stair", S(description)),
S("@1 Slab", S(description)),
default_metal_sounds,
false,
S("Inner @1 Stair", S(description)),
S("Outer @1 Stair", S(description))
)
end
minetest.register_alias(mineral_name.."_block", block_item)
if oredef.makes.ingot then
minetest.register_craft( {
Expand Down
5 changes: 5 additions & 0 deletions locale/moreores.de.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ Silver=Silber
Gold=Gold
Mithril=Mithril
Copper Rail=Kupferschiene

@1 Slab= @1treppe
@1 Stair= @1platte
Inner @1 Stair=Innere @1treppe
Outer @1 Stair=Äußere @1treppe
5 changes: 5 additions & 0 deletions locale/moreores.en.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ Silver=Silver
Gold=Gold
Mithril=Mithril
Copper Rail=Copper Rail

@1 Slab=@1 Slab
@1 Stair=@1 Stair
Inner @1 Stair=Inner @1 Stair
Outer @1 Stair=Outer @1 Stair
5 changes: 5 additions & 0 deletions locale/moreores.es.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=Escalera interior de @1
Outer @1 Stair=Escalera exterior de @1
5 changes: 5 additions & 0 deletions locale/moreores.fr.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions locale/moreores.hu.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
5 changes: 5 additions & 0 deletions locale/moreores.it.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ Silver=Argento
Gold=Oro
Mithril=Mithril
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
5 changes: 5 additions & 0 deletions locale/moreores.nl.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ Bronze=Brons
Silver=Silver
Gold=Goud
Mithril=Mithril

@1 Slab=
@1 Stair=
Inner @1 Stair=
Outer @1 Stair=
5 changes: 5 additions & 0 deletions locale/moreores.pl.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
5 changes: 5 additions & 0 deletions locale/moreores.pt_br.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,8 @@ Gold=Ouro
Mithril=Mitrilo

Copper Rail=Trilho de Cobre

@1 Slab=
@1 Stair=
Inner @1 Stair=
Outer @1 Stair=
5 changes: 5 additions & 0 deletions locale/moreores.tr.tr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ Gold=Altın
Mithril=Mithril

Copper Rail=Bakır ray

@1 Slab=
@1 Stair=
Inner @1 Stair=
Outer @1 Stair=
2 changes: 1 addition & 1 deletion mod.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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