Rationalise machine terminology

All electrically-powered machines now consistently indicate their
tier (supply voltage) in their names.  As this implies that they are
electrically powered, the furnaces no longer have "Electric" in their
names.  The fuel-fired equivalents of electric machines, which exist
for alloy furnace and furnace, now say "Fuel-Fired" to distinguish them.
(The fuel-fired alloy furnace used to say "Coal", which was inaccurate
because it uses any fuel.  The fuel-fired furnace, from the default mod,
used to just be called "Furnace", which is ambiguous.)

Electric power generators now consistently indicate their tier and have
the word "Generator" in their names.  This makes their purpose much
clearer, and makes obvious craft guide searches produce useful results.
The fuel-fired generators, previously just (ambiguously) called
"Generator", are now explicitly "Fuel-Fired".

diff --git a/technic/locale/de.txt b/technic/locale/de.txt
index 3b03f0b6a02ea8fa101fe8789404733d31faf0eb..984296ba9edec72a9f71df653390ad138e59673d 100644 (file)
--- a/technic/locale/de.txt
+++ b/technic/locale/de.txt
@@ -59,10 +59,22 @@ whole stacks = Ganzer Stapel
 %s Alloy Furnace = %s Legierungsofen
 %s Battery Box = %s Batteriebox
 %s Cable = %s Kabel
-%s Electric Furnace = %s Elektro-Ofen
+%s CNC Machine = %s CNC-Maschine
+%s Compressor = %s Kompressor
+%s Extractor = %s Extraktor
+%s Forcefield Emitter = %s Kraftfeld-Emitter 
+%s Furnace = %s Ofen
 %s Grinder = %s Schleifmaschine
-%s Generator = %s Generator
-%s Solar Array = %s Solaranlage
+%s Music Player = %s Musikspieler
+%s Quarry = %s Steinbruch
+%s Tool Workshop = %s Werkzeugwerkstatt
+Arrayed Solar %s Generator = %s Solaranlage
+Fuel-Fired %s Generator = %s Kohle-Generator
+Geothermal %s Generator = %s Geothermie-Generator
+Hydro %s Generator = %s Wassermuehle
+Nuclear %s Generator Core = %s Reaktorkern
+Small Solar %s Generator = %s Solarmodul
+Wind %s Generator = %s Windmuehle
 Injector = Injektor
 Constructor Mk%d = Konstruktor Modell %d
 Frame = Rahmen
@@ -74,22 +86,11 @@ Template tool = Schablonenwerkzeug
 Battery Box = Batteriebox
 Supply Converter = Stromumwandler
 Switching Station = Schaltanlage
-CNC Machine = CNC-Maschine
-Coal Alloy Furnace = Kohle-Legierungsofen
-Extractor = Extraktor
-Compressor = Kompressor
-Solar Panel = Solarmodul
-Geothermal Generator = Geothermie-Generator
-Music Player = Musikspieler
-Water Mill = Wassermuehle
-Tool Workshop = Werkzeugwerkstatt
-Wind Mill = Windmuehle
+Fuel-Fired Alloy Furnace = Kohle-Legierungsofen
+Fuel-Fired Furnace = Kohle-Ofen
 Wind Mill Frame = Windmuehlengeruest
-Forcefield Emitter = Kraftfeld-Emitter 
 Forcefield = Kraftfeld
-Nuclear Reactor Core = Reaktorkern
 Nuclear Reactor Rod Compartment = Brennstabfaecher
-Quarry = Steinbruch
 
 ## Machine-specific
 # $1: Pruduced EU

diff --git a/technic/locale/es.txt b/technic/locale/es.txt
index 1f2c274bbc6a298471f733844e0ce08e0d5eebd7..2323abc478de19f5de59ed8face1abd1cc014090 100644 (file)
--- a/technic/locale/es.txt
+++ b/technic/locale/es.txt
@@ -52,10 +52,22 @@ Enable/Disable = Habilitar/Deshabilitar
 %s Alloy Furnace = Horno de Aleacion %s
 %s Battery Box = Caja de Bateria %s
 %s Cable = Cable %s
-%s Electric Furnace = Horno Electrico %s
+%s CNC Machine = Maquina CNC %s
+%s Compressor = Compresor %s
+%s Extractor = Extractor %s
+%s Forcefield Emitter = Emisor de Campo de Fuerza %s
+%s Furnace = Horno %s
 %s Grinder = Amoladora %s
-%s Generator = Generador %s
-%s Solar Array = Panel Solar %s
+%s Music Player = Reproductor de Musica %s
+%s Quarry = Cantera %s
+%s Tool Workshop = Taller de Herramientas %s
+Arrayed Solar %s Generator = Panel Solar %s
+Fuel-Fired %s Generator = Generador a Carbon %s
+Geothermal %s Generator = Generador Geotermico %s
+Hydro %s Generator = Molino de Agua %s
+Nuclear %s Generator Core = Nucleo de Reactor Nuclear %s
+Small Solar %s Generator = Panel Solar %s
+Wind %s Generator = Molino de Viento %s
 Injector =
 Constructor Mk%d =
 Frame =
@@ -67,22 +79,11 @@ Template Tool =
 Supply Converter = Convertidor de Alimentacion
 Switching Station = Estacion de Conmutacion
 Battery Box = Caja de Baterias
-Quarry = Cantera
-CNC Machine = Maquina CNC
-Music Player = Reproductor de Musica
-Extractor = Extractor
-Coal Alloy Furnace = Horno de Aleacion a Carbon
-Tool Workshop = Taller de Herramientas
+Fuel-Fired Alloy Furnace = Horno de Aleacion a Carbon
+Fuel-Fired Furnace = Horno a Carbon
 Forcefield = Campo de Fuerza
-Forcefield Emitter = Emisor de Campo de Fuerza
-Compressor = Compresor
-Geothermal Generator = Generador Geotermico
-Water Mill = Molino de Agua
 Nuclear Reactor Rod Compartment = Compartimiento para Vara de Reactor Nuclear
