From 535e04d542520f58a2db8d4d7a222b73e5c96ef1 Mon Sep 17 00:00:00 2001 From: Cristiano Magro <cristiano.magro@vola.it> Date: Tue, 27 Aug 2024 11:42:59 +0200 Subject: [PATCH] Merge branch 'master' into xno_tree_trap --- technic/machines/MV/init.lua | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/technic/machines/MV/init.lua b/technic/machines/MV/init.lua index fbd561f..07c44b6 100644 --- a/technic/machines/MV/init.lua +++ b/technic/machines/MV/init.lua @@ -3,17 +3,33 @@ local path = technic.modpath.."/machines/MV" -dofile(path.."/alloy_furnace.lua") -dofile(path.."/battery_box.lua") +-- Wiring stuff dofile(path.."/cables.lua") +dofile(path.."/battery_box.lua") + +-- Generators +if technic.config:get_bool("enable_wind_mill") then + dofile(path.."/wind_mill.lua") +end +dofile(path.."/generator.lua") +dofile(path.."/solar_array.lua") +dofile(path.."/hydro_turbine.lua") + +-- Machines +dofile(path.."/alloy_furnace.lua") dofile(path.."/electric_furnace.lua") dofile(path.."/grinder.lua") -dofile(path.."/solar_array.lua") +dofile(path.."/extractor.lua") +dofile(path.."/compressor.lua") +dofile(path.."/centrifuge.lua") + dofile(path.."/tool_workshop.lua") -dofile(path.."/wind_mill.lua") + +dofile(path.."/freezer.lua") -- The power radiator supplies appliances with inductive coupled power: -- Lighting and associated textures is taken directly from VanessaE's homedecor and made electric. -dofile(path.."/power_radiator.lua") -dofile(path.."/lighting.lua") +-- This is currently useless, slow, and mostly copied +--dofile(path.."/power_radiator.lua") +--dofile(path.."/lighting.lua") -- Gitblit v1.8.0