diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua
index aa2be2125ae46ad28318236a2445f29a642c219f..68d5180ed002c61437106552272443b36083c293 100644
--- a/mods/default/furnace.lua
+++ b/mods/default/furnace.lua
@@ -1,297 +1,177 @@
+-- minetest/creative/init.lua
 
---
--- Formspecs
---
+creative_inventory = {}
+creative_inventory.creative_inventory_size = 0
 
-local function active_formspec(fuel_percent, item_percent)
-	local formspec = 
-		"size[8,8.5]"..
-		default.gui_bg..
-		default.gui_bg_img..
-		default.gui_slots..
-		"list[current_name;src;2.75,0.5;1,1;]"..
-		"list[current_name;fuel;2.75,2.5;1,1;]"..
-		"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
-		(100-fuel_percent)..":default_furnace_fire_fg.png]"..
-		"image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:"..
-		(item_percent)..":gui_furnace_arrow_fg.png^[transformR270]"..
-		"list[current_name;dst;4.75,0.96;2,2;]"..
-		"list[current_player;main;0,4.25;8,1;]"..
-		"list[current_player;main;0,5.5;8,3;8]"..
-		"listring[current_name;dst]"..
-		"listring[current_player;main]"..
-		"listring[current_name;src]"..
-		"listring[current_player;main]"..
-		default.get_hotbar_bg(0, 4.25)
-	return formspec
-end
-
-local inactive_formspec =
-	"size[8,8.5]"..
-	default.gui_bg..
-	default.gui_bg_img..
-	default.gui_slots..
-	"list[current_name;src;2.75,0.5;1,1;]"..
-	"list[current_name;fuel;2.75,2.5;1,1;]"..
-	"image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
-	"image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
-	"list[current_name;dst;4.75,0.96;2,2;]"..
-	"list[current_player;main;0,4.25;8,1;]"..
-	"list[current_player;main;0,5.5;8,3;8]"..
-	"listring[current_name;dst]"..
-	"listring[current_player;main]"..
-	"listring[current_name;src]"..
-	"listring[current_player;main]"..
-	default.get_hotbar_bg(0, 4.25)
-
---
--- Node callback functions that are the same for active and inactive furnace
---
-
-local function can_dig(pos, player)
-	local meta = minetest.get_meta(pos);
-	local inv = meta:get_inventory()
-	return inv:is_empty("fuel") and inv:is_empty("dst") and inv:is_empty("src")
-end
-
-local function allow_metadata_inventory_put(pos, listname, index, stack, player)
-	if minetest.is_protected(pos, player:get_player_name()) then
-		return 0
-	end
-	local meta = minetest.get_meta(pos)
-	local inv = meta:get_inventory()
-	if listname == "fuel" then
-		if minetest.get_craft_result({method="fuel", width=1, items={stack}}).time ~= 0 then
-			if inv:is_empty("src") then
-				meta:set_string("infotext", "Furnace is empty")
+-- Create detached creative inventory after loading all mods
+minetest.after(0, function()
+	local inv = minetest.create_detached_inventory("creative", {
+		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+			if minetest.setting_getbool("creative_mode") then
+				return count
+			else
+				return 0
+			end
+		end,
+		allow_put = function(inv, listname, index, stack, player)
+			return 0
+		end,
+		allow_take = function(inv, listname, index, stack, player)
+			if minetest.setting_getbool("creative_mode") then
+				return -1
+			else
+				return 0
+			end
+		end,
+		on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+		end,
+		on_put = function(inv, listname, index, stack, player)
+		end,
+		on_take = function(inv, listname, index, stack, player)
+			--print(player:get_player_name().." takes item from creative inventory; listname="..dump(listname)..", index="..dump(index)..", stack="..dump(stack))
+			if stack then
+				minetest.log("action", player:get_player_name().." takes "..dump(stack:get_name()).." from creative inventory")
+				--print("stack:get_name()="..dump(stack:get_name())..", stack:get_count()="..dump(stack:get_count()))
 			end
+		end,
+	})
+	local creative_list = {}
+	for name,def in pairs(minetest.registered_items) do
+		if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0)
+				and def.description and def.description ~= "" then
+			table.insert(creative_list, name)
+		end
+	end
+	table.sort(creative_list)
+	inv:set_size("main", #creative_list)
+	for _,itemstring in ipairs(creative_list) do
+		inv:add_item("main", ItemStack(itemstring))
+	end
+	creative_inventory.creative_inventory_size = #creative_list
+	--print("creative inventory size: "..dump(creative_inventory.creative_inventory_size))
+end)
+
+-- Create the trash field
+local trash = minetest.create_detached_inventory("creative_trash", {
+	-- Allow the stack to be placed and remove it in on_put()
+	-- This allows the creative inventory to restore the stack
+	allow_put = function(inv, listname, index, stack, player)
+		if minetest.setting_getbool("creative_mode") then
 			return stack:get_count()
 		else
 			return 0
 		end
-	elseif listname == "src" then
-		return stack:get_count()
-	elseif listname == "dst" then
-		return 0
-	end
-end
-
-local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player)
-	local meta = minetest.get_meta(pos)
-	local inv = meta:get_inventory()
-	local stack = inv:get_stack(from_list, from_index)
-	return allow_metadata_inventory_put(pos, to_list, to_index, stack, player)
+	end,
+	on_put = function(inv, listname, index, stack, player)
+		inv:set_stack(listname, index, "")
+	end,
+})
+trash:set_size("main", 1)
+
+
+creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
+	pagenum = math.floor(pagenum)
+	local pagemax = math.floor((creative_inventory.creative_inventory_size-1) / (6*4) + 1)
+	player:set_inventory_formspec(
+			"size[13,7.5]"..
+			--"image[6,0.6;1,2;player.png]"..
+			default.gui_bg..
+			default.gui_bg_img..
+			default.gui_slots..
+			"list[current_player;main;5,3.5;8,1;]"..
+			"list[current_player;main;5,4.75;8,3;8]"..
+			"list[current_player;craft;8,0;3,3;]"..
+			"list[current_player;craftpreview;12,1;1,1;]"..
+			"image[11,1;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
+			"list[detached:creative;main;0.3,0.5;4,6;"..tostring(start_i).."]"..
+			"label[2.0,6.55;"..tostring(pagenum).."/"..tostring(pagemax).."]"..
+			"button[0.3,6.5;1.6,1;creative_prev;<<]"..
+			"button[2.7,6.5;1.6,1;creative_next;>>]"..
+			"listring[current_player;main]"..
+			"listring[current_player;craft]"..
+			"listring[current_player;main]"..
+			"listring[detached:creative;main]"..
+			"label[5,1.5;Trash:]"..
+			"list[detached:creative_trash;main;5,2;1,1;]"..
+			default.get_hotbar_bg(5,3.5)
+	)
 end
