From c687e8cb7b9e624474353b0cc10acc5db14192f8 Mon Sep 17 00:00:00 2001
From: Jordan Snelling <jordach.snelling@gmail.com>
Date: Thu, 27 Jun 2013 09:40:03 +0200
Subject: [PATCH] Merge pull request #36 from ObKo/blocks
---
technic/init.lua | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/technic/init.lua b/technic/init.lua
index f1b4683..58e0488 100644
--- a/technic/init.lua
+++ b/technic/init.lua
@@ -1,34 +1,26 @@
--- Minetest 0.4.4 : technic
+-- Minetest 0.4.6 mod: technic
+-- namespace: technic
+-- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl>
modpath=minetest.get_modpath("technic")
--Read technic config file
dofile(modpath.."/config.lua")
-
--- world gen
-dofile(modpath.."/ores.lua")
-if enable_rubber_tree_generation==true then dofile(modpath.."/rubber.lua") end
-
--- chests
-dofile(modpath.."/chest_commons.lua")
-dofile(modpath.."/iron_chest.lua")
-dofile(modpath.."/copper_chest.lua")
-dofile(modpath.."/silver_chest.lua")
-dofile(modpath.."/gold_chest.lua")
-dofile(modpath.."/mithril_chest.lua")
+--helper functions
+dofile(modpath.."/helpers.lua")
--items
-dofile(modpath.."/concrete.lua")
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 +28,11 @@
--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")
+dofile(modpath.."/forcefield.lua")
--Tools
if enable_mining_drill==true then dofile(modpath.."/mining_drill.lua") end
@@ -46,17 +41,14 @@
dofile(modpath.."/cans.lua")
dofile(modpath.."/chainsaw.lua")
dofile(modpath.."/tree_tap.lua")
-dofile(modpath.."/screwdriver.lua")
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")
-
-if enable_item_drop then dofile(modpath.."/item_drop.lua") end
-if enable_item_pickup then dofile(modpath.."/item_pickup.lua") end
+dofile(modpath.."/frames.lua")
function has_locked_chest_privilege(meta, player)
if player:get_player_name() ~= meta:get_string("owner") then
--
Gitblit v1.8.0