From f8ca493a6bd9beaa83117de135c78d0d50d0b57f Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Tue, 4 Jan 2022 19:40:27 +0100 Subject: [PATCH] Fix ta5 hyperloop tank bug, EOF blank added --- .test/sink.lua | 2 +- basic_machines/autocrafter.lua | 2 +- basic_machines/blackhole.lua | 2 +- basic_machines/chest.lua | 2 +- basic_machines/concentrator.lua | 2 +- basic_machines/consumer.lua | 2 +- basic_machines/distributor.lua | 2 +- basic_machines/forceload.lua | 3 +- basic_machines/foreign_nodes.lua | 2 +- basic_machines/gravelsieve.lua | 2 +- basic_machines/grinder.lua | 2 +- basic_machines/itemsource.lua | 2 +- basic_machines/mods_support.lua | 1 - basic_machines/quarry.lua | 2 +- basic_machines/recycler.lua | 2 +- basic_machines/ta4_chest.lua | 2 +- basic_machines/ta4_injector.lua | 2 +- basic_machines/ta5_chest.lua | 2 +- basis/assemble.lua | 2 +- basis/command.lua | 2 +- basis/conf_inv.lua | 2 +- basis/fly_lib.lua | 2 +- basis/formspec_update.lua | 2 +- basis/fuel_lib.lua | 2 +- basis/gravel_lib.lua | 2 +- basis/laser_lib.lua | 2 +- basis/legacy.lua | 2 +- basis/lib.lua | 2 +- basis/liquid_lib.lua | 2 +- basis/manual.lua | 1 - basis/mark_lib.lua | 2 +- basis/node_states.lua | 2 +- basis/node_store.lua | 2 +- basis/nodedata_meta.lua | 2 +- basis/nodedata_sqlite.lua | 2 +- basis/numbers_sqlite.lua | 2 +- basis/numbers_storage.lua | 2 +- basis/oggfiles.lua | 2 +- basis/recipe_lib.lua | 2 +- basis/shared_tank.lua | 63 +++++++++++++++++------------ basis/submenu.lua | 2 +- basis/teleport.lua | 2 +- basis/tube_wall_entry.lua | 2 +- basis/tubes.lua | 2 +- basis/tubes_ta4.lua | 2 +- basis/windturbine_lib.lua | 2 +- carts/chest_cart.lua | 2 +- carts/tank_cart.lua | 2 +- chemistry/ta4_doser.lua | 2 +- chemistry/ta4_liquid_filter.lua | 2 +- chemistry/ta4_reactor.lua | 2 +- chemistry/ta4_stand.lua | 2 +- coal_power_station/firebox.lua | 2 +- coal_power_station/generator.lua | 2 +- coal_power_station/oilfirebox.lua | 1 - collider/inlets.lua | 2 +- collider/magnet.lua | 2 +- collider/terminal.lua | 2 +- collider/vacuumtube.lua | 2 +- digtron/battery.lua | 2 +- doc/guide.lua | 2 +- doc/items.lua | 2 +- doc/manual_DE.lua | 1 - doc/manual_EN.lua | 1 - doc/manual_api.lua | 1 - doc/plans.lua | 2 +- energy_storage/generator.lua | 1 - energy_storage/heatexchanger2.lua | 2 +- energy_storage/heatexchanger3.lua | 2 +- energy_storage/inlet.lua | 2 +- fermenter/gasflare.lua | 2 +- furnace/cooking.lua | 2 +- furnace/firebox.lua | 2 +- furnace/heater.lua | 2 +- furnace/recipes.lua | 2 +- hydrogen/fuelcell.lua | 2 +- icta_controller/battery.lua | 2 +- icta_controller/edit.lua | 2 +- icta_controller/formspec.lua | 2 +- icta_controller/signaltower.lua | 2 +- icta_controller/submenu.lua | 13 +++--- init.lua | 2 +- iron_age/coalburner.lua | 1 - iron_age/hopper.lua | 2 +- items/aluminium.lua | 2 +- items/baborium.lua | 2 +- items/barrel.lua | 2 +- items/basalt.lua | 2 +- items/bauxit.lua | 2 +- items/ceramic.lua | 2 +- items/cracking.lua | 2 +- items/electronic.lua | 2 +- items/epoxy.lua | 2 +- items/filling.lua | 2 +- items/hydrogen.lua | 2 +- items/lye.lua | 2 +- items/moreblocks.lua | 2 +- items/oil.lua | 2 +- items/plastic.lua | 2 +- items/powder.lua | 1 - items/registered_nodes.lua | 2 +- items/silicon.lua | 2 +- items/steelmat.lua | 2 +- items/usmium.lua | 2 +- lamps/ceilinglamp.lua | 2 +- lamps/growlight.lua | 2 +- lamps/industriallamp1.lua | 2 +- lamps/industriallamp2.lua | 2 +- lamps/industriallamp3.lua | 2 +- lamps/industriallamp4.lua | 2 +- lamps/lampholder.lua | 2 +- lamps/lightblock.lua | 2 +- lamps/simplelamp.lua | 2 +- lamps/streetlamp.lua | 2 +- liquids/filler.lua | 2 +- liquids/pipe_wall_entry.lua | 2 +- liquids/pump.lua | 2 +- liquids/silo.lua | 2 +- liquids/ta5_tank.lua | 2 +- liquids/tank.lua | 2 +- liquids/valve.lua | 2 +- liquids/waterpump.lua | 2 +- logic/button_2x.lua | 2 +- logic/button_4x.lua | 2 +- logic/cart_detector.lua | 2 +- logic/collector.lua | 2 +- logic/lib.lua | 2 +- logic/logic_block.lua | 1 - logic/lua_logic.lua | 1 - logic/mesecons_converter.lua | 2 +- logic/signallamp_2x.lua | 2 +- logic/signallamp_4x.lua | 2 +- logic/terminal.lua | 2 +- lua_controller/commands.lua | 2 +- lua_controller/controller.lua | 2 +- lua_controller/server.lua | 1 - mod.conf | 2 +- move_controller/doorblock.lua | 2 +- move_controller/doorcontroller2.lua | 2 +- move_controller/flycontroller.lua | 2 +- move_controller/movecontroller.lua | 2 +- move_controller/turncontroller.lua | 2 +- oil/distiller.lua | 2 +- oil/drillbox.lua | 2 +- oil/explore.lua | 2 +- oil/gasflare.lua | 2 +- power/drive_axle.lua | 2 +- power/electric_cable.lua | 2 +- power/junctionbox.lua | 2 +- power/power_terminal.lua | 2 +- power/power_terminal2.lua | 2 +- power/powerswitchbox.lua | 2 +- power/powerswitchbox_legacy.lua | 2 +- power/steam_pipe.lua | 2 +- power/ta4_cable.lua | 1 - power/ta4_cable_wall_entry.lua | 2 +- recipe_checker.lua | 2 +- solar/inverter.lua | 2 +- steam_engine/firebox.lua | 1 - steam_engine/flywheel.lua | 1 - ta1_watermill/mill.lua | 2 +- ta1_watermill/millboard.lua | 2 +- ta1_watermill/sluice.lua | 2 +- ta1_watermill/ta1_axle.lua | 2 +- ta1_watermill/watermill.lua | 2 +- ta2_energy_storage/ta2_rope.lua | 2 +- ta3_power/akkubox.lua | 2 +- ta4_power/electricmeter.lua | 2 +- ta4_power/transformer.lua | 2 +- tools/pipe_wrench.lua | 2 +- tools/trowel.lua | 2 +- wind_turbine/pillar.lua | 2 +- wind_turbine/rotor.lua | 2 +- 173 files changed, 199 insertions(+), 205 deletions(-) diff --git a/.test/sink.lua b/.test/sink.lua index d9def94..7d0c33a 100644 --- a/.test/sink.lua +++ b/.test/sink.lua @@ -109,4 +109,4 @@ minetest.register_node("techage:sink_on", { sounds = default.node_sound_wood_defaults(), }) -power.register_nodes({"techage:sink", "techage:sink_on"}, Cable, "con") \ No newline at end of file +power.register_nodes({"techage:sink", "techage:sink_on"}, Cable, "con") diff --git a/basic_machines/autocrafter.lua b/basic_machines/autocrafter.lua index 3d73cb3..4212bc2 100644 --- a/basic_machines/autocrafter.lua +++ b/basic_machines/autocrafter.lua @@ -511,4 +511,4 @@ local power = networks.power techage.register_node_for_v1_transition({"techage:ta3_autocrafter_pas", "techage:ta4_autocrafter_pas"}, function(pos, node) power.update_network(pos, nil, Cable) -end) \ No newline at end of file +end) diff --git a/basic_machines/blackhole.lua b/basic_machines/blackhole.lua index bed8e11..3f397c0 100644 --- a/basic_machines/blackhole.lua +++ b/basic_machines/blackhole.lua @@ -86,4 +86,4 @@ liquid.register_nodes({"techage:blackhole"}, put = put_liquid, take = take_liquid, } -) \ No newline at end of file +) diff --git a/basic_machines/chest.lua b/basic_machines/chest.lua index ea42799..b07f824 100644 --- a/basic_machines/chest.lua +++ b/basic_machines/chest.lua @@ -442,4 +442,4 @@ minetest.register_craft({ type = "shapeless", output = "techage:chest_ta4", recipe = {"techage:chest_ta3", "default:chest"} -}) \ No newline at end of file +}) diff --git a/basic_machines/concentrator.lua b/basic_machines/concentrator.lua index a240fc8..40e836d 100644 --- a/basic_machines/concentrator.lua +++ b/basic_machines/concentrator.lua @@ -123,4 +123,4 @@ minetest.register_craft({ {"techage:ta4_tubeS", "", "techage:ta4_tubeS"}, {"", "techage:ta4_tubeS", ""}, }, -}) \ No newline at end of file +}) diff --git a/basic_machines/consumer.lua b/basic_machines/consumer.lua index 8dd1cb4..b75fd0d 100644 --- a/basic_machines/consumer.lua +++ b/basic_machines/consumer.lua @@ -300,4 +300,4 @@ function techage.register_consumer(base_name, inv_name, tiles, tNode, validState end end return names[1], names[2], names[3], names[4] -end \ No newline at end of file +end diff --git a/basic_machines/distributor.lua b/basic_machines/distributor.lua index eed6ba9..6df2639 100644 --- a/basic_machines/distributor.lua +++ b/basic_machines/distributor.lua @@ -599,4 +599,4 @@ minetest.register_craft({ {node_name_ta4, "default:copper_ingot"}, {"default:mese_crystal_fragment", node_name_ta4}, }, -}) \ No newline at end of file +}) diff --git a/basic_machines/forceload.lua b/basic_machines/forceload.lua index 384fa11..121d8ab 100644 --- a/basic_machines/forceload.lua +++ b/basic_machines/forceload.lua @@ -116,7 +116,6 @@ local function formspec(name) local tRes = {} for idx,pos in ipairs(lPos) do local pos1, pos2 = calc_area(pos) - local ypos = 0.2 + idx * 0.4 tRes[#tRes+1] = idx tRes[#tRes+1] = minetest.formspec_escape(P2S(pos1)) tRes[#tRes+1] = "to" @@ -304,4 +303,4 @@ minetest.register_chatcommand("forceload", { return false, S("Priv missing") end end, -}) \ No newline at end of file +}) diff --git a/basic_machines/foreign_nodes.lua b/basic_machines/foreign_nodes.lua index 13faa36..e9a3ebc 100644 --- a/basic_machines/foreign_nodes.lua +++ b/basic_machines/foreign_nodes.lua @@ -150,4 +150,4 @@ techage.register_node({"xdecor:hive"}, { local inv = meta:get_inventory() return techage.put_items(inv, "honey", stack) end, -}) \ No newline at end of file +}) diff --git a/basic_machines/gravelsieve.lua b/basic_machines/gravelsieve.lua index 2513567..0d61593 100644 --- a/basic_machines/gravelsieve.lua +++ b/basic_machines/gravelsieve.lua @@ -278,4 +278,4 @@ techage.recipes.register_craft({ output = "techage:sieved_basalt_gravel", items = {"techage:basalt_gravel"}, type = "ta4_gravelsieve", -}) \ No newline at end of file +}) diff --git a/basic_machines/grinder.lua b/basic_machines/grinder.lua index 7e413ac..48a9efc 100644 --- a/basic_machines/grinder.lua +++ b/basic_machines/grinder.lua @@ -422,4 +422,4 @@ if minetest.global_exists("farming") then techage.add_grinder_recipe({input="farming:seed_rice 6", output="farming:rice_flour"}, true) techage.add_grinder_recipe({input="farming:oat 3", output="farming:flour"}, true) techage.add_grinder_recipe({input="farming:seed_oat 6", output="farming:flour"}, true) -end \ No newline at end of file +end diff --git a/basic_machines/itemsource.lua b/basic_machines/itemsource.lua index c034d05..ae28a40 100644 --- a/basic_machines/itemsource.lua +++ b/basic_machines/itemsource.lua @@ -97,4 +97,4 @@ techage.register_node({"techage:itemsource"}, { on_node_load = function(pos) minetest.get_node_timer(pos):start(CYCLE_TIME) end, -}) \ No newline at end of file +}) diff --git a/basic_machines/mods_support.lua b/basic_machines/mods_support.lua index 43c1137..1508479 100644 --- a/basic_machines/mods_support.lua +++ b/basic_machines/mods_support.lua @@ -129,4 +129,3 @@ techage.register_node({"protector:chest"}, { return techage.put_items(inv, "main", stack) end, }) - diff --git a/basic_machines/quarry.lua b/basic_machines/quarry.lua index 8b89d1e..90aaf87 100644 --- a/basic_machines/quarry.lua +++ b/basic_machines/quarry.lua @@ -425,4 +425,4 @@ minetest.register_craft({ {"", node_name_ta3, ""}, {"", "techage:ta4_wlanchip", ""}, }, -}) \ No newline at end of file +}) diff --git a/basic_machines/recycler.lua b/basic_machines/recycler.lua index 900568a..e2442a2 100644 --- a/basic_machines/recycler.lua +++ b/basic_machines/recycler.lua @@ -349,4 +349,4 @@ local function collect_recipes() end end -minetest.after(2, collect_recipes) \ No newline at end of file +minetest.after(2, collect_recipes) diff --git a/basic_machines/ta4_chest.lua b/basic_machines/ta4_chest.lua index 90483cb..096eaef 100644 --- a/basic_machines/ta4_chest.lua +++ b/basic_machines/ta4_chest.lua @@ -647,4 +647,4 @@ minetest.register_craft({ type = "shapeless", output = "techage:chest_ta4", recipe = {"techage:ta4_chest"} -}) \ No newline at end of file +}) diff --git a/basic_machines/ta4_injector.lua b/basic_machines/ta4_injector.lua index 30d158b..4332e17 100644 --- a/basic_machines/ta4_injector.lua +++ b/basic_machines/ta4_injector.lua @@ -294,4 +294,4 @@ minetest.register_craft({ {"", "techage:ta4_pusher_pas", ""}, {"", "basic_materials:ic", ""}, }, -}) \ No newline at end of file +}) diff --git a/basic_machines/ta5_chest.lua b/basic_machines/ta5_chest.lua index 65da8f8..1d56064 100644 --- a/basic_machines/ta5_chest.lua +++ b/basic_machines/ta5_chest.lua @@ -182,4 +182,4 @@ minetest.register_craft({ type = "shapeless", output = "techage:ta5_hl_chest", recipe = {"techage:chest_ta4", "techage:ta5_aichip"} -}) \ No newline at end of file +}) diff --git a/basis/assemble.lua b/basis/assemble.lua index daafa81..c4d81d9 100644 --- a/basis/assemble.lua +++ b/basis/assemble.lua @@ -238,4 +238,4 @@ end -- param2, and a route table like : {0,3} -- 0 = forward, 1 = right, 2 = backward, 3 = left -- techage.assemble.get_pos(pos, param2, route, y_offs) -techage.assemble.get_pos = dest_pos \ No newline at end of file +techage.assemble.get_pos = dest_pos diff --git a/basis/command.lua b/basis/command.lua index 9eb90d2..a32f218 100644 --- a/basis/command.lua +++ b/basis/command.lua @@ -624,4 +624,4 @@ minetest.register_chatcommand("my_expoints", { end end end -}) \ No newline at end of file +}) diff --git a/basis/conf_inv.lua b/basis/conf_inv.lua index 65aa23d..f64aca6 100644 --- a/basis/conf_inv.lua +++ b/basis/conf_inv.lua @@ -106,4 +106,4 @@ function inv_lib.take_item(pos, inv, listname, num, stacks) end -return inv_lib \ No newline at end of file +return inv_lib diff --git a/basis/fly_lib.lua b/basis/fly_lib.lua index b5ec939..b20a6ae 100644 --- a/basis/fly_lib.lua +++ b/basis/fly_lib.lua @@ -730,4 +730,4 @@ minetest.register_on_dieplayer(function(player) end end) -return flylib \ No newline at end of file +return flylib diff --git a/basis/formspec_update.lua b/basis/formspec_update.lua index 2256f55..9696c2f 100644 --- a/basis/formspec_update.lua +++ b/basis/formspec_update.lua @@ -49,4 +49,4 @@ minetest.register_on_leaveplayer(function(player) ActiveFormspecs[ActivePlayer[name]] = nil ActivePlayer[name] = nil end -end) \ No newline at end of file +end) diff --git a/basis/fuel_lib.lua b/basis/fuel_lib.lua index 605caca..0a60d3b 100644 --- a/basis/fuel_lib.lua +++ b/basis/fuel_lib.lua @@ -194,4 +194,4 @@ function techage.fuel.get_liquid_table(valid_fuel, capacity, start_firebox) return leftover end } -end \ No newline at end of file +end diff --git a/basis/gravel_lib.lua b/basis/gravel_lib.lua index 4a16150..f3ced55 100644 --- a/basis/gravel_lib.lua +++ b/basis/gravel_lib.lua @@ -93,4 +93,4 @@ function techage.gravelsieve_get_random_basalt_ore() else return ItemStack("techage:sieved_basalt_gravel") end -end \ No newline at end of file +end diff --git a/basis/laser_lib.lua b/basis/laser_lib.lua index 5126af6..135fe61 100644 --- a/basis/laser_lib.lua +++ b/basis/laser_lib.lua @@ -143,4 +143,4 @@ function techage.add_laser(pos, pos1, pos2) end -- techage.del_laser(pos) -techage.del_laser = del_laser \ No newline at end of file +techage.del_laser = del_laser diff --git a/basis/legacy.lua b/basis/legacy.lua index 90c40d7..18d25a1 100644 --- a/basis/legacy.lua +++ b/basis/legacy.lua @@ -22,4 +22,4 @@ function techage.register_node_for_v1_transition(nodenames, on_node_load) on_node_load(pos, node) end }) -end \ No newline at end of file +end diff --git a/basis/lib.lua b/basis/lib.lua index 33043dc..99deec8 100644 --- a/basis/lib.lua +++ b/basis/lib.lua @@ -546,4 +546,4 @@ function techage.set_expoints(player, ex_points) return true end end -end \ No newline at end of file +end diff --git a/basis/liquid_lib.lua b/basis/liquid_lib.lua index 205e755..25acfd3 100644 --- a/basis/liquid_lib.lua +++ b/basis/liquid_lib.lua @@ -254,4 +254,4 @@ techage.liquid.get_full_container = get_full_container techage.liquid.fill_container = fill_container techage.liquid.empty_container = empty_container techage.liquid.fill_on_punch = fill_on_punch -techage.liquid.empty_on_punch = empty_on_punch \ No newline at end of file +techage.liquid.empty_on_punch = empty_on_punch diff --git a/basis/manual.lua b/basis/manual.lua index 29b0446..d8e599c 100644 --- a/basis/manual.lua +++ b/basis/manual.lua @@ -89,4 +89,3 @@ techage.manual_DE.aPlanTable = { "", "", } - diff --git a/basis/mark_lib.lua b/basis/mark_lib.lua index 1894f29..835555a 100644 --- a/basis/mark_lib.lua +++ b/basis/mark_lib.lua @@ -119,4 +119,4 @@ minetest.register_entity(":techage:block_marker", { end, }) -return marker \ No newline at end of file +return marker diff --git a/basis/node_states.lua b/basis/node_states.lua index 7dfa900..f866910 100644 --- a/basis/node_states.lua +++ b/basis/node_states.lua @@ -503,4 +503,4 @@ minetest.register_node("techage:defect_dummy", { drop = "", groups = {cracky=2, crumbly=2, choppy=2, not_in_creative_inventory=1}, is_ground_content = false, -}) \ No newline at end of file +}) diff --git a/basis/node_store.lua b/basis/node_store.lua index 935734f..cce2e55 100644 --- a/basis/node_store.lua +++ b/basis/node_store.lua @@ -166,4 +166,4 @@ function techage.del_mem(pos) NvmStore[key1] = NvmStore[key1] or backend.get_mapblock_data(key1) NvmStore[key1][key2] = nil backend.store_mapblock_data(key1, NvmStore[key1]) -end \ No newline at end of file +end diff --git a/basis/nodedata_meta.lua b/basis/nodedata_meta.lua index 485bc69..875ce6d 100644 --- a/basis/nodedata_meta.lua +++ b/basis/nodedata_meta.lua @@ -99,4 +99,4 @@ function api.restore_at_startup() return {} end -return api \ No newline at end of file +return api diff --git a/basis/nodedata_sqlite.lua b/basis/nodedata_sqlite.lua index 2ba0efd..e9e3f8c 100644 --- a/basis/nodedata_sqlite.lua +++ b/basis/nodedata_sqlite.lua @@ -116,4 +116,4 @@ function api.restore_at_startup() return {} end -return api \ No newline at end of file +return api diff --git a/basis/numbers_sqlite.lua b/basis/numbers_sqlite.lua index 9447aa0..f2f8be8 100644 --- a/basis/numbers_sqlite.lua +++ b/basis/numbers_sqlite.lua @@ -139,4 +139,4 @@ function api.delete_invalid_entries(node_def) minetest.log("info", "[TechAge] Data maintenance finished") end -return api \ No newline at end of file +return api diff --git a/basis/numbers_storage.lua b/basis/numbers_storage.lua index 8b35b04..02219b1 100644 --- a/basis/numbers_storage.lua +++ b/basis/numbers_storage.lua @@ -95,4 +95,4 @@ function backend.delete_invalid_entries(node_def) minetest.log("info", "[TechAge] Data maintenance finished") end -return backend \ No newline at end of file +return backend diff --git a/basis/oggfiles.lua b/basis/oggfiles.lua index 7fe17ea..ffe7c82 100644 --- a/basis/oggfiles.lua +++ b/basis/oggfiles.lua @@ -100,4 +100,4 @@ techage.OggFileList = { "default_wood_footstep", -- ./games/minetest_game/mods/default/sounds "default_furnace_active", -- ./games/minetest_game/mods/default/sounds "default_item_smoke", -- ./games/minetest_game/mods/default/sounds -} \ No newline at end of file +} diff --git a/basis/recipe_lib.lua b/basis/recipe_lib.lua index e545c5d..8ff64e7 100644 --- a/basis/recipe_lib.lua +++ b/basis/recipe_lib.lua @@ -276,4 +276,4 @@ techage.recipes.register_craft = function(def) } unified_inventory.register_craft(ui_def) end -end \ No newline at end of file +end diff --git a/basis/shared_tank.lua b/basis/shared_tank.lua index bdd0fdd..1e2f067 100644 --- a/basis/shared_tank.lua +++ b/basis/shared_tank.lua @@ -21,6 +21,7 @@ techage.shared_tank = {} local liquid = networks.liquid local hyperloop = techage.hyperloop local remote_pos = techage.hyperloop.remote_pos +local is_paired = techage.hyperloop.is_paired local menu = techage.menu local function formspec(pos) @@ -36,7 +37,7 @@ local function formspec(pos) end function techage.shared_tank.node_timer(pos) - if techage.is_activeformspec(pos) then + if techage.is_activeformspec(pos) and is_paired(pos) then M(pos):set_string("formspec", formspec(pos)) return true end @@ -60,26 +61,47 @@ function techage.shared_tank.can_dig(pos, player) end function techage.shared_tank.peek_liquid(pos, indir) - pos = remote_pos(pos) - local nvm = techage.get_nvm(pos) - return liquid.srv_peek(nvm) + if is_paired(pos) then + pos = remote_pos(pos) + local nvm = techage.get_nvm(pos) + return liquid.srv_peek(nvm) + end end function techage.shared_tank.take_liquid(pos, indir, name, amount) - pos = remote_pos(pos) - local nvm = techage.get_nvm(pos) - amount, name = liquid.srv_take(nvm, name, amount) - if techage.is_activeformspec(pos) then - M(pos):set_string("formspec", formspec(pos)) + if is_paired(pos) then + pos = remote_pos(pos) + local nvm = techage.get_nvm(pos) + amount, name = liquid.srv_take(nvm, name, amount) + if techage.is_activeformspec(pos) then + M(pos):set_string("formspec", formspec(pos)) + end + return amount, name end - return amount, name + return 0, name end function techage.shared_tank.put_liquid(pos, indir, name, amount) - pos = remote_pos(pos) - -- check if it is not powder - local ndef = minetest.registered_craftitems[name] or {} - if not ndef.groups or ndef.groups.powder ~= 1 then + if is_paired(pos) then + pos = remote_pos(pos) + -- check if it is not powder + local ndef = minetest.registered_craftitems[name] or {} + if not ndef.groups or ndef.groups.powder ~= 1 then + local nvm = techage.get_nvm(pos) + local ndef = NDEF(pos) + local leftover = liquid.srv_put(nvm, name, amount, ndef.liquid.capa) + if techage.is_activeformspec(pos) then + M(pos):set_string("formspec", formspec(pos)) + end + return leftover + end + end + return amount +end + +function techage.shared_tank.untake_liquid(pos, indir, name, amount) + if is_paired(pos) then + pos = remote_pos(pos) local nvm = techage.get_nvm(pos) local ndef = NDEF(pos) local leftover = liquid.srv_put(nvm, name, amount, ndef.liquid.capa) @@ -91,15 +113,4 @@ function techage.shared_tank.put_liquid(pos, indir, name, amount) return amount end -function techage.shared_tank.untake_liquid(pos, indir, name, amount) - pos = remote_pos(pos) - local nvm = techage.get_nvm(pos) - local ndef = NDEF(pos) - local leftover = liquid.srv_put(nvm, name, amount, ndef.liquid.capa) - if techage.is_activeformspec(pos) then - M(pos):set_string("formspec", formspec(pos)) - end - return leftover -end - -techage.shared_tank.formspec = formspec \ No newline at end of file +techage.shared_tank.formspec = formspec diff --git a/basis/submenu.lua b/basis/submenu.lua index a5ebfeb..5ee9fb2 100644 --- a/basis/submenu.lua +++ b/basis/submenu.lua @@ -293,4 +293,4 @@ function techage.menu.eval_input(pos, form_def, fields, player_name) evaluate_data(pos, meta, form_def, fields, player_name) end return fields.refresh or fields.save or fields.key_enter_field -end \ No newline at end of file +end diff --git a/basis/teleport.lua b/basis/teleport.lua index 4628975..a9dd85b 100644 --- a/basis/teleport.lua +++ b/basis/teleport.lua @@ -164,4 +164,4 @@ function techage.teleport.after_formspec(pos, player, fields, max_dist, ex_point M(pos):set_string("status", S("Ex-points missing (@1 < @2)", techage.get_expoints(player), ex_points)) M(pos):set_string("formspec", techage.teleport.formspec(pos)) end -end \ No newline at end of file +end diff --git a/basis/tube_wall_entry.lua b/basis/tube_wall_entry.lua index 3ada768..a2dab89 100644 --- a/basis/tube_wall_entry.lua +++ b/basis/tube_wall_entry.lua @@ -54,4 +54,4 @@ minetest.register_craft({ {"", "basic_materials:concrete_block", ""}, {"", "",""}, }, -}) \ No newline at end of file +}) diff --git a/basis/tubes.lua b/basis/tubes.lua index 315f30c..177cb5e 100644 --- a/basis/tubes.lua +++ b/basis/tubes.lua @@ -145,4 +145,4 @@ minetest.register_craft({ {"", "group:wood", ""}, {"group:wood", "", "default:tin_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/basis/tubes_ta4.lua b/basis/tubes_ta4.lua index 71a5f60..6c06af2 100644 --- a/basis/tubes_ta4.lua +++ b/basis/tubes_ta4.lua @@ -117,4 +117,4 @@ minetest.register_craft({ techage.TA4tubes = { ["techage:ta4_tubeS"] = true, ["techage:ta4_tubeA"] = true, -} \ No newline at end of file +} diff --git a/basis/windturbine_lib.lua b/basis/windturbine_lib.lua index db9fe02..2aa9355 100644 --- a/basis/windturbine_lib.lua +++ b/basis/windturbine_lib.lua @@ -77,4 +77,4 @@ function techage.valid_place_for_windturbine(pos, player_name, num_turbines) S("is a suitable place for a wind turbine!")) end return true, "ok" -end \ No newline at end of file +end diff --git a/carts/chest_cart.lua b/carts/chest_cart.lua index 7d8f78c..e34e874 100644 --- a/carts/chest_cart.lua +++ b/carts/chest_cart.lua @@ -169,4 +169,4 @@ minetest.register_craft({ {"default:junglewood", "default:chest_locked", "default:junglewood"}, {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/carts/tank_cart.lua b/carts/tank_cart.lua index 4f88007..cbb1db1 100644 --- a/carts/tank_cart.lua +++ b/carts/tank_cart.lua @@ -173,4 +173,4 @@ minetest.register_craft({ {"default:junglewood", "techage:ta3_tank", "default:junglewood"}, {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/chemistry/ta4_doser.lua b/chemistry/ta4_doser.lua index 9ac813e..30abf1e 100644 --- a/chemistry/ta4_doser.lua +++ b/chemistry/ta4_doser.lua @@ -376,4 +376,4 @@ minetest.register_craft({ {"techage:ta3_pipeS", "techage:t4_pump", "techage:ta3_pipeS"}, {"", "techage:ta4_wlanchip", ""}, }, -}) \ No newline at end of file +}) diff --git a/chemistry/ta4_liquid_filter.lua b/chemistry/ta4_liquid_filter.lua index 0fd81dc..988a1d5 100644 --- a/chemistry/ta4_liquid_filter.lua +++ b/chemistry/ta4_liquid_filter.lua @@ -206,4 +206,4 @@ minetest.register_craft({ {'basic_materials:concrete_block', 'techage:ta3_pipeS', 'techage:ta3_pipeS'}, {'basic_materials:concrete_block', 'basic_materials:concrete_block', 'basic_materials:concrete_block'}, } -}) \ No newline at end of file +}) diff --git a/chemistry/ta4_reactor.lua b/chemistry/ta4_reactor.lua index 154b5f5..2736091 100644 --- a/chemistry/ta4_reactor.lua +++ b/chemistry/ta4_reactor.lua @@ -201,4 +201,4 @@ minetest.register_lbm({ inv:set_size('main', 1) M(pos):set_string("formspec", formspec()) end, -}) \ No newline at end of file +}) diff --git a/chemistry/ta4_stand.lua b/chemistry/ta4_stand.lua index 043ee96..efd429e 100644 --- a/chemistry/ta4_stand.lua +++ b/chemistry/ta4_stand.lua @@ -206,4 +206,4 @@ minetest.register_craft({ {'techage:ta3_pipeS', '', ''}, {'', '', ''}, } -}) \ No newline at end of file +}) diff --git a/coal_power_station/firebox.lua b/coal_power_station/firebox.lua index 3129d04..c8849dd 100644 --- a/coal_power_station/firebox.lua +++ b/coal_power_station/firebox.lua @@ -216,4 +216,4 @@ minetest.register_craft({ {'default:steel_ingot', '', 'default:steel_ingot'}, {'default:stone', 'default:stone', 'default:stone'}, }, -}) \ No newline at end of file +}) diff --git a/coal_power_station/generator.lua b/coal_power_station/generator.lua index 3f62e11..e744574 100644 --- a/coal_power_station/generator.lua +++ b/coal_power_station/generator.lua @@ -262,4 +262,4 @@ minetest.register_craft({ {"", "basic_materials:gear_steel", "techage:electric_cableS"}, {"default:wood", "techage:iron_ingot", "basic_materials:steel_bar"}, }, -}) \ No newline at end of file +}) diff --git a/coal_power_station/oilfirebox.lua b/coal_power_station/oilfirebox.lua index b1f1922..960d581 100644 --- a/coal_power_station/oilfirebox.lua +++ b/coal_power_station/oilfirebox.lua @@ -142,4 +142,3 @@ minetest.register_craft({ {'', '', ''}, }, }) - diff --git a/collider/inlets.lua b/collider/inlets.lua index c64feba..7826026 100644 --- a/collider/inlets.lua +++ b/collider/inlets.lua @@ -361,4 +361,4 @@ minetest.register_craft({ {'techage:electric_cableS', 'techage:ta4_colliderblock', ''}, {'', '', ''}, }, -}) \ No newline at end of file +}) diff --git a/collider/magnet.lua b/collider/magnet.lua index 19dedb8..4062413 100644 --- a/collider/magnet.lua +++ b/collider/magnet.lua @@ -302,4 +302,4 @@ minetest.register_lbm({ nvm.liquid.name = "techage:isobutane" end end, -}) \ No newline at end of file +}) diff --git a/collider/terminal.lua b/collider/terminal.lua index 43aa0f7..6ef6dd5 100644 --- a/collider/terminal.lua +++ b/collider/terminal.lua @@ -205,4 +205,4 @@ techage.register_node({"techage:ta4_terminal"}, { return true end end, -}) \ No newline at end of file +}) diff --git a/collider/vacuumtube.lua b/collider/vacuumtube.lua index e099a7a..9782670 100644 --- a/collider/vacuumtube.lua +++ b/collider/vacuumtube.lua @@ -127,4 +127,4 @@ minetest.register_craft({ {'techage:aluminum', 'dye:blue', 'techage:aluminum'}, {'', 'default:steel_ingot', ''}, }, -}) \ No newline at end of file +}) diff --git a/digtron/battery.lua b/digtron/battery.lua index 74f2d80..515c314 100644 --- a/digtron/battery.lua +++ b/digtron/battery.lua @@ -172,4 +172,4 @@ minetest.register_craft({ {"techage:electric_cableS", "default:tin_ingot", "digtron:digtron_core"}, {"group:wood", "default:copper_ingot", "group:wood"}, }, -}) \ No newline at end of file +}) diff --git a/doc/guide.lua b/doc/guide.lua index b46f540..61a8445 100644 --- a/doc/guide.lua +++ b/doc/guide.lua @@ -230,4 +230,4 @@ minetest.register_craft({ type = "shapeless", output = "techage:construction_board", recipe = {"techage:construction_board_EN"}, -}) \ No newline at end of file +}) diff --git a/doc/items.lua b/doc/items.lua index 8c6bbdf..de6dc6c 100644 --- a/doc/items.lua +++ b/doc/items.lua @@ -216,4 +216,4 @@ function techage.add_manual_items(table_with_items) for name, tbl in pairs(table_with_items) do techage.Items[name] = tbl end -end \ No newline at end of file +end diff --git a/doc/manual_DE.lua b/doc/manual_DE.lua index 84bce0d..3ef0398 100644 --- a/doc/manual_DE.lua +++ b/doc/manual_DE.lua @@ -2552,4 +2552,3 @@ techage.manual_DE.aPlanTable = { "", "", } - diff --git a/doc/manual_EN.lua b/doc/manual_EN.lua index 5d9303f..024086f 100644 --- a/doc/manual_EN.lua +++ b/doc/manual_EN.lua @@ -2545,4 +2545,3 @@ techage.manual_EN.aPlanTable = { "", "", } - diff --git a/doc/manual_api.lua b/doc/manual_api.lua index 5a814a0..b8eb70b 100644 --- a/doc/manual_api.lua +++ b/doc/manual_api.lua @@ -37,4 +37,3 @@ function techage.add_to_manual(language, titles, texts, items, plans) tbl.aPlanTable[#tbl.aPlanTable + 1] = item end end - diff --git a/doc/plans.lua b/doc/plans.lua index 12a40f5..6934d54 100644 --- a/doc/plans.lua +++ b/doc/plans.lua @@ -517,4 +517,4 @@ function techage.add_manual_plans(table_with_plans) for name, tbl in pairs(table_with_plans) do techage.ConstructionPlans[name] = tbl end -end \ No newline at end of file +end diff --git a/energy_storage/generator.lua b/energy_storage/generator.lua index ff88d5b..4621661 100644 --- a/energy_storage/generator.lua +++ b/energy_storage/generator.lua @@ -128,4 +128,3 @@ minetest.register_craft({ {"", "techage:ta4_wlanchip", ""}, }, }) - diff --git a/energy_storage/heatexchanger2.lua b/energy_storage/heatexchanger2.lua index cf9a91e..2478288 100644 --- a/energy_storage/heatexchanger2.lua +++ b/energy_storage/heatexchanger2.lua @@ -397,4 +397,4 @@ minetest.register_craft({ {"", "techage:ta4_wlanchip", ""}, {"", "techage:baborium_ingot", ""}, }, -}) \ No newline at end of file +}) diff --git a/energy_storage/heatexchanger3.lua b/energy_storage/heatexchanger3.lua index b2f863b..9c5c2e5 100644 --- a/energy_storage/heatexchanger3.lua +++ b/energy_storage/heatexchanger3.lua @@ -99,4 +99,4 @@ minetest.register_craft({ }, }) -techage.orientate_node = orientate_node \ No newline at end of file +techage.orientate_node = orientate_node diff --git a/energy_storage/inlet.lua b/energy_storage/inlet.lua index 42a8c11..8cb59d9 100644 --- a/energy_storage/inlet.lua +++ b/energy_storage/inlet.lua @@ -171,4 +171,4 @@ minetest.register_craft({ type = 'shapeless', output = "techage:ta4_pipe_inlet", recipe = {"basic_materials:concrete_block", "techage:ta4_pipeS"}, -}) \ No newline at end of file +}) diff --git a/fermenter/gasflare.lua b/fermenter/gasflare.lua index f41ceee..4f4c741 100644 --- a/fermenter/gasflare.lua +++ b/fermenter/gasflare.lua @@ -179,4 +179,4 @@ minetest.register_node("techage:gasflare2", { diggable = false, is_ground_content = false, sounds = default.node_sound_stone_defaults(), -}) \ No newline at end of file +}) diff --git a/furnace/cooking.lua b/furnace/cooking.lua index 3624206..54304c4 100644 --- a/furnace/cooking.lua +++ b/furnace/cooking.lua @@ -225,4 +225,4 @@ function techage.furnace.register_recipe(recipe) recipe.items = recipe.recipe recipe.type = "ta3_melting" techage.recipes.register_craft(recipe) -end \ No newline at end of file +end diff --git a/furnace/firebox.lua b/furnace/firebox.lua index e10ce91..e933d08 100644 --- a/furnace/firebox.lua +++ b/furnace/firebox.lua @@ -202,4 +202,4 @@ techage.register_node({"techage:furnace_firebox", "techage:furnace_firebox_on"}, }) liquid.register_nodes({"techage:furnace_firebox", "techage:furnace_firebox_on"}, - Pipe, "tank", nil, fuel.get_liquid_table(fuel.BT_OIL, fuel.CAPACITY, start_firebox)) \ No newline at end of file + Pipe, "tank", nil, fuel.get_liquid_table(fuel.BT_OIL, fuel.CAPACITY, start_firebox)) diff --git a/furnace/heater.lua b/furnace/heater.lua index be0bf84..2037d53 100644 --- a/furnace/heater.lua +++ b/furnace/heater.lua @@ -133,4 +133,4 @@ minetest.register_craft({ {'techage:basalt_stone', 'basic_materials:heating_element', 'techage:basalt_stone'}, {'techage:aluminum', 'techage:ta4_furnace_ceramic', 'techage:aluminum'}, }, -}) \ No newline at end of file +}) diff --git a/furnace/recipes.lua b/furnace/recipes.lua index 7788420..47a98b2 100644 --- a/furnace/recipes.lua +++ b/furnace/recipes.lua @@ -167,4 +167,4 @@ if minetest.global_exists("moreores") then time = 5, }) -end \ No newline at end of file +end diff --git a/hydrogen/fuelcell.lua b/hydrogen/fuelcell.lua index 6721d59..81301af 100644 --- a/hydrogen/fuelcell.lua +++ b/hydrogen/fuelcell.lua @@ -334,4 +334,4 @@ minetest.register_craft({ {'techage:ta3_pipeS', 'techage:ta4_fuelcellstack', 'techage:electric_cableS'}, {'default:steel_ingot', "techage:ta4_wlanchip", 'default:steel_ingot'}, }, -}) \ No newline at end of file +}) diff --git a/icta_controller/battery.lua b/icta_controller/battery.lua index aa75a41..24c710c 100644 --- a/icta_controller/battery.lua +++ b/icta_controller/battery.lua @@ -176,4 +176,4 @@ techage.register_node({"techage:ta4_battery"}, { return "unsupported" end end, -}) \ No newline at end of file +}) diff --git a/icta_controller/edit.lua b/icta_controller/edit.lua index b113855..55a89db 100644 --- a/icta_controller/edit.lua +++ b/icta_controller/edit.lua @@ -37,4 +37,4 @@ function techage.edit_command(fs_data, text) return "row "..pos1.." deleted" end return "Invalid command '"..text.."'" -end \ No newline at end of file +end diff --git a/icta_controller/formspec.lua b/icta_controller/formspec.lua index aa24986..13d682c 100644 --- a/icta_controller/formspec.lua +++ b/icta_controller/formspec.lua @@ -240,4 +240,4 @@ function techage.formspecHelp(offs) "label[0,"..(-offs/50)..";"..sHELP.."]".. --"label[0.2,0;test]".. "scrollbar[12,1;0.5,7;vertical;sb_help;"..offs.."]" -end \ No newline at end of file +end diff --git a/icta_controller/signaltower.lua b/icta_controller/signaltower.lua index 35f74e8..6377494 100644 --- a/icta_controller/signaltower.lua +++ b/icta_controller/signaltower.lua @@ -132,4 +132,4 @@ techage.register_node({"techage:ta4_signaltower", return meta:get_string("state") end end, -}) \ No newline at end of file +}) diff --git a/icta_controller/submenu.lua b/icta_controller/submenu.lua index 4f2f272..0e690bd 100644 --- a/icta_controller/submenu.lua +++ b/icta_controller/submenu.lua @@ -22,11 +22,10 @@ end -- generate the choice dependent part of the form local function add_controls_to_table(tbl, kvDefinition, kvSelect) - local val = "" local offs = 1.4 if kvDefinition[kvSelect.choice] then local lControls = kvDefinition[kvSelect.choice].formspec - for idx,elem in ipairs(lControls) do + for _,elem in ipairs(lControls) do if elem.type == "label" then tbl[#tbl+1] = "label[0,"..offs..";Description:\n"..elem.label.."]" offs = offs + 0.4 @@ -36,12 +35,12 @@ local function add_controls_to_table(tbl, kvDefinition, kvSelect) end if elem.type == "numbers" or elem.type == "number" or elem.type == "digits" or elem.type == "letters" or elem.type == "ascii" then - val = kvSelect[elem.name] or elem.default + local val = kvSelect[elem.name] or elem.default tbl[#tbl+1] = "field[0.3,"..(offs+0.2)..";8,1;"..elem.name..";;"..val.."]" offs = offs + 0.9 elseif elem.type == "textlist" then local l = elem.choices:split(",") - val = index(l, kvSelect[elem.name]) or elem.default + local val = index(l, kvSelect[elem.name]) or elem.default tbl[#tbl+1] = "dropdown[0.0,"..(offs)..";8.5,1.4;"..elem.name..";"..elem.choices..";"..val.."]" offs = offs + 0.9 end @@ -52,7 +51,7 @@ end local function default_data(kvDefinition, kvSelect) local lControls = kvDefinition[kvSelect.choice].formspec - for idx,elem in ipairs(lControls) do + for _,elem in ipairs(lControls) do kvSelect[elem.name] = elem.default end kvSelect.button = kvDefinition[kvSelect.choice].button(kvSelect) @@ -66,7 +65,7 @@ end local function field_to_kvSelect(kvDefinition, kvSelect, fields) local error = false local lControls = kvDefinition[kvSelect.choice].formspec - for idx,elem in ipairs(lControls) do + for _,elem in ipairs(lControls) do if elem.type == "numbers" then if fields[elem.name] then if fields[elem.name]:find("^[%d ]+$") then @@ -131,7 +130,7 @@ end function techage.submenu_verify(owner, kvDefinition, kvSelect) local error = false local lControls = kvDefinition[kvSelect.choice].formspec - for idx,elem in ipairs(lControls) do + for _,elem in ipairs(lControls) do if elem.type == "numbers" then if not kvSelect[elem.name]:find("^[%d ]+$") then error = true diff --git a/init.lua b/init.lua index b88a121..50810a8 100644 --- a/init.lua +++ b/init.lua @@ -402,4 +402,4 @@ dofile(MP.."/teleport/teleport_pipe.lua") techage.IE = nil -function techage.icta_register_condition(key, tData) end \ No newline at end of file +function techage.icta_register_condition(key, tData) end diff --git a/iron_age/coalburner.lua b/iron_age/coalburner.lua index f9d6a07..b11f603 100644 --- a/iron_age/coalburner.lua +++ b/iron_age/coalburner.lua @@ -246,4 +246,3 @@ function techage.stop_burner(pos) minetest.sound_stop(handle) meta:set_int("burn_time", 0) end - diff --git a/iron_age/hopper.lua b/iron_age/hopper.lua index 442a07e..6f6db01 100644 --- a/iron_age/hopper.lua +++ b/iron_age/hopper.lua @@ -89,4 +89,4 @@ minecart.register_inventory( listname = "dst", }, } -) \ No newline at end of file +) diff --git a/items/aluminium.lua b/items/aluminium.lua index cc07392..c75381b 100644 --- a/items/aluminium.lua +++ b/items/aluminium.lua @@ -60,4 +60,4 @@ techage.furnace.register_recipe({ "techage:gibbsite_powder", "techage:gibbsite_powder"}, time = 16, -}) \ No newline at end of file +}) diff --git a/items/baborium.lua b/items/baborium.lua index 52c2223..f82f0fb 100644 --- a/items/baborium.lua +++ b/items/baborium.lua @@ -48,4 +48,4 @@ minetest.register_craft({ output = 'techage:baborium_ingot', recipe = 'techage:baborium_lump', cooktime = 5, -}) \ No newline at end of file +}) diff --git a/items/barrel.lua b/items/barrel.lua index bca6933..226de59 100644 --- a/items/barrel.lua +++ b/items/barrel.lua @@ -111,4 +111,4 @@ techage.register_liquid("bucket:bucket_river_water", "bucket:bucket_empty", 1, " techage.register_liquid("techage:barrel_water", "techage:ta3_barrel_empty", 10, "techage:water") techage.register_liquid("techage:barrel_river_water", "techage:ta3_barrel_empty", 10, "techage:river_water") -techage.register_liquid("bucket:bucket_lava", "bucket:bucket_empty", 1, "default:lava_source") \ No newline at end of file +techage.register_liquid("bucket:bucket_lava", "bucket:bucket_empty", 1, "default:lava_source") diff --git a/items/basalt.lua b/items/basalt.lua index 1a494aa..e3fe2f6 100644 --- a/items/basalt.lua +++ b/items/basalt.lua @@ -200,4 +200,4 @@ minetest.register_craft({ techage.add_grinder_recipe({input="techage:basalt_stone", output="techage:basalt_gravel"}) techage.add_grinder_recipe({input="techage:basalt_cobble", output="techage:basalt_gravel"}) techage.add_grinder_recipe({input="techage:basalt_gravel", output="default:clay"}) -techage.add_grinder_recipe({input="techage:sieved_basalt_gravel", output="default:clay"}) \ No newline at end of file +techage.add_grinder_recipe({input="techage:sieved_basalt_gravel", output="default:clay"}) diff --git a/items/bauxit.lua b/items/bauxit.lua index 49ad719..cf3102a 100644 --- a/items/bauxit.lua +++ b/items/bauxit.lua @@ -65,4 +65,4 @@ minetest.register_ore({ }) techage.add_grinder_recipe({input="techage:bauxite_cobble", output="techage:bauxite_gravel"}) -techage.add_grinder_recipe({input="techage:bauxite_gravel", output="techage:bauxite_powder"}) \ No newline at end of file +techage.add_grinder_recipe({input="techage:bauxite_gravel", output="techage:bauxite_powder"}) diff --git a/items/ceramic.lua b/items/ceramic.lua index 3db98b0..f2d1dcf 100644 --- a/items/ceramic.lua +++ b/items/ceramic.lua @@ -66,4 +66,4 @@ techage.furnace.register_recipe({ "techage:ta4_ceramic_material", "techage:ta4_ceramic_material", }, time = 16, -}) \ No newline at end of file +}) diff --git a/items/cracking.lua b/items/cracking.lua index 6225b91..284bda4 100644 --- a/items/cracking.lua +++ b/items/cracking.lua @@ -89,4 +89,4 @@ techage.recipes.add("ta4_doser", { "techage:hydrogen 1", }, catalyst = "techage:iron_powder", -}) \ No newline at end of file +}) diff --git a/items/electronic.lua b/items/electronic.lua index f364547..ad180ce 100644 --- a/items/electronic.lua +++ b/items/electronic.lua @@ -83,4 +83,4 @@ techage.recipes.add("ta4_electronic_fab", { output = "techage:ta5_aichip 2", input = {"techage:ta4_leds 8", "basic_materials:copper_wire 1", "basic_materials:gold_wire 1", "techage:ta4_silicon_wafer 1"}, ex_points = 10, -}) \ No newline at end of file +}) diff --git a/items/epoxy.lua b/items/epoxy.lua index ef0e376..26a2ae2 100644 --- a/items/epoxy.lua +++ b/items/epoxy.lua @@ -42,4 +42,4 @@ techage.recipes.add("ta4_doser", { techage.register_liquid("techage:barrel_epoxy", "techage:ta3_barrel_empty", 10, "techage:epoxy") techage.register_liquid("techage:canister_epoxy", "techage:ta3_canister_empty", 1, "techage:epoxy") -minetest.register_alias("techage:ta4_epoxy", "techage:canister_epoxy") \ No newline at end of file +minetest.register_alias("techage:ta4_epoxy", "techage:canister_epoxy") diff --git a/items/filling.lua b/items/filling.lua index 248c718..55fb0ac 100644 --- a/items/filling.lua +++ b/items/filling.lua @@ -11,4 +11,4 @@ minetest.register_on_mods_loaded(function() end end networks.register_filling_items(fillings) -end) \ No newline at end of file +end) diff --git a/items/hydrogen.lua b/items/hydrogen.lua index 6cfbc4d..1abce56 100644 --- a/items/hydrogen.lua +++ b/items/hydrogen.lua @@ -40,4 +40,4 @@ techage.recipes.add("ta4_doser", { input = { "techage:gas 1", } -}) \ No newline at end of file +}) diff --git a/items/lye.lua b/items/lye.lua index 6ccaefd..b69894d 100644 --- a/items/lye.lua +++ b/items/lye.lua @@ -41,4 +41,4 @@ techage.recipes.add("ta4_doser", { }) techage.register_liquid("techage:barrel_lye", "techage:ta3_barrel_empty", 10, "techage:lye") -techage.register_liquid("techage:canister_lye", "techage:ta3_canister_empty", 1, "techage:lye") \ No newline at end of file +techage.register_liquid("techage:canister_lye", "techage:ta3_canister_empty", 1, "techage:lye") diff --git a/items/moreblocks.lua b/items/moreblocks.lua index cb74230..67bfa18 100644 --- a/items/moreblocks.lua +++ b/items/moreblocks.lua @@ -87,4 +87,4 @@ else register_alias(subname) end end -end \ No newline at end of file +end diff --git a/items/oil.lua b/items/oil.lua index 40a339e..02c4614 100644 --- a/items/oil.lua +++ b/items/oil.lua @@ -133,4 +133,4 @@ minetest.register_craftitem("techage:ta3_canister_oil", { techage.register_liquid("techage:bucket_oil", "bucket:bucket_empty", 1, "techage:oil_source") techage.register_liquid("techage:ta3_barrel_oil", "techage:ta3_barrel_empty", 10, "techage:oil_source") -techage.register_liquid("techage:ta3_canister_oil", "techage:ta3_canister_empty", 1, "techage:oil_source") \ No newline at end of file +techage.register_liquid("techage:ta3_canister_oil", "techage:ta3_canister_empty", 1, "techage:oil_source") diff --git a/items/plastic.lua b/items/plastic.lua index 3fddfae..1d68412 100644 --- a/items/plastic.lua +++ b/items/plastic.lua @@ -32,4 +32,4 @@ techage.furnace.register_recipe({ recipe = {"techage:plastic_granules"}, time = 2, -}) \ No newline at end of file +}) diff --git a/items/powder.lua b/items/powder.lua index 128d5e7..1ca6484 100644 --- a/items/powder.lua +++ b/items/powder.lua @@ -63,4 +63,3 @@ techage.add_grinder_recipe({input="default:clay", output="techage:clay_powder"}) techage.add_grinder_recipe({input="techage:aluminum", output="techage:aluminum_powder"}) techage.add_grinder_recipe({input="default:silver_sandstone", output="techage:silver_sandstone_powder"}) - diff --git a/items/registered_nodes.lua b/items/registered_nodes.lua index 71322c0..36cf710 100644 --- a/items/registered_nodes.lua +++ b/items/registered_nodes.lua @@ -37,4 +37,4 @@ minetest.register_on_mods_loaded(function() end end) -minetest.override_item("default:gravel", {groups = {crumbly = 2, gravel = 1, falling_node = 1}}) \ No newline at end of file +minetest.override_item("default:gravel", {groups = {crumbly = 2, gravel = 1, falling_node = 1}}) diff --git a/items/silicon.lua b/items/silicon.lua index 5265a95..2eaac4b 100644 --- a/items/silicon.lua +++ b/items/silicon.lua @@ -28,4 +28,4 @@ techage.furnace.register_recipe({ "techage:baborium_ingot" }, time = 6, -}) \ No newline at end of file +}) diff --git a/items/steelmat.lua b/items/steelmat.lua index 9a4cba3..5c158a4 100644 --- a/items/steelmat.lua +++ b/items/steelmat.lua @@ -26,4 +26,4 @@ minetest.register_craft({ {"default:steel_ingot", "techage:iron_ingot", "default:steel_ingot"}, {"", "techage:iron_ingot", ""}, }, -}) \ No newline at end of file +}) diff --git a/items/usmium.lua b/items/usmium.lua index 3eb9f52..18ce3c4 100644 --- a/items/usmium.lua +++ b/items/usmium.lua @@ -25,4 +25,4 @@ minetest.register_craftitem("techage:usmium_powder", { groups = {powder = 1}, }) -techage.add_grinder_recipe({input="techage:usmium_nuggets", output="techage:usmium_powder"}) \ No newline at end of file +techage.add_grinder_recipe({input="techage:usmium_nuggets", output="techage:usmium_powder"}) diff --git a/lamps/ceilinglamp.lua b/lamps/ceilinglamp.lua index d19170a..ecfae6e 100644 --- a/lamps/ceilinglamp.lua +++ b/lamps/ceilinglamp.lua @@ -63,4 +63,4 @@ minetest.register_craft({ type = "shapeless", output = "techage:ceilinglamp_off 3", recipe = {"techage:simplelamp_off", "default:wood", "default:glass"}, -}) \ No newline at end of file +}) diff --git a/lamps/growlight.lua b/lamps/growlight.lua index 02c4f7d..f4b1ac3 100644 --- a/lamps/growlight.lua +++ b/lamps/growlight.lua @@ -201,4 +201,4 @@ minetest.after(1, function() end end end -end) \ No newline at end of file +end) diff --git a/lamps/industriallamp1.lua b/lamps/industriallamp1.lua index 7766c7c..5fcfeb4 100644 --- a/lamps/industriallamp1.lua +++ b/lamps/industriallamp1.lua @@ -63,4 +63,4 @@ minetest.register_craft({ {"default:glass", "techage:simplelamp_off", "dye:grey"}, {"basic_materials:plastic_strip", "default:copper_ingot", "basic_materials:plastic_strip"}, }, -}) \ No newline at end of file +}) diff --git a/lamps/industriallamp2.lua b/lamps/industriallamp2.lua index dbfcc2b..b0f3227 100644 --- a/lamps/industriallamp2.lua +++ b/lamps/industriallamp2.lua @@ -65,4 +65,4 @@ minetest.register_craft({ {"techage:simplelamp_off", "dye:black", ""}, {"basic_materials:steel_bar", "basic_materials:steel_bar", ""}, }, -}) \ No newline at end of file +}) diff --git a/lamps/industriallamp3.lua b/lamps/industriallamp3.lua index b35383d..51d27bf 100644 --- a/lamps/industriallamp3.lua +++ b/lamps/industriallamp3.lua @@ -61,4 +61,4 @@ minetest.register_craft({ {"techage:simplelamp_off", "dye:red", ""}, {"basic_materials:steel_bar", "basic_materials:steel_bar", ""}, }, -}) \ No newline at end of file +}) diff --git a/lamps/industriallamp4.lua b/lamps/industriallamp4.lua index d58358c..2646136 100644 --- a/lamps/industriallamp4.lua +++ b/lamps/industriallamp4.lua @@ -61,4 +61,4 @@ minetest.register_craft({ {"techage:ta4_leds", "techage:ta4_leds", "techage:ta4_leds"}, {"techage:ta4_leds", "techage:basalt_glass_thin", "techage:ta4_leds"}, }, -}) \ No newline at end of file +}) diff --git a/lamps/lampholder.lua b/lamps/lampholder.lua index 964b3a0..cb7dcaf 100644 --- a/lamps/lampholder.lua +++ b/lamps/lampholder.lua @@ -112,4 +112,4 @@ minetest.register_craft({ {"", "default:gold_ingot", ""}, {"basic_materials:steel_bar", "", "basic_materials:steel_bar"}, }, -}) \ No newline at end of file +}) diff --git a/lamps/lightblock.lua b/lamps/lightblock.lua index 32022c3..a874452 100644 --- a/lamps/lightblock.lua +++ b/lamps/lightblock.lua @@ -62,4 +62,4 @@ function techage.light_ring(center_pos, on, large) end minetest.fix_light(pos1, pos2) end -end \ No newline at end of file +end diff --git a/lamps/simplelamp.lua b/lamps/simplelamp.lua index 627ea09..197b7f8 100644 --- a/lamps/simplelamp.lua +++ b/lamps/simplelamp.lua @@ -50,4 +50,4 @@ minetest.register_craft({ {"", "default:glass", ""}, {"", "basic_materials:heating_element", ""}, }, -}) \ No newline at end of file +}) diff --git a/lamps/streetlamp.lua b/lamps/streetlamp.lua index c27982c..945b84b 100644 --- a/lamps/streetlamp.lua +++ b/lamps/streetlamp.lua @@ -67,4 +67,4 @@ minetest.register_craft({ type = "shapeless", output = "techage:streetlamp_off 2", recipe = {"techage:simplelamp_off", "default:steel_ingot", "default:glass"}, -}) \ No newline at end of file +}) diff --git a/liquids/filler.lua b/liquids/filler.lua index 0556d6f..b547185 100644 --- a/liquids/filler.lua +++ b/liquids/filler.lua @@ -154,4 +154,4 @@ minetest.register_craft({ {"techage:tubeS", "", "techage:tubeS"}, {"default:steel_ingot", "group:wood", "default:steel_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/liquids/pipe_wall_entry.lua b/liquids/pipe_wall_entry.lua index 7acf030..f94afd2 100644 --- a/liquids/pipe_wall_entry.lua +++ b/liquids/pipe_wall_entry.lua @@ -54,4 +54,4 @@ minetest.register_craft({ {"", "basic_materials:concrete_block", ""}, {"", "",""}, }, -}) \ No newline at end of file +}) diff --git a/liquids/pump.lua b/liquids/pump.lua index a259304..0a49247 100644 --- a/liquids/pump.lua +++ b/liquids/pump.lua @@ -308,4 +308,4 @@ minetest.register_craft({ {"", "techage:t3_pump", ""}, {"", "", ""}, }, -}) \ No newline at end of file +}) diff --git a/liquids/silo.lua b/liquids/silo.lua index 4f3bfa0..0ef45c8 100644 --- a/liquids/silo.lua +++ b/liquids/silo.lua @@ -336,4 +336,4 @@ minetest.register_craft({ {"", "techage:ta3_silo", ""}, {"", "", ""}, }, -}) \ No newline at end of file +}) diff --git a/liquids/ta5_tank.lua b/liquids/ta5_tank.lua index 3d10660..f8b470b 100644 --- a/liquids/ta5_tank.lua +++ b/liquids/ta5_tank.lua @@ -102,4 +102,4 @@ minetest.register_craft({ {"", "techage:ta4_tank", ""}, {"", "", ""}, }, -}) \ No newline at end of file +}) diff --git a/liquids/tank.lua b/liquids/tank.lua index 6c4ba97..b970c50 100644 --- a/liquids/tank.lua +++ b/liquids/tank.lua @@ -295,4 +295,4 @@ minetest.register_lbm({ --tubelib2.del_mem(pos) end end, -}) \ No newline at end of file +}) diff --git a/liquids/valve.lua b/liquids/valve.lua index ecb3f96..8c9edd7 100644 --- a/liquids/valve.lua +++ b/liquids/valve.lua @@ -150,4 +150,4 @@ minetest.register_craft({ {"techage:ta3_pipeS", "basic_materials:steel_bar", "techage:ta3_pipeS"}, {"", "techage:vacuum_tube", ""}, }, -}) \ No newline at end of file +}) diff --git a/liquids/waterpump.lua b/liquids/waterpump.lua index c95900d..82ecf08 100644 --- a/liquids/waterpump.lua +++ b/liquids/waterpump.lua @@ -158,4 +158,4 @@ techage.register_node({"techage:t4_waterpump"}, { on_recv_message = function(pos, src, topic, payload) return State:on_receive_message(pos, topic, payload) end, -}) \ No newline at end of file +}) diff --git a/logic/button_2x.lua b/logic/button_2x.lua index e698816..82a1579 100644 --- a/logic/button_2x.lua +++ b/logic/button_2x.lua @@ -249,4 +249,4 @@ minetest.register_craft({ {"", "techage:ta4_button_off", "techage:ta4_button_off"}, {"", "", ""}, }, -}) \ No newline at end of file +}) diff --git a/logic/button_4x.lua b/logic/button_4x.lua index 0568372..609cba1 100644 --- a/logic/button_4x.lua +++ b/logic/button_4x.lua @@ -303,4 +303,4 @@ minetest.register_craft({ {"", "techage:ta4_button_off", "techage:ta4_button_off"}, {"", "", ""}, }, -}) \ No newline at end of file +}) diff --git a/logic/cart_detector.lua b/logic/cart_detector.lua index 2d046c7..244e40f 100644 --- a/logic/cart_detector.lua +++ b/logic/cart_detector.lua @@ -157,4 +157,4 @@ techage.register_node({"techage:ta3_cartdetector_off", "techage:ta3_cartdetector }) -- Register default cart in addition -minecart.tEntityNames["carts:cart"] = true \ No newline at end of file +minecart.tEntityNames["carts:cart"] = true diff --git a/logic/collector.lua b/logic/collector.lua index b7ccef6..d50a1e0 100644 --- a/logic/collector.lua +++ b/logic/collector.lua @@ -210,4 +210,4 @@ techage.register_node({"techage:ta4_collector"}, { on_node_load = function(pos) minetest.get_node_timer(pos):start(CYCLE_TIME) end, -}) \ No newline at end of file +}) diff --git a/logic/lib.lua b/logic/lib.lua index abcff02..248c3ff 100644 --- a/logic/lib.lua +++ b/logic/lib.lua @@ -102,4 +102,4 @@ function techage.logic.set_numbers(pos, numbers, player_name, descr) return true end return false -end \ No newline at end of file +end diff --git a/logic/logic_block.lua b/logic/logic_block.lua index 1d132f7..0b83272 100644 --- a/logic/logic_block.lua +++ b/logic/logic_block.lua @@ -408,4 +408,3 @@ techage.register_node({"techage:ta3_logic2"}, { end end, }) - diff --git a/logic/lua_logic.lua b/logic/lua_logic.lua index 1587be4..57cc629 100644 --- a/logic/lua_logic.lua +++ b/logic/lua_logic.lua @@ -250,4 +250,3 @@ techage.register_node({"techage:ta3_logic"}, { end, }) - diff --git a/logic/mesecons_converter.lua b/logic/mesecons_converter.lua index 811b602..9ab28e9 100644 --- a/logic/mesecons_converter.lua +++ b/logic/mesecons_converter.lua @@ -144,4 +144,4 @@ techage.register_node({"techage:ta3_mesecons_converter"}, { on_node_load = function(pos) minetest.get_node_timer(pos):start(CYCLE_TIME) end, -}) \ No newline at end of file +}) diff --git a/logic/signallamp_2x.lua b/logic/signallamp_2x.lua index 745c213..793cca9 100644 --- a/logic/signallamp_2x.lua +++ b/logic/signallamp_2x.lua @@ -148,4 +148,4 @@ minetest.register_craft({ {"", "default:glass", "techage:ta4_wlanchip"}, {"", "techage:ta4_leds", "techage:ta4_leds"}, }, -}) \ No newline at end of file +}) diff --git a/logic/signallamp_4x.lua b/logic/signallamp_4x.lua index 0983f1d..6482785 100644 --- a/logic/signallamp_4x.lua +++ b/logic/signallamp_4x.lua @@ -179,4 +179,4 @@ minetest.register_craft({ {"", "techage:ta4_signallamp_2x", ""}, {"", "", ""}, }, -}) \ No newline at end of file +}) diff --git a/logic/terminal.lua b/logic/terminal.lua index b988677..53a82e3 100644 --- a/logic/terminal.lua +++ b/logic/terminal.lua @@ -437,4 +437,4 @@ techage.register_node({"techage:terminal3"}, { end return true end, -}) \ No newline at end of file +}) diff --git a/lua_controller/commands.lua b/lua_controller/commands.lua index c59d1f5..dfe48f3 100644 --- a/lua_controller/commands.lua +++ b/lua_controller/commands.lua @@ -225,4 +225,4 @@ techage.lua_ctlr.register_function("item_description", { -- function not_protected(owner, number(s)) -techage.lua_ctlr.not_protected = not_protected \ No newline at end of file +techage.lua_ctlr.not_protected = not_protected diff --git a/lua_controller/controller.lua b/lua_controller/controller.lua index be987ad..68fe4df 100644 --- a/lua_controller/controller.lua +++ b/lua_controller/controller.lua @@ -654,4 +654,4 @@ techage.register_node({"techage:ta4_lua_controller"}, { return "unsupported" end end, -}) \ No newline at end of file +}) diff --git a/lua_controller/server.lua b/lua_controller/server.lua index 523f694..1c076a2 100644 --- a/lua_controller/server.lua +++ b/lua_controller/server.lua @@ -323,4 +323,3 @@ techage.lua_ctlr.register_action("server_write", { " return value: true if successful or false\n".. ' example: res = $server_write("123", "state", state)' }) - diff --git a/mod.conf b/mod.conf index 4fae9d8..cd7e53a 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = techage depends = default,doors,flowers,tubelib2,networks,basic_materials,bucket,stairs,screwdriver,minecart,lcdlib,safer_lua -optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecon,digtron,bakedclay,moreblocks,i3 +optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecon,digtron,bakedclay,moreblocks,i3,creative,craftguide description = Techage, go through 5 tech ages in search of wealth and power! diff --git a/move_controller/doorblock.lua b/move_controller/doorblock.lua index b4acfb5..f0b215b 100644 --- a/move_controller/doorblock.lua +++ b/move_controller/doorblock.lua @@ -105,4 +105,4 @@ minetest.register_craft({ {"default:mese_crystal_fragment", "",""}, {"group:wood", "", ""}, }, -}) \ No newline at end of file +}) diff --git a/move_controller/doorcontroller2.lua b/move_controller/doorcontroller2.lua index 047721c..0a7f458 100644 --- a/move_controller/doorcontroller2.lua +++ b/move_controller/doorcontroller2.lua @@ -428,4 +428,4 @@ for _, name in ipairs(ProtectorDoors) do end end -logic.SimpleNodes = RegisteredNodes \ No newline at end of file +logic.SimpleNodes = RegisteredNodes diff --git a/move_controller/flycontroller.lua b/move_controller/flycontroller.lua index 2bf931d..ca12aa1 100644 --- a/move_controller/flycontroller.lua +++ b/move_controller/flycontroller.lua @@ -238,4 +238,4 @@ minetest.register_craft({ {"techage:aluminum", "techage:ta5_aichip", "techage:aluminum"}, {"group:wood", "basic_materials:gear_steel", "group:wood"}, }, -}) \ No newline at end of file +}) diff --git a/move_controller/movecontroller.lua b/move_controller/movecontroller.lua index b0e9188..92e2348 100644 --- a/move_controller/movecontroller.lua +++ b/move_controller/movecontroller.lua @@ -213,4 +213,4 @@ minetest.register_craft({ {"default:mese_crystal_fragment", "techage:ta4_wlanchip", "default:mese_crystal_fragment"}, {"group:wood", "basic_materials:gear_steel", "group:wood"}, }, -}) \ No newline at end of file +}) diff --git a/move_controller/turncontroller.lua b/move_controller/turncontroller.lua index 4113e45..a41fedf 100644 --- a/move_controller/turncontroller.lua +++ b/move_controller/turncontroller.lua @@ -161,4 +161,4 @@ minetest.register_craft({ {"techage:aluminum", "techage:baborium_ingot", "techage:aluminum"}, {"group:wood", "basic_materials:gear_steel", "group:wood"}, }, -}) \ No newline at end of file +}) diff --git a/oil/distiller.lua b/oil/distiller.lua index c4f9b38..ff4dec8 100644 --- a/oil/distiller.lua +++ b/oil/distiller.lua @@ -266,4 +266,4 @@ minetest.register_craft({ {'', 'techage:ta3_pipeS', 'techage:ta3_pipeS'}, {'basic_materials:concrete_block', '', 'basic_materials:concrete_block'}, } -}) \ No newline at end of file +}) diff --git a/oil/drillbox.lua b/oil/drillbox.lua index fcf8a22..deec9fb 100644 --- a/oil/drillbox.lua +++ b/oil/drillbox.lua @@ -310,4 +310,4 @@ minetest.register_craft({ {"techage:tubeS", "basic_materials:gear_steel", "techage:tubeS"}, {"default:steel_ingot", "techage:vacuum_tube", "default:steel_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/oil/explore.lua b/oil/explore.lua index 1aa7a28..a628915 100644 --- a/oil/explore.lua +++ b/oil/explore.lua @@ -345,4 +345,4 @@ function techage.explore.dec_oil_amount(posC) end end return oil_amount -end \ No newline at end of file +end diff --git a/oil/gasflare.lua b/oil/gasflare.lua index d7fe9a6..e8edb96 100644 --- a/oil/gasflare.lua +++ b/oil/gasflare.lua @@ -179,4 +179,4 @@ minetest.register_node("techage:gasflare2", { diggable = false, is_ground_content = false, sounds = default.node_sound_stone_defaults(), -}) \ No newline at end of file +}) diff --git a/power/drive_axle.lua b/power/drive_axle.lua index 2b40afd..1ea3ede 100644 --- a/power/drive_axle.lua +++ b/power/drive_axle.lua @@ -185,4 +185,4 @@ minetest.register_craft({ }) -techage.Axle = Axle \ No newline at end of file +techage.Axle = Axle diff --git a/power/electric_cable.lua b/power/electric_cable.lua index 223e1e4..80b89cf 100644 --- a/power/electric_cable.lua +++ b/power/electric_cable.lua @@ -190,4 +190,4 @@ for idx, color in ipairs({ "white", "grey", "black", "brown", "yellow", "red", " { "techage:electric_cableS", "techage:electric_cableS", "techage:electric_cableS", }, } }) -end \ No newline at end of file +end diff --git a/power/junctionbox.lua b/power/junctionbox.lua index c2744f9..81e0310 100644 --- a/power/junctionbox.lua +++ b/power/junctionbox.lua @@ -63,4 +63,4 @@ minetest.register_craft({ {"basic_materials:plastic_sheet", "default:copper_ingot", "basic_materials:plastic_sheet"}, {"", "basic_materials:plastic_sheet", ""}, }, -}) \ No newline at end of file +}) diff --git a/power/power_terminal.lua b/power/power_terminal.lua index c1a44c3..3602ab5 100644 --- a/power/power_terminal.lua +++ b/power/power_terminal.lua @@ -12,4 +12,4 @@ ]]-- -minetest.register_alias_force("techage:power_terminal", "techage:ta3_power_terminal") \ No newline at end of file +minetest.register_alias_force("techage:power_terminal", "techage:ta3_power_terminal") diff --git a/power/power_terminal2.lua b/power/power_terminal2.lua index aa2ae3b..564e2e5 100644 --- a/power/power_terminal2.lua +++ b/power/power_terminal2.lua @@ -278,4 +278,4 @@ minetest.register_craft({ {"", "techage:basalt_glass_thin", "default:copper_ingot"}, {"", "techage:vacuum_tube", "default:steel_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/power/powerswitchbox.lua b/power/powerswitchbox.lua index 91a7089..14cde4c 100644 --- a/power/powerswitchbox.lua +++ b/power/powerswitchbox.lua @@ -145,4 +145,4 @@ minetest.register_craft({ {"techage:electric_cableS", "basic_materials:copper_wire", "techage:electric_cableS"}, {"", "basic_materials:plastic_sheet", ""}, }, -}) \ No newline at end of file +}) diff --git a/power/powerswitchbox_legacy.lua b/power/powerswitchbox_legacy.lua index c0aa2f0..9fd27b5 100644 --- a/power/powerswitchbox_legacy.lua +++ b/power/powerswitchbox_legacy.lua @@ -68,4 +68,4 @@ minetest.register_node("techage:powerswitch_box", { groups = {choppy=2, cracky=2, crumbly=2, techage_trowel = 1, not_in_creative_inventory = 1}, is_ground_content = false, sounds = default.node_sound_wood_defaults(), -}) \ No newline at end of file +}) diff --git a/power/steam_pipe.lua b/power/steam_pipe.lua index 6eaa83b..a46fb95 100644 --- a/power/steam_pipe.lua +++ b/power/steam_pipe.lua @@ -113,4 +113,4 @@ minetest.register_craft({ }, }) -techage.SteamPipe = Pipe \ No newline at end of file +techage.SteamPipe = Pipe diff --git a/power/ta4_cable.lua b/power/ta4_cable.lua index cd1a10b..7a69915 100644 --- a/power/ta4_cable.lua +++ b/power/ta4_cable.lua @@ -187,4 +187,3 @@ minetest.register_craft({ },}) techage.TA4_Cable = Cable - diff --git a/power/ta4_cable_wall_entry.lua b/power/ta4_cable_wall_entry.lua index 4c57dd3..fb96be6 100644 --- a/power/ta4_cable_wall_entry.lua +++ b/power/ta4_cable_wall_entry.lua @@ -54,4 +54,4 @@ minetest.register_craft({ {"", "basic_materials:concrete_block", ""}, {"", "",""}, }, -}) \ No newline at end of file +}) diff --git a/recipe_checker.lua b/recipe_checker.lua index b8f9f29..95558e1 100644 --- a/recipe_checker.lua +++ b/recipe_checker.lua @@ -33,4 +33,4 @@ minetest.after(1, function() end end end -end) \ No newline at end of file +end) diff --git a/solar/inverter.lua b/solar/inverter.lua index e7fd6f8..94c87ed 100644 --- a/solar/inverter.lua +++ b/solar/inverter.lua @@ -252,4 +252,4 @@ minetest.register_craft({ techage.register_node_for_v1_transition({"techage:ta4_solar_inverter"}, function(pos, node) power.update_network(pos, nil, Solar) -end) \ No newline at end of file +end) diff --git a/steam_engine/firebox.lua b/steam_engine/firebox.lua index 1bdc8aa..3d55acf 100644 --- a/steam_engine/firebox.lua +++ b/steam_engine/firebox.lua @@ -170,4 +170,3 @@ minetest.register_lbm({ minetest.get_node_timer(pos):start(CYCLE_TIME) end }) - diff --git a/steam_engine/flywheel.lua b/steam_engine/flywheel.lua index 9adc21e..a4ce7b5 100644 --- a/steam_engine/flywheel.lua +++ b/steam_engine/flywheel.lua @@ -236,4 +236,3 @@ minetest.register_craft({ {"default:wood", "techage:iron_ingot", "basic_materials:steel_bar"}, }, }) - diff --git a/ta1_watermill/mill.lua b/ta1_watermill/mill.lua index c09e830..c511ce3 100644 --- a/ta1_watermill/mill.lua +++ b/ta1_watermill/mill.lua @@ -175,4 +175,4 @@ minetest.register_craft({ {"stairs:slab_stone", "techage:iron_ingot", "stairs:slab_stone"}, {"", "", ""}, }, -}) \ No newline at end of file +}) diff --git a/ta1_watermill/millboard.lua b/ta1_watermill/millboard.lua index 4079f95..445b9ce 100644 --- a/ta1_watermill/millboard.lua +++ b/ta1_watermill/millboard.lua @@ -88,4 +88,4 @@ register_board2("techage:ta1_board2_apple", S("TA1 Apple Millrace Board"), {"d register_board2("techage:ta1_board2_jungle", S("TA1 Jungle Millrace Board"), {"default_junglewood.png"}, "techage:ta1_board1_jungle", "default:fence_rail_junglewood") register_board2("techage:ta1_board2_pine", S("TA1 Pine Millrace Board"), {"default_pine_wood.png"}, "techage:ta1_board1_pine", "default:fence_rail_pine_wood") register_board2("techage:ta1_board2_acacia", S("TA1 Acacia Millrace Board"), {"default_acacia_wood.png"}, "techage:ta1_board1_acacia", "default:fence_rail_acacia_wood") -register_board2("techage:ta1_board2_aspen", S("TA1 Aspen Millrace Board"), {"default_aspen_wood.png"}, "techage:ta1_board1_aspen", "default:fence_rail_aspen_wood") \ No newline at end of file +register_board2("techage:ta1_board2_aspen", S("TA1 Aspen Millrace Board"), {"default_aspen_wood.png"}, "techage:ta1_board1_aspen", "default:fence_rail_aspen_wood") diff --git a/ta1_watermill/sluice.lua b/ta1_watermill/sluice.lua index 3a60d29..8df01e3 100644 --- a/ta1_watermill/sluice.lua +++ b/ta1_watermill/sluice.lua @@ -192,4 +192,4 @@ minetest.register_craft({ {"", "default:stick", ""}, {"", "stairs:slab_wood", ""}, }, -}) \ No newline at end of file +}) diff --git a/ta1_watermill/ta1_axle.lua b/ta1_watermill/ta1_axle.lua index d2588ec..51aaa5a 100644 --- a/ta1_watermill/ta1_axle.lua +++ b/ta1_watermill/ta1_axle.lua @@ -173,4 +173,4 @@ minetest.register_craft({ }, }) -techage.TA1Axle = Axle \ No newline at end of file +techage.TA1Axle = Axle diff --git a/ta1_watermill/watermill.lua b/ta1_watermill/watermill.lua index fa87753..898031d 100644 --- a/ta1_watermill/watermill.lua +++ b/ta1_watermill/watermill.lua @@ -316,4 +316,4 @@ minetest.register_craft({ {"techage:ta1_board1_apple", "default:wood", "techage:ta1_board1_apple"}, {"techage:ta1_board1_apple", "techage:ta1_board1_apple", "techage:ta1_board1_apple"}, }, -}) \ No newline at end of file +}) diff --git a/ta2_energy_storage/ta2_rope.lua b/ta2_energy_storage/ta2_rope.lua index b1512bc..492461e 100644 --- a/ta2_energy_storage/ta2_rope.lua +++ b/ta2_energy_storage/ta2_rope.lua @@ -82,4 +82,4 @@ function techage.renew_rope(pos, length, force) end end -techage.del_rope = del_rope \ No newline at end of file +techage.del_rope = del_rope diff --git a/ta3_power/akkubox.lua b/ta3_power/akkubox.lua index 0f811c8..f856c6f 100644 --- a/ta3_power/akkubox.lua +++ b/ta3_power/akkubox.lua @@ -200,4 +200,4 @@ minetest.register_craft({ {"default:copper_ingot", "default:copper_ingot", "techage:electric_cableS"}, {"techage:iron_ingot", "techage:iron_ingot", "default:wood"}, }, -}) \ No newline at end of file +}) diff --git a/ta4_power/electricmeter.lua b/ta4_power/electricmeter.lua index 1a81e60..75c149b 100644 --- a/ta4_power/electricmeter.lua +++ b/ta4_power/electricmeter.lua @@ -190,4 +190,4 @@ minetest.register_craft({ {"techage:electric_cableS", "basic_materials:gold_wire", "techage:electric_cableS"}, {"default:steel_ingot", "techage:ta4_wlanchip", "default:steel_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/ta4_power/transformer.lua b/ta4_power/transformer.lua index 319f4e1..225df2c 100644 --- a/ta4_power/transformer.lua +++ b/ta4_power/transformer.lua @@ -180,4 +180,4 @@ minetest.register_craft({ {"techage:electric_cableS", "basic_materials:copper_wire", "techage:electric_cableS"}, {"default:steel_ingot", "techage:ta4_wlanchip", "default:steel_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/tools/pipe_wrench.lua b/tools/pipe_wrench.lua index a33e169..27182df 100644 --- a/tools/pipe_wrench.lua +++ b/tools/pipe_wrench.lua @@ -38,4 +38,4 @@ minetest.register_craft({ {"dye:red", "default:steel_ingot", "dye:red"}, {"default:steel_ingot", "", "default:steel_ingot"}, }, -}) \ No newline at end of file +}) diff --git a/tools/trowel.lua b/tools/trowel.lua index 5abf599..bffeb91 100644 --- a/tools/trowel.lua +++ b/tools/trowel.lua @@ -65,4 +65,4 @@ minetest.register_craft({ {"basic_materials:steel_bar", "default:stick", ""}, {"", "", "default:stick"}, }, -}) \ No newline at end of file +}) diff --git a/wind_turbine/pillar.lua b/wind_turbine/pillar.lua index 7ea90de..11551d2 100644 --- a/wind_turbine/pillar.lua +++ b/wind_turbine/pillar.lua @@ -37,4 +37,4 @@ minetest.register_craft({ type = "shapeless", output = "techage:pillar", recipe = {"basic_materials:concrete_block"}, -}) \ No newline at end of file +}) diff --git a/wind_turbine/rotor.lua b/wind_turbine/rotor.lua index 7131ef2..5be96d2 100644 --- a/wind_turbine/rotor.lua +++ b/wind_turbine/rotor.lua @@ -359,4 +359,4 @@ techage.furnace.register_recipe({ recipe = {"default:papyrus", "default:stick", "default:papyrus", "default:stick"}, heat = 4, time = 3, -}) \ No newline at end of file +})