-
-local function allow_metadata_inventory_take(pos, listname, index, stack, player)
-	if minetest.is_protected(pos, player:get_player_name()) then
-		return 0
+minetest.register_on_joinplayer(function(player)
+	-- If in creative mode, modify player's inventory forms
+	if not minetest.setting_getbool("creative_mode") then
+		return
 	end
-	return stack:get_count()
-end
-
-local function swap_node(pos, name)
-	local node = minetest.get_node(pos)
-	if node.name == name then
+	creative_inventory.set_creative_formspec(player, 0, 1)
+end)
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	if not minetest.setting_getbool("creative_mode") then
 		return
 	end
-	node.name = name
-	minetest.swap_node(pos, node)
-end
-
-local function furnace_node_timer(pos, elapsed)
-	--
-	-- Inizialize metadata
-	--
-	local meta = minetest.get_meta(pos)
-	local fuel_time = meta:get_float("fuel_time") or 0
-	local src_time = meta:get_float("src_time") or 0
-	local fuel_totaltime = meta:get_float("fuel_totaltime") or 0
-
-	local inv = meta:get_inventory()
-	local srclist = inv:get_list("src")
-	local fuellist = inv:get_list("fuel")
-	local dstlist = inv:get_list("dst")
-
-	--
-	-- Cooking
-	--
-
-	-- Check if we have cookable content
-	local cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
-	local cookable = true
-
-	if cooked.time == 0 then
-		cookable = false
+	-- Figure out current page from formspec
+	local current_page = 0
+	local formspec = player:get_inventory_formspec()
+	local start_i = string.match(formspec, "list%[detached:creative;main;[%d.]+,[%d.]+;[%d.]+,[%d.]+;(%d+)%]")
+	start_i = tonumber(start_i) or 0
+
+	if fields.creative_prev then
+		start_i = start_i - 4*6
 	end
