From caa92be9dd050b7dbd92f0568bac87c9cf052bde Mon Sep 17 00:00:00 2001 From: VanessaE Date: Wed, 29 Apr 2020 05:40:04 -0400 Subject: [PATCH 01/10] add recipes for copper, silver, gold coins and put them into the creative inv like normal (silver requires moreores) --- craftitems.lua | 24 +++++++++++++++++++++--- mod.conf | 2 +- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/craftitems.lua b/craftitems.lua index 58127bf..74aa8d8 100644 --- a/craftitems.lua +++ b/craftitems.lua @@ -14,7 +14,13 @@ minetest.register_craftitem("maptools:copper_coin", { inventory_image = "maptools_copper_coin.png", wield_scale = {x = 0.5, y = 0.5, z = 0.25}, stack_max = 10000, - groups = {not_in_creative_inventory = maptools.creative}, +}) + + +minetest.register_craft ({ + output = "maptools:copper_coin 10", + type = "shapeless", + recipe = { "default:copper_ingot", "default:copper_ingot" } }) minetest.register_craftitem("maptools:silver_coin", { @@ -22,15 +28,27 @@ minetest.register_craftitem("maptools:silver_coin", { inventory_image = "maptools_silver_coin.png", wield_scale = {x = 0.5, y = 0.5, z = 0.25}, stack_max = 10000, - groups = {not_in_creative_inventory = maptools.creative}, }) +if minetest.get_modpath("moreores") then + minetest.register_craft ({ + output = "maptools:silver_coin 10", + type = "shapeless", + recipe = { "moreores:silver_ingot", "moreores:silver_ingot" } + }) +end + minetest.register_craftitem("maptools:gold_coin", { description = S("Gold Coin"), inventory_image = "maptools_gold_coin.png", wield_scale = {x = 0.5, y = 0.5, z = 0.25}, stack_max = 10000, - groups = {not_in_creative_inventory = maptools.creative}, +}) + +minetest.register_craft ({ + output = "maptools:gold_coin 10", + type = "shapeless", + recipe = { "default:gold_ingot", "default:gold_ingot" } }) minetest.register_craftitem("maptools:infinitefuel", { diff --git a/mod.conf b/mod.conf index 363f651..697858b 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = maptools description = Adds various special versions of normal blocks, tools, and other map maintainer tools. depends = default -optional_depends = intllib +optional_depends = intllib, moreores From f0d25e85ad5117aacb20c5dd90bf4b0a32223de1 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 29 Apr 2020 17:36:31 +0200 Subject: [PATCH 02/10] Fix code style after recent changes --- craftitems.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/craftitems.lua b/craftitems.lua index 74aa8d8..3bc72bb 100644 --- a/craftitems.lua +++ b/craftitems.lua @@ -16,8 +16,7 @@ minetest.register_craftitem("maptools:copper_coin", { stack_max = 10000, }) - -minetest.register_craft ({ +minetest.register_craft({ output = "maptools:copper_coin 10", type = "shapeless", recipe = { "default:copper_ingot", "default:copper_ingot" } @@ -31,7 +30,7 @@ minetest.register_craftitem("maptools:silver_coin", { }) if minetest.get_modpath("moreores") then - minetest.register_craft ({ + minetest.register_craft({ output = "maptools:silver_coin 10", type = "shapeless", recipe = { "moreores:silver_ingot", "moreores:silver_ingot" } @@ -45,7 +44,7 @@ minetest.register_craftitem("maptools:gold_coin", { stack_max = 10000, }) -minetest.register_craft ({ +minetest.register_craft({ output = "maptools:gold_coin 10", type = "shapeless", recipe = { "default:gold_ingot", "default:gold_ingot" } From 4683434e0a1d66a8cbd8f7f8b8daefd896ad5945 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 29 Apr 2020 17:36:42 +0200 Subject: [PATCH 03/10] Update the changelog to mention recent changes around coins --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b95df9..0cd0be2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Changed + +- 10 coins of each type can now be crafted using 2 ingots (bronze, silver or gold). + - Silver coins require [More Ores](https://github.com/minetest-mods/moreores) + to be crafted, since minetest_game doesn't have silver ingots. +- Coins are now displayed in the creative inventory. + ## [2.0.0] - 2019-11-25 ### Changed From e6f61c31ce73c5617e60712a76a44c4b239ff9d7 Mon Sep 17 00:00:00 2001 From: Buckaroo Banzai <39065740+BuckarooBanzay@users.noreply.github.com> Date: Tue, 2 Jun 2020 09:13:24 +0200 Subject: [PATCH 04/10] Add "Drownable Air" node (`maptools:drowning`) (#18) Co-authored-by: Hugo Locurcio Co-authored-by: BuckarooBanzay --- NODES_ITEMS.md | 1 + nodes.lua | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/NODES_ITEMS.md b/NODES_ITEMS.md index f323156..c75429a 100644 --- a/NODES_ITEMS.md +++ b/NODES_ITEMS.md @@ -23,6 +23,7 @@ as they cannot be removed by hand (they can only be removed with | `maptools:no_interact` | Prevents interacting through the block (opening chests, furnaces, attacking entities, …), but can still be walked through. | | `maptools:damage_{1…5}` | :warning: Damaging blocks which damage players by 1 to 5 HP per second. | | `maptools:kill` | :warning: Instant kill blocks (damages players by 20 HP per second). | +| `maptools:drowning` | :warning: Simulates drowning in water. | | `maptools:light_block` | :warning: Invisible non-solid block, prevents light from passing through. | | `maptools:light_bulb` | :warning: Invisible non-solid block, emitting the maximum amount of light. | diff --git a/nodes.lua b/nodes.lua index 2f9d809..c369aa7 100644 --- a/nodes.lua +++ b/nodes.lua @@ -467,3 +467,18 @@ minetest.register_node("maptools:superapple", { sounds = default.node_sound_defaults(), on_drop = maptools.drop_msg }) + +minetest.register_node("maptools:drowning", { + description = S("Drownable Air"), + range = 12, + stack_max = 10000, + inventory_image = "default_steel_block.png^dye_black.png", + drawtype = "airlike", + paramtype = "light", + pointable = false, + drowning = true, + sunlight_propagates = true, + drop = "", + groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative}, + on_drop = maptools.drop_msg +}) From 235e02b0bea45470c1ed5a94090cd063b8470861 Mon Sep 17 00:00:00 2001 From: Buckaroo Banzai <39065740+BuckarooBanzay@users.noreply.github.com> Date: Tue, 2 Jun 2020 09:37:18 +0200 Subject: [PATCH 05/10] Add `maptools` to the list of Luacheck globals (#19) Co-authored-by: BuckarooBanzay --- .luacheckrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.luacheckrc b/.luacheckrc index 4bfca2a..a507374 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -3,6 +3,10 @@ unused_args = false allow_defined_top = true max_line_length = 90 +globals = { + "maptools" +} + stds.minetest = { read_globals = { "DIR_DELIM", From f9bf6a09515149d068a366e44dbb0ca0d6ebbfa3 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 3 Jun 2020 18:55:41 +0200 Subject: [PATCH 06/10] Declare the minimum supported Minetest version to 5.0.0 This information can be used by ContentDB. --- mod.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mod.conf b/mod.conf index 697858b..558ad1b 100644 --- a/mod.conf +++ b/mod.conf @@ -2,3 +2,4 @@ name = maptools description = Adds various special versions of normal blocks, tools, and other map maintainer tools. depends = default optional_depends = intllib, moreores +min_minetest_version = 5.0.0 From 246d525c20c44642077fdeb1ea294eeb99de018a Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 8 Jun 2020 21:40:10 +0200 Subject: [PATCH 07/10] Fix `maptools:drowning` using an invalid value and being walkable This prevented Minetest from starting (tested on Minetest 5.3.0-dev-cb9a44ef8). Being walkable also made it impossible to actually drown in, except when using noclip mode. --- nodes.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nodes.lua b/nodes.lua index c369aa7..039f10e 100644 --- a/nodes.lua +++ b/nodes.lua @@ -476,7 +476,8 @@ minetest.register_node("maptools:drowning", { drawtype = "airlike", paramtype = "light", pointable = false, - drowning = true, + walkable = false, + drowning = 1, sunlight_propagates = true, drop = "", groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative}, From 75d3253c5f3102b583816663a2e9f58906fec463 Mon Sep 17 00:00:00 2001 From: David Leal Date: Mon, 8 Jun 2020 14:48:04 -0500 Subject: [PATCH 08/10] Update translation system to MT 5.0.0+ (#16) --- .luacheckrc | 4 ---- init.lua | 3 +-- intllib.lua | 44 ---------------------------------- locale/es.txt | 39 ------------------------------ locale/fr.txt | 47 ------------------------------------- locale/it.txt | 47 ------------------------------------- locale/maptools.es.tr | 38 ++++++++++++++++++++++++++++++ locale/maptools.fr.tr | 46 ++++++++++++++++++++++++++++++++++++ locale/maptools.it.tr | 46 ++++++++++++++++++++++++++++++++++++ locale/maptools.template.tr | 46 ++++++++++++++++++++++++++++++++++++ mod.conf | 2 +- 11 files changed, 178 insertions(+), 184 deletions(-) delete mode 100644 intllib.lua delete mode 100644 locale/es.txt delete mode 100644 locale/fr.txt delete mode 100644 locale/it.txt create mode 100644 locale/maptools.es.tr create mode 100644 locale/maptools.fr.tr create mode 100644 locale/maptools.it.tr create mode 100644 locale/maptools.template.tr diff --git a/.luacheckrc b/.luacheckrc index a507374..5f1be00 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -27,7 +27,3 @@ stds.minetest = { }, } } - -read_globals = { - "intllib", -} diff --git a/init.lua b/init.lua index 7e053ec..4552db0 100644 --- a/init.lua +++ b/init.lua @@ -12,9 +12,8 @@ maptools = {} local modpath = minetest.get_modpath("maptools") -local S, NS = dofile(modpath .. "/intllib.lua") +local S = minetest.get_translator("maptools") maptools.S = S -maptools.NS = NS maptools.drop_msg = function(itemstack, player) local name = player:get_player_name() diff --git a/intllib.lua b/intllib.lua deleted file mode 100644 index c7af2c2..0000000 --- a/intllib.lua +++ /dev/null @@ -1,44 +0,0 @@ --- Fallback functions for when `intllib` is not installed. --- Code released under Unlicense . - --- Get the latest version of this file at: --- https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua - -local function format(str, ...) - local args = { ... } - local function repl(escape, open, num, close) - if escape == "" then - local replacement = tostring(args[tonumber(num)]) - if open == "" then - replacement = replacement..close - end - return replacement - else - return "@"..open..num..close - end - end - return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl)) -end - -local gettext, ngettext -if minetest.get_modpath("intllib") then - if intllib.make_gettext_pair then - -- New method using gettext. - gettext, ngettext = intllib.make_gettext_pair() - else - -- Old method using text files. - gettext = intllib.Getter() - end -end - --- Fill in missing functions. - -gettext = gettext or function(msgid, ...) - return format(msgid, ...) -end - -ngettext = ngettext or function(msgid, msgid_plural, n, ...) - return format(n==1 and msgid or msgid_plural, ...) -end - -return gettext, ngettext diff --git a/locale/es.txt b/locale/es.txt deleted file mode 100644 index 1bc96f2..0000000 --- a/locale/es.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Translation by kaeza - -[maptools] loaded. = [maptools] cargado. - -Cloud = Nube -Infinite Fuel = Combustible Infinito -Admin Pickaxe = Pico de Administrador -Copper Coin = Moneda de Cobre -Silver Coin = Moneda de Plata -Gold Coin = Moneda de Oro -Super Apple = Super Manzana -Fake Ladder = Escalera Falsa -Smoke Block = Bloque de Humo -Damaging Block: %s = Bloque Dañino: %s -Kill Block = Bloque Mortal -Build Prevention = Bloqueador de Construcción -Interact Prevention = Bloqueador de Interacción -Climb Block = Bloque Escalable -Light Block = Bloqueador de Luz -Light Bulb = Lamparilla -Player Clip = Bloqueo de Jugador -Full Clip = Bloqueo Total - -Unbreakable Stone = Piedra Irrompible -Unbreakable Sand = Arena Irrompible -Unbreakable Desert Stone = Piedra Desértica Irrompible -Unbreakable Desert Sand = Arena Desértica Irrompible -Unbreakable Gravel = Gravilla Irrompible -Unbreakable Dirt = Tierra Irrompible -Unbreakable Dirt with Grass = Hierba Irrompible -Unbreakable Full Grass= Bloque de Hierba Irrompible -Unbreakable Brick = Ladrillos Irrompibles -Unbreakable Wooden Planks = Planchas de Madera Irrompibles -Unbreakable Tree = Tronco de Árbol Irrompible -Unbreakable Glass = Cristal Irrompible -Unbreakable Sandstone = Arenisca Irrompible -Unbreakable Leaves = Foliaje Irrompible -Unbreakable Cobblestone = Guijarros Irrompibles -Unbreakable Mossy Cobblestone = Guijarros Enmohecidos Irrompibles diff --git a/locale/fr.txt b/locale/fr.txt deleted file mode 100644 index d137871..0000000 --- a/locale/fr.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Translation by Calinou - -[maptools] loaded. = [maptools] a été chargé. - -Cloud = Nuage -Infinite Fuel = Carburant infini -Admin Pickaxe = Pioche d'administrateur -Admin Pickaxe With Drops = Pioche d'administrateur qui donne des objets -Copper Coin = Pièce de cuivre -Silver Coin = Pièce d'argent -Gold Coin = Pièce d'or -Super Apple = Super pomme -Fake Ladder = Fausse échelle -Smoke Block = Bloc de fumée -Damaging Block: %s = Bloc de dégâts : %s -Kill Block = Bloc qui tue -Build Prevention = Prévention de construction -Interact Prevention = Prévention d'interaction -Climb Block = Bloc à grimper -Light Block = Bloqueur de lumière -Light Bulb = Bloc lumineux -Player Clip = Bloque-joueurs -Player Clip Bottom Face = Face inférieure de bloque-joueurs -Player Clip Top Face = Face supérieure de bloque-joueurs -Full Clip = Bloque-tout -Full Clip Face = Face de bloque-tout -Permanent Fire = Feu permanent -Fake Fire = Faux feu -Igniter = Incendieur -Pusher: %s = Pousseur : %s - -Unbreakable Stone = Pierre incassable -Unbreakable Sand = Sable incassable -Unbreakable Desert Stone = Pierre de désert incassable -Unbreakable Desert Sand = Sable de désert incassable -Unbreakable Gravel = Gravier incassable -Unbreakable Dirt = Terre incassable -Unbreakable Dirt with Grass = Herbe incassable -Unbreakable Full Grass= Bloc d'herbe incassable -Unbreakable Brick = Briques incassables -Unbreakable Wooden Planks = Planches de bois incassables -Unbreakable Tree = Tronc d'arbre incassable -Unbreakable Glass = Verre incassable -Unbreakable Sandstone = Grès incassable -Unbreakable Leaves = Feuillage incassable -Unbreakable Cobblestone = Pierre taillée incassable -Unbreakable Mossy Cobblestone = Pierre taillée mousseusse incassable diff --git a/locale/it.txt b/locale/it.txt deleted file mode 100644 index a1837fb..0000000 --- a/locale/it.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Translation by Emon - -[maptools] loaded. = [maptools] caricato. - -Cloud = Nuvola -Infinite Fuel = Combustibile infinito -Admin Pickaxe = Piccone della amministrazione -Admin Pickaxe With Drops = Piccone della amministrazione che lascia cadere a terra -Copper Coin = Moneta di rame -Silver Coin = Moneta di argento -Gold Coin = Moneta di oro -Super Apple = Super mela -Fake Ladder = Finta scala a pioli -Smoke Block = Blocco di fumo -Damaging Block: %s = Blocco che danneggia : %s -Kill Block = Blocco che uccide -Build Prevention = Impedimento alla costruzione -Interact Prevention = Impedimento alla interazione -Climb Block = Blocco su cui ci si può arrampicare -Light Block = Blocco di luce -Light Bulb = Lampadina -Player Clip = Blocca giocatori -Player Clip Bottom Face = Blocca giocatori - faccia inferiore -Player Clip Top Face = Glocca giocatori - faccia superiore -Full Clip = Blocca tutti -Full Clip Face = Faccia del blocca tutti -Permanent Fire = Fuoco eterno -Fake Fire = Fuoco finto -Igniter = Accendino -Pusher: %s = Che ha spinto : %s - -Unbreakable Stone = Pietra infrangibile -Unbreakable Sand = Sabbia infrangibile -Unbreakable Desert Stone = Pietra del deserto infrangibile -Unbreakable Desert Sand = Sabbia del deserto infrangibile -Unbreakable Gravel = Ghiaia infrangibile -Unbreakable Dirt = Terra infrangibile -Unbreakable Dirt with Grass = Erba infrangibile -Unbreakable Full Grass= Blocco d'erba infrangibile -Unbreakable Brick = Mattoni infrangibile -Unbreakable Wooden Planks = Assi in legno infrangibili -Unbreakable Tree = Albero infrangibile -Unbreakable Glass = Vetro infrangibile -Unbreakable Sandstone = Arenaria infrangibile -Unbreakable Leaves = Foglie infrangibili -Unbreakable Cobblestone = Ciottolo infrangibile -Unbreakable Mossy Cobblestone = Ciottolo muschioso infrangibile diff --git a/locale/maptools.es.tr b/locale/maptools.es.tr new file mode 100644 index 0000000..030f146 --- /dev/null +++ b/locale/maptools.es.tr @@ -0,0 +1,38 @@ +# textdomain: maptools +[maptools] loaded.=[maptools] cargado. + +Cloud=Nube +Infinite Fuel=Combustible Infinito +Admin Pickaxe=Pico de Administrador +Copper Coin=Moneda de Cobre +Silver Coin=Moneda de Plata +Gold Coin=Moneda de Oro +Super Apple=Super Manzana +Fake Ladder=Escalera Falsa +Smoke Block=Bloque de Humo +Damaging Block: %s=Bloque Dañino: %s +Kill Block=Bloque Mortal +Build Prevention=Bloqueador de Construcción +Interact Prevention=Bloqueador de Interacción +Climb Block=Bloque Escalable +Light Block=Bloqueador de Luz +Light Bulb=Lamparilla +Player Clip=Bloqueo de Jugador +Full Clip=Bloqueo Total + +Unbreakable Stone=Piedra Irrompible +Unbreakable Sand=Arena Irrompible +Unbreakable Desert Stone=Piedra Desértica Irrompible +Unbreakable Desert Sand=Arena Desértica Irrompible +Unbreakable Gravel=Gravilla Irrompible +Unbreakable Dirt=Tierra Irrompible +Unbreakable Dirt with Grass=Hierba Irrompible +Unbreakable Full Grass=Bloque de Hierba Irrompible +Unbreakable Brick=Ladrillos Irrompibles +Unbreakable Wooden Planks=Planchas de Madera Irrompibles +Unbreakable Tree=Tronco de Árbol Irrompible +Unbreakable Glass=Cristal Irrompible +Unbreakable Sandstone=Arenisca Irrompible +Unbreakable Leaves=Foliaje Irrompible +Unbreakable Cobblestone=Guijarros Irrompibles +Unbreakable Mossy Cobblestone=Guijarros Enmohecidos Irrompibles diff --git a/locale/maptools.fr.tr b/locale/maptools.fr.tr new file mode 100644 index 0000000..818b5f5 --- /dev/null +++ b/locale/maptools.fr.tr @@ -0,0 +1,46 @@ +# textdomain: maptools +[maptools] loaded.=[maptools] a été chargé. + +Cloud=Nuage +Infinite Fuel=Carburant infini +Admin Pickaxe=Pioche d'administrateur +Admin Pickaxe With Drops=Pioche d'administrateur qui donne des objets +Copper Coin=Pièce de cuivre +Silver Coin=Pièce d'argent +Gold Coin=Pièce d'or +Super Apple=Super pomme +Fake Ladder=Fausse échelle +Smoke Block=Bloc de fumée +Damaging Block: %s=Bloc de dégâts : %s +Kill Block=Bloc qui tue +Build Prevention=Prévention de construction +Interact Prevention=Prévention d'interaction +Climb Block=Bloc à grimper +Light Block=Bloqueur de lumière +Light Bulb=Bloc lumineux +Player Clip=Bloque-joueurs +Player Clip Bottom Face=Face inférieure de bloque-joueurs +Player Clip Top Face=Face supérieure de bloque-joueurs +Full Clip=Bloque-tout +Full Clip Face=Face de bloque-tout +Permanent Fire=Feu permanent +Fake Fire=Faux feu +Igniter=Incendieur +Pusher: %s=Pousseur : %s + +Unbreakable Stone=Pierre incassable +Unbreakable Sand=Sable incassable +Unbreakable Desert Stone=Pierre de désert incassable +Unbreakable Desert Sand=Sable de désert incassable +Unbreakable Gravel=Gravier incassable +Unbreakable Dirt=Terre incassable +Unbreakable Dirt with Grass=Herbe incassable +Unbreakable Full Grass=Bloc d'herbe incassable +Unbreakable Brick=Briques incassables +Unbreakable Wooden Planks=Planches de bois incassables +Unbreakable Tree=Tronc d'arbre incassable +Unbreakable Glass=Verre incassable +Unbreakable Sandstone=Grès incassable +Unbreakable Leaves=Feuillage incassable +Unbreakable Cobblestone=Pierre taillée incassable +Unbreakable Mossy Cobblestone=Pierre taillée mousseusse incassable diff --git a/locale/maptools.it.tr b/locale/maptools.it.tr new file mode 100644 index 0000000..b8fbd0e --- /dev/null +++ b/locale/maptools.it.tr @@ -0,0 +1,46 @@ +# textdomain: maptools +[maptools] loaded.=[maptools] caricato. + +Cloud=Nuvola +Infinite Fuel=Combustibile infinito +Admin Pickaxe=Piccone della amministrazione +Admin Pickaxe With Drops=Piccone della amministrazione che lascia cadere a terra +Copper Coin=Moneta di rame +Silver Coin=Moneta di argento +Gold Coin=Moneta di oro +Super Apple=Super mela +Fake Ladder=Finta scala a pioli +Smoke Block=Blocco di fumo +Damaging Block: %s=Blocco che danneggia : %s +Kill Block=Blocco che uccide +Build Prevention=Impedimento alla costruzione +Interact Prevention=Impedimento alla interazione +Climb Block=Blocco su cui ci si può arrampicare +Light Block=Blocco di luce +Light Bulb=Lampadina +Player Clip=Blocca giocatori +Player Clip Bottom Face=Blocca giocatori - faccia inferiore +Player Clip Top Face=Glocca giocatori - faccia superiore +Full Clip=Blocca tutti +Full Clip Face=Faccia del blocca tutti +Permanent Fire=Fuoco eterno +Fake Fire=Fuoco finto +Igniter=Accendino +Pusher: %s=Che ha spinto : %s + +Unbreakable Stone=Pietra infrangibile +Unbreakable Sand=Sabbia infrangibile +Unbreakable Desert Stone=Pietra del deserto infrangibile +Unbreakable Desert Sand=Sabbia del deserto infrangibile +Unbreakable Gravel=Ghiaia infrangibile +Unbreakable Dirt=Terra infrangibile +Unbreakable Dirt with Grass=Erba infrangibile +Unbreakable Full Grass=Blocco d'erba infrangibile +Unbreakable Brick=Mattoni infrangibile +Unbreakable Wooden Planks=Assi in legno infrangibili +Unbreakable Tree=Albero infrangibile +Unbreakable Glass=Vetro infrangibile +Unbreakable Sandstone=Arenaria infrangibile +Unbreakable Leaves=Foglie infrangibili +Unbreakable Cobblestone=Ciottolo infrangibile +Unbreakable Mossy Cobblestone=Ciottolo muschioso infrangibile diff --git a/locale/maptools.template.tr b/locale/maptools.template.tr new file mode 100644 index 0000000..7280ca4 --- /dev/null +++ b/locale/maptools.template.tr @@ -0,0 +1,46 @@ +# textdomain: maptools +[maptools] loaded.= + +Cloud=Nuage +Infinite Fuel= +Admin Pickaxe= +Admin Pickaxe With Drops= +Copper Coin= +Silver Coin= +Gold Coin= +Super Apple= +Fake Ladder= +Smoke Block= +Damaging Block: %s= +Kill Block= +Build Prevention= +Interact Prevention= +Climb Block= +Light Block= +Light Bulb= +Player Clip= +Player Clip Bottom Face= +Player Clip Top Face= +Full Clip= +Full Clip Face= +Permanent Fire= +Fake Fire= +Igniter= +Pusher: %s= + +Unbreakable Stone= +Unbreakable Sand= +Unbreakable Desert Stone= +Unbreakable Desert Sand= +Unbreakable Gravel= +Unbreakable Dirt= +Unbreakable Dirt with Grass= +Unbreakable Full Grass= +Unbreakable Brick= +Unbreakable Wooden Planks= +Unbreakable Tree= +Unbreakable Glass= +Unbreakable Sandstone= +Unbreakable Leaves= +Unbreakable Cobblestone= +Unbreakable Mossy Cobblestone= diff --git a/mod.conf b/mod.conf index 558ad1b..329484d 100644 --- a/mod.conf +++ b/mod.conf @@ -1,5 +1,5 @@ name = maptools description = Adds various special versions of normal blocks, tools, and other map maintainer tools. depends = default -optional_depends = intllib, moreores +optional_depends = moreores min_minetest_version = 5.0.0 From 7cce8f495f1b389b28e5667447d2aba907a8b531 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 8 Jun 2020 21:48:57 +0200 Subject: [PATCH 09/10] Update the changelog to mention the localization system change --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cd0be2..bb9c9d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Silver coins require [More Ores](https://github.com/minetest-mods/moreores) to be crafted, since minetest_game doesn't have silver ingots. - Coins are now displayed in the creative inventory. +- Moved translations from intllib to Minetest's built-in localization system. + - This allows translations to show up independently of the server's language. ## [2.0.0] - 2019-11-25 From b537954edfb10d4e592598f133bce87107ebdc02 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 8 Jun 2020 21:50:14 +0200 Subject: [PATCH 10/10] Bump to version 2.1.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb9c9d7..0e191ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [2.1.0] - 2020-06-08 + ### Changed - 10 coins of each type can now be crafted using 2 ingots (bronze, silver or gold). @@ -41,6 +43,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial versioned release. -[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.0.0...HEAD +[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.1.0...HEAD +[2.1.0]: https://github.com/minetest-mods/maptools/compare/v2.0.0...v2.1.0 [2.0.0]: https://github.com/minetest-mods/maptools/compare/v1.1.0...v2.0.0 [1.1.0]: https://github.com/minetest-mods/maptools/compare/v1.0.0...v1.1.0