Fix stable to build with MSVC2010, update version

.gitignore

@@ -21,7 +21,3 @@ src/jthread/libjthread.a
 debug.txt
 bin/debug.txt
 minetestmapper/map.png
-locale/
-src/lua/build/
-src/lua/CMakeFiles/
-*bak*

CMakeLists.txt

@@ -7,14 +7,11 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 # This can be read from ${PROJECT_NAME} after project() is called
 project(minetest)
 
-# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 4)
-set(VERSION_PATCH dev-20111204-1)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 20110922_3)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
-MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
-
 # Configuration options
 
 if(WIN32)
@@ -66,7 +63,7 @@ elseif(UNIX) # Linux, BSD etc
 	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
 endif()
 
-install(FILES "README.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 

README.txt

@@ -54,12 +54,12 @@ Compiling on GNU/Linux:
 -----------------------
 
 Install dependencies. Here's an example for Debian/Ubuntu:
-$ apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev
+$ apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev
 
 Download source, extract (this is the URL to the latest of source repository, which might not work at all times):
-$ wget https://github.com/celeron55/minetest/tarball/master -O master.tar.gz
-$ tar xf master.tar.gz
-$ cd celeron55-minetest-286edd4 (or similar)
+$ wget https://bitbucket.org/celeron55/minetest/get/tip.tar.gz
+$ tar xf tip.tar.gz
+$ cd minetest
 
 Build a version that runs directly from the source directory:
 $ cmake . -DRUN_IN_PLACE=1
@@ -73,7 +73,7 @@ $ ./minetest
 - If you want to install it system-wide (or are making a distribution package), you will want to use -DRUN_IN_PLACE=0
 - You can build a bare server or a bare client by specifying -DBUILD_CLIENT=0 or -DBUILD_SERVER=0
 - You can select between Release and Debug build by -DCMAKE_BUILD_TYPE=<Debug or Release>
-  - Debug build is slower, but gives much more useful output in a debugger
+  - Note that the Debug build is considerably slower
 
 Compiling on Windows:
 ---------------------
@@ -90,18 +90,16 @@ Compiling on Windows:
 		http://www.winimage.com/zLibDll/index.html
 	* Zlib library (zlibwapi.lib and zlibwapi.dll from zlib125dll.zip):
 		http://www.winimage.com/zLibDll/index.html
-	* Optional: gettext bibrary and tools:
+	* gettext bibrary and tools:
 		http://gnuwin32.sourceforge.net/downlinks/gettext.php
-		- This is used for other UI languages. Feel free to leave it out.
 	* And, of course, Minetest-c55:
 		http://celeron.55.lt/~celeron55/minetest/download
 - Steps:
 	- Select a directory called DIR hereafter in which you will operate.
 	- Make sure you have CMake and a compiler installed.
-	- Download all the other stuff to DIR and extract them into there.
-	  ("extract here", not "extract to packagename/")
-	- All those packages contain a nice base directory in them, which
-	  should end up being the direct subdirectories of DIR.
+	- Download all the other stuff to DIR and extract them into there. All those
+	  packages contain a nice base directory in them, which should end up being
+	  the direct subdirectories of DIR.
 	- You will end up with a directory structure like this (+=dir, -=file):
 	-----------------
 	+ DIR
@@ -121,7 +119,7 @@ Compiling on Windows:
 			+ lib
 			+ include
 			...
-		+ gettext (optional)
+		+ gettext
 			+bin
 			+include
 			+lib
@@ -165,8 +163,7 @@ Compiling on Windows:
 	If using MSVC:
 		- Open the generated minetest.sln
 		- The project defaults to the "Debug" configuration. Make very sure to
-		  select "Release", unless you want to debug some stuff (it's slower
-		  and might not even work at all)
+		  select "Release", unless you want to debug some stuff (it's slower)
 		- Build the ALL_BUILD project
 		- Build the INSTALL project
 		- You should now have a working game with the executable in
@@ -179,33 +176,8 @@ Compiling on Windows:
 		- You should now have a working game with the executable in
 			DIR/minetest/bin/minetest.exe
 
-Windows releases of minetest are built using a bat script like this:
---------------------------------------------------------------------
-
-set installpath="C:\tmp\minetest_install"
-set irrlichtpath="C:\tmp\irrlicht-1.7.2"
-
-set sourcedir=%CD%
-set builddir=%sourcedir%\bvc10
-mkdir %builddir%
-pushd %builddir%
-cmake %sourcedir% -G "Visual Studio 10" -DIRRLICHT_SOURCE_DIR=%irrlichtpath% -DRUN_IN_PLACE=1 -DCMAKE_INSTALL_PREFIX=%installpath%
-"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" ALL_BUILD.vcxproj /p:Configuration=Release
-"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" INSTALL.vcxproj /p:Configuration=Release
-"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" PACKAGE.vcxproj /p:Configuration=Release
-popd
-
-License of Minetest-c55 textures and sounds
--------------------------------------------
-
-This applies to textures and sounds contained in the main Minetest
-distribution.
-
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
-http://creativecommons.org/licenses/by-sa/3.0/
-
-License of Minetest-c55 source code
------------------------------------
+License of Minetest-c55
+-----------------------
 
 Minetest-c55
 Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>

data/builtin.lua

@@ -1,443 +0,0 @@
---
--- This file contains built-in stuff in Minetest implemented in Lua.
---
--- It is always loaded and executed after registration of the C API,
--- before loading and running any mods.
---
-
-function basic_dump2(o)
-	if type(o) == "number" then
-		return tostring(o)
-	elseif type(o) == "string" then
-		return string.format("%q", o)
-	elseif type(o) == "boolean" then
-		return tostring(o)
-	elseif type(o) == "function" then
-		return "<function>"
-	elseif type(o) == "userdata" then
-		return "<userdata>"
-	elseif type(o) == "nil" then
-		return "nil"
-	else
-		error("cannot dump a " .. type(o))
-		return nil
-	end
-end
-
-function dump2(o, name, dumped)
-	name = name or "_"
-	dumped = dumped or {}
-	io.write(name, " = ")
-	if type(o) == "number" or type(o) == "string" or type(o) == "boolean"
-			or type(o) == "function" or type(o) == "nil"
-			or type(o) == "userdata" then
-		io.write(basic_dump2(o), "\n")
-	elseif type(o) == "table" then
-		if dumped[o] then
-			io.write(dumped[o], "\n")
-		else
-			dumped[o] = name
-			io.write("{}\n") -- new table
-			for k,v in pairs(o) do
-				local fieldname = string.format("%s[%s]", name, basic_dump2(k))
-				dump2(v, fieldname, dumped)
-			end
-		end
-	else
-		error("cannot dump a " .. type(o))
-		return nil
-	end
-end
-
-function dump(o, dumped)
-	dumped = dumped or {}
-	if type(o) == "number" then
-		return tostring(o)
-	elseif type(o) == "string" then
-		return string.format("%q", o)
-	elseif type(o) == "table" then
-		if dumped[o] then
-			return "<circular reference>"
-		end
-		dumped[o] = true
-		local t = {}
-		for k,v in pairs(o) do
-			t[#t+1] = "" .. k .. " = " .. dump(v, dumped)
-		end
-		return "{" .. table.concat(t, ", ") .. "}"
-	elseif type(o) == "boolean" then
-		return tostring(o)
-	elseif type(o) == "function" then
-		return "<function>"
-	elseif type(o) == "userdata" then
-		return "<userdata>"
-	elseif type(o) == "nil" then
-		return "nil"
-	else
-		error("cannot dump a " .. type(o))
-		return nil
-	end
-end
-
---
--- Built-in node definitions. Also defined in C.
---
-
-minetest.register_nodedef_defaults({
-	-- name intentionally not defined here
-	drawtype = "normal",
-	visual_scale = 1.0,
-	tile_images = {"unknown_block.png"},
-	inventory_image = "unknown_block.png",
-	special_materials = {
-		{image="", backface_culling=true},
-		{image="", backface_culling=true},
-	},
-	alpha = 255,
-	post_effect_color = {a=0, r=0, g=0, b=0},
-	paramtype = "none",
-	is_ground_content = false,
-	light_propagates = false,
-	sunlight_propagates = false,
-	walkable = true,
-	pointable = true,
-	diggable = true,
-	climbable = false,
-	buildable_to = false,
-	wall_mounted = false,
-	often_contains_mineral = false,
-	dug_item = "",
-	extra_dug_item = "",
-	extra_dug_item_rarity = 2,
-	metadata_name = "",
-	liquidtype = "none",
-	liquid_alternative_flowing = "",
-	liquid_alternative_source = "",
-	liquid_viscosity = 0,
-	light_source = 0,
-	damage_per_second = 0,
-	selection_box = {type="regular"},
-	material = {
-		diggablity = "normal",
-		weight = 0,
-		crackiness = 0,
-		crumbliness = 0,
-		cuttability = 0,
-		flammability = 0,
-	},
-	cookresult_item = "", -- Cannot be cooked
-	furnace_cooktime = 3.0,
-	furnace_burntime = -1, -- Cannot be used as fuel
-})
-
-minetest.register_node("air", {
-	drawtype = "airlike",
-	paramtype = "light",
-	light_propagates = true,
-	sunlight_propagates = true,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true,
-	air_equivalent = true,
-})
-
-minetest.register_node("ignore", {
-	drawtype = "airlike",
-	paramtype = "none",
-	light_propagates = false,
-	sunlight_propagates = false,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true, -- A way to remove accidentally placed ignores
-	air_equivalent = true,
-})
-
---
--- stackstring manipulation functions
--- example stackstring: 'craft "apple" 4'
--- example item: {type="craft", name="apple"}
--- example item: {type="tool", name="SteelPick", wear="23272"}
---
-
-function stackstring_take_item(stackstring)
-	if stackstring == nil then
-		return '', nil
-	end
-	local stacktype = nil
-	stacktype = string.match(stackstring,
-			'([%a%d]+)')
-	if stacktype == "node" or stacktype == "craft" then
-		local itemtype = nil
-		local itemname = nil
-		local itemcount = nil
-		itemtype, itemname, itemcount = string.match(stackstring,
-				'([%a%d]+) "([^"]*)" (%d+)')
-		itemcount = tonumber(itemcount)
-		if itemcount == 0 then
-			return '', nil
-		elseif itemcount == 1 then
-			return '', {type=itemtype, name=itemname}
-		else
-			return itemtype.." \""..itemname.."\" "..(itemcount-1),
-					{type=itemtype, name=itemname}
-		end
-	elseif stacktype == "tool" then
-		local itemtype = nil
-		local itemname = nil
-		local itemwear = nil
-		itemtype, itemname, itemwear = string.match(stackstring,
-				'([%a%d]+) "([^"]*)" (%d+)')
-		itemwear = tonumber(itemwear)
-		return '', {type=itemtype, name=itemname, wear=itemwear}
-	end
-end
-
-function stackstring_put_item(stackstring, item)
-	if item == nil then
-		return stackstring, false
-	end
-	stackstring = stackstring or ''
-	local stacktype = nil
-	stacktype = string.match(stackstring,
-			'([%a%d]+)')
-	stacktype = stacktype or ''
-	if stacktype ~= '' and stacktype ~= item.type then
-		return stackstring, false
-	end
-	if item.type == "node" or item.type == "craft" then
-		local itemtype = nil
-		local itemname = nil
-		local itemcount = nil
-		itemtype, itemname, itemcount = string.match(stackstring,
-				'([%a%d]+) "([^"]*)" (%d+)')
-		itemtype = itemtype or item.type
-		itemname = itemname or item.name
-		if itemcount == nil then
-			itemcount = 0
-		end
-		itemcount = itemcount + 1
-		return itemtype.." \""..itemname.."\" "..itemcount, true
-	elseif item.type == "tool" then
-		if stacktype ~= nil then
-			return stackstring, false
-		end
-		local itemtype = nil
-		local itemname = nil
-		local itemwear = nil
-		itemtype, itemname, itemwear = string.match(stackstring,
-				'([%a%d]+) "([^"]*)" (%d+)')
-		itemwear = tonumber(itemwear)
-		return itemtype.." \""..itemname.."\" "..itemwear, true
-	end
-	return stackstring, false
-end
-
-function stackstring_put_stackstring(stackstring, src)
-	while src ~= '' do
-		--print("src="..dump(src))
-		src, item = stackstring_take_item(src)
-		--print("src="..dump(src).." item="..dump(item))
-		local success
-		stackstring, success = stackstring_put_item(stackstring, item)
-		if not success then
-			return stackstring, false
-		end
-	end
-	return stackstring, true
-end
-
-function test_stackstring()
-	local stack
-	local item
-	local success
-
-	stack, item = stackstring_take_item('node "TNT" 3')
-	assert(stack == 'node "TNT" 2')
-	assert(item.type == 'node')
-	assert(item.name == 'TNT')
-
-	stack, item = stackstring_take_item('craft "with spaces" 2')
-	assert(stack == 'craft "with spaces" 1')
-	assert(item.type == 'craft')
-	assert(item.name == 'with spaces')
-
-	stack, item = stackstring_take_item('craft "with spaces" 1')
-	assert(stack == '')
-	assert(item.type == 'craft')
-	assert(item.name == 'with spaces')
-
-	stack, item = stackstring_take_item('craft "s8df2kj3" 0')
-	assert(stack == '')
-	assert(item == nil)
-
-	stack, item = stackstring_take_item('tool "With Spaces" 32487')
-	assert(stack == '')
-	assert(item.type == 'tool')
-	assert(item.name == 'With Spaces')
-	assert(item.wear == 32487)
-
-	stack, success = stackstring_put_item('node "With Spaces" 40',
-			{type='node', name='With Spaces'})
-	assert(stack == 'node "With Spaces" 41')
-	assert(success == true)
-
-	stack, success = stackstring_put_item('craft "With Spaces" 40',
-			{type='craft', name='With Spaces'})
-	assert(stack == 'craft "With Spaces" 41')
-	assert(success == true)
-
-	stack, success = stackstring_put_item('tool "With Spaces" 32487',
-			{type='tool', name='With Spaces'})
-	assert(stack == 'tool "With Spaces" 32487')
-	assert(success == false)
-
-	stack, success = stackstring_put_item('node "With Spaces" 40',
-			{type='tool', name='With Spaces'})
-	assert(stack == 'node "With Spaces" 40')
-	assert(success == false)
-	
-	assert(stackstring_put_stackstring('node "With Spaces" 2',
-			'node "With Spaces" 1') == 'node "With Spaces" 3')
-end
-test_stackstring()
-
---
--- nodeitem helpers
---
-
-minetest.inventorycube = function(img1, img2, img3)
-	img2 = img2 or img1
-	img3 = img3 or img1
-	return "[inventorycube"
-			.. "{" .. img1:gsub("%^", "&")
-			.. "{" .. img2:gsub("%^", "&")
-			.. "{" .. img3:gsub("%^", "&")
-end
-
---
--- craftitem helpers
---
-
-minetest.craftitem_place_item = function(item, placer, pos)
-	--print("craftitem_place_item")
-	--print("item: " .. dump(item))
-	--print("placer: " .. dump(placer))
-	--print("pos: " .. dump(pos))
-	minetest.env:add_item(pos, 'craft "' .. item .. '" 1')
-	return true
-end
-
-minetest.craftitem_eat = function(hp_change)
-	return function(item, user, pointed_thing)  -- closure
-		--print("craftitem_eat(" .. hp_change .. ")")
-		--print("item: " .. dump(item))
-		--print("user: " .. dump(user))
-		--print("pointed_thing: " .. dump(pointed_thing))
-		user:set_hp(user:get_hp() + hp_change)
-		return true
-	end
-end
-
---
--- Default material types
---
-
-function minetest.digprop_constanttime(time)
-	return {
-		diggability = "constant",
-		constant_time = time,
-	}
-end
-
-function minetest.digprop_stonelike(toughness)
-	return {
-		diggablity = "normal",
-		weight = toughness * 5,
-		crackiness = 1,
-		crumbliness = -0.1,
-		cuttability = -0.2,
-	}
-end
-
-function minetest.digprop_dirtlike(toughness)
-	return {
-		diggablity = "normal",
-		weight = toughness * 1.2,
-		crackiness = 0,
-		crumbliness = 1.2,
-		cuttability = -0.4,
-	}
-end
-
-function minetest.digprop_gravellike(toughness)
-	return {
-		diggablity = "normal",
-		weight = toughness * 2,
-		crackiness = 0.2,
-		crumbliness = 1.5,
-		cuttability = -1.0,
-	}
-end
-
-function minetest.digprop_woodlike(toughness)
-	return {
-		diggablity = "normal",
-		weight = toughness * 1.0,
-		crackiness = 0.75,
-		crumbliness = -1.0,
-		cuttability = 1.5,
-	}
-end
-
-function minetest.digprop_leaveslike(toughness)
-	return {
-		diggablity = "normal",
-		weight = toughness * (-0.5),
-		crackiness = 0,
-		crumbliness = 0,
-		cuttability = 2.0,
-	}
-end
-
-function minetest.digprop_glasslike(toughness)
-	return {
-		diggablity = "normal",
-		weight = toughness * 0.1,
-		crackiness = 2.0,
-		crumbliness = -1.0,
-		cuttability = -1.0,
-	}
-end
-
---
--- Creative inventory
---
-
-minetest.creative_inventory = {}
-
-minetest.add_to_creative_inventory = function(itemstring)
-	table.insert(minetest.creative_inventory, itemstring)
-end
-
---
--- Callback registration
---
-
-function make_registration()
-	local t = {}
-	local registerfunc = function(func) table.insert(t, func) end
-	return t, registerfunc
-end
-
-minetest.registered_on_chat_messages, minetest.register_on_chat_message = make_registration()
-minetest.registered_globalsteps, minetest.register_globalstep = make_registration()
-minetest.registered_on_placenodes, minetest.register_on_placenode = make_registration()
-minetest.registered_on_dignodes, minetest.register_on_dignode = make_registration()
-minetest.registered_on_punchnodes, minetest.register_on_punchnode = make_registration()
-minetest.registered_on_generateds, minetest.register_on_generated = make_registration()
-minetest.registered_on_newplayers, minetest.register_on_newplayer = make_registration()
-minetest.registered_on_respawnplayers, minetest.register_on_respawnplayer = make_registration()
-
--- END

data/mods/bucket/depends.txt

@@ -1,2 +0,0 @@
-default
-

data/mods/bucket/init.lua

@@ -1,80 +0,0 @@
--- bucket (Minetest 0.4 mod)
--- A bucket, which can pick up water and lava
-
-minetest.alias_craftitem("bucket", "bucket:bucket_empty")
-minetest.alias_craftitem("bucket_water", "bucket:bucket_water")
-minetest.alias_craftitem("bucket_lava", "bucket:bucket_lava")
-
-minetest.register_craft({
-	output = 'craft "bucket:bucket_empty" 1',
-	recipe = {
-		{'craft "steel_ingot"', '', 'craft "steel_ingot"'},
-		{'', 'craft "steel_ingot"', ''},
-	}
-})
-
-minetest.register_craftitem("bucket:bucket_empty", {
-	image = "bucket.png",
-	stack_max = 1,
-	liquids_pointable = true,
-	on_place_on_ground = minetest.craftitem_place_item,
-	on_use = function(item, player, pointed_thing)
-		if pointed_thing.type == "node" then
-			n = minetest.env:get_node(pointed_thing.under)
-			if n.name == "default:water_source" then
-				minetest.env:add_node(pointed_thing.under, {name="air"})
-				player:add_to_inventory_later('craft "bucket:bucket_water" 1')
-				return true
-			elseif n.name == "default:lava_source" then
-				minetest.env:add_node(pointed_thing.under, {name="air"})
-				player:add_to_inventory_later('craft "bucket:bucket_lava" 1')
-				return true
-			end
-		end
-		return false
-	end,
-})
-
-minetest.register_craftitem("bucket:bucket_water", {
-	image = "bucket_water.png",
-	stack_max = 1,
-	liquids_pointable = true,
-	on_place_on_ground = minetest.craftitem_place_item,
-	on_use = function(item, player, pointed_thing)
-		if pointed_thing.type == "node" then
-			n = minetest.env:get_node(pointed_thing.under)
-			if n.name == "default:water_source" then
-				-- unchanged
-			elseif n.name == "default:water_flowing" or n.name == "default:lava_source" or n.name == "default:lava_flowing" then
-				minetest.env:add_node(pointed_thing.under, {name="default:water_source"})
-			else
-				minetest.env:add_node(pointed_thing.above, {name="default:water_source"})
-			end
-			player:add_to_inventory_later('craft "bucket:bucket_empty" 1')
-			return true
-		end
-		return false
-	end,
-})
-
-minetest.register_craftitem("bucket:bucket_lava", {
-	image = "bucket_lava.png",
-	stack_max = 1,
-	liquids_pointable = true,
-	on_place_on_ground = minetest.craftitem_place_item,
-	on_use = function(item, player, pointed_thing)
-		if pointed_thing.type == "node" then
-			n = minetest.env:get_node(pointed_thing.under)
-			if n.name == "default:lava_source" then
-				-- unchanged
-			elseif n.name == "default:water_source" or n.name == "default:water_flowing" or n.name == "default:lava_flowing" then
-				minetest.env:add_node(pointed_thing.under, {name="default:lava_source"})
-			else
-				minetest.env:add_node(pointed_thing.above, {name="default:lava_source"})
-			end
-			player:add_to_inventory_later('craft "bucket:bucket_empty" 1')
-			return true
-		end
-		return false
-	end,
-})

data/mods/experimental/depends.txt

@@ -1,2 +0,0 @@
-default
-

data/mods/experimental/init.lua

@@ -1,405 +0,0 @@
---
--- Experimental things
---
-
--- An example furnace-thing implemented in Lua
-
-minetest.register_node("experimental:luafurnace", {
-	tile_images = {"default_lava.png", "default_furnace_side.png",
-		"default_furnace_side.png", "default_furnace_side.png",
-		"default_furnace_side.png", "default_furnace_front.png"},
-	--inventory_image = "furnace_front.png",
-	inventory_image = minetest.inventorycube("default_furnace_front.png"),
-	paramtype = "facedir_simple",
-	metadata_name = "generic",
-	material = minetest.digprop_stonelike(3.0),
-})
-
-minetest.register_on_placenode(function(pos, newnode, placer)
-	if newnode.name == "experimental:luafurnace" then
-		local meta = minetest.env:get_meta(pos)
-		meta:inventory_set_list("fuel", {""})
-		meta:inventory_set_list("src", {""})
-		meta:inventory_set_list("dst", {"","","",""})
-		meta:set_inventory_draw_spec(
-			"invsize[8,9;]"
-			.."list[current_name;fuel;2,3;1,1;]"
-			.."list[current_name;src;2,1;1,1;]"
-			.."list[current_name;dst;5,1;2,2;]"
-			.."list[current_player;main;0,5;8,4;]"
-		)
-		
-		local total_cooked = 0;
-		meta:set_string("total_cooked", total_cooked)
-		meta:set_infotext("Lua Furnace: total cooked: "..total_cooked)
-	end
-end)
-
-minetest.register_abm({
-	nodenames = {"experimental:luafurnace"},
-	interval = 1.0,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		local meta = minetest.env:get_meta(pos)
-		local fuellist = meta:inventory_get_list("fuel")
-		local srclist = meta:inventory_get_list("src")
-		local dstlist = meta:inventory_get_list("dst")
-		if fuellist == nil or srclist == nil or dstlist == nil then
-			return
-		end
-		_, srcitem = stackstring_take_item(srclist[1])
-		_, fuelitem = stackstring_take_item(fuellist[1])
-		if not srcitem or not fuelitem then return end
-		if fuelitem.type == "node" then
-			local prop = minetest.registered_nodes[fuelitem.name]
-			if prop == nil then return end
-			if prop.furnace_burntime < 0 then return end
-		else
-			return
-		end
-		local resultstack = nil
-		if srcitem.type == "node" then
-			local prop = minetest.registered_nodes[srcitem.name]
-			if prop == nil then return end
-			if prop.cookresult_item == "" then return end
-			resultstack = prop.cookresult_item
-		else
-			return
-		end
-
-		if resultstack == nil then
-			return
-		end
-
-		dstlist[1], success = stackstring_put_stackstring(dstlist[1], resultstack)
-		if not success then
-			return
-		end
-
-		fuellist[1], _ = stackstring_take_item(fuellist[1])
-		srclist[1], _ = stackstring_take_item(srclist[1])
-
-		meta:inventory_set_list("fuel", fuellist)
-		meta:inventory_set_list("src", srclist)
-		meta:inventory_set_list("dst", dstlist)
-
-		local total_cooked = meta:get_string("total_cooked")
-		total_cooked = tonumber(total_cooked) + 1
-		meta:set_string("total_cooked", total_cooked)
-		meta:set_infotext("Lua Furnace: total cooked: "..total_cooked)
-	end,
-})
-
-minetest.register_craft({
-	output = 'node "experimental:luafurnace" 1',
-	recipe = {
-		{'node "default:cobble"', 'node "default:cobble"', 'node "default:cobble"'},
-		{'node "default:cobble"', 'node "default:steel_ingot"', 'node "default:cobble"'},
-		{'node "default:cobble"', 'node "default:cobble"', 'node "default:cobble"'},
-	}
-})
-
---
--- Random stuff
---
-
---[[
-minetest.register_tool("experimental:horribletool", {
-	image = "default_lava.png",
-	basetime = 2.0
-	dt_weight = 0.2
-	dt_crackiness = 0.2
-	dt_crumbliness = 0.2
-	dt_cuttability = 0.2
-	basedurability = 50
-	dd_weight = -5
-	dd_crackiness = -5
-	dd_crumbliness = -5
-	dd_cuttability = -5
-})
---]]
-
---[[minetest.register_craft({
-	output = 'node "somenode" 4',
-	recipe = {
-		{'craft "default_tick" 1'},
-	}
-})
-
-minetest.register_node("experimental:somenode", {
-	tile_images = {"lava.png", "mese.png", "stone.png", "grass.png", "cobble.png", "tree_top.png"},
-	inventory_image = minetest.inventorycube("lava.png", "mese.png", "stone.png"),
-	--inventory_image = "treeprop.png",
-	material = {
-		diggability = "normal",
-		weight = 0,
-		crackiness = 0,
-		crumbliness = 0,
-		cuttability = 0,
-		flammability = 0
-	},
-	metadata_name = "chest",
-})]]
-
---
--- TNT (not functional)
---
-
-minetest.register_craft({
-	output = 'node "experimental:tnt" 4',
-	recipe = {
-		{'node "default:wood" 1'},
-		{'craft "default:coal_lump" 1'},
-		{'node "default:wood" 1'}
-	}
-})
-
-minetest.register_node("experimental:tnt", {
-	tile_images = {"default_tnt_top.png", "default_tnt_bottom.png",
-			"default_tnt_side.png", "default_tnt_side.png",
-			"default_tnt_side.png", "default_tnt_side.png"},
-	inventory_image = minetest.inventorycube("default_tnt_top.png",
-			"default_tnt_side.png", "default_tnt_side.png"),
-	dug_item = '', -- Get nothing
-	material = {
-		diggability = "not",
-	},
-})
-
-minetest.register_on_punchnode(function(p, node)
-	if node.name == "experimental:tnt" then
-		minetest.env:remove_node(p)
-		minetest.env:add_luaentity(p, "experimental:tnt")
-		nodeupdate(p)
-	end
-end)
-
-local TNT = {
-	-- Static definition
-	physical = true, -- Collides with things
-	-- weight = 5,
-	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
-	visual = "cube",
-	textures = {"default_tnt_top.png", "default_tnt_bottom.png",
-			"default_tnt_side.png", "default_tnt_side.png",
-			"default_tnt_side.png", "default_tnt_side.png"},
-	-- Initial value for our timer
-	timer = 0,
-	-- Number of punches required to defuse
-	health = 1,
-	blinktimer = 0,
-	blinkstatus = true,
-}
-
--- Called when a TNT object is created
-function TNT:on_activate(staticdata)
-	print("TNT:on_activate()")
-	self.object:setvelocity({x=0, y=4, z=0})
-	self.object:setacceleration({x=0, y=-10, z=0})
-	self.object:settexturemod("^[brighten")
-end
-
--- Called periodically
-function TNT:on_step(dtime)
-	--print("TNT:on_step()")
-	self.timer = self.timer + dtime
-	self.blinktimer = self.blinktimer + dtime
-	if self.blinktimer > 0.5 then
-		self.blinktimer = self.blinktimer - 0.5
-		if self.blinkstatus then
-			self.object:settexturemod("")
-		else
-			self.object:settexturemod("^[brighten")
-		end
-		self.blinkstatus = not self.blinkstatus
-	end
-end
-
--- Called when object is punched
-function TNT:on_punch(hitter)
-	print("TNT:on_punch()")
-	self.health = self.health - 1
-	if self.health <= 0 then
-		self.object:remove()
-		hitter:add_to_inventory("node TNT 1")
-		hitter:set_hp(hitter:get_hp() - 1)
-	end
-end
-
--- Called when object is right-clicked
-function TNT:on_rightclick(clicker)
-	--pos = self.object:getpos()
-	--pos = {x=pos.x, y=pos.y+0.1, z=pos.z}
-	--self.object:moveto(pos, false)
-end
-
---print("TNT dump: "..dump(TNT))
---print("Registering TNT");
-minetest.register_entity("experimental:tnt", TNT)
-
---
--- A test entity for testing animated and yaw-modulated sprites
---
-
-minetest.register_entity("experimental:testentity", {
-	-- Static definition
-	physical = true, -- Collides with things
-	-- weight = 5,
-	collisionbox = {-0.7,-1.35,-0.7, 0.7,1.0,0.7},
-	--collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
-	visual = "sprite",
-	visual_size = {x=2, y=3},
-	textures = {"dungeon_master.png^[makealpha:128,0,0^[makealpha:128,128,0"},
-	spritediv = {x=6, y=5},
-	initial_sprite_basepos = {x=0, y=0},
-
-	on_activate = function(self, staticdata)
-		print("testentity.on_activate")
-		self.object:setsprite({x=0,y=0}, 1, 0, true)
-		--self.object:setsprite({x=0,y=0}, 4, 0.3, true)
-
-		-- Set gravity
-		self.object:setacceleration({x=0, y=-10, z=0})
-		-- Jump a bit upwards
-		self.object:setvelocity({x=0, y=10, z=0})
-	end,
-
-	on_punch = function(self, hitter)
-		self.object:remove()
-		hitter:add_to_inventory('craft testobject1 1')
-	end,
-})
-
---
--- More random stuff
---
-
-minetest.register_on_respawnplayer(function(player)
-	print("on_respawnplayer")
-	-- player:setpos({x=0, y=30, z=0})
-	-- return true
-end)
-
-minetest.register_on_generated(function(minp, maxp)
-	--print("on_generated: minp="..dump(minp).." maxp="..dump(maxp))
-	--cp = {x=(minp.x+maxp.x)/2, y=(minp.y+maxp.y)/2, z=(minp.z+maxp.z)/2}
-	--minetest.env:add_node(cp, {name="sand"})
-end)
-
--- Example setting get
---print("setting max_users = " .. dump(minetest.setting_get("max_users")))
---print("setting asdf = " .. dump(minetest.setting_get("asdf")))
-
-minetest.register_on_chat_message(function(name, message)
-	--[[print("on_chat_message: name="..dump(name).." message="..dump(message))
-	local cmd = "/testcommand"
-	if message:sub(0, #cmd) == cmd then
-		print(cmd.." invoked")
-		return true
-	end
-	local cmd = "/help"
-	if message:sub(0, #cmd) == cmd then
-		print("script-overridden help command")
-		minetest.chat_send_all("script-overridden help command")
-		return true
-	end]]
-end)
-
--- Grow papyrus on TNT every 10 seconds
---[[minetest.register_abm({
-	nodenames = {"TNT"},
-	interval = 10.0,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		print("TNT ABM action")
-		pos.y = pos.y + 1
-		minetest.env:add_node(pos, {name="papyrus"})
-	end,
-})]]
-
--- Replace texts of alls signs with "foo" every 10 seconds
---[[minetest.register_abm({
-	nodenames = {"sign_wall"},
-	interval = 10.0,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		print("ABM: Sign text changed")
-		local meta = minetest.env:get_meta(pos)
-		meta:set_text("foo")
-	end,
-})]]
-
---[[local ncpos = nil
-local ncq = 1
-local ncstuff = {
-    {2, 1, 0, 3}, {3, 0, 1, 2}, {4, -1, 0, 1}, {5, -1, 0, 1}, {6, 0, -1, 0},
-    {7, 0, -1, 0}, {8, 1, 0, 3}, {9, 1, 0, 3}, {10, 1, 0, 3}, {11, 0, 1, 2},
-    {12, 0, 1, 2}, {13, 0, 1, 2}, {14, -1, 0, 1}, {15, -1, 0, 1}, {16, -1, 0, 1},
-    {17, -1, 0, 1}, {18, 0, -1, 0}, {19, 0, -1, 0}, {20, 0, -1, 0}, {21, 0, -1, 0},
-    {22, 1, 0, 3}, {23, 1, 0, 3}, {24, 1, 0, 3}, {25, 1, 0, 3}, {10, 0, 1, 2}
-}
-local ncold = {}
-local nctime = nil
-
-minetest.register_abm({
-    nodenames = {"dirt_with_grass"},
-    interval = 100000.0,
-    chance = 1,
-    action = function(pos, node, active_object_count, active_object_count_wider)
-        if ncpos ~= nil then
-            return
-        end
-       
-        if pos.x % 16 ~= 8 or pos.z % 16 ~= 8 then
-            return
-        end
-       
-        pos.y = pos.y + 1
-        n = minetest.env:get_node(pos)
-        print(dump(n))
-        if n.name ~= "air" then
-            return
-        end
-
-        pos.y = pos.y + 2
-        ncpos = pos
-        nctime = os.clock()
-        minetest.env:add_node(ncpos, {name="nyancat"})
-    end
-})
-
-minetest.register_abm({
-    nodenames = {"nyancat"},
-    interval = 1.0,
-    chance = 1,
-    action = function(pos, node, active_object_count, active_object_count_wider)
-        if ncpos == nil then
-            return
-        end
-        if pos.x == ncpos.x and pos.y == ncpos.y and pos.z == ncpos.z then
-            clock = os.clock()
-            if clock - nctime < 0.1 then
-                return
-            end
-            nctime = clock
-           
-            s0 = ncstuff[ncq]
-            ncq = s0[1]
-            s1 = ncstuff[ncq]
-            p0 = pos
-            p1 = {x = p0.x + s0[2], y = p0.y, z = p0.z + s0[3]}
-            p2 = {x = p1.x + s1[2], y = p1.y, z = p1.z + s1[3]}
-            table.insert(ncold, 1, p0)
-            while #ncold >= 10 do
-                minetest.env:add_node(ncold[#ncold], {name="air"})
-                table.remove(ncold, #ncold)
-            end
-            minetest.env:add_node(p0, {name="nyancat_rainbow"})
-            minetest.env:add_node(p1, {name="nyancat", param1=s0[4]})
-            minetest.env:add_node(p2, {name="air"})
-            ncpos = p1
-        end
-    end,
-})--]]
-
-

data/mods/give_initial_stuff/depends.txt

@@ -1,2 +0,0 @@
-default
-

data/mods/give_initial_stuff/init.lua

@@ -1,12 +0,0 @@
-minetest.register_on_newplayer(function(player)
-	print("on_newplayer")
-	if minetest.setting_getbool("give_initial_stuff") then
-		print("giving give_initial_stuff to player")
-		player:add_to_inventory('tool "SteelPick" 0')
-		player:add_to_inventory('node "torch" 99')
-		player:add_to_inventory('tool "SteelAxe" 0')
-		player:add_to_inventory('tool "SteelShovel" 0')
-		player:add_to_inventory('node "cobble" 99')
-	end
-end)
-

data/mods/legacy/depends.txt

@@ -1,2 +0,0 @@
-default
-

data/mods/legacy/init.lua

@@ -1,100 +0,0 @@
--- legacy (Minetest 0.4 mod)
--- Provides as much backwards-compatibility as feasible
-
---
--- Aliases to support loading 0.3 and old 0.4 worlds and inventories
---
-
-minetest.alias_node("stone", "default:stone")
-minetest.alias_node("dirt_with_grass", "default:dirt_with_grass")
-minetest.alias_node("dirt_with_grass_footsteps", "default:dirt_with_grass_footsteps")
-minetest.alias_node("dirt", "default:dirt")
-minetest.alias_node("sand", "default:sand")
-minetest.alias_node("gravel", "default:gravel")
-minetest.alias_node("sandstone", "default:sandstone")
-minetest.alias_node("clay", "default:clay")
-minetest.alias_node("brick", "default:brick")
-minetest.alias_node("tree", "default:tree")
-minetest.alias_node("jungletree", "default:jungletree")
-minetest.alias_node("junglegrass", "default:junglegrass")
-minetest.alias_node("leaves", "default:leaves")
-minetest.alias_node("cactus", "default:cactus")
-minetest.alias_node("papyrus", "default:papyrus")
-minetest.alias_node("bookshelf", "default:bookshelf")
-minetest.alias_node("glass", "default:glass")
-minetest.alias_node("wooden_fence", "default:fence_wood")
-minetest.alias_node("rail", "default:rail")
-minetest.alias_node("ladder", "default:ladder")
-minetest.alias_node("wood", "default:wood")
-minetest.alias_node("mese", "default:mese")
-minetest.alias_node("cloud", "default:cloud")
-minetest.alias_node("water_flowing", "default:water_flowing")
-minetest.alias_node("water_source", "default:water_source")
-minetest.alias_node("lava_flowing", "default:lava_flowing")
-minetest.alias_node("lava_source", "default:lava_source")
-minetest.alias_node("torch", "default:torch")
-minetest.alias_node("sign_wall", "default:sign_wall")
-minetest.alias_node("chest", "default:chest")
-minetest.alias_node("locked_chest", "default:chest_locked")
-minetest.alias_node("cobble", "default:cobble")
-minetest.alias_node("mossycobble", "default:mossycobble")
-minetest.alias_node("steelblock", "default:steelblock")
-minetest.alias_node("nyancat", "default:nyancat")
-minetest.alias_node("nyancat_rainbow", "default:nyancat_rainbow")
-minetest.alias_node("sapling", "default:sapling")
-minetest.alias_node("apple", "default:apple")
-
-minetest.alias_tool("WPick", "default:pick_wood")
-minetest.alias_tool("STPick", "default:pick_stone")
-minetest.alias_tool("SteelPick", "default:pick_steel")
-minetest.alias_tool("MesePick", "default:pick_mese")
-minetest.alias_tool("WShovel", "default:shovel_wood")
-minetest.alias_tool("STShovel", "default:shovel_stone")
-minetest.alias_tool("SteelShovel", "default:shovel_steel")
-minetest.alias_tool("WAxe", "default:axe_wood")
-minetest.alias_tool("STAxe", "default:axe_stone")
-minetest.alias_tool("SteelAxe", "default:axe_steel")
-minetest.alias_tool("WSword", "default:sword_wood")
-minetest.alias_tool("STSword", "default:sword_stone")
-minetest.alias_tool("SteelSword", "default:sword_steel")
-
-minetest.alias_craftitem("Stick", "default:stick")
-minetest.alias_craftitem("paper", "default:paper")
-minetest.alias_craftitem("book", "default:book")
-minetest.alias_craftitem("lump_of_coal", "default:coal_lump")
-minetest.alias_craftitem("lump_of_iron", "default:iron_lump")
-minetest.alias_craftitem("lump_of_clay", "default:clay_lump")
-minetest.alias_craftitem("steel_ingot", "default:steel_ingot")
-minetest.alias_craftitem("clay_brick", "default:clay_brick")
-minetest.alias_craftitem("scorched_stuff", "default:scorched_stuff")
-minetest.alias_craftitem("apple", "default:apple")
-
---
--- Old items
---
-
-minetest.register_craftitem(":rat", {
-	image = "rat.png",
-	cookresult_itemstring = 'craft "cooked_rat" 1',
-	on_drop = function(item, dropper, pos)
-		minetest.env:add_rat(pos)
-		return true
-	end,
-})
-
-minetest.register_craftitem(":cooked_rat", {
-	image = "cooked_rat.png",
-	cookresult_itemstring = 'craft "scorched_stuff" 1',
-	on_place_on_ground = minetest.craftitem_place_item,
-	on_use = minetest.craftitem_eat(6),
-})
-
-minetest.register_craftitem(":firefly", {
-	image = "firefly.png",
-	on_drop = function(item, dropper, pos)
-		minetest.env:add_firefly(pos)
-		return true
-	end,
-})
-
--- END