-
-	-- Check if we have enough fuel to burn
-	if fuel_time < fuel_totaltime then
-		-- The furnace is currently active and has enough fuel
-		fuel_time = fuel_time + 1
-
-		-- If there is a cookable item then check if it is ready yet
-		if cookable then
-			src_time = src_time + 1
-			if src_time >= cooked.time then
-				-- Place result in dst list if possible
-				if inv:room_for_item("dst", cooked.item) then
-					inv:add_item("dst", cooked.item)
-					inv:set_stack("src", 1, aftercooked.items[1])
-					src_time = 0
-				end
-			end
-		end
-	else
-		-- Furnace ran out of fuel
-		if cookable then
-			-- We need to get new fuel
-			local fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
-
-			if fuel.time == 0 then
-				-- No valid fuel in fuel list
-				fuel_totaltime = 0
-				fuel_time = 0
-				src_time = 0
-			else
-				-- Take fuel from fuel list
-				inv:set_stack("fuel", 1, afterfuel.items[1])
-
-				fuel_totaltime = fuel.time
-				fuel_time = 0
-			end
-		else
-			-- We don't need to get new fuel since there is no cookable item
-			fuel_totaltime = 0
-			fuel_time = 0
-			src_time = 0
-		end
+	if fields.creative_next then
+		start_i = start_i + 4*6
 	end
 
-	--
-	-- Update formspec, infotext and node
-	--
-	local formspec = inactive_formspec
-	local item_state = ""
-	local item_percent = 0
-	if cookable then
-		item_percent = math.floor(src_time / cooked.time * 100)
-		item_state = item_percent .. "%"
-	else
-		if srclist[1]:is_empty() then
-			item_state = "Empty"
-		else
-			item_state = "Not cookable"
-		end
+	if start_i < 0 then
+		start_i = start_i + 4*6
 	end
-
-	local fuel_state = "Empty"
-	local active = "inactive "
-	local result = false
-
-	if fuel_time <= fuel_totaltime and fuel_totaltime ~= 0 then
-		active = "active "
-		local fuel_percent = math.floor(fuel_time / fuel_totaltime * 100)
-		fuel_state = fuel_percent .. "%"
-		formspec = active_formspec(fuel_percent, item_percent)
-		swap_node(pos, "default:furnace_active")
-		-- make sure timer restarts automatically
-		result = true
-	else
-		if not fuellist[1]:is_empty() then
-			fuel_state = "0%"
-		end
-		swap_node(pos, "default:furnace")
-		-- stop timer on the inactive furnace
-		local timer = minetest.get_node_timer(pos)
-		timer:stop()
+	if start_i >= creative_inventory.creative_inventory_size then
+		start_i = start_i - 4*6
+	end
+		
+	if start_i < 0 or start_i >= creative_inventory.creative_inventory_size then
+		start_i = 0
 	end
 
