Merge branch 'indev'

Conflicts:
	technic/alloy_furnace.lua
	technic/alloy_furnaces_commons.lua
	technic/battery_box.lua
	technic/battery_box_hv.lua
	technic/battery_box_mv.lua
	technic/chainsaw.lua
	technic/cnc.lua
	technic/cnc_nodes.lua
	technic/electric_furnace.lua
	technic/grinder.lua
	technic/init.lua
	technic/solar_array_hv.lua
	technic/solar_array_lv.lua
	technic/solar_array_mv.lua
	technic/solar_panel.lua
	unified_inventory/api.lua
	unified_inventory/depends.txt

unified_inventory/api.lua

@@ -230,7 +230,10 @@ unified_inventory.get_formspec = function(player,page)
 				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
 			
@@ -557,8 +560,12 @@ unified_inventory.update_recipe = function(player, stack_name, alternate)
 	local craft = crafts[alternate]
 	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
+
+	-- cooking, fuel, grinding, and extracting recipes
+	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)

unified_inventory/depends.txt

@@ -1 +1,2 @@
+creative