diff --git a/technic/locale/es.txt b/technic/locale/es.txt index efa5828..ddf1a3a 100644 --- a/technic/locale/es.txt +++ b/technic/locale/es.txt @@ -56,6 +56,14 @@ Enable/Disable = Habilitar/Deshabilitar %s Grinder = Amoladora %s %s Generator = Generador %s %s Solar Array = Panel Solar %s +Injector = +Constructor Mk%d = +Frame = +Frame Motor = +Template = +Template (replacing) = +Template Motor = +Template Tool = Supply Converter = Convertidor de Alimentacion Switching Station = Estacion de Conmutacion Battery Box = Caja de Baterias @@ -64,7 +72,7 @@ CNC Machine = Maquina CNC Music Player = Reproductor de Musica Extractor = Extractor Coal Alloy Furnace = Horno de Aleacion a Carbon -Tool WorkShop = Taller de Herramientas +Tool Workshop = Taller de Herramientas Forcefield = Campo de Fuerza Forcefield Emitter = Emisor de Campo de Fuerza Compressor = Compresor @@ -144,6 +152,7 @@ Tin = Estanio Zinc = Zinc ## Tools +RE Battery = Water Can = Bidon de Agua Lava Can = Bidon de Lava Chainsaw = Motosierra diff --git a/technic/locale/it.txt b/technic/locale/it.txt index 94ee4d2..e8499cf 100644 --- a/technic/locale/it.txt +++ b/technic/locale/it.txt @@ -53,6 +53,14 @@ Range = Raggio %s Grinder = %s Tritatutto %s Generator = %s Generatore %s Solar Array = %s Pannello Solare +Injector = +Constructor Mk%d = +Frame = +Frame Motor = +Template = +Template (replacing) = +Template Motor = +Template Tool = Battery Box = Box batterie Supply Converter = Trasformatore Switching Station = Stazione di controllo @@ -64,7 +72,7 @@ Solar Panel = Pannello solare Geothermal Generator = Generatore Geotermico Music Player = Music Player Water Mill = Turbina Elettrica -Tool WorkShop = Officina per attrezzi +Tool Workshop = Officina per attrezzi Wind Mill = Generatore eolico Wind Mill Frame = Pala eolica Forcefield Emitter = Emettitore di campo di forza @@ -141,6 +149,7 @@ Tin = Stagno Zinc = Zinco ## Tools +RE Battery = Water Can = Serbatoio d'acqua Lava Can = Serbatoio di lava Chainsaw = Motosega diff --git a/technic/locale/template.txt b/technic/locale/template.txt index 37d16db..a6e1e2c 100644 --- a/technic/locale/template.txt +++ b/technic/locale/template.txt @@ -56,6 +56,14 @@ Range = %s Grinder = %s Generator = %s Solar Array = +Injector = +Constructor Mk%d = +Frame = +Frame Motor = +Template = +Template (replacing) = +Template Motor = +Template Tool = Battery Box = Supply Converter = Switching Station = @@ -67,7 +75,7 @@ Solar Panel = Geothermal Generator = Music Player = Water Mill = -Tool WorkShop = +Tool Workshop = Wind Mill = Wind Mill Frame = Forcefield Emitter = @@ -144,6 +152,7 @@ Tin = Zinc = ## Tools +RE Battery = Water Can = Lava Can = Chainsaw = diff --git a/technic/machines/LV/battery_box.lua b/technic/machines/LV/battery_box.lua index a3f5171..459fdb3 100644 --- a/technic/machines/LV/battery_box.lua +++ b/technic/machines/LV/battery_box.lua @@ -1,30 +1,3 @@ --- LV Battery box and some other nodes... - -technic.register_power_tool("technic:battery", 10000) -technic.register_power_tool("technic:red_energy_crystal", 100000) -technic.register_power_tool("technic:green_energy_crystal", 250000) -technic.register_power_tool("technic:blue_energy_crystal", 500000) - -minetest.register_craft({ - output = 'technic:battery', - recipe = { - {'group:wood', 'default:copper_ingot', 'group:wood'}, - {'group:wood', 'moreores:tin_ingot', 'group:wood'}, - {'group:wood', 'default:copper_ingot', 'group:wood'}, - } -}) - -minetest.register_tool("technic:battery", { - description = "RE Battery", - inventory_image = "technic_battery.png", - tool_capabilities = { - charge = 0, - max_drop_level = 0, - groupcaps = { - fleshy = {times={}, uses=10000, maxlevel=0} - } - } -}) minetest.register_craft({ output = 'technic:lv_battery_box0', diff --git a/technic/machines/other/constructor.lua b/technic/machines/other/constructor.lua index 87cc59b..f4ccd09 100644 --- a/technic/machines/other/constructor.lua +++ b/technic/machines/other/constructor.lua @@ -1,4 +1,6 @@ +local S = technic.getter + minetest.register_craft({ type = "shapeless", output = 'technic:constructor_mk1_off 1', @@ -48,7 +50,7 @@ end minetest.register_node("technic:constructor_mk1_off", { - description = "Constructor MK1", + description = S("Constructor Mk%d"):format(1), tile_images = {"technic_constructor_mk1_top_off.png","technic_constructor_mk1_bottom_off.png","technic_constructor_mk1_side2_off.png","technic_constructor_mk1_side1_off.png", "technic_constructor_back.png","technic_constructor_front_off.png"}, is_ground_content = true, @@ -60,11 +62,11 @@ minetest.register_node("technic:constructor_mk1_off", { local meta = minetest.get_meta(pos) meta:set_string("formspec", "invsize[8,9;]".. - "label[0,0;Constructor MK1]".. + "label[0,0;"..S("Constructor Mk%d"):format(1).."]".. "label[5,0;Slot 1]".. "list[current_name;slot1;6,0;1,1;]".. "list[current_player;main;0,5;8,4;]") - meta:set_string("infotext", "Constructor MK1") + meta:set_string("infotext", S("Constructor Mk%d"):format(1)) local inv = meta:get_inventory() inv:set_size("slot1", 1) end, @@ -80,7 +82,7 @@ minetest.register_node("technic:constructor_mk1_off", { }) minetest.register_node("technic:constructor_mk1_on", { - description = "Constructor MK1", + description = S("Constructor Mk%d"):format(3), tile_images = {"technic_constructor_mk1_top_on.png","technic_constructor_mk1_bottom_on.png","technic_constructor_mk1_side2_on.png","technic_constructor_mk1_side1_on.png", "technic_constructor_back.png","technic_constructor_front_on.png"}, paramtype2 = "facedir", @@ -93,7 +95,7 @@ minetest.register_node("technic:constructor_mk1_on", { }) ---Constructor MK2 +--Constructor Mk2 mk2_on = function(pos, node) local meta = minetest.get_meta(pos) @@ -129,7 +131,7 @@ mk2_off = function(pos, node) end minetest.register_node("technic:constructor_mk2_off", { - description = "Constructor MK2", + description = S("Constructor Mk%d"):format(2), tile_images = {"technic_constructor_mk2_top_off.png","technic_constructor_mk2_bottom_off.png","technic_constructor_mk2_side2_off.png","technic_constructor_mk2_side1_off.png", "technic_constructor_back.png","technic_constructor_front_off.png"}, is_ground_content = true, @@ -141,13 +143,13 @@ minetest.register_node("technic:constructor_mk2_off", { local meta = minetest.get_meta(pos) meta:set_string("formspec", "invsize[8,9;]".. - "label[0,0;Constructor MK2]".. + "label[0,0;"..S("Constructor Mk%d"):format(2).."]".. "label[5,0;Slot 1]".. "list[current_name;slot1;6,0;1,1;]".. "label[5,1;Slot 2]".. "list[current_name;slot2;6,1;1,1;]".. "list[current_player;main;0,5;8,4;]") - meta:set_string("infotext", "Constructor MK2") + meta:set_string("infotext", S("Constructor Mk%d"):format(2)) local inv = meta:get_inventory() inv:set_size("slot1", 1) inv:set_size("slot2", 1) @@ -164,7 +166,7 @@ minetest.register_node("technic:constructor_mk2_off", { }) minetest.register_node("technic:constructor_mk2_on", { - description = "Constructor MK2", + description = S("Constructor Mk%d"):format(2), tile_images = {"technic_constructor_mk2_top_on.png","technic_constructor_mk2_bottom_on.png","technic_constructor_mk2_side2_on.png","technic_constructor_mk2_side1_on.png", "technic_constructor_back.png","technic_constructor_front_on.png"}, is_ground_content = true, @@ -178,7 +180,7 @@ minetest.register_node("technic:constructor_mk2_on", { }) --- Constructor MK3 +-- Constructor Mk3 mk3_on = function(pos, node) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() @@ -231,7 +233,7 @@ mk3_off = function(pos, node) end minetest.register_node("technic:constructor_mk3_off", { - description = "Constructor MK3", + description = S("Constructor Mk%d"):format(3), tile_images = {"technic_constructor_mk3_top_off.png","technic_constructor_mk3_bottom_off.png","technic_constructor_mk3_side2_off.png","technic_constructor_mk3_side1_off.png", "technic_constructor_back.png","technic_constructor_front_off.png"}, paramtype2 = "facedir", @@ -242,7 +244,7 @@ minetest.register_node("technic:constructor_mk3_off", { local meta = minetest.get_meta(pos) meta:set_string("formspec", "invsize[8,9;]".. - "label[0,0;Constructor MK2]".. + "label[0,0;"..S("Constructor Mk%d"):format(3).."]".. "label[5,0;Slot 1]".. "list[current_name;slot1;6,0;1,1;]".. "label[5,1;Slot 2]".. @@ -252,7 +254,7 @@ minetest.register_node("technic:constructor_mk3_off", { "label[5,3;Slot 4]".. "list[current_name;slot4;6,3;1,1;]".. "list[current_player;main;0,5;8,4;]") - meta:set_string("infotext", "Constructor MK3") + meta:set_string("infotext", S("Constructor Mk%d"):format(3)) local inv = meta:get_inventory() inv:set_size("slot1", 1) inv:set_size("slot2", 1) @@ -273,7 +275,7 @@ minetest.register_node("technic:constructor_mk3_off", { }) minetest.register_node("technic:constructor_mk3_on", { - description = "Constructor MK3", + description = S("Constructor Mk%d"):format(3), tile_images = {"technic_constructor_mk3_top_on.png","technic_constructor_mk3_bottom_on.png","technic_constructor_mk3_side2_on.png","technic_constructor_mk3_side1_on.png", "technic_constructor_back.png","technic_constructor_front_on.png"}, is_ground_content = true, diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua index 0eabf3d..46cf7bf 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -1,3 +1,6 @@ + +local S = technic.getter + frames = {} -- Helpers @@ -195,7 +198,7 @@ local nodeboxes= { minetest.register_node("technic:frame_"..nameext,{ - description = "Frame", + description = S("Frame"), tiles = {"technic_frame.png"}, groups=groups, drawtype = "nodebox", @@ -286,7 +289,7 @@ local function frame_motor_on(pos, node) end minetest.register_node("technic:frame_motor",{ - description = "Frame motor", + description = S("Frame Motor"), tiles = {"pipeworks_filter_top.png^[transformR90", "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,mesecon=2}, @@ -477,7 +480,7 @@ local function template_on_destruct(pos, node) end minetest.register_node("technic:template",{ - description = "Template", + description = S("Template"), tiles = {"technic_mv_cable.png"}, drop = "", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -489,7 +492,7 @@ minetest.register_node("technic:template",{ }) minetest.register_node("technic:template_disabled",{ - description = "Template", + description = S("Template"), tiles = {"technic_hv_cable.png"}, drop = "", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1}, @@ -502,7 +505,7 @@ minetest.register_node("technic:template_disabled",{ }) minetest.register_node("technic:template_connector",{ - description = "Template", + description = S("Template"), tiles = {"technic_lv_cable.png"}, drop = "", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1}, @@ -514,7 +517,7 @@ minetest.register_node("technic:template_connector",{ }) minetest.register_craftitem("technic:template_replacer",{ - description = "Template (replacing)", + description = S("Template (replacing)"), inventory_image = "technic_template_replacer.png", on_place = function(itemstack, placer, pointed_thing) local p = pointed_thing.under @@ -534,7 +537,7 @@ minetest.register_craftitem("technic:template_replacer",{ }) minetest.register_tool("technic:template_tool",{ - description = "Template tool", + description = S("Template tool"), inventory_image = "technic_template_tool.png", on_use = function(itemstack, puncher, pointed_thing) local pos = pointed_thing.under @@ -587,7 +590,7 @@ local function template_motor_on(pos, node) end minetest.register_node("technic:template_motor",{ - description = "Template motor", + description = S("Template motor"), tiles = {"pipeworks_filter_top.png^[transformR90", "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,mesecon=2}, diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua index 6897861..1bc2bec 100644 --- a/technic/machines/other/injector.lua +++ b/technic/machines/other/injector.lua @@ -1,4 +1,6 @@ +local S = technic.getter + minetest.register_craft({ output = 'technic:injector 1', recipe = { @@ -9,7 +11,7 @@ minetest.register_craft({ }) minetest.register_node("technic:injector", { - description = "Injector", + description = S("Injector"), tiles = {"technic_injector_top.png", "technic_injector_bottom.png", "technic_injector_side.png", "technic_injector_side.png", "technic_injector_side.png", "technic_injector_side.png"}, groups = chest_groups1, @@ -19,12 +21,12 @@ minetest.register_node("technic:injector", { local meta = minetest.env:get_meta(pos) meta:set_string("formspec", "invsize[8,9;]".. - "label[0,0;Injector]".. + "label[0,0;"..S("Injector").."]".. "button[0,1;.8,.8;mode;]".. "label[.8,1;Mode: single items]".. "list[current_name;main;0,2;8,2;]".. "list[current_player;main;0,5;8,4;]") - meta:set_string("infotext", "Injector") + meta:set_string("infotext", S("Injector")) local inv = meta:get_inventory() inv:set_size("main", 8*4) meta:set_string("mode","single items") @@ -47,7 +49,7 @@ minetest.register_node("technic:injector", { end meta:set_string("formspec", "invsize[8,9;]".. - "label[0,0;Injector]".. + "label[0,0;"..S("Injector").."]".. "button[0,1;.8,.8;mode;]".. "label[.8,1;Mode: "..mode.."]".. "list[current_name;main;0,2;8,2;]".. diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua index 8da6200..3124635 100644 --- a/technic/machines/register/battery_box.lua +++ b/technic/machines/register/battery_box.lua @@ -1,6 +1,33 @@ local S = technic.getter +technic.register_power_tool("technic:battery", 10000) +technic.register_power_tool("technic:red_energy_crystal", 100000) +technic.register_power_tool("technic:green_energy_crystal", 250000) +technic.register_power_tool("technic:blue_energy_crystal", 500000) + +minetest.register_craft({ + output = 'technic:battery', + recipe = { + {'group:wood', 'default:copper_ingot', 'group:wood'}, + {'group:wood', 'moreores:tin_ingot', 'group:wood'}, + {'group:wood', 'default:copper_ingot', 'group:wood'}, + } +}) + +minetest.register_tool("technic:battery", { + description = S("RE Battery"), + inventory_image = "technic_battery.png", + tool_capabilities = { + charge = 0, + max_drop_level = 0, + groupcaps = { + fleshy = {times={}, uses=10000, maxlevel=0} + } + } +}) + + function technic.register_battery_box(data) local tier = data.tier local ltier = string.lower(tier)