-	local infotext = "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")"
-
-	--
-	-- Set meta values
-	--
-	meta:set_float("fuel_totaltime", fuel_totaltime)
-	meta:set_float("fuel_time", fuel_time)
-	meta:set_float("src_time", src_time)
-	meta:set_string("formspec", formspec)
-	meta:set_string("infotext", infotext)
-
-	return result
-end
-
---
--- Node definitions
---
-
-minetest.register_node("default:furnace", {
-	description = "Furnace",
-	tiles = {
-		"default_furnace_top.png", "default_furnace_bottom.png",
-		"default_furnace_side.png", "default_furnace_side.png",
-		"default_furnace_side.png", "default_furnace_front.png"
-	},
-	paramtype2 = "facedir",
-	groups = {cracky=2},
-	legacy_facedir_simple = true,
-	is_ground_content = false,
-	sounds = default.node_sound_stone_defaults(),
-
-	can_dig = can_dig,
-
-	on_timer = furnace_node_timer,
-
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", inactive_formspec)
-		local inv = meta:get_inventory()
-		inv:set_size('src', 1)
-		inv:set_size('fuel', 1)
-		inv:set_size('dst', 4)
-	end,
-
-	on_metadata_inventory_put = function(pos)
-		-- start timer function, it will sort out whether furnace can burn or not.
-		local timer = minetest.get_node_timer(pos)
-		timer:start(1.0)
-	end,
-
-	allow_metadata_inventory_put = allow_metadata_inventory_put,
-	allow_metadata_inventory_move = allow_metadata_inventory_move,
-	allow_metadata_inventory_take = allow_metadata_inventory_take,
-})
-
-minetest.register_node("default:furnace_active", {
-	description = "Furnace",
-	tiles = {
-		"default_furnace_top.png", "default_furnace_bottom.png",
-		"default_furnace_side.png", "default_furnace_side.png",
-		"default_furnace_side.png",
-		{
-			image = "default_furnace_front_active.png",
-			backface_culling = false,
-			animation = {
-				type = "vertical_frames",
-				aspect_w = 16,
-				aspect_h = 16,
-				length = 1.5
+	creative_inventory.set_creative_formspec(player, start_i, start_i / (6*4) + 1)
+end)
+
+if minetest.setting_getbool("creative_mode") then
+	local digtime = 0.5
+	minetest.register_item(":", {
+		type = "none",
+		wield_image = "wieldhand.png",
+		wield_scale = {x=1,y=1,z=2.5},
+		range = 10,
+		tool_capabilities = {
+			full_punch_interval = 0.5,
+			max_drop_level = 3,
+			groupcaps = {
+				crumbly = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
+				cracky = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
+				snappy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
+				choppy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
+				oddly_breakable_by_hand = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
 			},
+			damage_groups = {fleshy = 10},
 		}
-	},
-	paramtype2 = "facedir",
-	light_source = 8,
-	drop = "default:furnace",
-	groups = {cracky=2, not_in_creative_inventory=1},
-	legacy_facedir_simple = true,
-	is_ground_content = false,
-	sounds = default.node_sound_stone_defaults(),
-	on_timer = furnace_node_timer,
-
-	can_dig = can_dig,
-
-	allow_metadata_inventory_put = allow_metadata_inventory_put,
-	allow_metadata_inventory_move = allow_metadata_inventory_move,
-	allow_metadata_inventory_take = allow_metadata_inventory_take,
-})
-
+	})
+	
+	minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
+		return true
+	end)
+	
+	function minetest.handle_node_drops(pos, drops, digger)
+		if not digger or not digger:is_player() then
+			return
+		end
+		local inv = digger:get_inventory()
+		if inv then
+			for _,item in ipairs(drops) do
+				item = ItemStack(item):get_name()
+				if not inv:contains_item("main", item) then
+					inv:add_item("main", item)
+				end
+			end
+		end
+	end
+	
+end
diff --git a/mods/furnace.lua b/mods/furnace.lua
deleted file mode 100644
index 68d5180ed002c61437106552272443b36083c293..0000000000000000000000000000000000000000
--- a/mods/furnace.lua
+++ /dev/null
@@ -1,177 +0,0 @@
--- minetest/creative/init.lua
-
-creative_inventory = {}
-creative_inventory.creative_inventory_size = 0
-
--- Create detached creative inventory after loading all mods
-minetest.after(0, function()
-	local inv = minetest.create_detached_inventory("creative", {
-		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-			if minetest.setting_getbool("creative_mode") then
-				return count
-			else
-				return 0
-			end
-		end,
-		allow_put = function(inv, listname, index, stack, player)
-			return 0
-		end,
-		allow_take = function(inv, listname, index, stack, player)
-			if minetest.setting_getbool("creative_mode") then
-				return -1
-			else
-				return 0
-			end
-		end,
-		on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-		end,
-		on_put = function(inv, listname, index, stack, player)
-		end,
-		on_take = function(inv, listname, index, stack, player)
-			--print(player:get_player_name().." takes item from creative inventory; listname="..dump(listname)..", index="..dump(index)..", stack="..dump(stack))
-			if stack then
-				minetest.log("action", player:get_player_name().." takes "..dump(stack:get_name()).." from creative inventory")
-				--print("stack:get_name()="..dump(stack:get_name())..", stack:get_count()="..dump(stack:get_count()))
-			end
-		end,
-	})
-	local creative_list = {}
-	for name,def in pairs(minetest.registered_items) do
-		if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0)
-				and def.description and def.description ~= "" then
-			table.insert(creative_list, name)
-		end
-	end
-	table.sort(creative_list)
-	inv:set_size("main", #creative_list)
-	for _,itemstring in ipairs(creative_list) do
-		inv:add_item("main", ItemStack(itemstring))
-	end
-	creative_inventory.creative_inventory_size = #creative_list
-	--print("creative inventory size: "..dump(creative_inventory.creative_inventory_size))
-end)
-
--- Create the trash field
-local trash = minetest.create_detached_inventory("creative_trash", {
-	-- Allow the stack to be placed and remove it in on_put()
-	-- This allows the creative inventory to restore the stack
-	allow_put = function(inv, listname, index, stack, player)
-		if minetest.setting_getbool("creative_mode") then
-			return stack:get_count()
-		else
-			return 0
-		end
-	end,
-	on_put = function(inv, listname, index, stack, player)
-		inv:set_stack(listname, index, "")
-	end,
-})
-trash:set_size("main", 1)
-
-
-creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
-	pagenum = math.floor(pagenum)
-	local pagemax = math.floor((creative_inventory.creative_inventory_size-1) / (6*4) + 1)
-	player:set_inventory_formspec(
-			"size[13,7.5]"..
-			--"image[6,0.6;1,2;player.png]"..
-			default.gui_bg..
-			default.gui_bg_img..
-			default.gui_slots..
-			"list[current_player;main;5,3.5;8,1;]"..
-			"list[current_player;main;5,4.75;8,3;8]"..
-			"list[current_player;craft;8,0;3,3;]"..
-			"list[current_player;craftpreview;12,1;1,1;]"..
-			"image[11,1;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
-			"list[detached:creative;main;0.3,0.5;4,6;"..tostring(start_i).."]"..
-			"label[2.0,6.55;"..tostring(pagenum).."/"..tostring(pagemax).."]"..
-			"button[0.3,6.5;1.6,1;creative_prev;<<]"..
-			"button[2.7,6.5;1.6,1;creative_next;>>]"..
-			"listring[current_player;main]"..
-			"listring[current_player;craft]"..
-			"listring[current_player;main]"..
-			"listring[detached:creative;main]"..
-			"label[5,1.5;Trash:]"..
-			"list[detached:creative_trash;main;5,2;1,1;]"..
-			default.get_hotbar_bg(5,3.5)
-	)
-end
-minetest.register_on_joinplayer(function(player)
-	-- If in creative mode, modify player's inventory forms
-	if not minetest.setting_getbool("creative_mode") then
-		return
-	end
-	creative_inventory.set_creative_formspec(player, 0, 1)
-end)
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	if not minetest.setting_getbool("creative_mode") then
-		return
-	end
-	-- Figure out current page from formspec
-	local current_page = 0
-	local formspec = player:get_inventory_formspec()
-	local start_i = string.match(formspec, "list%[detached:creative;main;[%d.]+,[%d.]+;[%d.]+,[%d.]+;(%d+)%]")
-	start_i = tonumber(start_i) or 0
-
-	if fields.creative_prev then
-		start_i = start_i - 4*6
-	end
-	if fields.creative_next then
-		start_i = start_i + 4*6
-	end
-
-	if start_i < 0 then
-		start_i = start_i + 4*6
-	end
-	if start_i >= creative_inventory.creative_inventory_size then
-		start_i = start_i - 4*6
-	end
-		
-	if start_i < 0 or start_i >= creative_inventory.creative_inventory_size then
-		start_i = 0
-	end
-
-	creative_inventory.set_creative_formspec(player, start_i, start_i / (6*4) + 1)
-end)
-
-if minetest.setting_getbool("creative_mode") then
-	local digtime = 0.5
-	minetest.register_item(":", {
-		type = "none",
-		wield_image = "wieldhand.png",
-		wield_scale = {x=1,y=1,z=2.5},
-		range = 10,
-		tool_capabilities = {
-			full_punch_interval = 0.5,
-			max_drop_level = 3,
-			groupcaps = {
-				crumbly = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-				cracky = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-				snappy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-				choppy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-				oddly_breakable_by_hand = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-			},
-			damage_groups = {fleshy = 10},
-		}
-	})
-	
-	minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
-		return true
-	end)
-	
-	function minetest.handle_node_drops(pos, drops, digger)
-		if not digger or not digger:is_player() then
-			return
-		end
-		local inv = digger:get_inventory()
-		if inv then
-			for _,item in ipairs(drops) do
-				item = ItemStack(item):get_name()
-				if not inv:contains_item("main", item) then
-					inv:add_item("main", item)
-				end
-			end
-		end
-	end
-	
-end