From 8e03d7ded6441b26e9d44102c0cd2ee39f9e90bc Mon Sep 17 00:00:00 2001
From: RealBadAngel <mk@realbadangel.pl>
Date: Sun, 30 Jun 2013 07:12:02 +0200
Subject: [PATCH] Sync with indev branch, bump version to 0.4.7
---
technic/init.lua | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/technic/init.lua b/technic/init.lua
index 9b25ccf..2248295 100644
--- a/technic/init.lua
+++ b/technic/init.lua
@@ -1,4 +1,8 @@
--- Minetest 0.4.4d1 : technic
+-- Minetest 0.4.6 mod: technic
+-- namespace: technic
+-- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl>
+
+technic = {}
modpath=minetest.get_modpath("technic")
@@ -7,20 +11,7 @@
--helper functions
dofile(modpath.."/helpers.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")
-
--items
-dofile(modpath.."/concrete.lua")
dofile(modpath.."/items.lua")
--LV machines
@@ -29,6 +20,7 @@
dofile(modpath.."/alloy_furnaces_commons.lua")
dofile(modpath.."/alloy_furnace.lua")
dofile(modpath.."/solar_panel.lua")
+dofile(modpath.."/solar_array_lv.lua")
dofile(modpath.."/geothermal.lua")
dofile(modpath.."/water_mill.lua")
dofile(modpath.."/electric_furnace.lua")
@@ -36,23 +28,32 @@
dofile(modpath.."/music_player.lua")
dofile(modpath.."/generator.lua")
dofile(modpath.."/grinder.lua")
+dofile(modpath.."/cnc.lua")
+dofile(modpath.."/cnc_api.lua")
+dofile(modpath.."/cnc_nodes.lua")
--MV machines
dofile(modpath.."/wires_mv.lua")
dofile(modpath.."/battery_box_mv.lua")
-dofile(modpath.."/solar_panel_mv.lua")
+dofile(modpath.."/solar_array_mv.lua")
+dofile(modpath.."/down_converter_mv.lua")
dofile(modpath.."/electric_furnace_mv.lua")
dofile(modpath.."/alloy_furnace_mv.lua")
dofile(modpath.."/forcefield.lua")
+--HV machines
+dofile(modpath.."/wires_hv.lua")
+dofile(modpath.."/battery_box_hv.lua")
+dofile(modpath.."/solar_array_hv.lua")
+dofile(modpath.."/down_converter_hv.lua")
+
--Tools
-if enable_mining_drill==true then dofile(modpath.."/mining_drill.lua") end
-if enable_mining_laser==true then dofile(modpath.."/mining_laser_mk1.lua") end
-if enable_flashlight==true then dofile(modpath.."/flashlight.lua") end
+if technic.config:getBool("enable_mining_drill") then dofile(modpath.."/mining_drill.lua") end
+if technic.config:getBool("enable_mining_laser") then dofile(modpath.."/mining_laser_mk1.lua") end
+if technic.config:getBool("enable_flashlight") then dofile(modpath.."/flashlight.lua") end
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
@@ -61,10 +62,6 @@
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
function has_locked_chest_privilege(meta, player)
if player:get_player_name() ~= meta:get_string("owner") then
--
Gitblit v1.8.0