-Nuclear Reactor Core = Nucleo de Reactor Nuclear
-Wind Mill = Molino de Viento
 Wind Mill Frame = Armazon de Molino de Viento
-Solar Panel = Panel Solar
 
 ## Machine-specific
 # $1: Pruduced EU

diff --git a/technic/locale/it.txt b/technic/locale/it.txt
index 764c099ad0cad1056dbc0c1f382b3dd313c95c9d..70da24eafc70005f7c05cabe83610b84d209b62c 100644 (file)
--- a/technic/locale/it.txt
+++ b/technic/locale/it.txt
@@ -56,10 +56,22 @@ whole stacks = pila completa
 %s Alloy Furnace = %s Fornace per leghe
 %s Battery Box =  %s Box batterie
 %s Cable = Cavo %s
-%s Electric Furnace = %s Fornace elettrica
+%s CNC Machine = Tornio CNC %s
+%s Compressor = Compressore %s
+%s Extractor = Estrattore %s
+%s Forcefield Emitter = Emettitore di campo di forza %s
+%s Furnace = %s Fornace
 %s Grinder = %s Tritatutto
-%s Generator = %s Generatore
-%s Solar Array = %s Pannello Solare
+%s Music Player = Music Player %s
+%s Quarry = Cava %s
+%s Tool Workshop = Officina per attrezzi %s
+Arrayed Solar %s Generator = %s Pannello Solare
+Fuel-Fired %s Generator = %s Generatore a carbone
+Geothermal %s Generator = %s Generatore Geotermico
+Hydro %s Generator = Turbina Elettrica %s
+Nuclear %s Generator Core = Reattore nucleare %s
+Small Solar %s Generator = %s Pannello solare
+Wind %s Generator = %s Generatore eolico
 Injector = Ignettore
 Constructor Mk%d = Costruttore Mk%d
 Frame = Cornice
@@ -71,22 +83,11 @@ Template Tool =
 Battery Box = Box batterie
 Supply Converter = Trasformatore
 Switching Station = Stazione di controllo
-CNC Machine = Tornio CNC
-Coal Alloy Furnace = Fornace per leghe a carbone
-Extractor = Estrattore
-Compressor = Compressore
-Solar Panel = Pannello solare
-Geothermal Generator = Generatore Geotermico
-Music Player = Music Player
-Water Mill = Turbina Elettrica
-Tool Workshop = Officina per attrezzi
-Wind Mill = Generatore eolico
+Fuel-Fired Alloy Furnace = Fornace per leghe a carbone
+Fuel-Fired Furnace = Fornace a carbone
 Wind Mill Frame = Pala eolica
-Forcefield Emitter = Emettitore di campo di forza
 Forcefield = Campo di forza
-Nuclear Reactor Core = Reattore nucleare
 Nuclear Reactor Rod Compartment = Compartimento combustibile nucleare
-Quarry = Cava
 
 ## Machine-specific
 # $1: Pruduced EU

diff --git a/technic/locale/template.txt b/technic/locale/template.txt
index ccf0bdece15bf4528bf987e8ff5dd127f02de63b..dd14ae1769134b1a7e379d838caa1768580388cb 100644 (file)
--- a/technic/locale/template.txt
+++ b/technic/locale/template.txt
@@ -59,10 +59,22 @@ whole stacks =
 %s Alloy Furnace =
 %s Battery Box = 
 %s Cable =
-%s Electric Furnace =
+%s CNC Machine =
+%s Compressor =
+%s Extractor =
+%s Forcefield Emitter =
+%s Furnace =
 %s Grinder =
-%s Generator =
-%s Solar Array =
+%s Music Player =
+%s Quarry =
+%s Tool Workshop =
+Arrayed Solar %s Generator =
+Fuel-Fired %s Generator =
+Geothermal %s Generator =
+Hydro %s Generator =
+Nuclear %s Generator Core =
+Small Solar %s Generator =
+Wind %s Generator =
 Injector =
 Constructor Mk%d =
 Frame =
@@ -74,22 +86,11 @@ Template Tool =
 Battery Box =
 Supply Converter =
 Switching Station =
-CNC Machine =
-Coal Alloy Furnace =
-Extractor =
-Compressor =
-Solar Panel =
-Geothermal Generator =
-Music Player =
-Water Mill =
-Tool Workshop =
-Wind Mill =
+Fuel-Fired Alloy Furnace =
+Fuel-Fired Furnace =
 Wind Mill Frame =
-Forcefield Emitter =
 Forcefield =
-Nuclear Reactor Core =
 Nuclear Reactor Rod Compartment =
-Quarry =
 
 ## Machine-specific
 # $1: Pruduced EU

diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua
index 41adf94adbe2f534c6408aafff10e6ad562bb2c4..711243dfdcf96039ccaa39234e57cccf9f51246a 100644 (file)
--- a/technic/machines/HV/forcefield.lua
+++ b/technic/machines/HV/forcefield.lua
@@ -105,7 +105,7 @@ local mesecons = {
 }
 
 minetest.register_node("technic:forcefield_emitter_off", {
-       description = S("Forcefield Emitter"),
+       description = S("%s Forcefield Emitter"):format("HV"),
        tiles = {"technic_forcefield_emitter_off.png"},
        groups = {cracky = 1},
        on_receive_fields = forcefield_receive_fields,
@@ -116,13 +116,13 @@ minetest.register_node("technic:forcefield_emitter_off", {
                meta:set_int("range", 10)
                meta:set_int("enabled", 0)
                meta:set_string("formspec", get_forcefield_formspec(10))
-               meta:set_string("infotext", S("Forcefield Emitter"))
+               meta:set_string("infotext", S("%s Forcefield Emitter"):format("HV"))
        end,
        mesecons = mesecons
 })
 
 minetest.register_node("technic:forcefield_emitter_on", {
-       description = S("Forcefield Emitter"),
+       description = S("%s Forcefield Emitter"):format("HV"),
        tiles = {"technic_forcefield_emitter_on.png"},
        groups = {cracky = 1, not_in_creative_inventory=1},
        drop = "technic:forcefield_emitter_off",
@@ -140,7 +140,7 @@ minetest.register_node("technic:forcefield_emitter_on", {
 })
 
 minetest.register_node("technic:forcefield", {
-       description = S("Forcefield"),
+       description = S("%s Forcefield"):format("HV"),
        sunlight_propagates = true,
        drawtype = "glasslike",
        groups = {not_in_creative_inventory=1, unbreakable=1},
@@ -166,7 +166,7 @@ minetest.register_abm({
                local eu_input   = meta:get_int("HV_EU_input")
                local eu_demand  = meta:get_int("HV_EU_demand")
                local enabled    = meta:get_int("enabled")
-               local machine_name = S("Forcefield Emitter")
+               local machine_name = S("%s Forcefield Emitter"):format("HV")
                -- Power off automatically if no longer connected to a switching station
                technic.switching_station_timeout_count(pos, "HV")
 

diff --git a/technic/machines/HV/nuclear_reactor.lua b/technic/machines/HV/nuclear_reactor.lua
index 4dbd0c50929b98bef60d0a9c0d3026f6d715f1a1..abe71bcd3940819765f7a096a5317cc3ecbc4397 100644 (file)
--- a/technic/machines/HV/nuclear_reactor.lua
+++ b/technic/machines/HV/nuclear_reactor.lua
@@ -49,7 +49,7 @@ local nodebox = {
 }
 
 minetest.register_node("technic:hv_nuclear_reactor_core", {
-       description = S("Nuclear Reactor Core"),
+       description = S("Nuclear %s Generator Core"):format("HV"),
        tiles = {"technic_hv_nuclear_reactor_core.png", "technic_hv_nuclear_reactor_core.png",
                 "technic_hv_nuclear_reactor_core.png", "technic_hv_nuclear_reactor_core.png",
                 "technic_hv_nuclear_reactor_core.png", "technic_hv_nuclear_reactor_core.png"},
@@ -65,7 +65,7 @@ minetest.register_node("technic:hv_nuclear_reactor_core", {
        },
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Nuclear Reactor Core"))
+               meta:set_string("infotext", S("Nuclear %s Generator Core"):format("HV"))
                meta:set_int("HV_EU_supply", 0)
                -- Signal to the switching station that this device burns some
                -- sort of fuel and needs special handling
@@ -194,7 +194,7 @@ minetest.register_abm({
        chance   = 1,
        action = function(pos, node, active_object_count, active_object_count_wider)
                local meta = minetest.get_meta(pos)
-               local machine_name = S("Nuclear Reactor Core")
+               local machine_name = S("Nuclear %s Generator Core"):format("HV")
                local burn_time = meta:get_int("burn_time") or 0
 
                if burn_time >= burn_ticks or burn_time == 0 then

diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua
index 1f0629b7bf53f897148e925d294e647788237a1b..f22e09460dd7015c9aba10dfbba074b1fc82f479 100644 (file)
--- a/technic/machines/HV/quarry.lua
+++ b/technic/machines/HV/quarry.lua
@@ -16,9 +16,9 @@ local function set_quarry_formspec(meta)
        local formspec = "size[3,1.5]"..
                "field[1,0.5;2,1;size;Radius;"..meta:get_int("size").."]"
        if meta:get_int("enabled") == 0 then
-               formspec = formspec.."button[0,1;3,1;enable;"..S("%s Disabled"):format(S("Quarry")).."]"
+               formspec = formspec.."button[0,1;3,1;enable;"..S("%s Disabled"):format(S("%s Quarry"):format("HV")).."]"
        else
-               formspec = formspec.."button[0,1;3,1;disable;"..S("%s Enabled"):format(S("Quarry")).."]"
+               formspec = formspec.."button[0,1;3,1;disable;"..S("%s Enabled"):format(S("%s Quarry"):format("HV")).."]"
        end
        meta:set_string("formspec", formspec)
 end
@@ -127,7 +127,7 @@ local function send_items(items, pos, node)
 end
 
 minetest.register_node("technic:quarry", {
-       description = S("Quarry"),
+       description = S("%s Quarry"):format("HV"),
        tiles = {"technic_carbon_steel_block.png", "technic_carbon_steel_block.png",
                 "technic_carbon_steel_block.png", "technic_carbon_steel_block.png",
                 "technic_carbon_steel_block.png^default_tool_mesepick.png", "technic_carbon_steel_block.png"},
@@ -138,7 +138,7 @@ minetest.register_node("technic:quarry", {
        },
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Quarry"))
+               meta:set_string("infotext", S("%s Quarry"):format("HV"))
                meta:set_int("size", 4)
                set_quarry_formspec(meta)
                meta:set_int("dig_y", pos.y)
@@ -163,7 +163,7 @@ minetest.register_abm({
                local demand = 10000
                local center = get_quarry_center(pos, size)
                local dig_y = meta:get_int("dig_y")
-               local machine_name = S("Quarry")
+               local machine_name = S("%s Quarry"):format("HV")
 
                technic.switching_station_timeout_count(pos, "HV")
 

diff --git a/technic/machines/LV/cnc.lua b/technic/machines/LV/cnc.lua
index baee2c9dff2c5abc508d0f96bd5733e33562e7d8..7395645fd8477eabfc21dfbbbe46f69ec23b8e7a 100644 (file)
--- a/technic/machines/LV/cnc.lua
+++ b/technic/machines/LV/cnc.lua
@@ -127,7 +127,7 @@ end
 
 -- The actual block inactive state
 minetest.register_node("technic:cnc", {
-       description = S("CNC Machine"),
+       description = S("%s CNC Machine"):format("LV"),
        tiles       = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
                       "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"},
        drawtype    = "nodebox",
@@ -143,7 +143,7 @@ minetest.register_node("technic:cnc", {
        legacy_facedir_simple = true,
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("CNC Machine"))
+               meta:set_string("infotext", S("%s CNC Machine"):format("LV"))
                meta:set_float("technic_power_machine", 1)
                meta:set_string("formspec", cnc_formspec)
                local inv = meta:get_inventory()
@@ -159,7 +159,7 @@ minetest.register_node("technic:cnc", {
 
 -- Active state block
 minetest.register_node("technic:cnc_active", {
-       description = S("CNC Machine"),
+       description = S("%s CNC Machine"):format("LV"),
        tiles       = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
                       "technic_cnc_side.png",       "technic_cnc_side.png",   "technic_cnc_front_active.png"},
        paramtype2 = "facedir",
@@ -182,7 +182,7 @@ minetest.register_abm({
                local meta         = minetest.get_meta(pos)
                local inv          = meta:get_inventory()
                local eu_input     = meta:get_int("LV_EU_input")
-               local machine_name = S("CNC Machine")
+               local machine_name = S("%s CNC Machine"):format("LV")
                local machine_node = "technic:cnc"
                local demand       = 450
 

diff --git a/technic/machines/LV/coal_alloy_furnace.lua b/technic/machines/LV/coal_alloy_furnace.lua
index 36307b75b80f2a131ad8f78f2bb3ea08ec06d2ed..2240a514537af9a434606800007d42d37138c0ab 100644 (file)
--- a/technic/machines/LV/coal_alloy_furnace.lua
+++ b/technic/machines/LV/coal_alloy_furnace.lua
@@ -1,5 +1,5 @@
 
--- Coal driven alloy furnace. This uses no EUs:
+-- Fuel driven alloy furnace. This uses no EUs:
 
 local S = technic.getter
 
@@ -13,7 +13,7 @@ minetest.register_craft({
 })
 
 minetest.register_node("technic:coal_alloy_furnace", {
-       description = S("Coal Alloy Furnace"),
+       description = S("Fuel-Fired Alloy Furnace"),
        tiles = {"technic_coal_alloy_furnace_top.png",  "technic_coal_alloy_furnace_bottom.png",
                 "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_side.png",
                 "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_front.png"},
@@ -24,7 +24,7 @@ minetest.register_node("technic:coal_alloy_furnace", {
        on_construct = function(pos)
                local meta = minetest.env:get_meta(pos)
                meta:set_string("formspec", coal_alloy_furnace_formspec)
-               meta:set_string("infotext", S("Coal Alloy Furnace"))
+               meta:set_string("infotext", S("Fuel-Fired Alloy Furnace"))
                local inv = meta:get_inventory()
                inv:set_size("fuel", 1)
                inv:set_size("src", 1)
@@ -38,7 +38,7 @@ minetest.register_node("technic:coal_alloy_furnace", {
 })
 
 minetest.register_node("technic:coal_alloy_furnace_active", {
-       description = "Alloy Furnace",
+       description = S("Fuel-Fired Alloy Furnace"),
        tiles = {"technic_coal_alloy_furnace_top.png",  "technic_coal_alloy_furnace_bottom.png",
                 "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_side.png",
                 "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_front_active.png"},
@@ -62,7 +62,7 @@ minetest.register_abm({
                local meta = minetest.get_meta(pos)
                local inv    = meta:get_inventory()
                local recipe = nil
-               local machine_name = S("Coal Alloy Furnace")
+               local machine_name = S("Fuel-Fired Alloy Furnace")
                local formspec =
                        "size[8,9]"..
                        "label[0,0;"..machine_name.."]"..

diff --git a/technic/machines/LV/coal_furnace.lua b/technic/machines/LV/coal_furnace.lua
new file mode 100644 (file)
index 0000000..53a0f8b
--- /dev/null
+++ b/technic/machines/LV/coal_furnace.lua
@@ -0,0 +1,5 @@
+local S = technic.getter
+
+if minetest.registered_nodes["default:furnace"].description == "Furnace" then
+       minetest.override_item("default:furnace", { description = S("Fuel-Fired Furnace") })
+end

diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua
index c0e590f4099dc7e595e02eda322f57c889666f2e..84aaac9e86f55aff6a90b7143b3d8ef68b70773f 100644 (file)
--- a/technic/machines/LV/compressor.lua
+++ b/technic/machines/LV/compressor.lua
@@ -54,13 +54,13 @@ minetest.register_craft({
 
 local compressor_formspec =
        "invsize[8,9;]"..
-       "label[0,0;"..S("Compressor").."]"..
+       "label[0,0;"..S("%s Compressor"):format("LV").."]"..
        "list[current_name;src;3,1;1,1;]"..
        "list[current_name;dst;5,1;2,2;]"..
        "list[current_player;main;0,5;8,4;]"
 
 minetest.register_node("technic:compressor", {
-       description = S("Compressor"),
+       description = S("%s Compressor"):format("LV"),
        tiles = {"technic_compressor_top.png",  "technic_compressor_bottom.png",
                 "technic_compressor_side.png", "technic_compressor_side.png",
                 "technic_compressor_back.png", "technic_compressor_front.png"},
@@ -70,7 +70,7 @@ minetest.register_node("technic:compressor", {
        sounds = default.node_sound_wood_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Compressor"))
+               meta:set_string("infotext", S("%s Compressor"):format("LV"))
                meta:set_string("formspec", compressor_formspec)
                local inv = meta:get_inventory()
                inv:set_size("src", 1)
@@ -83,7 +83,7 @@ minetest.register_node("technic:compressor", {
 })
 
 minetest.register_node("technic:compressor_active", {
-       description = S("Compressor"),
+       description = S("%s Compressor"):format("LV"),
        tiles = {"technic_compressor_top.png",  "technic_compressor_bottom.png",
                 "technic_compressor_side.png", "technic_compressor_side.png",
                 "technic_compressor_back.png", "technic_compressor_front_active.png"},
@@ -105,7 +105,7 @@ minetest.register_abm({
        action = function(pos, node, active_object_count, active_object_count_wider)
                local meta         = minetest.get_meta(pos)
                local eu_input     = meta:get_int("LV_EU_input")
-               local machine_name = S("Compressor")
+               local machine_name = S("%s Compressor"):format("LV")
                local machine_node = "technic:compressor"
                local demand       = 300
  

diff --git a/technic/machines/LV/extractor.lua b/technic/machines/LV/extractor.lua
index 6a620c1f4f262887f3c796323ddf6e5dd1991a80..72d2ce7c5ff1e4007c20c04686045635af3862a9 100644 (file)
--- a/technic/machines/LV/extractor.lua
+++ b/technic/machines/LV/extractor.lua
@@ -61,13 +61,13 @@ minetest.register_craft({
 
 local extractor_formspec =
    "invsize[8,9;]"..
-   "label[0,0;"..S("Extractor").."]"..
+   "label[0,0;"..S("%s Extractor"):format("LV").."]"..
    "list[current_name;src;3,1;1,1;]"..
    "list[current_name;dst;5,1;2,2;]"..
    "list[current_player;main;0,5;8,4;]"
 
 minetest.register_node("technic:extractor", {
-       description = S("Extractor"),
+       description = S("%s Extractor"):format("LV"),
        tiles = {"technic_lv_grinder_top.png",  "technic_lv_grinder_bottom.png", "technic_lv_grinder_side.png",
                 "technic_lv_grinder_side.png", "technic_lv_grinder_side.png",   "technic_lv_grinder_front.png"},
        paramtype2 = "facedir",
@@ -76,7 +76,7 @@ minetest.register_node("technic:extractor", {
        sounds = default.node_sound_wood_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Extractor"))
+               meta:set_string("infotext", S("%s Extractor"):format("LV"))
                meta:set_string("formspec", extractor_formspec)
                local inv = meta:get_inventory()
                inv:set_size("src", 1)
@@ -89,7 +89,7 @@ minetest.register_node("technic:extractor", {
 })
 
 minetest.register_node("technic:extractor_active", {
-       description = S("Extractor"),
+       description = S("%s Extractor"):format("LV"),
        tiles = {"technic_lv_grinder_top.png",  "technic_lv_grinder_bottom.png",
                 "technic_lv_grinder_side.png", "technic_lv_grinder_side.png",
                 "technic_lv_grinder_side.png", "technic_lv_grinder_front_active.png"},
@@ -116,7 +116,7 @@ minetest.register_abm({
                local eu_input = meta:get_int("LV_EU_input")
 
                -- Machine information
-               local machine_name = S("Extractor")
+               local machine_name = S("%s Extractor"):format("LV")
                local machine_node = "technic:extractor"
                local demand       = 300
 

diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua
index 855593c8c610500e8e72bdc636ab24b88836cc0b..8c64708c32861b7355492470764efdbc83b1e4c2 100644 (file)
--- a/technic/machines/LV/geothermal.lua
+++ b/technic/machines/LV/geothermal.lua
@@ -17,11 +17,11 @@ minetest.register_craft({
 })
 
 minetest.register_craftitem("technic:geothermal", {
-       description = S("Geothermal Generator"),
+       description = S("Geothermal %s Generator"):format("LV"),
 }) 
 
 minetest.register_node("technic:geothermal", {
-       description = S("Geothermal Generator"),
+       description = S("Geothermal %s Generator"):format("LV"),
        tiles = {"technic_geothermal_top.png", "technic_machine_bottom.png", "technic_geothermal_side.png",
                 "technic_geothermal_side.png", "technic_geothermal_side.png", "technic_geothermal_side.png"},
        paramtype2 = "facedir",
@@ -30,13 +30,13 @@ minetest.register_node("technic:geothermal", {
        sounds = default.node_sound_wood_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Geothermal Generator"))
+               meta:set_string("infotext", S("Geothermal %s Generator"):format("LV"))
                meta:set_int("LV_EU_supply", 0)
        end,    
 })
 
 minetest.register_node("technic:geothermal_active", {
-       description = S("Geothermal Generator"),
+       description = S("Geothermal %s Generator"):format("LV"),
        tiles = {"technic_geothermal_top_active.png", "technic_machine_bottom.png", "technic_geothermal_side.png",
                 "technic_geothermal_side.png", "technic_geothermal_side.png", "technic_geothermal_side.png"},
        paramtype2 = "facedir",
@@ -96,7 +96,7 @@ minetest.register_abm({
                end
 
                meta:set_string("infotext",
-                       S("Geothermal Generator").." ("..production_level.."%)")
+                       S("Geothermal %s Generator"):format("LV").." ("..production_level.."%)")
 
                if production_level > 0 and minetest.get_node(pos).name == "technic:geothermal" then
                        technic.swap_node (pos, "technic:geothermal_active")

diff --git a/technic/machines/LV/init.lua b/technic/machines/LV/init.lua
index dc47087ecef4c36a34e32fc21f9c7da6ff2e5065..b8b87597692bbc96ee98b5ac898e463bbd8b178b 100644 (file)
--- a/technic/machines/LV/init.lua
+++ b/technic/machines/LV/init.lua
@@ -7,6 +7,7 @@ dofile(path.."/cables.lua")
 dofile(path.."/battery_box.lua")
 dofile(path.."/alloy_furnace.lua")
 dofile(path.."/coal_alloy_furnace.lua")
+dofile(path.."/coal_furnace.lua")
 dofile(path.."/solar_panel.lua")
 dofile(path.."/solar_array.lua")
 dofile(path.."/geothermal.lua")

diff --git a/technic/machines/LV/music_player.lua b/technic/machines/LV/music_player.lua
index d04e72d71df423e4c03bb4700fc2466a3ca32a7f..39dd32911c684bb1cc2e8e271cf190963fa51d37 100644 (file)
--- a/technic/machines/LV/music_player.lua
+++ b/technic/machines/LV/music_player.lua
@@ -17,7 +17,7 @@ local music_handles = {}
 
 local music_player_formspec =
        "invsize[8,9;]"..
-       "label[0,0;"..S("Music Player").."]"..
+       "label[0,0;"..S("%s Music Player"):format("LV").."]"..
        "button[4,1;1,1;track1;1]"..
        "button[5,1;1,1;track2;2]"..
        "button[6,1;1,1;track3;3]"..
@@ -37,14 +37,14 @@ local function play_track(pos, track)
 end
 
 minetest.register_node("technic:music_player", {
-       description = S("Music Player"),
+       description = S("%s Music Player"):format("LV"),
        tiles = {"technic_music_player_top.png", "technic_machine_bottom.png", "technic_music_player_side.png",
                 "technic_music_player_side.png", "technic_music_player_side.png", "technic_music_player_side.png"},
        groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
        sounds = default.node_sound_wood_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Music Player"))
+               meta:set_string("infotext", S("%s Music Player"):format("LV"))
                meta:set_int("active", 0)
                meta:set_int("current_track", 1)
                meta:set_string("formspec", music_player_formspec)
@@ -66,7 +66,7 @@ minetest.register_node("technic:music_player", {
                meta:set_int("current_track", current_track)
                meta:set_string("formspec",
                                "invsize[8,9;]"..
-                               "label[0,0;"..S("Music Player").."]"..
+                               "label[0,0;"..S("%s Music Player"):format("LV").."]"..
                                "button[4,1;1,1;track1;1]"..
                                "button[5,1;1,1;track2;2]"..
                                "button[6,1;1,1;track3;3]"..
@@ -104,7 +104,7 @@ minetest.register_abm({
        action = function(pos, node, active_object_count, active_object_count_wider)
                local meta         = minetest.get_meta(pos)
                local eu_input     = meta:get_int("LV_EU_input")
-               local machine_name = S("Music Player")
+               local machine_name = S("%s Music Player"):format("LV")
                local machine_node = "technic:music_player"
                local demand       = 150
 

diff --git a/technic/machines/LV/solar_panel.lua b/technic/machines/LV/solar_panel.lua
index 95b359dee117004fe9d43e508d8b4adfb8137946..b10a3f18d6624d6258c17a241aa577a7ab0a4079 100644 (file)
--- a/technic/machines/LV/solar_panel.lua
+++ b/technic/machines/LV/solar_panel.lua
@@ -9,7 +9,7 @@ minetest.register_node("technic:solar_panel", {
                 "technic_solar_panel_side.png", "technic_solar_panel_side.png",   "technic_solar_panel_side.png"},
        groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
        sounds = default.node_sound_wood_defaults(),
-       description = S("Solar Panel"),
+       description = S("Small Solar %s Generator"):format("LV"),
        active = false,
        drawtype = "nodebox",
        paramtype = "light",
@@ -21,7 +21,7 @@ minetest.register_node("technic:solar_panel", {
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
                meta:set_int("LV_EU_supply", 0)
-               meta:set_string("infotext", S("Solar Panel"))
+               meta:set_string("infotext", S("Small Solar %s Generator"):format("LV"))
        end,
 })
 
@@ -48,7 +48,7 @@ minetest.register_abm({
                -- To take care of some of it solar panels do not work outside daylight hours or if
                -- built below -10m
                local pos1 = {x=pos.x, y=pos.y+1, z=pos.z}
-               local machine_name = S("Solar Panel")
+               local machine_name = S("Small Solar %s Generator"):format("LV")
 
                local light = minetest.get_node_light(pos1, nil)
                local time_of_day = minetest.get_timeofday()

diff --git a/technic/machines/LV/water_mill.lua b/technic/machines/LV/water_mill.lua
index 90a5bae39c1f74c21f816281a6a620e861b648e4..0ddccc78506b6c771f9ec1e9ebc468ee9c985d13 100644 (file)
--- a/technic/machines/LV/water_mill.lua
+++ b/technic/machines/LV/water_mill.lua
@@ -16,7 +16,7 @@ minetest.register_craft({
 })
 
 minetest.register_node("technic:water_mill", {
-       description = S("Water Mill"),
+       description = S("Hydro %s Generator"):format("LV"),
        tiles = {"technic_water_mill_top.png",  "technic_machine_bottom.png",
                 "technic_water_mill_side.png", "technic_water_mill_side.png",
                 "technic_water_mill_side.png", "technic_water_mill_side.png"},
@@ -26,13 +26,13 @@ minetest.register_node("technic:water_mill", {
        sounds = default.node_sound_wood_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Water Mill"))
+               meta:set_string("infotext", S("Hydro %s Generator"):format("LV"))
                meta:set_int("LV_EU_supply", 0)
        end,    
 })
 
 minetest.register_node("technic:water_mill_active", {
-       description = S("Water Mill"),
+       description = S("Hydro %s Generator"):format("LV"),
        tiles = {"technic_water_mill_top_active.png", "technic_machine_bottom.png",
                 "technic_water_mill_side.png",       "technic_water_mill_side.png",
                 "technic_water_mill_side.png",       "technic_water_mill_side.png"},
@@ -85,7 +85,7 @@ minetest.register_abm({
                end
 
                meta:set_string("infotext",
-                       S("Water Mill").." ("..production_level.."%)")
+                       S("Hydro %s Generator"):format("LV").." ("..production_level.."%)")
 
                if production_level > 0 and
                   minetest.get_node(pos).name == "technic:water_mill" then

diff --git a/technic/machines/MV/power_radiator.lua b/technic/machines/MV/power_radiator.lua
index 6462606986480b5eb218e07dde09aa282c577140..652347185e18a799241280e5ed7886466b3d93e6 100644 (file)
--- a/technic/machines/MV/power_radiator.lua
+++ b/technic/machines/MV/power_radiator.lua
@@ -108,7 +108,7 @@ local toggle_on_off_inductive_appliances = function(pos, node, puncher)
 end
 
 minetest.register_node("technic:power_radiator", {
-       description = "Power Radiator",
+       description = "MV Power Radiator",
        tiles  = {"technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png",
                  "technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png"},
        groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
@@ -124,7 +124,7 @@ minetest.register_node("technic:power_radiator", {
                local meta = minetest.get_meta(pos)
                meta:set_int("MV_EU_demand",1)               -- Demand on the primary side when idle
                meta:set_int("connected_EU_demand",0)        -- Potential demand of connected appliances
-               meta:set_string("infotext", "Power Radiator")
+               meta:set_string("infotext", "MV Power Radiator")
        end,
        on_dig = function(pos, node, digger)
                shutdown_inductive_appliances(pos)
@@ -158,7 +158,7 @@ minetest.register_abm({
 
                if eu_input == 0 then
                        -- No power
-                       meta:set_string("infotext", "Power Radiator is unpowered");
+                       meta:set_string("infotext", "MV Power Radiator is unpowered");
                        -- meta:set_int("active", 1) -- used for setting textures someday maybe
                        shutdown_inductive_appliances(pos)
                        meta:set_int("connected_EU_demand", 0)
@@ -201,7 +201,7 @@ minetest.register_abm({
                                        -- The appliance has power from this node. Spend power if it is on.
                                        used_charge = used_charge + math.floor(meta1:get_int("EU_charge") / eff_factor)
                                end
-                               meta:set_string("infotext", "Power Radiator is powered ("
+                               meta:set_string("infotext", "MV Power Radiator is powered ("
                                        ..math.floor(used_charge / max_charge * 100)
                                        .."% of maximum power)");
                                if used_charge == 0 then

diff --git a/technic/machines/MV/tool_workshop.lua b/technic/machines/MV/tool_workshop.lua
index 8bc95ea866dc12a6b3d8523a8dee9e94d28f82e0..15aa09dd935fc5d56fef8490e0375b68852dfaa3 100644 (file)
--- a/technic/machines/MV/tool_workshop.lua
+++ b/technic/machines/MV/tool_workshop.lua
@@ -17,18 +17,18 @@ minetest.register_craft({
 local workshop_formspec =
        "invsize[8,9;]"..
        "list[current_name;src;3,1;1,1;]"..
-       "label[0,0;"..S("Tool Workshop").."]"..
+       "label[0,0;"..S("%s Tool Workshop"):format("MV").."]"..
        "list[current_player;main;0,5;8,4;]"
 
 minetest.register_node("technic:tool_workshop", {
-       description = S("Tool Workshop"),
+       description = S("%s Tool Workshop"):format("MV"),
        tiles = {"technic_workshop_top.png", "technic_machine_bottom.png", "technic_workshop_side.png",
                 "technic_workshop_side.png", "technic_workshop_side.png", "technic_workshop_side.png"},
        groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
        sounds = default.node_sound_wood_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Tool Workshop"))
+               meta:set_string("infotext", S("%s Tool Workshop"):format("MV"))
                meta:set_string("formspec", workshop_formspec)
                local inv = meta:get_inventory()
                inv:set_size("src", 1)
@@ -46,7 +46,7 @@ minetest.register_abm({
                local meta         = minetest.get_meta(pos)
                local inv          = meta:get_inventory()
                local eu_input     = meta:get_int("MV_EU_input")
-               local machine_name = S("Tool Workshop")
+               local machine_name = S("%s Tool Workshop"):format("MV")
                local machine_node = "technic:tool_workshop"
                local demand       = 5000
 

diff --git a/technic/machines/MV/wind_mill.lua b/technic/machines/MV/wind_mill.lua
index 6930228d7b1b81dfa12568fc86796d54711f00c8..868a60e0312948b8b73d9962f961e9e1291340cd 100644 (file)
--- a/technic/machines/MV/wind_mill.lua
+++ b/technic/machines/MV/wind_mill.lua
@@ -30,7 +30,7 @@ minetest.register_node("technic:wind_mill_frame", {
 })
 
 minetest.register_node("technic:wind_mill", {
-       description = S("Wind Mill"),
+       description = S("Wind %s Generator"):format("MV"),
        tiles = {"technic_carbon_steel_block.png"},
        paramtype2 = "facedir",
        groups = {cracky=1},
@@ -48,7 +48,7 @@ minetest.register_node("technic:wind_mill", {
        },
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", S("Wind Mill"))
+               meta:set_string("infotext", S("Wind %s Generator"):format("MV"))
                meta:set_int("MV_EU_supply", 0)
        end,    
 })
@@ -72,7 +72,7 @@ minetest.register_abm({
        chance   = 1,
        action = function(pos, node, active_object_count, active_object_count_wider)
                local meta = minetest.get_meta(pos)
-               local machine_name = S("Wind Mill")
+               local machine_name = S("Wind %s Generator"):format("MV")
                local power = math.min(pos.y * 100, 5000)
 
                if not check_wind_mill(pos) then

diff --git a/technic/machines/register/alloy_furnace.lua b/technic/machines/register/alloy_furnace.lua
index ac1cd05e4e948c35c8f2dd9d7cc78fe631022065..ac99da5ee5c89f33ec707bda0789ecab09029a4a 100644 (file)
--- a/technic/machines/register/alloy_furnace.lua
+++ b/technic/machines/register/alloy_furnace.lua
@@ -183,7 +183,7 @@ function technic.register_alloy_furnace(data)
        })
 
        minetest.register_node("technic:"..ltier.."_alloy_furnace_active",{
-               description = S(tier.." Alloy Furnace"),
+               description = S("%s Alloy Furnace"):format(tier),
                tiles = {"technic_"..ltier.."_alloy_furnace_top.png",
                         "technic_"..ltier.."_alloy_furnace_bottom.png",
                         tube_side_texture,

diff --git a/technic/machines/register/electric_furnace.lua b/technic/machines/register/electric_furnace.lua
index e153609eeeef33c359f41bee9ccc658b41a8e385..a2df6f8a1cbf3d968b14ada701de4d533769d22a 100644 (file)
--- a/technic/machines/register/electric_furnace.lua
+++ b/technic/machines/register/electric_furnace.lua
@@ -36,7 +36,7 @@ function technic.register_electric_furnace(data)
                "list[current_name;src;3,1;1,1;]"..
                "list[current_name;dst;5,1;2,2;]"..
                "list[current_player;main;0,6;8,4;]"..
-               "label[0,0;"..S("%s Electric Furnace"):format(tier).."]"
+               "label[0,0;"..S("%s Furnace"):format(tier).."]"
        if data.upgrade then
                formspec = formspec..
                        "list[current_name;upgrade1;1,4;1,1;]"..
@@ -45,7 +45,7 @@ function technic.register_electric_furnace(data)
        end
 
        minetest.register_node("technic:"..ltier.."_electric_furnace", {
-               description = S("%s Electric Furnace"):format(tier),
+               description = S("%s Furnace"):format(tier),
                tiles = {"technic_"..ltier.."_electric_furnace_top.png",
                         "technic_"..ltier.."_electric_furnace_bottom.png",
                         tube_side_texture,
@@ -60,7 +60,7 @@ function technic.register_electric_furnace(data)
                on_construct = function(pos)
                        local meta = minetest.get_meta(pos)
                        local name = minetest.get_node(pos).name
-                       meta:set_string("infotext", S("%s Electric Furnace"):format(tier))
+                       meta:set_string("infotext", S("%s Furnace"):format(tier))
                        meta:set_int("tube_time",  0)
                        meta:set_string("formspec", formspec)
                        local inv = meta:get_inventory()
@@ -76,7 +76,7 @@ function technic.register_electric_furnace(data)
        })
 
        minetest.register_node("technic:"..ltier.."_electric_furnace_active", {
-               description = ("%s Electric Furnace"):format(tier),
+               description = ("%s Furnace"):format(tier),
                tiles = {"technic_"..ltier.."_electric_furnace_top.png",
                         "technic_"..ltier.."_electric_furnace_bottom.png",
                         tube_side_texture,
@@ -94,7 +94,7 @@ function technic.register_electric_furnace(data)
                        local meta = minetest.get_meta(pos)
                        local name = minetest.get_node(pos).name
                        local data = minetest.registered_nodes[name].technic
-                       meta:set_string("infotext", S("%s Electric Furnace"):format(tier))
+                       meta:set_string("infotext", S("%s Furnace"):format(tier))
                        meta:set_int("tube_time",  0)
                        meta:set_string("formspec", formspec)
                        local inv = meta:get_inventory()
@@ -120,7 +120,7 @@ function technic.register_electric_furnace(data)
                        local eu_input = meta:get_int(tier.."_EU_input")
 
                        -- Machine information
-                       local machine_name   = S("%s Electric Furnace"):format(tier)
+                       local machine_name   = S("%s Furnace"):format(tier)
                        local machine_node   = "technic:"..ltier.."_electric_furnace"
                        local machine_demand = data.demand
 

diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua
index d253323e228113292918d8cb0285559f14d292c8..547ee2e175c443106dffe842062c3f5e09e98231 100644 (file)
--- a/technic/machines/register/generator.lua
+++ b/technic/machines/register/generator.lua
@@ -29,12 +29,12 @@ function technic.register_generator(data)
 
        local generator_formspec =
                "invsize[8,9;]"..
-               "label[0,0;"..S("%s Generator"):format(tier).."]"..
+               "label[0,0;"..S("Fuel-Fired %s Generator"):format(tier).."]"..
                "list[current_name;src;3,1;1,1;]"..
                "image[4,1;1,1;default_furnace_fire_bg.png]"..
                "list[current_player;main;0,5;8,4;]"
        
-       local desc = S("%s Generator"):format(tier)
+       local desc = S("Fuel-Fired %s Generator"):format(tier)
        minetest.register_node("technic:"..ltier.."_generator", {
                description = desc,
                tiles = {"technic_"..ltier.."_generator_top.png", "technic_machine_bottom.png",
@@ -121,7 +121,7 @@ function technic.register_generator(data)
                        meta:set_string("infotext", desc.." ("..percent.."%)")
                                meta:set_string("formspec", 
                                        "size[8, 9]"..
-                                       "label[0, 0;Generator]"..
+                                       "label[0, 0;"..minetest.formspec_escape(desc).."]"..
                                        "list[current_name;src;3, 1;1, 1;]"..
                                        "image[4, 1;1, 1;default_furnace_fire_bg.png^[lowpart:"..
                                        (percent)..":default_furnace_fire_fg.png]"..

diff --git a/technic/machines/register/solar_array.lua b/technic/machines/register/solar_array.lua
index 93deb863cd91f433e3ccb1ed65d29528236b4669..da1017f105a59ed28cc0d10ddd6b25bc1ae33c20 100644 (file)
--- a/technic/machines/register/solar_array.lua
+++ b/technic/machines/register/solar_array.lua
@@ -11,7 +11,7 @@ function technic.register_solar_array(data)
                         "technic_"..ltier.."_solar_array_side.png", "technic_"..ltier.."_solar_array_side.png"},
                groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
                sounds = default.node_sound_wood_defaults(),
-               description = S("%s Solar Array"):format(tier),
+               description = S("Arrayed Solar %s Generator"):format(tier),
                active = false,
                drawtype = "nodebox",
                paramtype = "light",
@@ -40,7 +40,7 @@ function technic.register_solar_array(data)
                        -- To take care of some of it solar panels do not work outside daylight hours or if
                        -- built below -10m
                        local pos1 = {}
-                       local machine_name = S("%s Solar Array"):format(tier)
+                       local machine_name = S("Arrayed Solar %s Generator"):format(tier)
                        pos1.y = pos.y + 1
                        pos1.x = pos.x
                        pos1.z = pos.z