From 9e85cc64c6126133176f6cd6b321984b1772b79f Mon Sep 17 00:00:00 2001
From: VanessaE <vanessaezekowitz@gmail.com>
Date: Fri, 08 Mar 2013 01:15:20 +0100
Subject: [PATCH] Merge pull request #12 from VanessaE/master
---
technic/init.lua | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/technic/init.lua b/technic/init.lua
index f1b4683..8ffa9c7 100644
--- a/technic/init.lua
+++ b/technic/init.lua
@@ -1,9 +1,11 @@
--- Minetest 0.4.4 : technic
+-- Minetest 0.4.4d1 : technic
modpath=minetest.get_modpath("technic")
--Read technic config file
dofile(modpath.."/config.lua")
+--helper functions
+dofile(modpath.."/helpers.lua")
-- world gen
dofile(modpath.."/ores.lua")
@@ -22,13 +24,14 @@
dofile(modpath.."/items.lua")
--LV machines
+dofile(modpath.."/wires.lua")
+dofile(modpath.."/battery_box.lua")
+dofile(modpath.."/alloy_furnaces_commons.lua")
dofile(modpath.."/alloy_furnace.lua")
dofile(modpath.."/solar_panel.lua")
dofile(modpath.."/geothermal.lua")
dofile(modpath.."/water_mill.lua")
dofile(modpath.."/electric_furnace.lua")
-dofile(modpath.."/battery_box.lua")
-dofile(modpath.."/wires.lua")
dofile(modpath.."/tool_workshop.lua")
dofile(modpath.."/music_player.lua")
dofile(modpath.."/generator.lua")
@@ -36,8 +39,10 @@
--MV machines
dofile(modpath.."/wires_mv.lua")
-dofile(modpath.."/solar_panel_mv.lua")
dofile(modpath.."/battery_box_mv.lua")
+dofile(modpath.."/solar_panel_mv.lua")
+dofile(modpath.."/electric_furnace_mv.lua")
+dofile(modpath.."/alloy_furnace_mv.lua")
--Tools
if enable_mining_drill==true then dofile(modpath.."/mining_drill.lua") end
@@ -50,10 +55,12 @@
dofile(modpath.."/sonic_screwdriver.lua")
-- mesecons and tubes related
---dofile(modpath.."/injector.lua")
+dofile(modpath.."/injector.lua")
dofile(modpath.."/node_breaker.lua")
---dofile(modpath.."/deployer.lua")
+dofile(modpath.."/deployer.lua")
dofile(modpath.."/constructor.lua")
+dofile(modpath.."/frames.lua")
+
if enable_item_drop then dofile(modpath.."/item_drop.lua") end
if enable_item_pickup then dofile(modpath.."/item_pickup.lua") end
--
Gitblit v1.8.0