diff --git a/technic/locale/technic.de.tr b/technic/locale/technic.de.tr index a801fbf..7189426 100644 --- a/technic/locale/technic.de.tr +++ b/technic/locale/technic.de.tr @@ -94,6 +94,7 @@ Corium Source=Corium-Quelle Cube=Würfel Current target:=Aktuelles Ziel: Current track: @1=Aktueller Kurs: @1 +Demand: @1=Bedarf: @1 Diamond Drill Head=Diamantbohrkopf Digging @1 m below machine=Graben @1 m unterhalb der Maschine Digging finished=Graben beendet @@ -207,4 +208,4 @@ Wind @1 Generator=@1 Windmuehle Wind Mill Frame=Windmuehlengeruest Wrought Iron=Schmiedeeisen You are not allowed to edit this!=Es ist nicht erlaubt, dies zu bearbeiten! -Zinc=Zink \ No newline at end of file +Zinc=Zink diff --git a/technic/locale/technic.es.tr b/technic/locale/technic.es.tr index fcccd04..8d4566c 100644 --- a/technic/locale/technic.es.tr +++ b/technic/locale/technic.es.tr @@ -94,6 +94,7 @@ Corium Source=Fuente de corio Cube=Cubo Current target:=Objetivo actual: Current track: @1=Pista actual: @1 +Demand: @1=Demanda: @1 Diamond Drill Head=Mecha de Taladro de Diamante Digging @1 m below machine=Excavación @1 m por debajo de la máquina Digging finished=Excavación terminada @@ -207,4 +208,4 @@ Wind @1 Generator=Molino de Viento @1 Wind Mill Frame=Armazon de Molino de Viento Wrought Iron=Hierro Forjado You are not allowed to edit this!=¡No está permitido editar esto! -Zinc=Zinc \ No newline at end of file +Zinc=Zinc diff --git a/technic/locale/technic.fr.tr b/technic/locale/technic.fr.tr index 5c91072..11a351a 100644 --- a/technic/locale/technic.fr.tr +++ b/technic/locale/technic.fr.tr @@ -94,6 +94,7 @@ Corium Source=Source de corium Cube=Cube Current target:=Cible actuelle : Current track: @1=Piste actuelle : @1 +Demand: @1=Demande : @1 Diamond Drill Head=Tête de forage en diamant Digging @1 m below machine=Creusement à @1m en dessous de la machine Digging finished=Creusement terminé @@ -207,4 +208,4 @@ Wind @1 Generator=Générateur éolien @1 Wind Mill Frame=Cadre d'éolienne Wrought Iron=Fer You are not allowed to edit this!=Vous n'êtes pas autorisé à modifier ceci ! -Zinc=Zinc \ No newline at end of file +Zinc=Zinc diff --git a/technic/locale/technic.it.tr b/technic/locale/technic.it.tr index 53585e0..9c1e3ad 100644 --- a/technic/locale/technic.it.tr +++ b/technic/locale/technic.it.tr @@ -94,6 +94,7 @@ Corium Source=Sorgente di corium Cube=Cubo Current target:=Obiettivo attuale: Current track: @1=Traccia attuale: @1 +Demand: @1=Domanda: @1 Diamond Drill Head=Trivella diamantata Digging @1 m below machine=Scavo di @1 m sotto la macchina Digging finished=Scavo finito @@ -207,4 +208,4 @@ Wind @1 Generator=@1 Generatore eolico Wind Mill Frame=Pala eolica Wrought Iron=Ferro Battuto You are not allowed to edit this!=Non ti è permesso di modificarlo! -Zinc=Zinco \ No newline at end of file +Zinc=Zinco diff --git a/technic/locale/technic.pl.tr b/technic/locale/technic.pl.tr index 22e7d5f..2ad871f 100644 --- a/technic/locale/technic.pl.tr +++ b/technic/locale/technic.pl.tr @@ -94,6 +94,7 @@ Corium Source=Źródło Korium Cube=Cube Current target:=Aktualny cel: Current track: @1=Aktualna ścieżka: @1 +Demand: @1=Popyt: @1 Diamond Drill Head=Diamentowa głowica wiertła Digging @1 m below machine=Kopię @1 m pod maszyną Digging finished=Kopanie skończone @@ -207,4 +208,4 @@ Wind @1 Generator=@1 Generator wiatrowy Wind Mill Frame=Klatka wiatraka Wrought Iron=Kutego żelaza You are not allowed to edit this!=Nie możesz tego edytować! -Zinc=Cynku \ No newline at end of file +Zinc=Cynku diff --git a/technic/locale/technic.pt_BR.tr b/technic/locale/technic.pt_BR.tr index bb84ded..aef19ce 100644 --- a/technic/locale/technic.pt_BR.tr +++ b/technic/locale/technic.pt_BR.tr @@ -94,6 +94,7 @@ Corium Source=Fonte de Cório Cube=Cube Current target:=Meta atual: Current track: @1=Pista atual: @1 +Demand: @1=Demanda: @1 Diamond Drill Head=Cabeça de Broca de Diamante Digging @1 m below machine=Escavando @1 m abaixo da máquina Digging finished=Escavação terminada @@ -207,4 +208,4 @@ Wind @1 Generator=Gerador de Energia Eólica @1 Wind Mill Frame=Armação de Moinho de Vento Wrought Iron=Ferro Forjado You are not allowed to edit this!=Você não está autorizado a editar isto! -Zinc=Zinco \ No newline at end of file +Zinc=Zinco diff --git a/technic/locale/technic.zh_CN.tr b/technic/locale/technic.zh_CN.tr index 9574241..9680ff0 100644 --- a/technic/locale/technic.zh_CN.tr +++ b/technic/locale/technic.zh_CN.tr @@ -94,6 +94,7 @@ Corium Source=镭射源 Cube=立方体 Current target:=目前的目标。 Current track: @1=目前的轨道。@1 +Demand: @1=需求。 @1 Diamond Drill Head=金刚石钻头 Digging @1 m below machine=挖掘 @1 m以下的机器 Digging finished=挖完 @@ -207,4 +208,4 @@ Wind @1 Generator=风力@1发电机 Wind Mill Frame=风力机框架 Wrought Iron=锻铁 You are not allowed to edit this!=你不允许编辑这个! -Zinc=锌 \ No newline at end of file +Zinc=锌 diff --git a/technic/locale/template.txt b/technic/locale/template.txt index ff527bf..505b3e7 100644 --- a/technic/locale/template.txt +++ b/technic/locale/template.txt @@ -91,6 +91,7 @@ Corium Source= Cube= Current target:= Current track: @1= +Demand: @1= Diamond Drill Head= Digging @1 m below machine= Digging finished= diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua index d50cd3c..ba9d028 100644 --- a/technic/machines/HV/forcefield.lua +++ b/technic/machines/HV/forcefield.lua @@ -290,7 +290,8 @@ local function run(pos, node) elseif eu_input >= power_requirement then if node.name == "technic:forcefield_emitter_off" then technic.swap_node(pos, "technic:forcefield_emitter_on") - meta:set_string("infotext", S("@1 Active", machine_name)) + meta:set_string("infotext", S("@1 Active", machine_name) .. "\n" .. + S("Demand: @1", technic.EU_string(power_requirement))) end update_forcefield(pos, meta, true) end diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index 682d463..9efa3ef 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -13,7 +13,8 @@ local quarry_demand = 10000 local network_time_limit = 30000 local infotext = { - active = S("@1 Active", S("@1 Quarry", S("HV"))), + active = S("@1 Active", S("@1 Quarry", S("HV"))) .. "\n" .. + S("Demand: @1", technic.EU_string(quarry_demand)), disabled = S("@1 Disabled", S("@1 Quarry", S("HV"))), finished = S("@1 Finished", S("@1 Quarry", S("HV"))), purge = S("@1 Purging Cache", S("@1 Quarry", S("HV"))), diff --git a/technic/machines/LV/lamp.lua b/technic/machines/LV/lamp.lua index b11906b..fad1092 100644 --- a/technic/machines/LV/lamp.lua +++ b/technic/machines/LV/lamp.lua @@ -5,10 +5,10 @@ local S = technic.getter local desc = S("@1 Lamp", S("LV")) -local active_desc = S("@1 Active", desc) +local demand = 50 +local active_desc = S("@1 Active", desc) .. "\n" .. S("Demand: @1", technic.EU_string(demand)) local unpowered_desc = S("@1 Unpowered", desc) local off_desc = S("@1 Off", desc) -local demand = 50 -- Invisible light source node used for illumination minetest.register_node("technic:dummy_light_source", { diff --git a/technic/machines/LV/led.lua b/technic/machines/LV/led.lua index 36fa458..3347793 100644 --- a/technic/machines/LV/led.lua +++ b/technic/machines/LV/led.lua @@ -5,9 +5,9 @@ local S = technic.getter local desc = S("@1 LED", S("LV")) -local active_desc = S("@1 Active", desc) -local unpowered_desc = S("@1 Unpowered", desc) local demand = 5 +local active_desc = S("@1 Active", desc) .. "\n" .. S("Demand: @1", technic.EU_string(demand)) +local unpowered_desc = S("@1 Unpowered", desc) local function led_run(pos, node) diff --git a/technic/machines/LV/music_player.lua b/technic/machines/LV/music_player.lua index 645d772..4e5f801 100644 --- a/technic/machines/LV/music_player.lua +++ b/technic/machines/LV/music_player.lua @@ -50,7 +50,8 @@ local run = function(pos, node) music_handle = nil end elseif eu_input >= demand then - meta:set_string("infotext", S("@1 Active", machine_name)) + meta:set_string("infotext", S("@1 Active", machine_name) .. "\n" .. + S("Demand: @1", technic.EU_string(demand))) if not music_handle then music_handle = play_track(pos, current_track) end diff --git a/technic/machines/MV/tool_workshop.lua b/technic/machines/MV/tool_workshop.lua index 4bdc893..46e6829 100644 --- a/technic/machines/MV/tool_workshop.lua +++ b/technic/machines/MV/tool_workshop.lua @@ -74,7 +74,8 @@ local run = function(pos, node) if eu_input < workshop_demand[EU_upgrade+1] then meta:set_string("infotext", S("@1 Unpowered", machine_name)) elseif eu_input >= workshop_demand[EU_upgrade+1] then - meta:set_string("infotext", S("@1 Active", machine_name)) + meta:set_string("infotext", S("@1 Active", machine_name) .. "\n" .. + S("Demand: @1", technic.EU_string(workshop_demand[EU_upgrade+1]))) srcstack:add_wear(-1000) inv:set_stack("src", 1, srcstack) end diff --git a/technic/machines/register/machine_base.lua b/technic/machines/register/machine_base.lua index 653009d..d90ecde 100644 --- a/technic/machines/register/machine_base.lua +++ b/technic/machines/register/machine_base.lua @@ -117,7 +117,8 @@ function technic.register_base_machine(nodename, data) end meta:set_int(tier.."_EU_demand", machine_demand[EU_upgrade+1]) technic.swap_node(pos, nodename.."_active") - meta:set_string("infotext", infotext_active) + meta:set_string("infotext", infotext_active .. "\n" .. + S("Demand: @1", technic.EU_string(machine_demand[EU_upgrade+1]))) if meta:get_int("src_time") < round(result.time*10) then if not powered then technic.swap_node(pos, nodename)