From 5ad1b8db0837e384276ad274af51c959b6f9ce64 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sat, 20 Apr 2013 05:42:08 +0200
Subject: [PATCH] Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev

---
 technic/config.lua |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/technic/config.lua b/technic/config.lua
index 3fa1282..f237968 100644
--- a/technic/config.lua
+++ b/technic/config.lua
@@ -1,5 +1,3 @@
-enable_item_drop=false
-enable_item_pickup=true
 enable_technic_inventory=true
 enable_mining_drill=true
 enable_mining_laser=true
@@ -7,4 +5,3 @@
 enable_rubber_tree_generation=true
 enable_marble_generation=true
 enable_granite_generation=true
-enable_obsidian_generation=true

--
Gitblit v1.8.0