summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2020-02-20 14:29:07 +0000
committerVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2020-02-20 14:29:07 +0000
commit99cb3a5d9da25c8f9c003efe6f09dd045bdb9ebe (patch)
tree81e411f39c2c9ba5edf7b2b265a4be1aa8d44129
parent760e9e383c280dfee895150b08f6316cd3f4a70c (diff)
parent728d4e179a6076e86ce69bb6b8a4d675eeeb6ada (diff)
downloadpipeworks-99cb3a5d9da25c8f9c003efe6f09dd045bdb9ebe.tar
pipeworks-99cb3a5d9da25c8f9c003efe6f09dd045bdb9ebe.tar.gz
pipeworks-99cb3a5d9da25c8f9c003efe6f09dd045bdb9ebe.tar.bz2
pipeworks-99cb3a5d9da25c8f9c003efe6f09dd045bdb9ebe.tar.xz
pipeworks-99cb3a5d9da25c8f9c003efe6f09dd045bdb9ebe.zip
Merge branch 'fix-21' into 'master'
Translation string errors Closes #21 See merge request VanessaE/pipeworks!17
-rw-r--r--compat-furnaces.lua2
-rw-r--r--teleport_tube.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/compat-furnaces.lua b/compat-furnaces.lua
index f1618d2..abf087f 100644
--- a/compat-furnaces.lua
+++ b/compat-furnaces.lua
@@ -255,7 +255,7 @@ local function furnace_node_timer(pos, elapsed)
minetest.get_node_timer(pos):stop()
end
- local infotext = active.." "..DS("(Item: @2; Fuel: @3)", item_state, fuel_state)
+ local infotext = active.." "..DS("(Item: @1; Fuel: @2)", item_state, fuel_state)
--
-- Set meta values
diff --git a/teleport_tube.lua b/teleport_tube.lua
index 7fd118a..7dcdf62 100644
--- a/teleport_tube.lua
+++ b/teleport_tube.lua
@@ -229,7 +229,7 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
if channel ~= "" then
set_tube(pos, channel, can_receive)
local cr_description = (can_receive == 1) and "sending and receiving" or "sending"
- meta:set_string("infotext", S("Teleportation Tube @1 on '@1'", cr_description, channel))
+ meta:set_string("infotext", S("Teleportation Tube @1 on '@2'", cr_description, channel))
else
-- remove empty channel tubes, to not have to search through them
remove_tube(pos)