From ab38e29a18eb27814006f697040591c5438e701a Mon Sep 17 00:00:00 2001
From: kpoppel <poulsen.kim@gmail.com>
Date: Sat, 06 Jul 2013 00:19:05 +0200
Subject: [PATCH] Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev
---
unified_inventory/api.lua | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/unified_inventory/api.lua b/unified_inventory/api.lua
index 02c08e9..91681b1 100644
--- a/unified_inventory/api.lua
+++ b/unified_inventory/api.lua
@@ -230,7 +230,10 @@
end
if craft.type == "alloy" then
method="Alloy cooking"
- end
+ end
+ if craft.type == "extracting" then
+ method="Extracting"
+ end
formspec = formspec.."label[6,3;"..method.."]"
end
@@ -558,7 +561,7 @@
inv:set_stack("output", 1, craft.output)
local items=craft.items
-- cook, fuel, grinding recipes
- if craft.type == "cooking" or craft.type == "fuel" or craft.type == "grinding" then
+ if craft.type == "cooking" or craft.type == "fuel" or craft.type == "grinding" or craft.type == "extracting" then
def=unified_inventory.find_item_def(craft["items"][1])
if def then
inv:set_stack("build", 1, def)
--
Gitblit v1.8.0