Fix stable to build with MSVC2010, update version

Update changelog
minetestmapper: Fix the way ylist is computed, use cStringIO instead of rolling own Bytestream, remove some artifacts when drawing underground blocks, introduce a --drawunderground switch (defaults to of), 'blocknum' renamed to 'content'.
2011-10-16 02:24:11 +03:00 · 2011-09-27 18:11:12 +03:00 · 2011-09-27 16:18:22 +03:00 · 2011-09-27 16:18:22 +03:00 · 2011-09-26 21:57:18 +03:00 · 2011-09-26 21:57:18 +03:00
468 changed files with 33717 additions and 72156 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,5 @@
-## Generic ignorable patterns and files
-*~
-.*.swp
-*bak*
-tags
-*.vim
-
-## Non-static Minetest directories
-/bin/
-/games/*
-!/games/minimal/
-/cache/
-/textures/
-/sounds/
-/mods/*
-!/mods/minetest/
-/mods/minetest/*
-!/mods/minetest/mods_here.txt
-/worlds/
-/world/
-
-## Configuration/log files
-minetest.conf
-debug.txt
-
-## Build files
+map/*
+world/*
 CMakeFiles/*
 src/CMakeFiles/*
 src/Makefile
@@ -33,13 +9,15 @@ src/jthread/CMakeFiles/*
 src/jthread/Makefile
 src/jthread/cmake_config.h
 src/jthread/cmake_install.cmake
-src/jthread/libjthread.a
-src/lua/build/
-src/lua/CMakeFiles/
+.*.swp
+minetest.conf
+bin/
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
 Makefile
 cmake_install.cmake
-locale/
-
+src/jthread/libjthread.a
+debug.txt
+bin/debug.txt
+minetestmapper/map.png
--- a/.hgignore
+++ b/.hgignore
@@ -0,0 +1,25 @@
+map/*
+world/*
+CMakeFiles/*
+src/CMakeFiles/*
+src/Makefile
+src/cmake_config.h
+src/cmake_install.cmake
+src/jthread/CMakeFiles/*
+src/jthread/Makefile
+src/jthread/cmake_config.h
+src/jthread/cmake_install.cmake
+src/.*.swp
+src/sqlite/libsqlite3.a
+src/session.vim
+util/uloste.png
+minetest.conf
+debug.txt
+bin/
+CMakeCache.txt
+CPackConfig.cmake
+CPackSourceConfig.cmake
+Makefile
+cmake_install.cmake
+src/jthread/libjthread.a
+data_temp/*
--- a/.hgtags
+++ b/.hgtags
@@ -0,0 +1 @@
+a519d683251105654d2a146ae7b91d3850b6504c 0.2.20110731_3
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,19 +7,11 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 # This can be read from ${PROJECT_NAME} after project() is called
 project(minetest)

-set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
-
-# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 4)
-set(VERSION_PATCH 0)
-if(VERSION_EXTRA)
-	set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
-endif()
+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)
@@ -54,68 +46,26 @@ find_package(Irrlicht)
 #

 if(WIN32)
-	set(SHAREDIR ".")
+	set(DATADIR "data")
 	set(BINDIR "bin")
 	set(DOCDIR "doc")
 	set(EXAMPLE_CONF_DIR ".")
-	set(LOCALEDIR "locale")
 elseif(APPLE)
-	# Random placeholders; this isn't usually used and may not work
-	# See https://github.com/toabi/minetest-mac/
-	set(SHAREDIR "share/${PROJECT_NAME}")
+	# random placeholders
+	set(DATADIR "share/${PROJECT_NAME}")
 	set(BINDIR "bin")
 	set(DOCDIR "share/doc/${PROJECT_NAME}")
-	set(EXAMPLE_CONF_DIR ${DOCDIR})
-	set(LOCALEDIR "locale")
+	set(EXAMPLE_CONF_DIR ".")
 elseif(UNIX) # Linux, BSD etc
-	if(RUN_IN_PLACE)
-		set(SHAREDIR ".")
-		set(BINDIR "bin")
-		set(DOCDIR "doc")
-		set(EXAMPLE_CONF_DIR ".")
-		set(MANDIR "unix/man")
-		set(XDG_APPS_DIR "unix/applications")
-		set(ICONDIR "unix/icons")
-		set(LOCALEDIR "locale")
-	else()
-		set(SHAREDIR "share/${PROJECT_NAME}")
-		set(BINDIR "bin")
-		set(DOCDIR "share/doc/${PROJECT_NAME}")
-		set(MANDIR "share/man")
-		set(EXAMPLE_CONF_DIR ${DOCDIR})
-		set(XDG_APPS_DIR "share/applications")
-		set(ICONDIR "share/icons")
-		set(LOCALEDIR "share/locale")
-	endif()
+	set(DATADIR "share/${PROJECT_NAME}")
+	set(BINDIR "bin")
+	set(DOCDIR "share/doc/${PROJECT_NAME}")
+	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
 endif()

-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games")
-set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game")
-if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
-	install(FILES ${MINETEST_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/minetest_game/")
-	install(FILES ${MINETEST_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/minetest_game/")
-	install(DIRECTORY ${MINETEST_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/minetest_game")
-endif()
-if(BUILD_CLIENT)
-	#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base")
-	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base")
-endif()
-if(RUN_IN_PLACE)
-	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/minetest/mods_here.txt" DESTINATION "${SHAREDIR}/mods/minetest")
-	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/all/textures_here.txt" DESTINATION "${SHAREDIR}/textures/all")
-endif()
-
-install(FILES "README.txt" DESTINATION "${DOCDIR}")
-install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
-install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}")
-install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
-
-if(UNIX)
-	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
-	install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
-	install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
-endif()
+install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
+install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")

 #
 # Subdirectories
--- a/README.txt
+++ b/README.txt
@@ -1,75 +1,50 @@
 Minetest-c55
-============
-
+---------------
 An InfiniMiner/Minecraft inspired game.
+Copyright (c) 2010-2011 Perttu Ahola <celeron55@gmail.com>
+(see source files for other contributors)

-Copyright (c) 2010-2012 Perttu Ahola <celeron55@gmail.com>
-and ther contributors (see source file comments and the version control log)
-
-In case you downloaded the source code:
---------------------------------------
-If you downloaded the Minetest Engine source code in which this file is
-contained, you probably want to download the minetest_game project too:
-  https://github.com/celeron55/minetest_game/
-See the README.txt in it.
-
-Further documentation
+Further documentation:
 ----------------------
- Website: http://c55.me/minetest/
- Wiki: http://c55.me/minetest/wiki/
- Forum: http://c55.me/minetest/forum/
- Github: https://github.com/celeron55/minetest/
+- Website: http://celeron.55.lt/~celeron55/minetest/
+- Wiki: http://celeron.55.lt/~celeron55/minetest/wiki/
+- Forum: http://celeron.55.lt/~celeron55/minetest/forum/
 - doc/ directory of source distribution

-This game is not finished
+This game is not finished:
 --------------------------
 - Don't expect it to work as well as a finished game will.
- Please report any bugs. When doing that, debug.txt is useful.
+- Please report any bugs to me. debug.txt is useful.

-Default Controls
-----------------
- WASD: Move
- Space: Jump
- E: Go down
- Shift: Sneak
- Q: Drop item
- I: Open inventory
- Mouse: Turn/look
+Controls:
+---------
+- See the in-game pause menu
 - Settable in the configuration file, see the section below.

-Paths
------
-$bin   - Compiled binaries
-$share - Cistributed read-only data
-$user  - User-created modifiable data
-
-Windows .zip / RUN_IN_PLACE source:
-$bin   = bin
-$share = .
-$user  = .
-
-Linux installed:
-$bin   = /usr/bin
-$share = /usr/share/minetest
-$user  = ~/.minetest
-
-OS X:
-$bin   = ?
-$share = ?
-$user  = ~/Library/Application Support/minetest
-
-World directory
----------------
- Worlds can be found as separate folders in:
-    $user/worlds/
+Map directory:
+--------------
+- Map is stored in a directory, which can be removed to generate a new map.
+- There is a command-line option for it: --map-dir
+- For a RUN_IN_PLACE build, it is located in:
+		../world
+- Otherwise something like this:
+	Windows: C:\Documents and Settings\user\Application Data\minetest\world
+	Linux: ~/.minetest/world
+	OS X: ~/Library/Application Support/minetest/world

 Configuration file:
 -------------------
- Default location:
-    $user/minetest.conf
- It is created by Minetest when it is ran the first time.
- A specific file can be specified on the command line:
+- An optional configuration file can be used. See minetest.conf.example.
+- Path to file can be passed as a parameter to the executable:
 	--config <path-to-file>
+- Defaults:
+	- If built with -DRUN_IN_PLACE=1:
+		../minetest.conf
+		../../minetest.conf
+	- Otherwise something like this:
+		Windows: C:\Documents and Settings\user\Application Data\minetest\minetest.conf
+		Linux: ~/.minetest/minetest.conf
+		OS X: ~/Library/Application Support/minetest.conf

 Command-line options:
 ---------------------
@@ -79,19 +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 libogg-dev libvorbis-dev libopenal-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)
-
-Download minetest_game (otherwise only the "Minimal development test" game is available)
-$ cd games/
-$ wget https://github.com/celeron55/minetest_game/tarball/master -O master.tar.gz
-$ tar xf master.tar.gz
-$ mv celeron55-minetest_game-* minetest_game
-$ cd ..
+$ 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
@@ -105,13 +73,10 @@ $ ./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:
 ---------------------
- This section is outdated. In addition to what is described here:
-  - In addition to minetest, you need to download minetest_game.
-  - If you wish to have sound support, you need libogg, libvorbis and libopenal

 - You need:
 	* CMake:
@@ -125,19 +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://c55.me/minetest/download
+		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/")
-	  NOTE: zlib125dll.zip needs to be extracted into zlib125dll
-	- 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
@@ -157,7 +119,7 @@ Compiling on Windows:
 			+ lib
 			+ include
 			...
-		+ gettext (optional)
+		+ gettext
 			+bin
 			+include
 			+lib
@@ -201,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
@@ -212,56 +173,18 @@ Compiling on Windows:
 	If using MinGW:
 		- Using the command line, browse to the build directory and run 'make'
 		  (or mingw32-make or whatever it happens to be)
-		- You may need to copy some of the downloaded DLLs into bin/, see what
-		  running the produced executable tells you it doesn't have.
 		- 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 sourcedir=%CD%
-set installpath="C:\tmp\minetest_install"
-set irrlichtpath="C:\tmp\irrlicht-1.7.2"
-
-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%
-if %errorlevel% neq 0 goto fail
-"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" ALL_BUILD.vcxproj /p:Configuration=Release
-if %errorlevel% neq 0 goto fail
-"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" INSTALL.vcxproj /p:Configuration=Release
-if %errorlevel% neq 0 goto fail
-"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" PACKAGE.vcxproj /p:Configuration=Release
-if %errorlevel% neq 0 goto fail
-popd
-echo Finished.
-exit /b 0
-
-:fail
-popd
-echo Failed.
-exit /b 1
-
-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>

 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.

 This program is distributed in the hope that it will be useful,
@@ -269,7 +192,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

-You should have received a copy of the GNU Lesser General Public License along
+You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

@@ -325,50 +248,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.

-Lua
---------------
-
-Lua is licensed under the terms of the MIT license reproduced below.
-This means that Lua is free software and can be used for both academic
-and commercial purposes at absolutely no cost.
-
-For details and rationale, see http://www.lua.org/license.html .
-
-Copyright (C) 1994-2008 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Fonts
---------------
-
-DejaVu Sans Mono:
-
-  Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-  Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-  Bitstream Vera Fonts Copyright:
-
-  Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-  a trademark of Bitstream, Inc.
-
-  Arev Fonts Copyright:
-
-  Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-

--- a/builtin/auth.lua
+++ b/builtin/auth.lua
@@ -1,188 +0,0 @@
-- Minetest: builtin/auth.lua
-
--
-- Authentication handler
--
-
-function minetest.string_to_privs(str, delim)
-	assert(type(str) == "string")
-	delim = delim or ','
-	privs = {}
-	for _, priv in pairs(string.split(str, delim)) do
-		privs[priv:trim()] = true
-	end
-	return privs
-end
-
-function minetest.privs_to_string(privs, delim)
-	assert(type(privs) == "table")
-	delim = delim or ','
-	list = {}
-	for priv, bool in pairs(privs) do
-		if bool then
-			table.insert(list, priv)
-		end
-	end
-	return table.concat(list, delim)
-end
-
-assert(minetest.string_to_privs("a,b").b == true)
-assert(minetest.privs_to_string({a=true,b=true}) == "a,b")
-
-minetest.auth_file_path = minetest.get_worldpath().."/auth.txt"
-minetest.auth_table = {}
-
-local function read_auth_file()
-	local newtable = {}
-	local file, errmsg = io.open(minetest.auth_file_path, 'rb')
-	if not file then
-		minetest.log("info", minetest.auth_file_path.." could not be opened for reading ("..errmsg.."); assuming new world")
-		return
-	end
-	for line in file:lines() do
-		if line ~= "" then
-			local name, password, privilegestring = string.match(line, "([^:]*):([^:]*):([^:]*)")
-			if not name or not password or not privilegestring then
-				error("Invalid line in auth.txt: "..dump(line))
-			end
-			local privileges = minetest.string_to_privs(privilegestring)
-			newtable[name] = {password=password, privileges=privileges}
-		end
-	end
-	io.close(file)
-	minetest.auth_table = newtable
-	minetest.notify_authentication_modified()
-end
-
-local function save_auth_file()
-	local newtable = {}
-	-- Check table for validness before attempting to save
-	for name, stuff in pairs(minetest.auth_table) do
-		assert(type(name) == "string")
-		assert(name ~= "")
-		assert(type(stuff) == "table")
-		assert(type(stuff.password) == "string")
-		assert(type(stuff.privileges) == "table")
-	end
-	local file, errmsg = io.open(minetest.auth_file_path, 'w+b')
-	if not file then
-		error(minetest.auth_file_path.." could not be opened for writing: "..errmsg)
-	end
-	for name, stuff in pairs(minetest.auth_table) do
-		local privstring = minetest.privs_to_string(stuff.privileges)
-		file:write(name..":"..stuff.password..":"..privstring..'\n')
-	end
-	io.close(file)
-end
-
-read_auth_file()
-
-minetest.builtin_auth_handler = {
-	get_auth = function(name)
-		assert(type(name) == "string")
-		-- Figure out what password to use for a new player (singleplayer
-		-- always has an empty password, otherwise use default, which is
-		-- usually empty too)
-		local new_password_hash = ""
-		-- If not in authentication table, return nil
-		if not minetest.auth_table[name] then
-			return nil
-		end
-		-- Figure out what privileges the player should have.
-		-- Take a copy of the privilege table
-		local privileges = {}
-		for priv, _ in pairs(minetest.auth_table[name].privileges) do
-			privileges[priv] = true
-		end
-		-- If singleplayer, give all privileges except those marked as give_to_singleplayer = false
-		if minetest.is_singleplayer() then
-			for priv, def in pairs(minetest.registered_privileges) do
-				if def.give_to_singleplayer then
-					privileges[priv] = true
-				end
-			end
-		-- For the admin, give everything
-		elseif name == minetest.setting_get("name") then
-			for priv, def in pairs(minetest.registered_privileges) do
-				privileges[priv] = true
-			end
-		end
-		-- All done
-		return {
-			password = minetest.auth_table[name].password,
-			privileges = privileges,
-		}
-	end,
-	create_auth = function(name, password)
-		assert(type(name) == "string")
-		assert(type(password) == "string")
-		minetest.log('info', "Built-in authentication handler adding player '"..name.."'")
-		minetest.auth_table[name] = {
-			password = password,
-			privileges = minetest.string_to_privs(minetest.setting_get("default_privs")),
-		}
-		save_auth_file()
-	end,
-	set_password = function(name, password)
-		assert(type(name) == "string")
-		assert(type(password) == "string")
-		if not minetest.auth_table[name] then
-			minetest.builtin_auth_handler.create_auth(name, password)
-		else
-			minetest.log('info', "Built-in authentication handler setting password of player '"..name.."'")
-			minetest.auth_table[name].password = password
-			save_auth_file()
-		end
-		return true
-	end,
-	set_privileges = function(name, privileges)
-		assert(type(name) == "string")
-		assert(type(privileges) == "table")
-		if not minetest.auth_table[name] then
-			minetest.builtin_auth_handler.create_auth(name, minetest.get_password_hash(name, minetest.setting_get("default_password")))
-		end
-		minetest.auth_table[name].privileges = privileges
-		minetest.notify_authentication_modified(name)
-		save_auth_file()
-	end,
-	reload = function()
-		read_auth_file()
-		return true
-	end,
-}
-
-function minetest.register_authentication_handler(handler)
-	if minetest.registered_auth_handler then
-		error("Add-on authentication handler already registered by "..minetest.registered_auth_handler_modname)
-	end
-	minetest.registered_auth_handler = handler
-	minetest.registered_auth_handler_modname = minetest.get_current_modname()
-end
-
-function minetest.get_auth_handler()
-	if minetest.registered_auth_handler then
-		return minetest.registered_auth_handler
-	end
-	return minetest.builtin_auth_handler
-end
-
-function minetest.set_player_password(name, password)
-	if minetest.get_auth_handler().set_password then
-		minetest.get_auth_handler().set_password(name, password)
-	end
-end
-
-function minetest.set_player_privs(name, privs)
-	if minetest.get_auth_handler().set_privileges then
-		minetest.get_auth_handler().set_privileges(name, privs)
-	end
-end
-
-function minetest.auth_reload()
-	if minetest.get_auth_handler().reload then
-		return minetest.get_auth_handler().reload()
-	end
-	return false
-end
-
-
--- a/builtin/builtin.lua
+++ b/builtin/builtin.lua
@@ -1,24 +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.
--
-
-- Initialize some very basic things
-print = minetest.debug
-math.randomseed(os.time())
-
-- Load other files
-dofile(minetest.get_modpath("__builtin").."/serialize.lua")
-dofile(minetest.get_modpath("__builtin").."/misc_helpers.lua")
-dofile(minetest.get_modpath("__builtin").."/item.lua")
-dofile(minetest.get_modpath("__builtin").."/misc_register.lua")
-dofile(minetest.get_modpath("__builtin").."/item_entity.lua")
-dofile(minetest.get_modpath("__builtin").."/deprecated.lua")
-dofile(minetest.get_modpath("__builtin").."/misc.lua")
-dofile(minetest.get_modpath("__builtin").."/privileges.lua")
-dofile(minetest.get_modpath("__builtin").."/auth.lua")
-dofile(minetest.get_modpath("__builtin").."/chatcommands.lua")
-dofile(minetest.get_modpath("__builtin").."/static_spawn.lua")
-
--- a/builtin/chatcommands.lua
+++ b/builtin/chatcommands.lua
@@ -1,373 +0,0 @@
-- Minetest: builtin/chatcommands.lua
-
--
-- Chat command handler
--
-
-minetest.chatcommands = {}
-function minetest.register_chatcommand(cmd, def)
-	def = def or {}
-	def.params = def.params or ""
-	def.description = def.description or ""
-	def.privs = def.privs or {}
-	minetest.chatcommands[cmd] = def
-end
-
-minetest.register_on_chat_message(function(name, message)
-	local cmd, param = string.match(message, "^/([^ ]+) *(.*)")
-	if not param then
-		param = ""
-	end
-	local cmd_def = minetest.chatcommands[cmd]
-	if cmd_def then
-		if not cmd_def.func then
-			-- This is a C++ command
-			return false
-		else
-			local has_privs, missing_privs = minetest.check_player_privs(name, cmd_def.privs)
-			if has_privs then
-				cmd_def.func(name, param)
-			else
-				minetest.chat_send_player(name, "You don't have permission to run this command (missing privileges: "..table.concat(missing_privs, ", ")..")")
-			end
-			return true -- handled chat message
-		end
-	end
-	return false
-end)
-
--
-- Chat commands
--
-
-- Register C++ commands without functions
-minetest.register_chatcommand("me", {params = nil, description = "chat action (eg. /me orders a pizza)", privs = {shout=true}})
-minetest.register_chatcommand("status", {description = "print server status line"})
-minetest.register_chatcommand("shutdown", {params = "", description = "shutdown server", privs = {server=true}})
-minetest.register_chatcommand("clearobjects", {params = "", description = "clear all objects in world", privs = {server=true}})
-minetest.register_chatcommand("time", {params = "<0...24000>", description = "set time of day", privs = {settime=true}})
-minetest.register_chatcommand("ban", {params = "<name>", description = "ban IP of player", privs = {ban=true}})
-minetest.register_chatcommand("unban", {params = "<name/ip>", description = "remove IP ban", privs = {ban=true}})
-
-- Register other commands
-minetest.register_chatcommand("help", {
-	privs = {},
-	params = "(nothing)/all/privs/<cmd>",
-	description = "Get help for commands or list privileges",
-	func = function(name, param)
-		local format_help_line = function(cmd, def)
-			local msg = "/"..cmd
-			if def.params and def.params ~= "" then msg = msg .. " " .. def.params end
-			if def.description and def.description ~= "" then msg = msg .. ": " .. def.description end
-			return msg
-		end
-		if param == "" then
-			local msg = ""
-			cmds = {}
-			for cmd, def in pairs(minetest.chatcommands) do
-				if minetest.check_player_privs(name, def.privs) then
-					table.insert(cmds, cmd)
-				end
-			end
-			minetest.chat_send_player(name, "Available commands: "..table.concat(cmds, " "))
-			minetest.chat_send_player(name, "Use '/help <cmd>' to get more information, or '/help all' to list everything.")
-		elseif param == "all" then
-			minetest.chat_send_player(name, "Available commands:")
-			for cmd, def in pairs(minetest.chatcommands) do
-				if minetest.check_player_privs(name, def.privs) then
-					minetest.chat_send_player(name, format_help_line(cmd, def))
-				end
-			end
-		elseif param == "privs" then
-			minetest.chat_send_player(name, "Available privileges:")
-			for priv, def in pairs(minetest.registered_privileges) do
-				minetest.chat_send_player(name, priv..": "..def.description)
-			end
-		else
-			local cmd = param
-			def = minetest.chatcommands[cmd]
-			if not def then
-				minetest.chat_send_player(name, "Command not available: "..cmd)
-			else
-				minetest.chat_send_player(name, format_help_line(cmd, def))
-			end
-		end
-	end,
-})
-minetest.register_chatcommand("privs", {
-	params = "<name>",
-	description = "print out privileges of player",
-	func = function(name, param)
-		if param == "" then
-			param = name
-		else
-			--[[if not minetest.check_player_privs(name, {privs=true}) then
-				minetest.chat_send_player(name, "Privileges of "..param.." are hidden from you.")
-				return
-			end]]
-		end
-		minetest.chat_send_player(name, "Privileges of "..param..": "..minetest.privs_to_string(minetest.get_player_privs(param), ' '))
-	end,
-})
-minetest.register_chatcommand("grant", {
-	params = "<name> <privilege>|all",
-	description = "Give privilege to player",
-	privs = {},
-	func = function(name, param)
-		if not minetest.check_player_privs(name, {privs=true}) and 
-				not minetest.check_player_privs(name, {basic_privs=true}) then
-			minetest.chat_send_player(name, "Your privileges are insufficient.")
-			return
-		end
-		local grantname, grantprivstr = string.match(param, "([^ ]+) (.+)")
-		if not grantname or not grantprivstr then
-			minetest.chat_send_player(name, "Invalid parameters (see /help grant)")
-			return
-		end
-		local grantprivs = minetest.string_to_privs(grantprivstr)
-		if grantprivstr == "all" then
-			grantprivs = minetest.registered_privileges
-		end
-		local privs = minetest.get_player_privs(grantname)
-		local privs_known = true
-		for priv, _ in pairs(grantprivs) do
-			if priv ~= "interact" and priv ~= "shout" and priv ~= "interact_extra" and not minetest.check_player_privs(name, {privs=true}) then
-				minetest.chat_send_player(name, "Your privileges are insufficient.")
-				return
-			end
-			if not minetest.registered_privileges[priv] then
-				minetest.chat_send_player(name, "Unknown privilege: "..priv)
-				privs_known = false
-			end
-			privs[priv] = true
-		end
-		if not privs_known then
-			return
-		end
-		minetest.set_player_privs(grantname, privs)
-		minetest.chat_send_player(name, "Privileges of "..grantname..": "..minetest.privs_to_string(minetest.get_player_privs(grantname), ' '))
-		if grantname ~= name then
-			minetest.chat_send_player(grantname, name.." granted you privileges: "..minetest.privs_to_string(grantprivs, ' '))
-		end
-	end,
-})
-minetest.register_chatcommand("revoke", {
-	params = "<name> <privilege>|all",
-	description = "Remove privilege from player",
-	privs = {},
-	func = function(name, param)
-		if not minetest.check_player_privs(name, {privs=true}) and 
-				not minetest.check_player_privs(name, {basic_privs=true}) then
-			minetest.chat_send_player(name, "Your privileges are insufficient.")
-			return
-		end
-		local revokename, revokeprivstr = string.match(param, "([^ ]+) (.+)")
-		if not revokename or not revokeprivstr then
-			minetest.chat_send_player(name, "Invalid parameters (see /help revoke)")
-			return
-		end
-		local revokeprivs = minetest.string_to_privs(revokeprivstr)
-		local privs = minetest.get_player_privs(revokename)
-		for priv, _ in pairs(revokeprivs) do
-			if priv ~= "interact" and priv ~= "shout" and priv ~= "interact_extra" and not minetest.check_player_privs(name, {privs=true}) then
-				minetest.chat_send_player(name, "Your privileges are insufficient.")
-				return
-			end
-		end
-		if revokeprivstr == "all" then
-			privs = {}
-		else
-			for priv, _ in pairs(revokeprivs) do
-				privs[priv] = nil
-			end
-		end
-		minetest.set_player_privs(revokename, privs)
-		minetest.chat_send_player(name, "Privileges of "..revokename..": "..minetest.privs_to_string(minetest.get_player_privs(revokename), ' '))
-		if revokename ~= name then
-			minetest.chat_send_player(revokename, name.." revoked privileges from you: "..minetest.privs_to_string(revokeprivs, ' '))
-		end
-	end,
-})
-minetest.register_chatcommand("setpassword", {
-	params = "<name> <password>",
-	description = "set given password",
-	privs = {password=true},
-	func = function(name, param)
-		local toname, raw_password = string.match(param, "^([^ ]+) +(.+)$")
-		if not toname then
-			toname = string.match(param, "^([^ ]+) *$")
-			raw_password = nil
-		end
-		if not toname then
-			minetest.chat_send_player(name, "Name field required")
-			return
-		end
-		local actstr = "?"
-		if not raw_password then
-			minetest.set_player_password(toname, "")
-			actstr = "cleared"
-		else
-			minetest.set_player_password(toname, minetest.get_password_hash(toname, raw_password))
-			actstr = "set"
-		end
-		minetest.chat_send_player(name, "Password of player \""..toname.."\" "..actstr)
-		if toname ~= name then
-			minetest.chat_send_player(toname, "Your password was "..actstr.." by "..name)
-		end
-	end,
-})
-minetest.register_chatcommand("clearpassword", {
-	params = "<name>",
-	description = "set empty password",
-	privs = {password=true},
-	func = function(name, param)
-		toname = param
-		if not toname then
-			minetest.chat_send_player(toname, "Name field required")
-			return
-		end
-		minetest.set_player_password(toname, '')
-		minetest.chat_send_player(name, "Password of player \""..toname.."\" cleared")
-	end,
-})
-
-minetest.register_chatcommand("auth_reload", {
-	params = "",
-	description = "reload authentication data",
-	privs = {server=true},
-	func = function(name, param)
-		local done = minetest.auth_reload()
-		if done then
-			minetest.chat_send_player(name, "Done.")
-		else
-			minetest.chat_send_player(name, "Failed.")
-		end
-	end,
-})
-
-minetest.register_chatcommand("teleport", {
-	params = "<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>",
-	description = "teleport to given position",
-	privs = {teleport=true},
-	func = function(name, param)
-		-- Returns (pos, true) if found, otherwise (pos, false)
-		local function find_free_position_near(pos)
-			local tries = {
-				{x=1,y=0,z=0},
-				{x=-1,y=0,z=0},
-				{x=0,y=0,z=1},
-				{x=0,y=0,z=-1},
-			}
-			for _, d in ipairs(tries) do
-				local p = {x = pos.x+d.x, y = pos.y+d.y, z = pos.z+d.z}
-				local n = minetest.env:get_node(p)
-				if not minetest.registered_nodes[n.name].walkable then
-					return p, true
-				end
-			end
-			return pos, false
-		end
-
-		local teleportee = nil
-		local p = {}
-		p.x, p.y, p.z = string.match(param, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
-		teleportee = minetest.env:get_player_by_name(name)
-		if teleportee and p.x and p.y and p.z then
-			minetest.chat_send_player(name, "Teleporting to ("..p.x..", "..p.y..", "..p.z..")")
-			teleportee:setpos(p)
-			return
-		end
-		
-		local teleportee = nil
-		local p = nil
-		local target_name = nil
-		target_name = string.match(param, "^([^ ]+)$")
-		teleportee = minetest.env:get_player_by_name(name)
-		if target_name then
-			local target = minetest.env:get_player_by_name(target_name)
-			if target then
-				p = target:getpos()
-			end
-		end
-		if teleportee and p then
-			p = find_free_position_near(p)
-			minetest.chat_send_player(name, "Teleporting to "..target_name.." at ("..p.x..", "..p.y..", "..p.z..")")
-			teleportee:setpos(p)
-			return
-		end
-		
-		if minetest.check_player_privs(name, {bring=true}) then
-			local teleportee = nil
-			local p = {}
-			local teleportee_name = nil
-			teleportee_name, p.x, p.y, p.z = string.match(param, "^([^ ]+) +([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
-			if teleportee_name then
-				teleportee = minetest.env:get_player_by_name(teleportee_name)
-			end
-			if teleportee and p.x and p.y and p.z then
-				minetest.chat_send_player(name, "Teleporting "..teleportee_name.." to ("..p.x..", "..p.y..", "..p.z..")")
-				teleportee:setpos(p)
-				return
-			end
-			
-			local teleportee = nil
-			local p = nil
-			local teleportee_name = nil
-			local target_name = nil
-			teleportee_name, target_name = string.match(param, "^([^ ]+) +([^ ]+)$")
-			if teleportee_name then
-				teleportee = minetest.env:get_player_by_name(teleportee_name)
-			end
-			if target_name then
-				local target = minetest.env:get_player_by_name(target_name)
-				if target then
-					p = target:getpos()
-				end
-			end
-			if teleportee and p then
-				p = find_free_position_near(p)
-				minetest.chat_send_player(name, "Teleporting "..teleportee_name.." to "..target_name.." at ("..p.x..", "..p.y..", "..p.z..")")
-				teleportee:setpos(p)
-				return
-			end
-		end
-
-		minetest.chat_send_player(name, "Invalid parameters (\""..param.."\") or player not found (see /help teleport)")
-		return
-	end,
-})
-
-minetest.register_chatcommand("set", {
-	params = "[-n] <name> <value> | <name>",
-	description = "set or read server configuration setting",
-	privs = {server=true},
-	func = function(name, param)
-		local arg, setname, setvalue = string.match(param, "(-[n]) ([^ ]+) (.+)")
-		if arg and arg == "-n" and setname and setvalue then
-			minetest.setting_set(setname, setvalue)
-			minetest.chat_send_player(name, setname.." = "..setvalue)
-			return
-		end
-		local setname, setvalue = string.match(param, "([^ ]+) (.+)")
-		if setname and setvalue then
-			if not minetest.setting_get(setname) then
-				minetest.chat_send_player(name, "Failed. Use '/set -n <name> <value>' to create a new setting.")
-				return
-			end
-			minetest.setting_set(setname, setvalue)
-			minetest.chat_send_player(name, setname.." = "..setvalue)
-			return
-		end
-		local setname = string.match(param, "([^ ]+)")
-		if setname then
-			local setvalue = minetest.setting_get(setname)
-			if not setvalue then
-				setvalue = "<not set>"
-			end
-			minetest.chat_send_player(name, setname.." = "..setvalue)
-			return
-		end
-		minetest.chat_send_player(name, "Invalid parameters (see /help set)")
-	end,
-})
-
--- a/builtin/deprecated.lua
+++ b/builtin/deprecated.lua
@@ -1,19 +0,0 @@
-- Minetest: builtin/deprecated.lua
-
--
-- Default material types
--
-function digprop_err()
-	minetest.log("info", debug.traceback())
-	minetest.log("info", "WARNING: The minetest.digprop_* functions are obsolete and need to be replaced by item groups.")
-end
-
-minetest.digprop_constanttime = digprop_err
-minetest.digprop_stonelike = digprop_err
-minetest.digprop_dirtlike = digprop_err
-minetest.digprop_gravellike = digprop_err
-minetest.digprop_woodlike = digprop_err
-minetest.digprop_leaveslike = digprop_err
-minetest.digprop_glasslike = digprop_err
-
-
--- a/builtin/item.lua
+++ b/builtin/item.lua
@@ -1,447 +0,0 @@
-- Minetest: builtin/item.lua
-
--
-- Item definition helpers
--
-
-function minetest.inventorycube(img1, img2, img3)
-	img2 = img2 or img1
-	img3 = img3 or img1
-	return "[inventorycube"
-			.. "{" .. img1:gsub("%^", "&")
-			.. "{" .. img2:gsub("%^", "&")
-			.. "{" .. img3:gsub("%^", "&")
-end
-
-function minetest.get_pointed_thing_position(pointed_thing, above)
-	if pointed_thing.type == "node" then
-		if above then
-			-- The position where a node would be placed
-			return pointed_thing.above
-		else
-			-- The position where a node would be dug
-			return pointed_thing.under
-		end
-	elseif pointed_thing.type == "object" then
-		obj = pointed_thing.ref
-		if obj ~= nil then
-			return obj:getpos()
-		else
-			return nil
-		end
-	else
-		return nil
-	end
-end
-
-function minetest.dir_to_facedir(dir)
-	if math.abs(dir.x) > math.abs(dir.z) then
-		if dir.x < 0 then
-			return 3
-		else
-			return 1
-		end
-	else
-		if dir.z < 0 then
-			return 2
-		else
-			return 0
-		end
-	end
-end
-
-function minetest.dir_to_wallmounted(dir)
-	if math.abs(dir.y) > math.max(math.abs(dir.x), math.abs(dir.z)) then
-		if dir.y < 0 then
-			return 1
-		else
-			return 0
-		end
-	elseif math.abs(dir.x) > math.abs(dir.z) then
-		if dir.x < 0 then
-			return 3
-		else
-			return 2
-		end
-	else
-		if dir.z < 0 then
-			return 5
-		else
-			return 4
-		end
-	end
-end
-
-function minetest.get_node_drops(nodename, toolname)
-	local drop = ItemStack({name=nodename}):get_definition().drop
-	if drop == nil then
-		-- default drop
-		return {ItemStack({name=nodename})}
-	elseif type(drop) == "string" then
-		-- itemstring drop
-		return {ItemStack(drop)}
-	elseif drop.items == nil then
-		-- drop = {} to disable default drop
-		return {}
-	end
-
-	-- Extended drop table
-	local got_items = {}
-	local got_count = 0
-	local _, item, tool
-	for _, item in ipairs(drop.items) do
-		local good_rarity = true
-		local good_tool = true
-		if item.rarity ~= nil then
-			good_rarity = item.rarity < 1 or math.random(item.rarity) == 1
-		end
-		if item.tools ~= nil then
-			good_tool = false
-			for _, tool in ipairs(item.tools) do
-				if tool:sub(1, 1) == '~' then
-					good_tool = toolname:find(tool:sub(2)) ~= nil
-				else
-					good_tool = toolname == tool
-				end
-				if good_tool then
-					break
-				end
-			end
-        	end
-		if good_rarity and good_tool then
-			got_count = got_count + 1
-			for _, add_item in ipairs(item.items) do
-				got_items[#got_items+1] = add_item
-			end
-			if drop.max_items ~= nil and got_count == drop.max_items then
-				break
-			end
-		end
-	end
-	return got_items
-end
-
-function minetest.item_place_node(itemstack, placer, pointed_thing)
-	local item = itemstack:peek_item()
-	local def = itemstack:get_definition()
-	if def.type == "node" and pointed_thing.type == "node" then
-		local pos = pointed_thing.above
-		local oldnode = minetest.env:get_node(pos)
-		local olddef = ItemStack({name=oldnode.name}):get_definition()
-
-		if not olddef.buildable_to then
-			minetest.log("info", placer:get_player_name() .. " tried to place"
-				.. " node in invalid position " .. minetest.pos_to_string(pos)
-				.. ", replacing " .. oldnode.name)
-			return
-		end
-
-		minetest.log("action", placer:get_player_name() .. " places node "
-			.. def.name .. " at " .. minetest.pos_to_string(pos))
-
-		local newnode = {name = def.name, param1 = 0, param2 = 0}
-
-		-- Calculate direction for wall mounted stuff like torches and signs
-		if def.paramtype2 == 'wallmounted' then
-			local under = pointed_thing.under
-			local above = pointed_thing.above
-			local dir = {x = under.x - above.x, y = under.y - above.y, z = under.z - above.z}
-			newnode.param2 = minetest.dir_to_wallmounted(dir)
-		-- Calculate the direction for furnaces and chests and stuff
-		elseif def.paramtype2 == 'facedir' and placer then
-			local playerpos = placer:getpos()
-			local dir = {x = pos.x - playerpos.x, y = pos.y - playerpos.y, z = pos.z - playerpos.z}
-			newnode.param2 = minetest.dir_to_facedir(dir)
-			minetest.log("action", "facedir: " .. newnode.param2)
-		end
-
-		-- Add node and update
-		minetest.env:add_node(pos, newnode)
-
-		-- Run callback
-		if def.after_place_node then
-			def.after_place_node(pos, placer)
-		end
-
-		-- Run script hook (deprecated)
-		local _, callback
-		for _, callback in ipairs(minetest.registered_on_placenodes) do
-			callback(pos, newnode, placer)
-		end
-
-		itemstack:take_item()
-	end
-	return itemstack
-end
-
-function minetest.item_place_object(itemstack, placer, pointed_thing)
-	local pos = minetest.get_pointed_thing_position(pointed_thing, true)
-	if pos ~= nil then
-		local item = itemstack:take_item()
-		minetest.env:add_item(pos, item)
-	end
-	return itemstack
-end
-
-function minetest.item_place(itemstack, placer, pointed_thing)
-	if itemstack:get_definition().type == "node" then
-		return minetest.item_place_node(itemstack, placer, pointed_thing)
-	else
-		return minetest.item_place_object(itemstack, placer, pointed_thing)
-	end
-end
-
-function minetest.item_drop(itemstack, dropper, pos)
-	if dropper.get_player_name then
-		local v = dropper:get_look_dir()
-		local p = {x=pos.x+v.x, y=pos.y+1.5+v.y, z=pos.z+v.z}
-		local obj = minetest.env:add_item(p, itemstack)
-		v.x = v.x*2
-		v.y = v.y*2 + 1
-		v.z = v.z*2
-		obj:setvelocity(v)
-	else
-		minetest.env:add_item(pos, itemstack)
-	end
-	return ""
-end
-
-function minetest.item_eat(hp_change, replace_with_item)
-	return function(itemstack, user, pointed_thing)  -- closure
-		if itemstack:take_item() ~= nil then
-			user:set_hp(user:get_hp() + hp_change)
-			itemstack:add_item(replace_with_item) -- note: replace_with_item is optional
-		end
-		return itemstack
-	end
-end
-
-function minetest.node_punch(pos, node, puncher)
-	-- Run script hook
-	local _, callback
-	for _, callback in ipairs(minetest.registered_on_punchnodes) do
-		callback(pos, node, puncher)
-	end
-
-end
-
-function minetest.node_dig(pos, node, digger)
-	minetest.debug("node_dig")
-
-	local def = ItemStack({name=node.name}):get_definition()
-	if not def.diggable or (def.can_dig and not def.can_dig(pos,digger)) then
-		minetest.debug("not diggable")
-		minetest.log("info", digger:get_player_name() .. " tried to dig "
-			.. node.name .. " which is not diggable "
-			.. minetest.pos_to_string(pos))
-		return
-	end
-
-	minetest.log('action', digger:get_player_name() .. " digs "
-		.. node.name .. " at " .. minetest.pos_to_string(pos))
-
-	if not minetest.setting_getbool("creative_mode") then
-		local wielded = digger:get_wielded_item()
-		local drops = minetest.get_node_drops(node.name, wielded:get_name())
-
-		-- Wear out tool
-		tp = wielded:get_tool_capabilities()
-		dp = minetest.get_dig_params(def.groups, tp)
-		wielded:add_wear(dp.wear)
-		digger:set_wielded_item(wielded)
-
-		-- Add dropped items to object's inventory
-		if digger:get_inventory() then
-			local _, dropped_item
-			for _, dropped_item in ipairs(drops) do
-				digger:get_inventory():add_item("main", dropped_item)
-			end
-		end
-	end
-	
-	local oldnode = nil
-	local oldmetadata = nil
-	if def.after_dig_node then
-		oldnode = node;
-		oldmetadata = minetest.env:get_meta(pos):to_table()
-	end
-
-	-- Remove node and update
-	minetest.env:remove_node(pos)
-	
-	-- Run callback
-	if def.after_dig_node then
-		def.after_dig_node(pos, oldnode, oldmetadata, digger)
-	end
-
-	-- Run script hook (deprecated)
-	local _, callback
-	for _, callback in ipairs(minetest.registered_on_dignodes) do
-		callback(pos, node, digger)
-	end
-end
-
-function minetest.node_metadata_inventory_move_allow_all(pos, from_list,
-		from_index, to_list, to_index, count, player)
-	minetest.log("verbose", "node_metadata_inventory_move_allow_all")
-	local meta = minetest.env:get_meta(pos)
-	local inv = meta:get_inventory()
-
-	local from_stack = inv:get_stack(from_list, from_index)
-	local taken_items = from_stack:take_item(count)
-	inv:set_stack(from_list, from_index, from_stack)
-
-	local to_stack = inv:get_stack(to_list, to_index)
-	to_stack:add_item(taken_items)
-	inv:set_stack(to_list, to_index, to_stack)
-end
-
-function minetest.node_metadata_inventory_offer_allow_all(pos, listname, index, stack, player)
-	minetest.log("verbose", "node_metadata_inventory_offer_allow_all")
-	local meta = minetest.env:get_meta(pos)
-	local inv = meta:get_inventory()
-	local the_stack = inv:get_stack(listname, index)
-	the_stack:add_item(stack)
-	inv:set_stack(listname, index, the_stack)
-	return ItemStack("")
-end
-
-function minetest.node_metadata_inventory_take_allow_all(pos, listname, index, count, player)
-	minetest.log("verbose", "node_metadata_inventory_take_allow_all")
-	local meta = minetest.env:get_meta(pos)
-	local inv = meta:get_inventory()
-	local the_stack = inv:get_stack(listname, index)
-	local taken_items = the_stack:take_item(count)
-	inv:set_stack(listname, index, the_stack)
-	return taken_items
-end
-
-- This is used to allow mods to redefine minetest.item_place and so on
-- NOTE: This is not the preferred way. Preferred way is to provide enough
--       callbacks to not require redefining global functions. -celeron55
-local function redef_wrapper(table, name)
-	return function(...)
-		return table[name](...)
-	end
-end
-
--
-- Item definition defaults
--
-
-minetest.nodedef_default = {
-	-- Item properties
-	type="node",
-	-- name intentionally not defined here
-	description = "",
-	groups = {},
-	inventory_image = "",
-	wield_image = "",
-	wield_scale = {x=1,y=1,z=1},
-	stack_max = 99,
-	usable = false,
-	liquids_pointable = false,
-	tool_capabilities = nil,
-	node_placement_prediction = nil,
-
-	-- Interaction callbacks
-	on_place = redef_wrapper(minetest, 'item_place'), -- minetest.item_place
-	on_drop = redef_wrapper(minetest, 'item_drop'), -- minetest.item_drop
-	on_use = nil,
-	can_dig = nil,
-
-	on_punch = redef_wrapper(minetest, 'node_punch'), -- minetest.node_punch
-	on_dig = redef_wrapper(minetest, 'node_dig'), -- minetest.node_dig
-
-	on_receive_fields = nil,
-	
-	on_metadata_inventory_move = minetest.node_metadata_inventory_move_allow_all,
-	on_metadata_inventory_offer = minetest.node_metadata_inventory_offer_allow_all,
-	on_metadata_inventory_take = minetest.node_metadata_inventory_take_allow_all,
-
-	-- Node properties
-	drawtype = "normal",
-	visual_scale = 1.0,
-	-- Don't define these because otherwise the old tile_images and
-	-- special_materials wouldn't be read
-	--tiles ={""},
-	--special_tiles = {
-	--	{name="", backface_culling=true},
-	--	{name="", backface_culling=true},
-	--},
-	alpha = 255,
-	post_effect_color = {a=0, r=0, g=0, b=0},
-	paramtype = "none",
-	paramtype2 = "none",
-	is_ground_content = false,
-	sunlight_propagates = false,
-	walkable = true,
-	pointable = true,
-	diggable = true,
-	climbable = false,
-	buildable_to = false,
-	liquidtype = "none",
-	liquid_alternative_flowing = "",
-	liquid_alternative_source = "",
-	liquid_viscosity = 0,
-	light_source = 0,
-	damage_per_second = 0,
-	selection_box = {type="regular"},
-	legacy_facedir_simple = false,
-	legacy_wallmounted = false,
-}
-
-minetest.craftitemdef_default = {
-	type="craft",
-	-- name intentionally not defined here
-	description = "",
-	groups = {},
-	inventory_image = "",
-	wield_image = "",
-	wield_scale = {x=1,y=1,z=1},
-	stack_max = 99,
-	liquids_pointable = false,
-	tool_capabilities = nil,
-
-	-- Interaction callbacks
-	on_place = redef_wrapper(minetest, 'item_place'), -- minetest.item_place
-	on_drop = redef_wrapper(minetest, 'item_drop'), -- minetest.item_drop
-	on_use = nil,
-}
-
-minetest.tooldef_default = {
-	type="tool",
-	-- name intentionally not defined here
-	description = "",
-	groups = {},
-	inventory_image = "",
-	wield_image = "",
-	wield_scale = {x=1,y=1,z=1},
-	stack_max = 1,
-	liquids_pointable = false,
-	tool_capabilities = nil,
-
-	-- Interaction callbacks
-	on_place = redef_wrapper(minetest, 'item_place'), -- minetest.item_place
-	on_drop = redef_wrapper(minetest, 'item_drop'), -- minetest.item_drop
-	on_use = nil,
-}
-
-minetest.noneitemdef_default = {  -- This is used for the hand and unknown items
-	type="none",
-	-- name intentionally not defined here
-	description = "",
-	groups = {},
-	inventory_image = "",
-	wield_image = "",
-	wield_scale = {x=1,y=1,z=1},
-	stack_max = 99,
-	liquids_pointable = false,
-	tool_capabilities = nil,
-
-	-- Interaction callbacks
-	on_place = nil,
-	on_drop = nil,
-	on_use = nil,
-}
-
--- a/builtin/item_entity.lua
+++ b/builtin/item_entity.lua
@@ -1,103 +0,0 @@
-- Minetest: builtin/item_entity.lua
-
-function minetest.spawn_item(pos, item)
-	-- Take item in any format
-	local stack = ItemStack(item)
-	local obj = minetest.env:add_entity(pos, "__builtin:item")
-	obj:get_luaentity():set_item(stack:to_string())
-	return obj
-end
-
-minetest.register_entity("__builtin:item", {
-	initial_properties = {
-		hp_max = 1,
-		physical = true,
-		collisionbox = {-0.17,-0.17,-0.17, 0.17,0.17,0.17},
-		visual = "sprite",
-		visual_size = {x=0.5, y=0.5},
-		textures = {""},
-		spritediv = {x=1, y=1},
-		initial_sprite_basepos = {x=0, y=0},
-		is_visible = false,
-	},
-	
-	itemstring = '',
-	physical_state = true,
-
-	set_item = function(self, itemstring)
-		self.itemstring = itemstring
-		local stack = ItemStack(itemstring)
-		local itemtable = stack:to_table()
-		local itemname = nil
-		if itemtable then
-			itemname = stack:to_table().name
-		end
-		local item_texture = nil
-		local item_type = ""
-		if minetest.registered_items[itemname] then
-			item_texture = minetest.registered_items[itemname].inventory_image
-			item_type = minetest.registered_items[itemname].type
-		end
-		prop = {
-			is_visible = true,
-			visual = "sprite",
-			textures = {"unknown_item.png"}
-		}
-		if item_texture and item_texture ~= "" then
-			prop.visual = "sprite"
-			prop.textures = {item_texture}
-			prop.visual_size = {x=0.50, y=0.50}
-		else
-			prop.visual = "wielditem"
-			prop.textures = {itemname}
-			prop.visual_size = {x=0.20, y=0.20}
-			prop.automatic_rotate = math.pi * 0.25
-		end
-		self.object:set_properties(prop)
-	end,
-
-	get_staticdata = function(self)
-		return self.itemstring
-	end,
-
-	on_activate = function(self, staticdata)
-		self.itemstring = staticdata
-		self.object:set_armor_groups({immortal=1})
-		self.object:setvelocity({x=0, y=2, z=0})
-		self.object:setacceleration({x=0, y=-10, z=0})
-		self:set_item(self.itemstring)
-	end,
-
-	on_step = function(self, dtime)
-		local p = self.object:getpos()
-		p.y = p.y - 0.3
-		local nn = minetest.env:get_node(p).name
-		if minetest.registered_nodes[nn].walkable then
-			if self.physical_state then
-				self.object:setvelocity({x=0,y=0,z=0})
-				self.object:setacceleration({x=0, y=0, z=0})
-				self.physical_state = false
-				self.object:set_properties({
-					physical = false
-				})
-			end
-		else
-			if not self.physical_state then
-				self.object:setvelocity({x=0,y=0,z=0})
-				self.object:setacceleration({x=0, y=-10, z=0})
-				self.physical_state = true
-				self.object:set_properties({
-					physical = true
-				})
-			end
-		end
-	end,
-
-	on_punch = function(self, hitter)
-		if self.itemstring ~= '' then
-			hitter:get_inventory():add_item("main", self.itemstring)
-		end
-		self.object:remove()
-	end,
-})
-
--- a/builtin/misc.lua
+++ b/builtin/misc.lua
@@ -1,101 +0,0 @@
-- Minetest: builtin/misc.lua
-
--
-- Misc. API functions
--
-
-minetest.timers_to_add = {}
-minetest.timers = {}
-minetest.register_globalstep(function(dtime)
-	for _, timer in ipairs(minetest.timers_to_add) do
-		table.insert(minetest.timers, timer)
-	end
-	minetest.timers_to_add = {}
-	for index, timer in ipairs(minetest.timers) do
-		timer.time = timer.time - dtime
-		if timer.time <= 0 then
-			timer.func(timer.param)
-			table.remove(minetest.timers,index)
-		end
-	end
-end)
-
-function minetest.after(time, func, param)
-	table.insert(minetest.timers_to_add, {time=time, func=func, param=param})
-end
-
-function minetest.check_player_privs(name, privs)
-	local player_privs = minetest.get_player_privs(name)
-	local missing_privileges = {}
-	for priv, val in pairs(privs) do
-		if val then
-			if not player_privs[priv] then
-				table.insert(missing_privileges, priv)
-			end
-		end
-	end
-	if #missing_privileges > 0 then
-		return false, missing_privileges
-	end
-	return true, ""
-end
-
-function minetest.get_connected_players()
-	-- This could be optimized a bit, but leave that for later
-	local list = {}
-	for _, obj in pairs(minetest.env:get_objects_inside_radius({x=0,y=0,z=0}, 1000000)) do
-		if obj:is_player() then
-			table.insert(list, obj)
-		end
-	end
-	return list
-end
-
-function minetest.hash_node_position(pos)
-	return (pos.z+32768)*65536*65536 + (pos.y+32768)*65536 + pos.x+32768
-end
-
-function minetest.get_item_group(name, group)
-	if not minetest.registered_items[name] or not
-			minetest.registered_items[name].groups[group] then
-		return 0
-	end
-	return minetest.registered_items[name].groups[group]
-end
-
-function minetest.get_node_group(name, group)
-	return minetest.get_item_group(name, group)
-end
-
-function minetest.string_to_pos(value)
-	local p = {}
-	p.x, p.y, p.z = string.match(value, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
-	if p.x and p.y and p.z then
-		p.x = tonumber(p.x)
-		p.y = tonumber(p.y)
-		p.z = tonumber(p.z)
-		return p
-	end
-	local p = {}
-	p.x, p.y, p.z = string.match(value, "^%( *([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+) *%)$")
-	if p.x and p.y and p.z then
-		p.x = tonumber(p.x)
-		p.y = tonumber(p.y)
-		p.z = tonumber(p.z)
-		return p
-	end
-	return nil
-end
-
-assert(minetest.string_to_pos("10.0, 5, -2").x == 10)
-assert(minetest.string_to_pos("( 10.0, 5, -2)").z == -2)
-assert(minetest.string_to_pos("asd, 5, -2)") == nil)
-
-function minetest.setting_get_pos(name)
-	local value = minetest.setting_get(name)
-	if not value then
-		return nil
-	end
-	return minetest.string_to_pos(value)
-end
-
--- a/builtin/misc_helpers.lua
+++ b/builtin/misc_helpers.lua
@@ -1,94 +0,0 @@
-- Minetest: builtin/misc_helpers.lua
-
-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
-
-function string:split(sep)
-	local sep, fields = sep or ",", {}
-	local pattern = string.format("([^%s]+)", sep)
-	self:gsub(pattern, function(c) fields[#fields+1] = c end)
-	return fields
-end
-
-function string:trim()
-	return (self:gsub("^%s*(.-)%s*$", "%1"))
-end
-
-assert(string.trim("\n \t\tfoo bar\t ") == "foo bar")
-
-function minetest.pos_to_string(pos)
-	return "(" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")"
-end
-
-
--- a/builtin/misc_register.lua
+++ b/builtin/misc_register.lua
@@ -1,313 +0,0 @@
-- Minetest: builtin/misc_register.lua
-
--
-- Make raw registration functions inaccessible to anyone except this file
--
-
-local register_item_raw = minetest.register_item_raw
-minetest.register_item_raw = nil
-
-local register_alias_raw = minetest.register_alias_raw
-minetest.register_item_raw = nil
-
--
-- Item / entity / ABM registration functions
--
-
-minetest.registered_abms = {}
-minetest.registered_entities = {}
-minetest.registered_items = {}
-minetest.registered_nodes = {}
-minetest.registered_craftitems = {}
-minetest.registered_tools = {}
-minetest.registered_aliases = {}
-
-- For tables that are indexed by item name:
-- If table[X] does not exist, default to table[minetest.registered_aliases[X]]
-local function set_alias_metatable(table)
-	setmetatable(table, {
-		__index = function(name)
-			return rawget(table, minetest.registered_aliases[name])
-		end
-	})
-end
-set_alias_metatable(minetest.registered_items)
-set_alias_metatable(minetest.registered_nodes)
-set_alias_metatable(minetest.registered_craftitems)
-set_alias_metatable(minetest.registered_tools)
-
-- These item names may not be used because they would interfere
-- with legacy itemstrings
-local forbidden_item_names = {
-	MaterialItem = true,
-	MaterialItem2 = true,
-	MaterialItem3 = true,
-	NodeItem = true,
-	node = true,
-	CraftItem = true,
-	craft = true,
-	MBOItem = true,
-	ToolItem = true,
-	tool = true,
-}
-
-local function check_modname_prefix(name)
-	if name:sub(1,1) == ":" then
-		-- Escape the modname prefix enforcement mechanism
-		return name:sub(2)
-	else
-		-- Modname prefix enforcement
-		local expected_prefix = minetest.get_current_modname() .. ":"
-		if name:sub(1, #expected_prefix) ~= expected_prefix then
-			error("Name " .. name .. " does not follow naming conventions: " ..
-				"\"modname:\" or \":\" prefix required")
-		end
-		local subname = name:sub(#expected_prefix+1)
-		if subname:find("[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]") then
-			error("Name " .. name .. " does not follow naming conventions: " ..
-				"contains unallowed characters")
-		end
-		return name
-	end
-end
-
-function minetest.register_abm(spec)
-	-- Add to minetest.registered_abms
-	minetest.registered_abms[#minetest.registered_abms+1] = spec
-end
-
-function minetest.register_entity(name, prototype)
-	-- Check name
-	if name == nil then
-		error("Unable to register entity: Name is nil")
-	end
-	name = check_modname_prefix(tostring(name))
-
-	prototype.name = name
-	prototype.__index = prototype  -- so that it can be used as a metatable
-
-	-- Add to minetest.registered_entities
-	minetest.registered_entities[name] = prototype
-end
-
-function minetest.register_item(name, itemdef)
-	-- Check name
-	if name == nil then
-		error("Unable to register item: Name is nil")
-	end
-	name = check_modname_prefix(tostring(name))
-	if forbidden_item_names[name] then
-		error("Unable to register item: Name is forbidden: " .. name)
-	end
-	itemdef.name = name
-
-	-- Apply defaults and add to registered_* table
-	if itemdef.type == "node" then
-		setmetatable(itemdef, {__index = minetest.nodedef_default})
-		minetest.registered_nodes[itemdef.name] = itemdef
-	elseif itemdef.type == "craft" then
-		setmetatable(itemdef, {__index = minetest.craftitemdef_default})
-		minetest.registered_craftitems[itemdef.name] = itemdef
-	elseif itemdef.type == "tool" then
-		setmetatable(itemdef, {__index = minetest.tooldef_default})
-		minetest.registered_tools[itemdef.name] = itemdef
-	elseif itemdef.type == "none" then
-		setmetatable(itemdef, {__index = minetest.noneitemdef_default})
-	else
-		error("Unable to register item: Type is invalid: " .. dump(itemdef))
-	end
-
-	-- Flowing liquid uses param2
-	if itemdef.type == "node" and itemdef.liquidtype == "flowing" then
-		itemdef.paramtype2 = "flowingliquid"
-	end
-
-	-- BEGIN Legacy stuff
-	if itemdef.cookresult_itemstring ~= nil and itemdef.cookresult_itemstring ~= "" then
-		minetest.register_craft({
-			type="cooking",
-			output=itemdef.cookresult_itemstring,
-			recipe=itemdef.name,
-			cooktime=itemdef.furnace_cooktime
-		})
-	end
-	if itemdef.furnace_burntime ~= nil and itemdef.furnace_burntime >= 0 then
-		minetest.register_craft({
-			type="fuel",
-			recipe=itemdef.name,
-			burntime=itemdef.furnace_burntime
-		})
-	end
-	-- END Legacy stuff
-
-	-- Disable all further modifications
-	getmetatable(itemdef).__newindex = {}
-
-	--minetest.log("Registering item: " .. itemdef.name)
-	minetest.registered_items[itemdef.name] = itemdef
-	minetest.registered_aliases[itemdef.name] = nil
-	register_item_raw(itemdef)
-end
-
-function minetest.register_node(name, nodedef)
-	nodedef.type = "node"
-	minetest.register_item(name, nodedef)
-end
-
-function minetest.register_craftitem(name, craftitemdef)
-	craftitemdef.type = "craft"
-
-	-- BEGIN Legacy stuff
-	if craftitemdef.inventory_image == nil and craftitemdef.image ~= nil then
-		craftitemdef.inventory_image = craftitemdef.image
-	end
-	-- END Legacy stuff
-
-	minetest.register_item(name, craftitemdef)
-end
-
-function minetest.register_tool(name, tooldef)
-	tooldef.type = "tool"
-	tooldef.stack_max = 1
-
-	-- BEGIN Legacy stuff
-	if tooldef.inventory_image == nil and tooldef.image ~= nil then
-		tooldef.inventory_image = tooldef.image
-	end
-	if tooldef.tool_capabilities == nil and
-	   (tooldef.full_punch_interval ~= nil or
-	    tooldef.basetime ~= nil or
-	    tooldef.dt_weight ~= nil or
-	    tooldef.dt_crackiness ~= nil or
-	    tooldef.dt_crumbliness ~= nil or
-	    tooldef.dt_cuttability ~= nil or
-	    tooldef.basedurability ~= nil or
-	    tooldef.dd_weight ~= nil or
-	    tooldef.dd_crackiness ~= nil or
-	    tooldef.dd_crumbliness ~= nil or
-	    tooldef.dd_cuttability ~= nil) then
-		tooldef.tool_capabilities = {
-			full_punch_interval = tooldef.full_punch_interval,
-			basetime = tooldef.basetime,
-			dt_weight = tooldef.dt_weight,
-			dt_crackiness = tooldef.dt_crackiness,
-			dt_crumbliness = tooldef.dt_crumbliness,
-			dt_cuttability = tooldef.dt_cuttability,
-			basedurability = tooldef.basedurability,
-			dd_weight = tooldef.dd_weight,
-			dd_crackiness = tooldef.dd_crackiness,
-			dd_crumbliness = tooldef.dd_crumbliness,
-			dd_cuttability = tooldef.dd_cuttability,
-		}
-	end
-	-- END Legacy stuff
-
-	minetest.register_item(name, tooldef)
-end
-
-function minetest.register_alias(name, convert_to)
-	if forbidden_item_names[name] then
-		error("Unable to register alias: Name is forbidden: " .. name)
-	end
-	if minetest.registered_items[name] ~= nil then
-		minetest.log("WARNING: Not registering alias, item with same name" ..
-			" is already defined: " .. name .. " -> " .. convert_to)
-	else
-		--minetest.log("Registering alias: " .. name .. " -> " .. convert_to)
-		minetest.registered_aliases[name] = convert_to
-		register_alias_raw(name, convert_to)
-	end
-end
-
-- Alias the forbidden item names to "" so they can't be
-- created via itemstrings (e.g. /give)
-local name
-for name in pairs(forbidden_item_names) do
-	minetest.registered_aliases[name] = ""
-	register_alias_raw(name, "")
-end
-
-
-- Deprecated:
-- Aliases for minetest.register_alias (how ironic...)
--minetest.alias_node = minetest.register_alias
--minetest.alias_tool = minetest.register_alias
--minetest.alias_craftitem = minetest.register_alias
-
--
-- Built-in node definitions. Also defined in C.
--
-
-minetest.register_item(":unknown", {
-	type = "none",
-	description = "Unknown Item",
-	inventory_image = "unknown_item.png",
-	on_place = minetest.item_place,
-	on_drop = minetest.item_drop,
-})
-
-minetest.register_node(":air", {
-	description = "Air (you hacker you!)",
-	inventory_image = "unknown_block.png",
-	wield_image = "unknown_block.png",
-	drawtype = "airlike",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true,
-	air_equivalent = true,
-})
-
-minetest.register_node(":ignore", {
-	description = "Ignore (you hacker you!)",
-	inventory_image = "unknown_block.png",
-	wield_image = "unknown_block.png",
-	drawtype = "airlike",
-	paramtype = "none",
-	sunlight_propagates = false,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true, -- A way to remove accidentally placed ignores
-	air_equivalent = true,
-})
-
-- The hand (bare definition)
-minetest.register_item(":", {
-	type = "none",
-})
-
--
-- Creative inventory
--
-
-minetest.creative_inventory = {}
-
-minetest.add_to_creative_inventory = function(itemstring)
-	table.insert(minetest.creative_inventory, itemstring)
-end
-
--
-- Callback registration
--
-
-local 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_punchnodes, minetest.register_on_punchnode = 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_generateds, minetest.register_on_generated = make_registration()
-minetest.registered_on_newplayers, minetest.register_on_newplayer = make_registration()
-minetest.registered_on_dieplayers, minetest.register_on_dieplayer = make_registration()
-minetest.registered_on_respawnplayers, minetest.register_on_respawnplayer = make_registration()
-minetest.registered_on_joinplayers, minetest.register_on_joinplayer = make_registration()
-minetest.registered_on_leaveplayers, minetest.register_on_leaveplayer = make_registration()
-
--- a/builtin/privileges.lua
+++ b/builtin/privileges.lua
@@ -1,48 +0,0 @@
-- Minetest: builtin/privileges.lua
-
--
-- Privileges
--
-
-minetest.registered_privileges = {}
-
-function minetest.register_privilege(name, param)
-	local function fill_defaults(def)
-		if def.give_to_singleplayer == nil then
-			def.give_to_singleplayer = true
-		end
-		if def.description == nil then
-			def.description = "(no description)"
-		end
-	end
-	local def = {}
-	if type(param) == "table" then
-		def = param
-	else
-		def = {description = param}
-	end
-	fill_defaults(def)
-	minetest.registered_privileges[name] = def
-end
-
-minetest.register_privilege("interact", "Can interact with things and modify the world")
-minetest.register_privilege("teleport", "Can use /teleport command")
-minetest.register_privilege("bring", "Can teleport other players")
-minetest.register_privilege("settime", "Can use /time")
-minetest.register_privilege("privs", "Can modify privileges")
-minetest.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
-minetest.register_privilege("server", "Can do server maintenance stuff")
-minetest.register_privilege("shout", "Can speak in chat")
-minetest.register_privilege("ban", "Can ban and unban players")
-minetest.register_privilege("give", "Can use /give and /giveme")
-minetest.register_privilege("password", "Can use /setpassword and /clearpassword")
-minetest.register_privilege("fly", {
-	description = "Can fly using the free_move mode",
-	give_to_singleplayer = false,
-})
-minetest.register_privilege("fast", {
-	description = "Can walk fast using the fast_move mode",
-	give_to_singleplayer = false,
-})
-
-
--- a/builtin/serialize.lua
+++ b/builtin/serialize.lua
@@ -1,207 +0,0 @@
-- Minetest: builtin/serialize.lua
-
-- https://github.com/fab13n/metalua/blob/no-dll/src/lib/serialize.lua
-- Copyright (c) 2006-2997 Fabien Fleutot <metalua@gmail.com>
-- License: MIT
--------------------------------------------------------------------------------
-- Serialize an object into a source code string. This string, when passed as
-- an argument to deserialize(), returns an object structurally identical
-- to the original one. The following are currently supported:
-- * strings, numbers, booleans, nil
-- * tables thereof. Tables can have shared part, but can't be recursive yet.
-- Caveat: metatables and environments aren't saved.
--------------------------------------------------------------------------------
-
-local no_identity = { number=1, boolean=1, string=1, ['nil']=1 }
-
-function minetest.serialize(x)
-
-	local gensym_max   =  0  -- index of the gensym() symbol generator
-	local seen_once    = { } -- element->true set of elements seen exactly once in the table
-	local multiple     = { } -- element->varname set of elements seen more than once
-	local nested       = { } -- transient, set of elements currently being traversed
-	local nest_points  = { }
-	local nest_patches = { }
-	
-	local function gensym()
-		gensym_max = gensym_max + 1 ;  return gensym_max
-	end
-
-	-----------------------------------------------------------------------------
-	-- nest_points are places where a table appears within itself, directly or not.
-	-- for instance, all of these chunks create nest points in table x:
-	-- "x = { }; x[x] = 1", "x = { }; x[1] = x", "x = { }; x[1] = { y = { x } }".
-	-- To handle those, two tables are created by mark_nest_point:
-	-- * nest_points [parent] associates all keys and values in table parent which
-	--   create a nest_point with boolean `true'
-	-- * nest_patches contain a list of { parent, key, value } tuples creating
-	--   a nest point. They're all dumped after all the other table operations
-	--   have been performed.
-	--
-	-- mark_nest_point (p, k, v) fills tables nest_points and nest_patches with
-	-- informations required to remember that key/value (k,v) create a nest point
-	-- in table parent. It also marks `parent' as occuring multiple times, since
-	-- several references to it will be required in order to patch the nest
-	-- points.
-	-----------------------------------------------------------------------------
-	local function mark_nest_point (parent, k, v)
-		local nk, nv = nested[k], nested[v]
-		assert (not nk or seen_once[k] or multiple[k])
-		assert (not nv or seen_once[v] or multiple[v])
-		local mode = (nk and nv and "kv") or (nk and "k") or ("v")
-		local parent_np = nest_points [parent]
-		local pair = { k, v }
-		if not parent_np then parent_np = { }; nest_points [parent] = parent_np end
-		parent_np [k], parent_np [v] = nk, nv
-		table.insert (nest_patches, { parent, k, v })
-		seen_once [parent], multiple [parent]  = nil, true
-	end
-
-	-----------------------------------------------------------------------------
-	-- First pass, list the tables and functions which appear more than once in x
-	-----------------------------------------------------------------------------
-	local function mark_multiple_occurences (x)
-		if no_identity [type(x)] then return end
-		if     seen_once [x]     then seen_once [x], multiple [x] = nil, true
-		elseif multiple  [x]     then -- pass
-		else   seen_once [x] = true end
-		
-		if type (x) == 'table' then
-			nested [x] = true
-			for k, v in pairs (x) do
-				if nested[k] or nested[v] then mark_nest_point (x, k, v) else
-					mark_multiple_occurences (k)
-					mark_multiple_occurences (v)
-				end
-			end
-			nested [x] = nil
-		end
-	end
-
-	local dumped    = { } -- multiply occuring values already dumped in localdefs
-	local localdefs = { } -- already dumped local definitions as source code lines
-
-	-- mutually recursive functions:
-	local dump_val, dump_or_ref_val
-
-	--------------------------------------------------------------------
-	-- if x occurs multiple times, dump the local var rather than the
-	-- value. If it's the first time it's dumped, also dump the content
-	-- in localdefs.
-	--------------------------------------------------------------------
-	function dump_or_ref_val (x)
-		if nested[x] then return 'false' end -- placeholder for recursive reference
-		if not multiple[x] then return dump_val (x) end
-		local var = dumped [x]
-		if var then return "_[" .. var .. "]" end -- already referenced
-		local val = dump_val(x) -- first occurence, create and register reference
-		var = gensym()
-		table.insert(localdefs, "_["..var.."]="..val)
-		dumped [x] = var
-		return "_[" .. var .. "]"
-	end
-
-	-----------------------------------------------------------------------------
-	-- Second pass, dump the object; subparts occuring multiple times are dumped
-	-- in local variables which can be referenced multiple times;
-	-- care is taken to dump locla vars in asensible order.
-	-----------------------------------------------------------------------------
-	function dump_val(x)
-		local  t = type(x)
-		if     x==nil        then return 'nil'
-		elseif t=="number"   then return tostring(x)
-		elseif t=="string"   then return string.format("%q", x)
-		elseif t=="boolean"  then return x and "true" or "false"
-		elseif t=="table" then
-			local acc        = { }
-			local idx_dumped = { }
-			local np         = nest_points [x]
-			for i, v in ipairs(x) do
-				if np and np[v] then
-					table.insert (acc, 'false') -- placeholder
-				else
-					table.insert (acc, dump_or_ref_val(v))
-				end
-				idx_dumped[i] = true
-			end
-			for k, v in pairs(x) do
-				if np and (np[k] or np[v]) then
-					--check_multiple(k); check_multiple(v) -- force dumps in localdefs
-				elseif not idx_dumped[k] then
-					table.insert (acc, "[" .. dump_or_ref_val(k) .. "] = " .. dump_or_ref_val(v))
-				end
-			end
-			return "{ "..table.concat(acc,", ").." }"
-		else
-			error ("Can't serialize data of type "..t)
-		end
-	end
-	
-	local function dump_nest_patches()
-		for _, entry in ipairs(nest_patches) do
-			local p, k, v = unpack (entry)
-			assert (multiple[p])
-			local set = dump_or_ref_val (p) .. "[" .. dump_or_ref_val (k) .. "] = " .. 
-				dump_or_ref_val (v) .. " -- rec "
-			table.insert (localdefs, set)
-		end
-	end
-
-	mark_multiple_occurences (x)
-	local toplevel = dump_or_ref_val (x)
-	dump_nest_patches()
-
-	if next (localdefs) then
-		return "local _={ }\n" ..
-			table.concat (localdefs, "\n") .. 
-			"\nreturn " .. toplevel
-	else
-		return "return " .. toplevel
-	end
-end
-
-- Deserialization.
-- http://stackoverflow.com/questions/5958818/loading-serialized-data-into-a-table
--
-
-local function stringtotable(sdata)
-	if sdata:byte(1) == 27 then return nil, "binary bytecode prohibited" end
-	local f, message = assert(loadstring(sdata))
-	if not f then return nil, message end
-	setfenv(f, table)
-	return f()
-end
-
-function minetest.deserialize(sdata)
-	local table = {}
-	local okay,results = pcall(stringtotable, sdata)
-	if okay then
-		return results
-	end
-	print('error:'.. results)
-	return nil
-end
-
-- Run some unit tests
-local function unit_test()
-	function unitTest(name, success)
-		if not success then
-			error(name .. ': failed')
-		end
-	end
-
-	unittest_input = {cat={sound="nyan", speed=400}, dog={sound="woof"}}
-	unittest_output = minetest.deserialize(minetest.serialize(unittest_input))
-
-	unitTest("test 1a", unittest_input.cat.sound == unittest_output.cat.sound)
-	unitTest("test 1b", unittest_input.cat.speed == unittest_output.cat.speed)
-	unitTest("test 1c", unittest_input.dog.sound == unittest_output.dog.sound)
-
-	unittest_input = {escapechars="\n\r\t\v\\\"\'\[\]", noneuropean="θשׁ٩∂"}
-	unittest_output = minetest.deserialize(minetest.serialize(unittest_input))
-	unitTest("test 3a", unittest_input.escapechars == unittest_output.escapechars)
-	unitTest("test 3b", unittest_input.noneuropean == unittest_output.noneuropean)
-end
-unit_test() -- Run it
-unit_test = nil -- Hide it
-
--- a/builtin/static_spawn.lua
+++ b/builtin/static_spawn.lua
@@ -1,33 +0,0 @@
-- Minetest: builtin/static_spawn.lua
-
-local function warn_invalid_static_spawnpoint()
-	if minetest.setting_get("static_spawnpoint") and
-			not minetest.setting_get_pos("static_spawnpoint") then
-		minetest.log('error', "The static_spawnpoint setting is invalid: \""..
-				minetest.setting_get("static_spawnpoint").."\"")
-	end
-end
-
-warn_invalid_static_spawnpoint()
-
-local function put_player_in_spawn(obj)
-	warn_invalid_static_spawnpoint()
-	local static_spawnpoint = minetest.setting_get_pos("static_spawnpoint")
-	if not static_spawnpoint then
-		return false
-	end
-	minetest.log('action', "Moving "..obj:get_player_name()..
-			" to static spawnpoint at "..
-			minetest.pos_to_string(static_spawnpoint))
-	obj:setpos(static_spawnpoint)
-	return true
-end
-
-minetest.register_on_newplayer(function(obj)
-	put_player_in_spawn(obj)
-end)
-
-minetest.register_on_respawnplayer(function(obj)
-	return put_player_in_spawn(obj)
-end)
-
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/cmake/Modules/FindGettextLib.cmake
@@ -59,7 +59,7 @@ ENDIF()
 IF(GETTEXT_FOUND)
 	SET(GETTEXT_PO_PATH ${CMAKE_SOURCE_DIR}/po)
 	SET(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale/<locale>/LC_MESSAGES)
-	SET(GETTEXT_MO_DEST_PATH ${LOCALEDIR}/<locale>/LC_MESSAGES)
+	SET(GETTEXT_MO_DEST_PATH ${DATADIR}/../locale/<locale>/LC_MESSAGES)
 	FILE(GLOB GETTEXT_AVAILABLE_LOCALES RELATIVE ${GETTEXT_PO_PATH} "${GETTEXT_PO_PATH}/*")
 	LIST(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES minetest.pot)
 	MACRO(SET_MO_PATHS _buildvar _destvar _locale)
--- a/cmake/Modules/FindVorbis.cmake
+++ b/cmake/Modules/FindVorbis.cmake
@@ -1,46 +0,0 @@
-# - Find vorbis
-# Find the native vorbis includes and libraries
-#
-#  VORBIS_INCLUDE_DIR - where to find vorbis.h, etc.
-#  OGG_INCLUDE_DIR    - where to find ogg/ogg.h, etc.
-#  VORBIS_LIBRARIES   - List of libraries when using vorbis(file).
-#  VORBIS_FOUND       - True if vorbis found.
-
-if(NOT GP2XWIZ)
-    if(VORBIS_INCLUDE_DIR)
-        # Already in cache, be silent
-        set(VORBIS_FIND_QUIETLY TRUE)
-    endif(VORBIS_INCLUDE_DIR)
-    find_path(OGG_INCLUDE_DIR ogg/ogg.h)
-    find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
-    # MSVC built ogg/vorbis may be named ogg_static and vorbis_static
-    find_library(OGG_LIBRARY NAMES ogg ogg_static)
-    find_library(VORBIS_LIBRARY NAMES vorbis vorbis_static)
-    find_library(VORBISFILE_LIBRARY NAMES vorbisfile vorbisfile_static)
-    # Handle the QUIETLY and REQUIRED arguments and set VORBIS_FOUND
-    # to TRUE if all listed variables are TRUE.
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(VORBIS DEFAULT_MSG
-        OGG_INCLUDE_DIR VORBIS_INCLUDE_DIR
-        OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY)
-else(NOT GP2XWIZ)
-    find_path(VORBIS_INCLUDE_DIR tremor/ivorbisfile.h)
-    find_library(VORBIS_LIBRARY NAMES vorbis_dec)
-    find_package_handle_standard_args(VORBIS DEFAULT_MSG
-        VORBIS_INCLUDE_DIR VORBIS_LIBRARY)
-endif(NOT GP2XWIZ)
-    
-if(VORBIS_FOUND)
-  if(NOT GP2XWIZ)
-     set(VORBIS_LIBRARIES ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY}
-           ${OGG_LIBRARY})
-  else(NOT GP2XWIZ)
-     set(VORBIS_LIBRARIES ${VORBIS_LIBRARY})
-  endif(NOT GP2XWIZ)
-else(VORBIS_FOUND)
-  set(VORBIS_LIBRARIES)
-endif(VORBIS_FOUND)
-
-mark_as_advanced(OGG_INCLUDE_DIR VORBIS_INCLUDE_DIR)
-mark_as_advanced(OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY)
-
--- a/games/minimal/mods/default/textures/default_apple.png
+++ b/games/minimal/mods/default/textures/default_apple.png
--- a/games/minimal/mods/legacy/textures/apple_iron.png
+++ b/games/minimal/mods/legacy/textures/apple_iron.png
--- a/games/minimal/mods/default/textures/default_book.png
+++ b/games/minimal/mods/default/textures/default_book.png
--- a/games/minimal/mods/default/textures/default_bookshelf.png
+++ b/games/minimal/mods/default/textures/default_bookshelf.png
--- a/games/minimal/mods/default/textures/default_brick.png
+++ b/games/minimal/mods/default/textures/default_brick.png
--- a/games/minimal/mods/default/textures/default_cactus_side.png
+++ b/games/minimal/mods/default/textures/default_cactus_side.png
--- a/games/minimal/mods/default/textures/default_cactus_top.png
+++ b/games/minimal/mods/default/textures/default_cactus_top.png
--- a/games/minimal/mods/default/textures/default_chest_front.png
+++ b/games/minimal/mods/default/textures/default_chest_front.png
--- a/games/minimal/mods/default/textures/default_chest_side.png
+++ b/games/minimal/mods/default/textures/default_chest_side.png
--- a/games/minimal/mods/default/textures/default_chest_top.png
+++ b/games/minimal/mods/default/textures/default_chest_top.png
--- a/games/minimal/mods/default/textures/default_clay.png
+++ b/games/minimal/mods/default/textures/default_clay.png
--- a/games/minimal/mods/default/textures/default_clay_brick.png
+++ b/games/minimal/mods/default/textures/default_clay_brick.png
--- a/games/minimal/mods/default/textures/default_cloud.png
+++ b/games/minimal/mods/default/textures/default_cloud.png
--- a/games/minimal/mods/default/textures/default_cobble.png
+++ b/games/minimal/mods/default/textures/default_cobble.png
--- a/games/minimal/mods/legacy/textures/cooked_rat.png
+++ b/games/minimal/mods/legacy/textures/cooked_rat.png
--- a/games/minimal/mods/default/textures/default_tool_woodaxe.png
+++ b/games/minimal/mods/default/textures/default_tool_woodaxe.png
--- a/games/minimal/mods/default/textures/default_fence.png
+++ b/games/minimal/mods/default/textures/default_fence.png
--- a/games/minimal/mods/legacy/textures/firefly.png
+++ b/games/minimal/mods/legacy/textures/firefly.png
--- a/textures/base/pack/fontlucida.png
+++ b/textures/base/pack/fontlucida.png
--- a/games/minimal/mods/default/textures/default_furnace_front.png
+++ b/games/minimal/mods/default/textures/default_furnace_front.png
--- a/games/minimal/mods/default/textures/default_furnace_side.png
+++ b/games/minimal/mods/default/textures/default_furnace_side.png
--- a/data/glass.png
+++ b/data/glass.png
--- a/games/minimal/mods/default/textures/default_grass.png
+++ b/games/minimal/mods/default/textures/default_grass.png
--- a/games/minimal/mods/default/textures/default_grass_footsteps.png
+++ b/games/minimal/mods/default/textures/default_grass_footsteps.png
--- a/games/minimal/mods/default/textures/default_grass_side.png
+++ b/games/minimal/mods/default/textures/default_grass_side.png
--- a/games/minimal/mods/default/textures/default_gravel.png
+++ b/games/minimal/mods/default/textures/default_gravel.png
--- a/games/minimal/mods/default/textures/heart.png
+++ b/games/minimal/mods/default/textures/heart.png
--- a/games/minimal/mods/default/textures/default_junglegrass.png
+++ b/games/minimal/mods/default/textures/default_junglegrass.png
--- a/games/minimal/mods/default/textures/default_jungletree.png
+++ b/games/minimal/mods/default/textures/default_jungletree.png
--- a/games/minimal/mods/default/textures/default_jungletree_top.png
+++ b/games/minimal/mods/default/textures/default_jungletree_top.png
--- a/games/minimal/mods/default/textures/default_ladder.png
+++ b/games/minimal/mods/default/textures/default_ladder.png
--- a/games/minimal/mods/default/textures/default_lava.png
+++ b/games/minimal/mods/default/textures/default_lava.png
--- a/games/minimal/mods/default/textures/default_leaves.png
+++ b/games/minimal/mods/default/textures/default_leaves.png
--- a/games/minimal/mods/default/textures/default_clay_lump.png
+++ b/games/minimal/mods/default/textures/default_clay_lump.png
--- a/games/minimal/mods/default/textures/default_coal_lump.png
+++ b/games/minimal/mods/default/textures/default_coal_lump.png
--- a/games/minimal/mods/default/textures/default_iron_lump.png
+++ b/games/minimal/mods/default/textures/default_iron_lump.png
--- a/textures/base/pack/menulogo.png
+++ b/textures/base/pack/menulogo.png
--- a/games/minimal/mods/default/textures/default_mese.png
+++ b/games/minimal/mods/default/textures/default_mese.png
--- a/games/minimal/mods/default/textures/default_mineral_coal.png
+++ b/games/minimal/mods/default/textures/default_mineral_coal.png
--- a/games/minimal/mods/default/textures/default_mineral_iron.png
+++ b/games/minimal/mods/default/textures/default_mineral_iron.png
--- a/games/minimal/mods/default/textures/default_mossycobble.png
+++ b/games/minimal/mods/default/textures/default_mossycobble.png
--- a/games/minimal/mods/default/textures/default_dirt.png
+++ b/games/minimal/mods/default/textures/default_dirt.png
--- a/games/minimal/mods/default/textures/default_nc_back.png
+++ b/games/minimal/mods/default/textures/default_nc_back.png
--- a/games/minimal/mods/default/textures/default_nc_front.png
+++ b/games/minimal/mods/default/textures/default_nc_front.png
--- a/games/minimal/mods/default/textures/default_nc_rb.png
+++ b/games/minimal/mods/default/textures/default_nc_rb.png
--- a/games/minimal/mods/default/textures/default_nc_side.png
+++ b/games/minimal/mods/default/textures/default_nc_side.png
--- a/games/minimal/mods/legacy/textures/oerkki1.png
+++ b/games/minimal/mods/legacy/textures/oerkki1.png
--- a/games/minimal/mods/legacy/textures/oerkki1_damaged.png
+++ b/games/minimal/mods/legacy/textures/oerkki1_damaged.png
--- a/games/minimal/mods/default/textures/default_paper.png
+++ b/games/minimal/mods/default/textures/default_paper.png
--- a/games/minimal/mods/default/textures/default_papyrus.png
+++ b/games/minimal/mods/default/textures/default_papyrus.png
--- a/games/minimal/mods/default/textures/player.png
+++ b/games/minimal/mods/default/textures/player.png
--- a/games/minimal/mods/default/textures/player_back.png
+++ b/games/minimal/mods/default/textures/player_back.png
--- a/games/minimal/mods/default/textures/default_rail.png
+++ b/games/minimal/mods/default/textures/default_rail.png
--- a/games/minimal/mods/default/textures/default_rail_crossing.png
+++ b/games/minimal/mods/default/textures/default_rail_crossing.png
--- a/games/minimal/mods/default/textures/default_rail_curved.png
+++ b/games/minimal/mods/default/textures/default_rail_curved.png
--- a/games/minimal/mods/default/textures/default_rail_t_junction.png
+++ b/games/minimal/mods/default/textures/default_rail_t_junction.png
--- a/games/minimal/mods/legacy/textures/rat.png
+++ b/games/minimal/mods/legacy/textures/rat.png
--- a/games/minimal/mods/default/textures/default_sand.png
+++ b/games/minimal/mods/default/textures/default_sand.png
--- a/games/minimal/mods/default/textures/default_sandstone.png
+++ b/games/minimal/mods/default/textures/default_sandstone.png
--- a/games/minimal/mods/default/textures/default_scorched_stuff.png
+++ b/games/minimal/mods/default/textures/default_scorched_stuff.png
--- a/games/minimal/mods/default/textures/default_tool_stoneaxe.png
+++ b/games/minimal/mods/default/textures/default_tool_stoneaxe.png
--- a/games/minimal/mods/default/textures/default_tool_steelaxe.png
+++ b/games/minimal/mods/default/textures/default_tool_steelaxe.png
--- a/games/minimal/mods/default/textures/default_sign_wall.png
+++ b/games/minimal/mods/default/textures/default_sign_wall.png
--- a/data/skybox1.png
+++ b/data/skybox1.png
--- a/data/skybox1_dawn.png
+++ b/data/skybox1_dawn.png
--- a/data/skybox1_night.png
+++ b/data/skybox1_night.png
--- a/data/skybox2.png
+++ b/data/skybox2.png
--- a/data/skybox2_dawn.png
+++ b/data/skybox2_dawn.png
--- a/data/skybox2_night.png
+++ b/data/skybox2_night.png
--- a/data/skybox3.png
+++ b/data/skybox3.png
--- a/data/skybox3_dawn.png
+++ b/data/skybox3_dawn.png
--- a/data/skybox3_night.png
+++ b/data/skybox3_night.png
--- a/games/minimal/mods/default/textures/default_steel_block.png
+++ b/games/minimal/mods/default/textures/default_steel_block.png
--- a/games/minimal/mods/default/textures/default_steel_ingot.png
+++ b/games/minimal/mods/default/textures/default_steel_ingot.png
--- a/games/minimal/mods/default/textures/default_stick.png
+++ b/games/minimal/mods/default/textures/default_stick.png
--- a/games/minimal/mods/default/textures/default_stone.png
+++ b/games/minimal/mods/default/textures/default_stone.png
--- a/games/minimal/mods/default/textures/default_tool_mesepick.png
+++ b/games/minimal/mods/default/textures/default_tool_mesepick.png
--- a/data/tool_steelaxe.png
+++ b/data/tool_steelaxe.png
--- a/games/minimal/mods/default/textures/default_tool_steelpick.png
+++ b/games/minimal/mods/default/textures/default_tool_steelpick.png
--- a/games/minimal/mods/default/textures/default_tool_steelshovel.png
+++ b/games/minimal/mods/default/textures/default_tool_steelshovel.png
--- a/games/minimal/mods/default/textures/default_tool_steelsword.png
+++ b/games/minimal/mods/default/textures/default_tool_steelsword.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Perttu Ahola	f446fbf017	Fix stable to build with MSVC2010, update version	2011-10-16 02:24:11 +03:00
Perttu Ahola	960009d619	Update changelog	2011-09-27 18:11:12 +03:00
Kahrl	5ca877b836	minetestmapper: Fix the way ylist is computed, use cStringIO instead of rolling own Bytestream, remove some artifacts when drawing underground blocks, introduce a --drawunderground switch (defaults to of), 'blocknum' renamed to 'content'.	2011-09-27 16:18:22 +03:00
Perttu Ahola	b0c2c83861	minetestmapper speed tweaks (kahrl & JacobF)	2011-09-27 16:18:22 +03:00
Perttu Ahola	1a63c6e016	Add apple color to minetestmapper and fix cactus color	2011-09-26 21:57:18 +03:00
Perttu Ahola	fd7c8706ce	Fix minetestmapper.py	2011-09-26 21:57:18 +03:00
Kahrl	aefa3b630b	Support Python 2 and 3 in sectors2sqlite.py.	2011-09-26 21:57:18 +03:00
Kahrl	d5281eaa2e	Fix processing of blocks below y=0 in sectors2sqlite.py.	2011-09-26 21:57:18 +03:00
Perttu Ahola	7504a748d0	Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros	2011-09-26 21:57:17 +03:00
				`@@ -0,0 +1 @@`
				`a519d683251105654d2a146ae7b91d3850b6504c 0.2.20110731_3`