From b21c3d368077aa3a1c42ff1582cda6263c018585 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 6 Mar 2019 17:01:02 -0500 Subject: updated cottages, areasprotector, bees, biome_lib, technic, facade, farming redo, homedecor, maptools, mesecons, moreblocks, moreores, pipeworks, quartz, travelnet, unified_inventory, unifieddyes, xban2 delete the playeranim mod, not 5.0.0 compatible. --- technic/init.lua | 4 ++-- technic/items.lua | 6 +++--- technic/locale/de.txt | 8 ++++---- technic/locale/es.txt | 2 +- technic/locale/template.txt | 2 +- technic/machines/HV/cables.lua | 2 +- technic/machines/LV/cables.lua | 2 +- technic/machines/LV/geothermal.lua | 2 +- technic/machines/LV/water_mill.lua | 2 +- technic/machines/MV/cables.lua | 2 +- technic/machines/MV/hydro_turbine.lua | 4 ++-- technic/machines/MV/lighting.lua | 4 ++-- technic/machines/other/injector.lua | 8 ++++---- technic/machines/register/alloy_recipes.lua | 2 +- technic/machines/register/battery_box.lua | 8 ++++---- technic/machines/register/cables.lua | 2 +- technic/machines/register/common.lua | 6 +++--- technic/machines/register/generator.lua | 10 +++++----- technic/machines/register/machine_base.lua | 2 +- technic/tools/flashlight.lua | 2 +- technic/tools/mining_drill.lua | 2 +- technic/tools/prospector.lua | 4 ++-- technic/tools/sonic_screwdriver.lua | 2 +- 23 files changed, 44 insertions(+), 44 deletions(-) (limited to 'technic') diff --git a/technic/init.lua b/technic/init.lua index 0d97319..370c71b 100644 --- a/technic/init.lua +++ b/technic/init.lua @@ -26,10 +26,10 @@ dofile(modpath.."/config.lua") -- Helper functions dofile(modpath.."/helpers.lua") --- Items +-- Items dofile(modpath.."/items.lua") --- Craft recipes for items +-- Craft recipes for items dofile(modpath.."/crafts.lua") -- Register functions diff --git a/technic/items.lua b/technic/items.lua index d89ed46..cf57229 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -35,7 +35,7 @@ minetest.register_tool("technic:blue_energy_crystal", { fleshy = {times={}, uses=10000, maxlevel=0} } } -}) +}) minetest.register_tool("technic:green_energy_crystal", { description = S("Green Energy Crystal"), @@ -51,7 +51,7 @@ minetest.register_tool("technic:green_energy_crystal", { fleshy = {times={}, uses=10000, maxlevel=0} } } -}) +}) minetest.register_tool("technic:red_energy_crystal", { description = S("Red Energy Crystal"), @@ -67,7 +67,7 @@ minetest.register_tool("technic:red_energy_crystal", { fleshy = {times={}, uses=10000, maxlevel=0} } } -}) +}) minetest.register_craftitem("technic:copper_coil", { description = S("Copper Coil"), diff --git a/technic/locale/de.txt b/technic/locale/de.txt index 69bcb3d..45ff387 100644 --- a/technic/locale/de.txt +++ b/technic/locale/de.txt @@ -25,7 +25,7 @@ Mixed Metal Ingot = Mischmetallbarren Composite Plate = Verbundplatte Copper Plate = Kupferplatte Carbon Plate = Kohlefaserplatte -Graphite = Graphit +Graphite = Graphit Carbon Cloth = Kohlefasergewebe Raw Latex = Rohlatex Rubber Fiber = Gummifaser @@ -42,7 +42,7 @@ Inventory move disallowed due to protection = Das Inventar ist geschuetzt, Zugri %s Enabled = %s Idle = %s ist bereit %s Improperly Placed = %s ist falsch plaziert -%s Unpowered = %s hat keine Stromversorgung +%s Unpowered = %s hat keine Stromversorgung %s Out Of Fuel = %s hat keinen Brennstoff %s Has Bad Cabling = %s ist falsch verkabelt %s Has No Network = %s hat kein Netzwerk @@ -69,7 +69,7 @@ Disabled = %s Cable = %s Kabel %s Compressor = %s Kompressor %s Extractor = %s Extraktor -%s Forcefield Emitter = %s Kraftfeld-Emitter +%s Forcefield Emitter = %s Kraftfeld-Emitter %s Furnace = %s Ofen %s Grinder = %s Schleifmaschine %s Music Player = %s Musikspieler @@ -105,7 +105,7 @@ Administrative World Anchor = Charge = Aufladen Discharge = Entladen Power level = Energiestufe -# $1: Tier $2: current_charge $3: max_charge +# $1: Tier $2: current_charge $3: max_charge @1 Battery Box: @2/@3 = @1 Batteriebox: @2/@3 # $1: Machine name $2: Supply $3: Demand @1. Supply: @2 Demand: @3 = @1. Versorgung: @2 Bedarf: @3 diff --git a/technic/locale/es.txt b/technic/locale/es.txt index 2c1cdca..fa66988 100644 --- a/technic/locale/es.txt +++ b/technic/locale/es.txt @@ -101,7 +101,7 @@ Administrative World Anchor = Charge = Cargar Discharge = Descargar Power level = Nivel de Poder -# $1: Tier $2: current_charge $3: max_charge +# $1: Tier $2: current_charge $3: max_charge @1 Battery Box: @2/@3 = Caja de Bateria @1: @2/@3 # $1: Machine name $2: Supply $3: Demand @1. Supply: @2 Demand: @3 = @1. Alimentacion: @2 Demanda: @3 diff --git a/technic/locale/template.txt b/technic/locale/template.txt index f94ccda..12dbc65 100644 --- a/technic/locale/template.txt +++ b/technic/locale/template.txt @@ -110,7 +110,7 @@ Administrative World Anchor = Charge = Discharge = Power level = -# $1: Tier $2: current_charge $3: max_charge +# $1: Tier $2: current_charge $3: max_charge @1 Battery Box: @2/@3 = # $1: Machine name $2: Supply $3: Demand @1. Supply: @2 Demand: @3 = diff --git a/technic/machines/HV/cables.lua b/technic/machines/HV/cables.lua index 0b86a23..e084cf0 100644 --- a/technic/machines/HV/cables.lua +++ b/technic/machines/HV/cables.lua @@ -6,7 +6,7 @@ minetest.register_craft({ {'technic:mv_cable', 'technic:mv_cable', 'technic:mv_cable'}, {'homedecor:plastic_sheeting', 'homedecor:plastic_sheeting', 'homedecor:plastic_sheeting'}, } -}) +}) technic.register_cable("HV", 3/16) diff --git a/technic/machines/LV/cables.lua b/technic/machines/LV/cables.lua index d4ed880..69c0a24 100644 --- a/technic/machines/LV/cables.lua +++ b/technic/machines/LV/cables.lua @@ -8,7 +8,7 @@ minetest.register_craft({ {'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'}, {'default:paper', 'default:paper', 'default:paper'}, } -}) +}) technic.register_cable("LV", 2/16) diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index d828f6d..c66547e 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -22,7 +22,7 @@ minetest.register_craft({ minetest.register_craftitem("technic:geothermal", { description = S("Geothermal %s Generator"):format("LV"), -}) +}) local check_node_around = function(pos) local node = minetest.get_node(pos) diff --git a/technic/machines/LV/water_mill.lua b/technic/machines/LV/water_mill.lua index 33834ec..ed3c1e1 100644 --- a/technic/machines/LV/water_mill.lua +++ b/technic/machines/LV/water_mill.lua @@ -1,5 +1,5 @@ -- A water mill produces LV EUs by exploiting flowing water across it --- It is a LV EU supplyer and fairly low yield (max 180EUs) +-- It is a LV EU supplier and fairly low yield (max 180EUs) -- It is a little over half as good as the thermal generator. local S = technic.getter diff --git a/technic/machines/MV/cables.lua b/technic/machines/MV/cables.lua index 0c1f457..7d63dfd 100644 --- a/technic/machines/MV/cables.lua +++ b/technic/machines/MV/cables.lua @@ -8,7 +8,7 @@ minetest.register_craft({ {'technic:lv_cable', 'technic:lv_cable', 'technic:lv_cable'}, {'technic:rubber', 'technic:rubber', 'technic:rubber'}, } -}) +}) technic.register_cable("MV", 2.5/16) diff --git a/technic/machines/MV/hydro_turbine.lua b/technic/machines/MV/hydro_turbine.lua index e5df5e6..19dfebb 100644 --- a/technic/machines/MV/hydro_turbine.lua +++ b/technic/machines/MV/hydro_turbine.lua @@ -1,5 +1,5 @@ -- A Hydro Turbine produces MV EUs by exploiting flowing water across it --- It is a MV EU supplyer and fairly high yield (max 1800EUs) +-- It is a MV EU supplier and fairly high yield (max 1800EUs) local S = technic.getter @@ -25,7 +25,7 @@ local function get_water_flow(pos) end --- --- 10 times better than LV hydro because of 2 extra water mills and 4 stainless steel, a transformer and whatnot ;P. +-- 10 times better than LV hydro because of 2 extra water mills and 4 stainless steel, a transformer and whatnot ;P. -- Man hydro turbines are tough and long lasting. So, give it some value :) local run = function(pos, node) local meta = minetest.get_meta(pos) diff --git a/technic/machines/MV/lighting.lua b/technic/machines/MV/lighting.lua index 76fcb20..8ff2702 100644 --- a/technic/machines/MV/lighting.lua +++ b/technic/machines/MV/lighting.lua @@ -49,7 +49,7 @@ local dirs1 = {20, 23, 22, 21} local dirs2 = {9, 18, 7, 12} local technic_homedecor_rotate_and_place = function(itemstack, placer, pointed_thing) - if not technic_homedecor_node_is_owned(pointed_thing.under, placer) + if not technic_homedecor_node_is_owned(pointed_thing.under, placer) and not technic_homedecor_node_is_owned(pointed_thing.above, placer) then local node = minetest.get_node(pointed_thing.under) if not minetest.registered_nodes[node.name] or not minetest.registered_nodes[node.name].on_rightclick then @@ -76,7 +76,7 @@ local technic_homedecor_rotate_and_place = function(itemstack, placer, pointed_t if not minetest.registered_nodes[minetest.get_node(pos1).name]["buildable_to"] then return end - if iswall then + if iswall then minetest.add_node(pos1, {name = wield_name, param2 = dirs2[fdir+1] }) -- place wall variant elseif isceiling then minetest.add_node(pos1, {name = wield_name, param2 = 20 }) -- place upside down variant diff --git a/technic/machines/other/injector.lua b/technic/machines/other/injector.lua index 4fe78b2..c98be59 100644 --- a/technic/machines/other/injector.lua +++ b/technic/machines/other/injector.lua @@ -6,7 +6,7 @@ local fs_helpers = pipeworks.fs_helpers local tube_entry = "^pipeworks_tube_connection_metallic.png" local function inject_items (pos) - local meta=minetest.get_meta(pos) + local meta=minetest.get_meta(pos) local inv = meta:get_inventory() local mode=meta:get_string("mode") if mode=="single items" then @@ -15,7 +15,7 @@ local function inject_items (pos) i=i+1 if stack then local item0=stack:to_table() - if item0 then + if item0 then item0["count"] = "1" technic.tube_inject_item(pos, pos, vector.new(0, -1, 0), item0) stack:take_item(1) @@ -31,7 +31,7 @@ local function inject_items (pos) i=i+1 if stack then local item0=stack:to_table() - if item0 then + if item0 then technic.tube_inject_item(pos, pos, vector.new(0, -1, 0), item0) stack:clear() inv:set_stack("main", i, stack) @@ -142,7 +142,7 @@ minetest.register_abm({ chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) local pos1 = vector.add(pos, vector.new(0, -1, 0)) - local node1 = minetest.get_node(pos1) + local node1 = minetest.get_node(pos1) if minetest.get_item_group(node1.name, "tubedevice") > 0 then inject_items(pos) end diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua index 8731b8e..d5a4a4e 100644 --- a/technic/machines/register/alloy_recipes.lua +++ b/technic/machines/register/alloy_recipes.lua @@ -26,7 +26,7 @@ local recipes = { {"technic:silicon_wafer", "technic:gold_dust", "technic:doped_silicon_wafer"}, -- from https://en.wikipedia.org/wiki/Carbon_black -- The highest volume use of carbon black is as a reinforcing filler in rubber products, especially tires. - -- "[Compounding a] pure gum vulcanizate … with 50% of its weight of carbon black improves its tensile strength and wear resistance …" + -- "[Compounding a] pure gum vulcanizate … with 50% of its weight of carbon black improves its tensile strength and wear resistance …" {"technic:raw_latex 4", "technic:coal_dust 2", "technic:rubber 6", 2}, } diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua index d10b705..4f1f76e 100644 --- a/technic/machines/register/battery_box.lua +++ b/technic/machines/register/battery_box.lua @@ -129,11 +129,11 @@ local tube = { } local function add_on_off_buttons(meta, ltier, charge_percent) - local formspec = "" - if ltier == "mv" or ltier == "hv" then - formspec = "image[1,1;1,2;technic_power_meter_bg.png" + local formspec = "image[1,1;1,2;technic_power_meter_bg.png" .."^[lowpart:"..charge_percent - ..":technic_power_meter_fg.png]".. + ..":technic_power_meter_fg.png]" + if ltier == "mv" or ltier == "hv" then + formspec = formspec.. fs_helpers.cycling_button( meta, "image_button[3,2.0;1,0.6", diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua index 924128e..63ee851 100644 --- a/technic/machines/register/cables.lua +++ b/technic/machines/register/cables.lua @@ -122,7 +122,7 @@ local function item_place_override_node(itemstack, placer, pointed, node) local temp_itemstack = ItemStack(itemstack) temp_itemstack:set_name(node.name) local original_count = temp_itemstack:get_count() - temp_itemstack = + temp_itemstack = minetest.item_place(temp_itemstack, placer, pointed, node.param2) or temp_itemstack -- Remove the same number of items from the real itemstack diff --git a/technic/machines/register/common.lua b/technic/machines/register/common.lua index dfa2948..38354f9 100644 --- a/technic/machines/register/common.lua +++ b/technic/machines/register/common.lua @@ -66,14 +66,14 @@ function technic.send_items(pos, x_velocity, z_velocity, output_name) output_name = "dst" end - local meta = minetest.get_meta(pos) + local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local i = 0 for _, stack in ipairs(inv:get_list(output_name)) do i = i + 1 if stack then local item0 = stack:to_table() - if item0 then + if item0 then item0["count"] = "1" technic.tube_inject_item(pos, pos, vector.new(x_velocity, 0, z_velocity), item0) stack:take_item(1) @@ -124,7 +124,7 @@ function technic.handle_machine_pipeworks(pos, tube_upgrade, send_function) if node.param2 == 0 then pos1.x = pos1.x + 1 x_velocity = 1 end local output_tube_connected = false - local node1 = minetest.get_node(pos1) + local node1 = minetest.get_node(pos1) if minetest.get_item_group(node1.name, "tubedevice") > 0 then output_tube_connected = true end diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua index 87ef6e7..f8d7e6a 100644 --- a/technic/machines/register/generator.lua +++ b/technic/machines/register/generator.lua @@ -57,7 +57,7 @@ function technic.register_generator(data) -- Burn another piece of fuel if burn_time == 0 then local inv = meta:get_inventory() - if not inv:is_empty("src") then + if not inv:is_empty("src") then local fuellist = inv:get_list("src") local fuel local afterfuel @@ -96,7 +96,7 @@ function technic.register_generator(data) } )..pipeworks.button_label end - meta:set_string("formspec", + meta:set_string("formspec", "size[8, 9]".. "label[0, 0;"..minetest.formspec_escape(desc).."]".. "list[current_name;src;3, 1;1, 1;]".. @@ -120,7 +120,7 @@ function technic.register_generator(data) "technic_"..ltier.."_generator_side.png"..tentry, "technic_"..ltier.."_generator_side.png"..tentry, "technic_"..ltier.."_generator_front.png" - }, + }, paramtype2 = "facedir", groups = groups, connect_sides = {"bottom", "back", "left", "right"}, @@ -240,7 +240,7 @@ function technic.register_generator(data) } )..pipeworks.button_label end - meta:set_string("formspec", + meta:set_string("formspec", "size[8, 9]".. "label[0, 0;"..minetest.formspec_escape(desc).."]".. "list[current_name;src;3, 1;1, 1;]".. @@ -274,7 +274,7 @@ function technic.register_generator(data) local burn_time = meta:get_int("burn_time") local percent = math.floor(burn_time / burn_totaltime * 100) - meta:set_string("formspec", + meta:set_string("formspec", "size[8, 9]".. "label[0, 0;"..minetest.formspec_escape(desc).."]".. "list[current_name;src;3, 1;1, 1;]".. diff --git a/technic/machines/register/machine_base.lua b/technic/machines/register/machine_base.lua index 14cf998..15fb8ea 100644 --- a/technic/machines/register/machine_base.lua +++ b/technic/machines/register/machine_base.lua @@ -147,7 +147,7 @@ function technic.register_base_machine(data) minetest.register_node("technic:"..ltier.."_"..machine_name, { description = machine_desc:format(tier), tiles = { - "technic_"..ltier.."_"..machine_name.."_top.png"..tentry, + "technic_"..ltier.."_"..machine_name.."_top.png"..tentry, "technic_"..ltier.."_"..machine_name.."_bottom.png"..tentry, "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua index 252dc8c..30f2480 100644 --- a/technic/tools/flashlight.lua +++ b/technic/tools/flashlight.lua @@ -8,7 +8,7 @@ local S = technic.getter technic.register_power_tool("technic:flashlight", flashlight_max_charge) minetest.register_alias("technic:light_off", "air") - + minetest.register_tool("technic:flashlight", { description = S("Flashlight"), inventory_image = "technic_flashlight.png", diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index 250c461..cb16914 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -62,7 +62,7 @@ end local function drill_dig_it1 (player) local dir=player:get_look_dir() - if math.abs(dir.x)>math.abs(dir.z) then + if math.abs(dir.x)>math.abs(dir.z) then if dir.x>0 then return 0 end return 1 end diff --git a/technic/tools/prospector.lua b/technic/tools/prospector.lua index 9a918a2..12437a7 100644 --- a/technic/tools/prospector.lua +++ b/technic/tools/prospector.lua @@ -93,7 +93,7 @@ minetest.register_tool("technic:prospector", { "label[0,7.5;Accuracy:]".. "label[0,8;98%]") return - end, + end, }) minetest.register_on_player_receive_fields(function(user, formname, fields) @@ -117,7 +117,7 @@ minetest.register_on_player_receive_fields(function(user, formname, fields) user:set_wielded_item(toolstack) return true end) - + minetest.register_craft({ output = "technic:prospector", recipe = { diff --git a/technic/tools/sonic_screwdriver.lua b/technic/tools/sonic_screwdriver.lua index 300d363..536f47c 100644 --- a/technic/tools/sonic_screwdriver.lua +++ b/technic/tools/sonic_screwdriver.lua @@ -86,7 +86,7 @@ minetest.register_tool("technic:sonic_screwdriver", { return itemstack end, }) - + minetest.register_craft({ output = "technic:sonic_screwdriver", recipe = { -- cgit v1.2.3