From ceb8a71f27b45c304ce2626cc4f939a52323b192 Mon Sep 17 00:00:00 2001 From: kpoppel <poulsen.kim@gmail.com> Date: Mon, 03 Jun 2013 23:48:46 +0200 Subject: [PATCH] Merge pull request #19 from kpoppel/master --- technic/init.lua | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/technic/init.lua b/technic/init.lua index e57c7a2..3cc73be 100644 --- a/technic/init.lua +++ b/technic/init.lua @@ -1,4 +1,8 @@ --- Minetest 0.4.6 : technic +-- Minetest 0.4.6 mod: technic +-- namespace: technic +-- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl> + +technic = {} modpath=minetest.get_modpath("technic") @@ -7,16 +11,7 @@ --helper functions dofile(modpath.."/helpers.lua") --- 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 @@ -25,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") @@ -32,19 +28,27 @@ 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.."/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") + --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") @@ -56,10 +60,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