maualy merged object linking interface from cao_sao_split patch

Merge branch 'master' into sapier_experimental
Merge branch 'object_object_collision' into sapier_experimental
2012-02-07 21:37:42 +01:00 · 2012-02-07 20:52:20 +01:00 · 2012-02-07 17:04:32 +01:00 · 2012-02-07 17:01:04 +01:00 · 2012-02-07 16:57:36 +01:00 · 2012-02-07 16:52:32 +01:00
883 changed files with 47799 additions and 154883 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,82 +1,27 @@
-## Generic ignorable patterns and files
-*~
-.*.swp
-*bak*
-tags
-*.vim
-*.orig
-*.rej
-
-## Non-static Minetest directories
-/bin/
-/games/*
-!/games/minimal/
-/cache/
-/textures/*
-!/textures/base/
-/sounds/
-/mods/*
-!/mods/minetest/
-/mods/minetest/*
-!/mods/minetest/mods_here.txt
-/worlds/
-/world/
-
-## Configuration/log files
-minetest.conf
-debug.txt
-
-## Doxygen files
-doc/Doxyfile
-doc/html/
-doc/doxygen_*
-
-## Build files
+map/*
+world/*
 CMakeFiles/*
 src/CMakeFiles/*
 src/Makefile
 src/cmake_config.h
-src/cmake_config_githash.h
 src/cmake_install.cmake
-src/script/CMakeFiles/*
-src/script/common/CMakeFiles/*
-src/script/cpp_api/CMakeFiles/*
-src/script/lua_api/CMakeFiles/*
-src/util/CMakeFiles/*
 src/jthread/CMakeFiles/*
 src/jthread/Makefile
 src/jthread/cmake_config.h
 src/jthread/cmake_install.cmake
-src/jthread/libjthread.a
-src/json/libjson.a
-src/lua/build/
-src/lua/CMakeFiles/
-src/cguittfont/CMakeFiles/
-src/cguittfont/libcguittfont.a
-src/cguittfont/cmake_install.cmake
-src/cguittfont/Makefile
-src/json/CMakeFiles/
-src/json/libjsoncpp.a
-src/sqlite/CMakeFiles/*
-src/sqlite/libsqlite3.a
+.*.swp
+minetest.conf
+bin/
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
 Makefile
 cmake_install.cmake
+src/jthread/libjthread.a
+debug.txt
+bin/debug.txt
+minetestmapper/map.png
 locale/
-*.cbp
-*.layout
-*.o
-
-## Build variants
-build/android/assets
-build/android/bin
-build/android/Debug
-build/android/deps
-build/android/gen
-build/android/jni/src/*
-build/android/libs
-build/android/obj
-timestamp
-
+src/lua/build/
+src/lua/CMakeFiles/
+*bak*
--- 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/.mailmap
+++ b/.mailmap
@@ -1,33 +0,0 @@
-0gb.us <0gb.us@0gb.us> <us_0gb@laptop-0gb-us.0gb.us>
-Calinou <calinou9999@gmail.com> <calinou9999spam@gmail.com>
-Perttu Ahola <celeron55@gmail.com> celeron55 <celeron55@gmail.com>
-Perttu Ahola <celeron55@gmail.com> celeron55 <celeron55@armada.(none)>
-Craig Robbins <kde.psych@gmail.com> <crobbins@localhost.localdomain>
-Diego Martínez <kaeza@users.sf.net> <lkaezadl3@gmail.com>
-Ilya Zhuravlev <zhuravlevilya@ya.ru> <whatever@xyz.is>
-kwolekr <kwolekr@minetest.net> <mirrorisim@gmail.com>
-PilzAdam <pilzadam@minetest.net> PilzAdam <adam-k@outlook.com>
-PilzAdam <pilzadam@minetest.net> Pilz Adam <PilzAdam@gmx.de>
-PilzAdam <pilzadam@minetest.net> PilzAdam <PilzAdam@gmx.de>
-proller <proller@github.com> <proler@github.com>
-proller <proller@github.com> <proler@gmail.com>
-RealBadAngel <maciej.kasatkin@o2.pl> <mk@realbadangel.pl>
-RealBadAngel <maciej.kasatkin@o2.pl> <maciej.kasatkin@yahoo.com>
-Selat <LongExampleTestName@gmail.com> <LongExampletestName@gmail.com>
-ShadowNinja <shadowninja@minetest.net> ShadowNinja <noreply@gmail.com>
-Shen Zheyu <arsdragonfly@gmail.com> arsdragonfly <arsdragonfly@gmail.com>
-Pavel Elagin <elagin.pasha@gmail.com> elagin <elagin.pasha@gmail.com>
-Esteban I. Ruiz Moreno <exio4.com@gmail.com> Esteban I. RM <exio4.com@gmail.com>
-manuel duarte <ffrogger0@yahoo.com> manuel joaquim <ffrogger0@yahoo.com>
-manuel duarte <ffrogger0@yahoo.com> sweetbomber <ffrogger _zero_ at yahoo dot com>
-Diego Martínez <kaeza@users.sf.net> kaeza <kaeza@users.sf.net>
-Diego Martínez <kaeza@users.sf.net> Diego Martinez <kaeza@users.sf.net>
-Lord James <neftali_dtctv@hotmail.com> Lord89James <neftali_dtctv@hotmail.com>
-BlockMen <nmuelll@web.de> Block Men <nmuelll@web.de>
-sfan5 <sfan5@live.de> Sfan5 <sfan5@live.de>
-DannyDark <the_skeleton_of_a_child@yahoo.co.uk> dannydark <the_skeleton_of_a_child@yahoo.co.uk>
-Ilya Pavlov <TTChangeTheWorld@gmail.com> Ilya <TTChangeTheWorld@gmail.com>
-Ilya Zhuravlev <zhuravlevilya@ya.ru> xyzz <zhuravlevilya@ya.ru>
-sapier <Sapier at GMX dot net> sapier <sapier AT gmx DOT net>
-sapier <Sapier at GMX dot net> sapier <sapier at gmx dot net>
-
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +0,0 @@
-language: cpp
-compiler:
-  - gcc
-  - clang
-env:
-  - WINDOWS=32
-  - WINDOWS=64
-  - WINDOWS=no
-before_install: ./util/travis/before_install.sh
-script: ./util/travis/script.sh
-notifications:
-  email: false
-matrix:
-  fast_finish: true
-  exclude:
-    - env: WINDOWS=32
-      compiler: clang
-    - env: WINDOWS=64
-      compiler: clang
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,20 +7,10 @@ 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 11)
-set(VERSION_PATCH_ORIG ${VERSION_PATCH})
-
-if(VERSION_EXTRA)
-	set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
-else()
-	# Comment the following line during release
-	#set(VERSION_PATCH ${VERSION_PATCH}-dev)
-endif()
+set(VERSION_PATCH dev-20120122-1)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")

 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
@@ -33,13 +23,6 @@ else()
 	set(RUN_IN_PLACE 0 CACHE BOOL "Run directly in source directory structure")
 endif()

-# RUN_IN_PLACE is exported as a #define value, ensure it's 1/0 instead of ON/OFF
-if(RUN_IN_PLACE)
-	set(RUN_IN_PLACE 1)
-else()
-	set(RUN_IN_PLACE 0)
-endif()
-
 set(BUILD_CLIENT 1 CACHE BOOL "Build client")
 if(WIN32)
 	set(BUILD_SERVER 0 CACHE BOOL "Build server")
@@ -66,115 +49,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)
-	set(SHAREDIR ".")
-	set(BINDIR ".")
-	set(DOCDIR "./doc/${PROJECT_NAME}")
-	set(EXAMPLE_CONF_DIR ${DOCDIR})
-	set(LOCALEDIR "locale")
+	# random placeholders
+	set(DATADIR "share/${PROJECT_NAME}")
+	set(BINDIR "bin")
+	set(DOCDIR "share/doc/${PROJECT_NAME}")
+	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(APPDATADIR "unix/appdata")
-		set(ICONDIR "unix/icons")
-		set(LOCALEDIR "locale")
-	else()
-		set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
-		set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
-		set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
-		set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
-		set(EXAMPLE_CONF_DIR ${DOCDIR})
-		set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
-		set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
-		set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
-		set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/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()

-set(CUSTOM_SHAREDIR "" CACHE STRING "Directory to install data files into")
-if(NOT CUSTOM_SHAREDIR STREQUAL "")
-	set(SHAREDIR "${CUSTOM_SHAREDIR}")
-	message(STATUS "Using SHAREDIR=${SHAREDIR}")
-endif()
-set(CUSTOM_BINDIR "" CACHE STRING "Directory to install binaries into")
-if(NOT CUSTOM_BINDIR STREQUAL "")
-	set(BINDIR "${CUSTOM_BINDIR}")
-	message(STATUS "Using BINDIR=${BINDIR}")
-endif()
-set(CUSTOM_DOCDIR "" CACHE STRING "Directory to install documentation into")
-if(NOT CUSTOM_DOCDIR STREQUAL "")
-	set(DOCDIR "${CUSTOM_DOCDIR}")
-	message(STATUS "Using DOCDIR=${DOCDIR}")
-endif()
-set(CUSTOM_MANDIR "" CACHE STRING "Directory to install manpages into")
-if(NOT CUSTOM_MANDIR STREQUAL "")
-	set(MANDIR "${CUSTOM_MANDIR}")
-	message(STATUS "Using MANDIR=${MANDIR}")
-endif()
-set(CUSTOM_EXAMPLE_CONF_DIR "" CACHE STRING "Directory to install example config file into")
-if(NOT CUSTOM_EXAMPLE_CONF_DIR STREQUAL "")
-	set(EXAMPLE_CONF_DIR "${CUSTOM_EXAMPLE_CONF_DIR}")
-	message(STATUS "Using EXAMPLE_CONF_DIR=${EXAMPLE_CONF_DIR}")
-endif()
-set(CUSTOM_XDG_APPS_DIR "" CACHE STRING "Directory to install .desktop files into")
-if(NOT CUSTOM_XDG_APPS_DIR STREQUAL "")
-	set(XDG_APPS_DIR "${CUSTOM_XDG_APPS_DIR}")
-	message(STATUS "Using XDG_APPS_DIR=${XDG_APPS_DIR}")
-endif()
-set(CUSTOM_ICONDIR "" CACHE STRING "Directory to install icons into")
-if(NOT CUSTOM_ICONDIR STREQUAL "")
-	set(ICONDIR "${CUSTOM_ICONDIR}")
-	message(STATUS "Using ICONDIR=${ICONDIR}")
-endif()
-set(CUSTOM_LOCALEDIR "" CACHE STRING "Directory to install l10n files into")
-if(NOT CUSTOM_LOCALEDIR STREQUAL "")
-	set(LOCALEDIR "${CUSTOM_LOCALEDIR}")
-	message(STATUS "Using LOCALEDIR=${LOCALEDIR}")
-endif()
-
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" 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")
-	install(DIRECTORY ${MINETEST_GAME_SOURCE}/menu 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/mods_here.txt" DESTINATION "${SHAREDIR}/mods")
-	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures")
-endif()
-
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}")
-
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
-install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
-install(FILES "doc/menu_lua_api.txt" DESTINATION "${DOCDIR}")
-install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}")
-install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
-
-if(UNIX AND NOT APPLE)
-	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
-	install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
-	install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}")
-	install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
-endif()
+install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
+install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")

 #
 # Subdirectories
@@ -202,22 +96,22 @@ if(WIN32)
 	#	install(FILES bin/minetestserver.exe DESTINATION bin)
 	#endif()

-	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win64")
-	else(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")
-	endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")

 	set(CPACK_GENERATOR ZIP)

 	# This might be needed for some installer
 	#set(CPACK_PACKAGE_EXECUTABLES bin/minetest.exe "Minetest" bin/minetestserver.exe "Minetest Server")
 elseif(APPLE)
+	# TODO
+	# see http://cmake.org/Wiki/CMake:CPackPackageGenerators#Bundle_.28OSX_only.29
+	#
 	set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-osx")
-	set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.icns)
+	set(CPACK_PACKAGE_ICON "")
 	set(CPACK_BUNDLE_NAME ${PROJECT_NAME})
-	set(CPACK_BUNDLE_ICON ${CPACK_PACKAGE_ICON})
-	set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/misc/Info.plist)
+	set(CPACK_BUNDLE_ICON "")
+	set(CPACK_BUNDLE_PLIST "")
+	set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/${PROJECT_NAME}")
 	set(CPACK_GENERATOR "Bundle")
 else()
 	set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux")
@@ -227,14 +121,3 @@ endif()

 include(CPack)

-# Add a target to generate API documentation with Doxygen
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile @ONLY)
-	add_custom_target(doc
-		${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc
-		COMMENT "Generating API documentation with Doxygen" VERBATIM
-	)
-endif(DOXYGEN_FOUND)
-
--- a/README.txt
+++ b/README.txt
@@ -1,99 +1,50 @@
-Minetest
-========
-
+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-2013 Perttu Ahola <celeron55@gmail.com>
-and 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/minetest/minetest_game/
-See the README.txt in it.
-
-Further documentation
+Further documentation:
 ----------------------
- Website: http://minetest.net/
- Wiki: http://wiki.minetest.net/
- Developer wiki: http://dev.minetest.net/
- Forum: http://forum.minetest.net/
- Github: https://github.com/minetest/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.
-
-Default Controls
-----------------
- WASD: move
- Space: jump/climb
- Shift: sneak/go down
- Q: drop itemstack (+ SHIFT for single item)
- I: inventory
- Mouse: turn/look
- Mouse left: dig/punch
- Mouse right: place/use
- Mouse wheel: select item
- T: chat
- 1-8: select item
-
- Esc: pause menu (pauses only singleplayer game)
- R: Enable/Disable full range view
- +: Increase view range
- -: Decrease view range
- K: Enable/Disable fly (needs fly privilege)
- J: Enable/Disable fast (needs fast privilege)
- H: Enable/Disable noclip (needs noclip privilege)
-
- F1:  Hide/Show HUD
- F2:  Hide/Show Chat
- F3:  Disable/Enable Fog
- F4:  Disable/Enable Camera update (Mapblocks are not updated anymore when disabled)
- F5:  Toogle through debug info screens
- F6:  Toogle through output data
- F7:  Toggle through camera modes
- F10: Show/Hide console
- F12: Take screenshot
+- Please report any bugs to me. debug.txt is useful.

+Controls:
+---------
+- See the in-game pause menu
 - Settable in the configuration file, see the section below.

-Paths
------
-$bin   - Compiled binaries
-$share - Distributed 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:
 ---------------------
@@ -103,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 libcurl4-gnutls-dev libfreetype6-dev
+$ apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-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/minetest/minetest/tarball/master -O master.tar.gz
+$ wget https://github.com/celeron55/minetest/tarball/master -O master.tar.gz
 $ tar xf master.tar.gz
-$ cd minetest-minetest-286edd4 (or similar)
-
-Download minetest_game (otherwise only the "Minimal development test" game is available)
-$ cd games/
-$ wget https://github.com/minetest/minetest_game/tarball/master -O minetest_game.tar.gz
-$ tar xf minetest_game.tar.gz
-$ mv minetest-minetest_game-* minetest_game
-$ cd ..
+$ cd celeron55-minetest-286edd4 (or similar)

 Build a version that runs directly from the source directory:
 $ cmake . -DRUN_IN_PLACE=1
@@ -130,86 +74,9 @@ $ ./minetest
 - 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
- If you build a bare server, you don't need to have Irrlicht installed. In that case use -DIRRLICHT_SOURCE_DIR=/the/irrlicht/source
-
-CMake options
-------------
-General options:
-
-BUILD_CLIENT        - Build Minetest client
-BUILD_SERVER        - Build Minetest server
-CMAKE_BUILD_TYPE    - Type of build (Release vs. Debug)
-    Release         - Release build
-    Debug           - Debug build
-    RelWithDebInfo  - Release build with Debug information
-    MinSizeRel      - Release build with -Os passed to compiler to make executable as small as possible
-ENABLE_CURL         - Build with cURL; Enables use of online mod repo, public serverlist and remote media fetching via http
-ENABLE_FREETYPE     - Build with Freetype2; Allows using TTF fonts
-ENABLE_GETTEXT      - Build with Gettext; Allows using translations
-ENABLE_GLES         - Search for Open GLES headers & libraries and use them
-ENABLE_LEVELDB      - Build with LevelDB; Enables use of LevelDB, which is much faster than SQLite, as map backend
-ENABLE_REDIS        - Build with libhiredis; Enables use of redis map backend
-ENABLE_SOUND        - Build with OpenAL, libogg & libvorbis; in-game Sounds
-DISABLE_LUAJIT      - Do not search for LuaJIT headers & library
-RUN_IN_PLACE        - Create a portable install (worlds, settings etc. in current directory)
-USE_GPROF           - Enable profiling using GProf
-VERSION_EXTRA       - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar)
-
-Library specific options:
-
-BZIP2_INCLUDE_DIR               - Linux only; directory where bzlib.h is located
-BZIP2_LIBRARY                   - Linux only; path to libbz2.a/libbz2.so
-CURL_DLL                        - Only if building with cURL on Windows; path to libcurl.dll
-CURL_INCLUDE_DIR                - Only if building with cURL; directory where curl.h is located
-CURL_LIBRARY                    - Only if building with cURL; path to libcurl.a/libcurl.so/libcurl.lib
-EGL_INCLUDE_DIR                 - Only if building with GLES; directory that contains egl.h
-EGL_egl_LIBRARY                 - Only if building with GLES; path to libEGL.a/libEGL.so
-FREETYPE_INCLUDE_DIR_freetype2  - Only if building with Freetype2; directory that contains an freetype directory with files such as ftimage.h in it
-FREETYPE_INCLUDE_DIR_ft2build   - Only if building with Freetype2; directory that contains ft2build.h
-FREETYPE_LIBRARY                - Only if building with Freetype2; path to libfreetype.a/libfreetype.so/freetype.lib
-FREETYPE_DLL                    - Only if building with Freetype2 on Windows; path to libfreetype.dll
-GETTEXT_DLL                     - Only when building with Gettext on Windows; path to libintl3.dll
-GETTEXT_ICONV_DLL               - Only when building with Gettext on Windows; path to libiconv2.dll
-GETTEXT_INCLUDE_DIR             - Only when building with Gettext; directory that contains iconv.h
-GETTEXT_LIBRARY                 - Only when building with Gettext on Windows; path to libintl.dll.a
-GETTEXT_MSGFMT                  - Only when building with Gettext; path to msgfmt/msgfmt.exe
-IRRLICHT_DLL                    - path to Irrlicht.dll
-IRRLICHT_INCLUDE_DIR            - directory that contains IrrCompileConfig.h
-IRRLICHT_LIBRARY                - path to libIrrlicht.a/libIrrlicht.so/libIrrlicht.dll.a
-LEVELDB_INCLUDE_DIR             - Only when building with LevelDB; directory that contains db.h
-LEVELDB_LIBRARY                 - Only when building with LevelDB; path to libleveldb.a/libleveldb.so/libleveldb.dll.a
-LEVELDB_DLL                     - Only when building with LevelDB on Windows; path to libleveldb.dll
-REDIS_INCLUDE_DIR               - Only when building with redis support; directory that contains hiredis.h
-REDIS_LIBRARY                   - Only when building with redis support; path to libhiredis.a/libhiredis.so
-LUA_INCLUDE_DIR                 - Only if you want to use LuaJIT; directory where luajit.h is located
-LUA_LIBRARY                     - Only if you want to use LuaJIT; path to libluajit.a/libluajit.so
-MINGWM10_DLL                    - Only if compiling with MinGW; path to mingwm10.dll
-OGG_DLL                         - Only if building with sound on Windows; path to libogg.dll
-OGG_INCLUDE_DIR                 - Only if building with sound; directory that contains an ogg directory which contains ogg.h
-OGG_LIBRARY                     - Only if building with sound; path to libogg.a/libogg.so/libogg.dll.a
-OPENAL_DLL                      - Only if building with sound on Windows; path to OpenAL32.dll
-OPENAL_INCLUDE_DIR              - Only if building with sound; directory where al.h is located
-OPENAL_LIBRARY                  - Only if building with sound; path to libopenal.a/libopenal.so/OpenAL32.lib
-OPENGLES2_INCLUDE_DIR           - Only if building with GLES; directory that contains gl2.h
-OPENGLES2_gl_LIBRARY            - Only if building with GLES; path to libGLESv2.a/libGLESv2.so
-SQLITE3_INCLUDE_DIR             - Only if you want to use SQLite from your OS; directory that contains sqlite3.h
-SQLITE3_LIBRARY                 - Only if you want to use the SQLite from your OS; path to libsqlite3.a/libsqlite3.so
-VORBISFILE_DLL                  - Only if building with sound on Windows; path to libvorbisfile-3.dll
-VORBISFILE_LIBRARY              - Only if building with sound; path to libvorbisfile.a/libvorbisfile.so/libvorbisfile.dll.a
-VORBIS_DLL                      - Only if building with sound on Windows; path to libvorbis-0.dll
-VORBIS_INCLUDE_DIR              - Only if building with sound; directory that contains a directory vorbis with vorbisenc.h inside
-VORBIS_LIBRARY                  - Only if building with sound; path to libvorbis.a/libvorbis.so/libvorbis.dll.a
-XXF86VM_LIBRARY                 - Only on Linux; path to libXXf86vm.a/libXXf86vm.so
-ZLIB_DLL                        - Only on Windows; path to zlib1.dll
-ZLIBWAPI_DLL                    - Only on Windows; path to zlibwapi.dll
-ZLIB_INCLUDE_DIR                - directory where zlib.h is located
-ZLIB_LIBRARY                    - path to libz.a/libz.so/zlibwapi.lib

 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:
@@ -223,17 +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 library and tools:
+	* Optional: 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:
-		http://minetest.net/download.php
+	* And, of course, Minetest-c55:
+		http://celeron.55.lt/~celeron55/minetest/download
 - Steps:
 	- Select a directory called DIR hereafter in which you will operate.
 	- Make sure you have CMake and a compiler installed.
 	- Download all the other stuff to DIR and extract them into there.
 	  ("extract here", not "extract to packagename/")
-	  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.
 	- You will end up with a directory structure like this (+=dir, -=file):
@@ -310,78 +176,51 @@ 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 sourcedir=%CD%
 set builddir=%sourcedir%\bvc10
 mkdir %builddir%
 pushd %builddir%
 cmake %sourcedir% -G "Visual Studio 10" -DIRRLICHT_SOURCE_DIR=%irrlichtpath% -DRUN_IN_PLACE=1 -DCMAKE_INSTALL_PREFIX=%installpath%
-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 textures and sounds
---------------------------------------
+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)
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
 http://creativecommons.org/licenses/by-sa/3.0/

-Authors of media files
-----------------------
-Everything not listed in here:
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+License of Minetest-c55 source code
+-----------------------------------

-BlockMen:
-  textures/base/pack/menuheader.png
-
-erlehmann:
-  misc/minetest-icon-24x24.png
-  misc/minetest-icon.ico
-  misc/minetest-icon.svg
-  textures/base/pack/logo.png
-
-License of Minetest source code
-------------------------------
-
-Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+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,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
+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.

@@ -437,68 +276,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.
-
-Liberation Fonts Copyright:
-
-  Copyright (c) 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc.
-
-DroidSansFallback:
-
-  Copyright (C) 2008 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--- a/build/android/AndroidManifest.xml.template
+++ b/build/android/AndroidManifest.xml.template
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.minetest.minetest"
-	android:versionCode="###ANDROID_VERSION###"
-	android:versionName="###BASE_VERSION###.###ANDROID_VERSION###"
-	android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="9"/>
-	<uses-feature android:glEsVersion="0x00010000" android:required="true"/>
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	###DEBUG_BUILD###
-	<application android:icon="@drawable/irr_icon" android:label="Minetest" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" ###DEBUG_FLAG###>
-	<activity android:name=".MtNativeActivity"
-		android:label="Minetest"
-		android:launchMode="singleTask"
-		android:configChanges="orientation|keyboardHidden"
-		android:screenOrientation="sensorLandscape"
-		android:clearTaskOnLaunch="true">
-		<intent-filter>
-			<action android:name="android.intent.action.MAIN" />
-			<category android:name="android.intent.category.LAUNCHER" />
-		</intent-filter>
-		<meta-data android:name="android.app.lib_name" android:value="minetest" />
-	</activity>
-	<activity android:name=".MinetestTextEntry"
-		android:theme="@style/Theme.Transparent"
-		android:excludeFromRecents="true">
-	</activity>
-	<activity android:name=".MinetestAssetCopy"
-		android:theme="@style/Theme.Transparent"
-		android:excludeFromRecents="true">
-	</activity>
-	</application>
-</manifest>
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -1,737 +0,0 @@
-# build options
-
-OS := $(shell uname)
-
-#automaticaly set number of jobs
-ifeq ($(OS),Linux)
-  PARALLEL := $(shell grep -c ^processor /proc/cpuinfo)
-else
-  PARALLEL := 1
-endif
-
-# compile with GPROF
-# GPROF = 1
-
-# build for build platform
-APP_PLATFORM = android-9
-
-# paths used for timestaps, dependencys, tree config and libs
-PATHCFGFILE = path.cfg
-
-ROOT = $(shell pwd)
-
-################################################################################
-# Android Version code
-# Increase for each build!
-################################################################################
-ANDROID_VERSION_CODE = 5
-
-################################################################################
-# toolchain config for arm old processors
-################################################################################
-TARGET_HOST = arm-linux
-TARGET_ABI = armeabi
-TARGET_LIBDIR = armeabi
-TARGET_TOOLCHAIN = arm-linux-androideabi-
-TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp
-CROSS_PREFIX = arm-linux-androideabi-
-COMPILER_VERSION = 4.8
-HAVE_LEVELDB = 1
-
-################################################################################
-# toolchain config for arm new processors
-################################################################################
-#TARGET_HOST = arm-linux
-#TARGET_ABI = armeabi-v7a-hard
-#TARGET_LIBDIR = armeabi-v7a
-#TARGET_TOOLCHAIN = arm-linux-androideabi-
-#TARGET_CFLAGS_ADDON =  -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 \
-#						-mfloat-abi=hard -march=armv7-a
-#TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
-#TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
-#CROSS_PREFIX = arm-linux-androideabi-
-#COMPILER_VERSION = 4.8
-#HAVE_LEVELDB = 1
-
-################################################################################
-# toolchain config for little endian mips
-################################################################################
-#TARGET_HOST = mipsel-linux
-#TARGET_ABI = mips
-#TARGET_LIBDIR = mips
-#TARGET_TOOLCHAIN = mipsel-linux-android-
-#CROSS_PREFIX = mipsel-linux-android-
-#COMPILER_VERSION = 4.8
-#HAVE_LEVELDB = 0
-
-################################################################################
-# toolchain config for x86
-################################################################################
-#TARGET_HOST = x86-linux
-#TARGET_ABI = x86
-#TARGET_LIBDIR = x86
-#TARGET_TOOLCHAIN = x86-
-#CROSS_PREFIX = i686-linux-android-
-#COMPILER_VERSION = 4.8
-#HAVE_LEVELDB = 1
-
-################################################################################
-ASSETS_TIMESTAMP = deps/assets_timestamp
-
-LEVELDB_DIR = $(ROOT)/deps/leveldb/
-LEVELDB_LIB = $(LEVELDB_DIR)libleveldb.a
-LEVELDB_TIMESTAMP = $(LEVELDB_DIR)/timestamp
-LEVELDB_TIMESTAMP_INT = $(ROOT)/deps/leveldb_timestamp
-LEVELDB_URL_GIT = https://code.google.com/p/leveldb/
-
-OPENAL_DIR = $(ROOT)/deps/openal-soft/
-OPENAL_LIB = $(OPENAL_DIR)libs/$(TARGET_ABI)/libopenal.so
-OPENAL_TIMESTAMP = $(OPENAL_DIR)/timestamp
-OPENAL_TIMESTAMP_INT = $(ROOT)/deps/openal_timestamp
-OPENAL_URL_GIT = https://github.com/apportable/openal-soft
-
-OGG_DIR = $(ROOT)/deps/libvorbis-libogg-android/
-OGG_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so
-VORBIS_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so
-OGG_TIMESTAMP = $(OGG_DIR)timestamp
-OGG_TIMESTAMP_INT = $(ROOT)/deps/ogg_timestamp
-OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android
-
-IRRLICHT_DIR = $(ROOT)/deps/irrlicht/
-IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a
-IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp
-IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp
-IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es/
-
-OPENSSL_BASEDIR = openssl-android
-OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/
-OPENSSL_LIB = $(OPENSSL_DIR)libs/$(TARGET_ABI)/libopenssl.so
-OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp
-OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp
-OPENSSL_URL_GIT = https://github.com/wobbals/openssl-android
-
-CURL_VERSION = 7.35.0
-CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION)
-CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
-CURL_TIMESTAMP = $(CURL_DIR)/timestamp
-CURL_TIMESTAMP_INT = $(ROOT)/deps/curl_timestamp
-CURL_URL_HTTP = http://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2
-
-FREETYPE_DIR = $(ROOT)/deps/freetype2-android/
-FREETYPE_LIB = $(FREETYPE_DIR)/Android/obj/local/$(TARGER_ABI)/libfreetype2-static.a
-FREETYPE_TIMESTAMP = $(FREETYPE_DIR)timestamp
-FREETYPE_TIMESTAMP_INT = $(ROOT)/deps/freetype_timestamp
-FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android
-
-include $(PATHCFGFILE)
-
-#use interim target variable to switch leveldb on or off
-ifeq ($(HAVE_LEVELDB),1)
-	LEVELDB_TARGET = $(LEVELDB_LIB)
-endif
-
-.PHONY : debug release reconfig delconfig \
-	leveldb_download clean_leveldb leveldb\
-	irrlicht_download clean_irrlicht irrlicht \
-	clean_assets assets \
-	freetype_download clean_freetype freetype \
-	apk clean_apk \
-	clean_all clean prep_srcdir \
-	install_debug install envpaths all \
-	manifest clean_manifest\
-	$(ASSETS_TIMESTAMP) $(LEVELDB_TIMESTAMP) \
-	$(OPENAL_TIMESTAMP) $(OGG_TIMESTAMP) \
-	$(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \
-	$(OPENSSL_TIMESTAMP) curl_binary \
-	$(ROOT)/jni/src/android_version.h
-	
-debug : $(PATHCFGFILE)
-	export NDEBUG=;                                                            \
-	export BUILD_TYPE=debug;                                                   \
-	$(MAKE) -j${PARALLEL} apk
-	
-all : debug release
-	
-release : $(PATHCFGFILE)
-	@export NDEBUG=1;                                                          \
-	export BUILD_TYPE=release;                                                 \
-	$(MAKE) -j${PARALLEL} apk
-
-reconfig: delconfig
-	@$(MAKE) -j${PARALLEL} $(PATHCFGFILE)
-
-delconfig :
-	$(RM) ${PATHCFGFILE}
-
-$(PATHCFGFILE) :
-	@echo "Please specify path of ANDROID NDK";                                \
-	echo "e.g. /home/user/android-ndk-r9c/";                                   \
-	read ANDROID_NDK ;                                                         \
-	if [ ! -d $$ANDROID_NDK ] ; then                                           \
-		echo "$$ANDROID_NDK is not a valid folder";                            \
-		exit 1;                                                                \
-	fi;                                                                        \
-	echo "ANDROID_NDK = $$ANDROID_NDK" > ${PATHCFGFILE};                       \
-	echo "NDK_MODULE_PATH = $$ANDROID_NDK/toolchains" >> ${PATHCFGFILE};            \
-	echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\
-	echo "+ Note: NDK_MODULE_PATH is set to $$ANDROID_NDK/toolchains";              \
-	echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\
-	echo "Please specify path of ANDROID SDK";                                 \
-	echo "e.g. /home/user/adt-bundle-linux-x86_64-20131030/sdk/";              \
-	read SDKFLDR ;                                                             \
-	if [ ! -d $$SDKFLDR ] ; then                                               \
-		echo "$$SDKFLDR is not a valid folder";                                \
-		exit 1;                                                                \
-	fi;                                                                        \
-	echo "SDKFOLDER = $$SDKFLDR" >> ${PATHCFGFILE};
-
-$(OPENAL_TIMESTAMP) : openal_download
-	@LAST_MODIF=$$(find ${OPENAL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${OPENAL_TIMESTAMP};                                            \
-	fi
-	
-openal_download :
-	@if [ ! -d ${OPENAL_DIR} ] ; then                                          \
-		echo "openal sources missing, downloading...";                         \
-		mkdir -p ${ROOT}/deps;                                                 \
-		cd ${ROOT}/deps ;                                                      \
-		git clone ${OPENAL_URL_GIT} || exit 1;                                 \
-	fi
-	
-openal : $(OPENAL_LIB)
-
-$(OPENAL_LIB): $(OPENAL_TIMESTAMP)
-	@REFRESH=0;                                                                \
-	if [ ! -e ${OPENAL_TIMESTAMP_INT} ] ; then                                 \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ${OPENAL_TIMESTAMP} -nt ${OPENAL_TIMESTAMP_INT} ] ; then              \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ $$REFRESH -ne 0 ] ; then                                              \
-	export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK};             \
-	echo "changed timestamp for openal detected building...";                  \
-	cd ${OPENAL_DIR};                                                          \
-	ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH}              \
-	APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} -j${PARALLEL}           \
-	TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                    \
-	TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                                  \
-	TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                     \
-	touch ${OPENAL_TIMESTAMP};                                                 \
-	touch ${OPENAL_TIMESTAMP_INT};                                             \
-	else                                                                       \
-		echo "nothing to be done for openal";                                  \
-	fi
-	
-clean_openal :
-	$(RM) -rf ${OPENAL_DIR}
-	
-$(OGG_TIMESTAMP) : ogg_download
-	@LAST_MODIF=$$(find ${OGG_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${OGG_TIMESTAMP};                                                \
-	fi
-	
-ogg_download :
-	@if [ ! -d ${OGG_DIR} ] ; then                                             \
-		echo "ogg sources missing, downloading...";                            \
-		mkdir -p ${ROOT}/deps;                                                 \
-		cd ${ROOT}/deps ;                                                      \
-		git clone ${OGG_URL_GIT}|| exit 1;                                     \
-		cd libvorbis-libogg-android ;                                          \
-		patch -p1 < ../../libvorbis-libogg-fpu.patch || exit 1;                \
-	fi
-	
-ogg : $(OGG_LIB)
-
-$(OGG_LIB): $(OGG_TIMESTAMP)
-	@REFRESH=0;                                                                \
-	if [ ! -e ${OGG_TIMESTAMP_INT} ] ; then                                    \
-		echo "${OGG_TIMESTAMP_INT} doesn't exist";                             \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ${OGG_TIMESTAMP} -nt ${OGG_TIMESTAMP_INT} ] ; then                    \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ $$REFRESH -ne 0 ] ; then                                              \
-	export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK};             \
-	echo "changed timestamp for ogg detected building...";                     \
-	cd ${OGG_DIR};                                                             \
-	ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH}              \
-	APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} -j${PARALLEL}           \
-	TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                    \
-	TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                                  \
-	TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                     \
-	touch ${OGG_TIMESTAMP};                                                    \
-	touch ${OGG_TIMESTAMP_INT};                                                \
-	else                                                                       \
-		echo "nothing to be done for libogg/libvorbis";                        \
-	fi
-
-clean_ogg :
-	$(RM) -rf ${OGG_DIR}
-	
-$(OPENSSL_TIMESTAMP) : openssl_download
-	@LAST_MODIF=$$(find ${OPENSSL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${OPENSSL_TIMESTAMP};                                            \
-	fi
-	
-openssl_download :
-	@if [ ! -d ${OPENSSL_DIR} ] ; then                                         \
-		echo "openssl sources missing, downloading...";                        \
-		mkdir -p ${ROOT}/deps;                                                 \
-		cd ${ROOT}/deps ;                                                      \
-		git clone ${OPENSSL_URL_GIT} || exit 1;                                \
-	fi
-	
-openssl : $(OPENSSL_LIB)
-
-$(OPENSSL_LIB): $(OPENSSL_TIMESTAMP)
-	@REFRESH=0;                                                                \
-	if [ ! -e ${OPENSSL_TIMESTAMP_INT} ] ; then                                \
-		echo "${OPENSSL_TIMESTAMP_INT} doesn't exist";                         \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ${OPENSSL_TIMESTAMP} -nt ${OPENSSL_TIMESTAMP_INT} ] ; then            \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ $$REFRESH -ne 0 ] ; then                                              \
-	export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK};             \
-	echo "changed timestamp for openssl detected building...";                 \
-	cd ${OPENSSL_DIR};                                                         \
-	cat jni/Application.mk | grep -v NDK_TOOLCHAIN_VERSION >jni/Application.mk.new;\
-	mv jni/Application.mk.new jni/Application.mk;                              \
-	ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH}              \
-	APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} -j${PARALLEL}           \
-	TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                    \
-	TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                                  \
-	TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                     \
-	touch ${OPENSSL_TIMESTAMP};                                                \
-	touch ${OPENSSL_TIMESTAMP_INT};                                            \
-	else                                                                       \
-		echo "nothing to be done for openssl";                        \
-	fi
-
-clean_openssl :
-	$(RM) -rf ${OPENSSL_DIR}
-
-$(LEVELDB_TIMESTAMP) : leveldb_download
-	@LAST_MODIF=$$(find ${LEVELDB_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${LEVELDB_TIMESTAMP};                                            \
-	fi
-
-leveldb_download :
-	@if [ ! -d ${LEVELDB_DIR} ] ; then                                         \
-		echo "leveldb sources missing, downloading...";                        \
-		mkdir -p ${ROOT}/deps;                                                 \
-		cd ${ROOT}/deps ;                                                      \
-		git clone ${LEVELDB_URL_GIT} || exit 1;                                \
-	fi
-	
-leveldb : $(LEVELDB_LIB)
-
-$(LEVELDB_LIB): $(LEVELDB_TIMESTAMP)
-	@REFRESH=0;                                                                \
-	if [ ! -e ${LEVELDB_TIMESTAMP_INT} ] ; then                                \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ${LEVELDB_TIMESTAMP} -nt ${LEVELDB_TIMESTAMP_INT} ] ; then            \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ $$REFRESH -ne 0 ] ; then                                              \
-	export PATH=$${PATH}:${SDKFOLDER}/platform-tools:${ANDROID_NDK};           \
-	echo "changed timestamp for leveldb detected building...";                 \
-	cd deps/leveldb;                                                           \
-	export CROSS_PREFIX=${CROSS_PREFIX};                                       \
-	export TOOLCHAIN=/tmp/ndk-arm;                                             \
-	${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh                    \
-	--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION}                         \
-	--install-dir=$${TOOLCHAIN} --system=linux-x86_64;                         \
-	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
-	export CC=${CROSS_PREFIX}gcc;                                              \
-	export CXX=${CROSS_PREFIX}g++;                                             \
-	export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}";                         \
-	export CPPFLAGS="$${CPPFLAGS} ${TARGET_CFLAGS_ADDON}";                     \
-	export LDFLAGS="$${LDFLAGS} ${TARGET_LDFLAGS_ADDON}";                      \
-	export TARGET_OS=OS_ANDROID_CROSSCOMPILE;                                  \
-	$(MAKE) -j${PARALLEL} -s || exit 1;                                        \
-	touch ${LEVELDB_TIMESTAMP};                                                \
-	touch ${LEVELDB_TIMESTAMP_INT};                                            \
-	else                                                                       \
-		echo "nothing to be done for leveldb";                                 \
-	fi
-	
-clean_leveldb :
-	$(RM) -rf deps/leveldb
-	
-$(FREETYPE_TIMESTAMP) : freetype_download
-	@LAST_MODIF=$$(find ${FREETYPE_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${FREETYPE_TIMESTAMP};                                           \
-	fi
-
-freetype_download :
-	@if [ ! -d ${FREETYPE_DIR} ] ; then                                        \
-		echo "freetype sources missing, downloading...";                       \
-		mkdir -p ${ROOT}/deps;                                                 \
-		cd deps;                                                               \
-		git clone ${FREETYPE_URL_GIT} || exit 1;                               \
-	fi
-	
-$(IRRLICHT_TIMESTAMP) : irrlicht_download
-	@LAST_MODIF=$$(find ${IRRLICHT_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${IRRLICHT_TIMESTAMP};                                           \
-	fi
-	
-freetype : $(FREETYPE_LIB)
-
-$(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP)
-	@REFRESH=0;                                                                \
-	if [ ! -e ${FREETYPE_TIMESTAMP_INT} ] ; then                               \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ! -e ${FREETYPE_LIB} ] ; then                                         \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ${FREETYPE_TIMESTAMP} -nt ${FREETYPE_TIMESTAMP_INT} ] ; then          \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ $$REFRESH -ne 0 ] ; then                                              \
-	mkdir -p ${FREETYPE_DIR};                                                  \
-	export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK};             \
-	echo "changed timestamp for freetype detected building...";                \
-	cd ${FREETYPE_DIR}/Android/jni;                                            \
-	ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH}              \
-	APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI} -j${PARALLEL}           \
-	TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                    \
-	TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                                  \
-	TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                     \
-	touch ${FREETYPE_TIMESTAMP};                                               \
-	touch ${FREETYPE_TIMESTAMP_INT};                                           \
-	else                                                                       \
-		echo "nothing to be done for freetype";                                \
-	fi
-	
-clean_freetype :
-	$(RM) -rf ${FREETYPE_DIR}
-
-#Note: Texturehack patch is required for gpu's not supporting color format
-#      correctly. Known bad GPU:
-#      -geforce on emulator
-#      -Vivante Corporation GC1000 core (e.g. Galaxy Tab 3)
-
-irrlicht_download :
-	@if [ ! -d "deps/irrlicht" ] ; then                                        \
-		echo "irrlicht sources missing, downloading...";                       \
-		mkdir -p ${ROOT}/deps;                                                 \
-		cd deps;                                                               \
-		svn co ${IRRLICHT_URL_SVN} irrlicht || exit 1;                         \
-		cd irrlicht;                                                           \
-		patch -p1 < ../../irrlicht-touchcount.patch || exit 1;                 \
-		patch -p1 < ../../irrlicht-back_button.patch || exit 1;                \
-		patch -p1 < ../../irrlicht-texturehack.patch || exit 1;                \
-	fi
-
-irrlicht : $(IRRLICHT_LIB)
-
-$(IRRLICHT_LIB): $(IRRLICHT_TIMESTAMP) $(FREETYPE_LIB)
-	@REFRESH=0;                                                                \
-	if [ ! -e ${IRRLICHT_TIMESTAMP_INT} ] ; then                               \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ! -e ${IRRLICHT_LIB} ] ; then                                         \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ${IRRLICHT_TIMESTAMP} -nt ${IRRLICHT_TIMESTAMP_INT} ] ; then          \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ $$REFRESH -ne 0 ] ; then                                              \
-	mkdir -p ${IRRLICHT_DIR};                                                  \
-	export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK};             \
-	echo "changed timestamp for irrlicht detected building...";                \
-	cd deps/irrlicht/source/Irrlicht/Android;                                  \
-	ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH}              \
-	APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} -j${PARALLEL}           \
-	TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                    \
-	TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                                  \
-	TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1;                     \
-	touch ${IRRLICHT_TIMESTAMP};                                               \
-	touch ${IRRLICHT_TIMESTAMP_INT};                                           \
-	else                                                                       \
-		echo "nothing to be done for irrlicht";                                \
-	fi
-	
-clean_irrlicht :
-	$(RM) -rf deps/irrlicht
-	
-$(CURL_TIMESTAMP) : curl_download
-	@LAST_MODIF=$$(find ${CURL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${CURL_TIMESTAMP};                                               \
-	fi
-
-curl_download :
-	@if [ ! -d "deps/curl-${CURL_VERSION}" ] ; then                            \
-		echo "curl sources missing, downloading...";                           \
-		mkdir -p ${ROOT}/deps;                                                 \
-		cd deps;                                                               \
-		wget ${CURL_URL_HTTP} || exit 1;                                       \
-		tar -xjf curl-${CURL_VERSION}.tar.bz2 || exit 1;                       \
-		rm curl-${CURL_VERSION}.tar.bz2;                                       \
-	fi
-
-curl : $(CURL_LIB)
-
-$(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
-	@REFRESH=0;                                                                \
-	if [ ! -e ${CURL_TIMESTAMP_INT} ] ; then                                   \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ! -e ${CURL_LIB} ] ; then                                             \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ${CURL_TIMESTAMP} -nt ${CURL_TIMESTAMP_INT} ] ; then                  \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ $$REFRESH -ne 0 ] ; then                                              \
-	mkdir -p ${CURL_DIR};                                                      \
-	export PATH="$${PATH}:${SDKFOLDER}/platform-tools:${ANDROID_NDK}";         \
-	echo "changed timestamp for curl detected building...";                    \
-	cd deps/curl-${CURL_VERSION};                                              \
-	export CROSS_PREFIX=${CROSS_PREFIX};                                       \
-	export TOOLCHAIN=/tmp/ndk-arm;                                             \
-	${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh                    \
-	--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION}                         \
-	--install-dir=$${TOOLCHAIN} --system=linux-x86_64;                         \
-	export PATH="$${TOOLCHAIN}/bin:$${PATH}";                                  \
-	export CC=${CROSS_PREFIX}gcc;                                              \
-	export CXX=${CROSS_PREFIX}g++;                                             \
-	export TARGET_OS=OS_ANDROID_CROSSCOMPILE;                                  \
-	export CPPFLAGS="$${CPPFLAGS} -I${OPENSSL_DIR}/include                     \
-	-L${OPENSSL_DIR}/libs/${TARGET_ABI}/ ${TARGET_CFLAGS_ADDON}";              \
-	export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}";                         \
-	export LDFLAGS="$${LDFLAGS} -L${OPENSSL_DIR}/libs/${TARGET_ABI}/           \
-	${TARGET_LDFLAGS_ADDON}";                                                  \
-	./configure --host=${TARGET_HOST} --disable-shared --enable-static --with-ssl;  \
-	$(MAKE) -j${PARALLEL} -s || exit 1;                                        \
-	touch ${CURL_TIMESTAMP};                                                   \
-	touch ${CURL_TIMESTAMP_INT};                                               \
-	else                                                                       \
-		echo "nothing to be done for curl";                                    \
-	fi
-	
-clean_curl :
-	$(RM) -rf deps/curl-${CURL_VERSION}
-	
-	
-curl_binary: 
-	@if [ ! -d "deps/curl-${CURL_VERSION_BINARY}" ] ; then                     \
-		echo "curl sources missing, downloading...";                           \
-		mkdir -p ${ROOT}/deps;                                                 \
-		cd deps;                                                               \
-		wget http://curl.haxx.se/gknw.net/7.34.0/dist-android/curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz || exit 1;\
-		tar -xzf curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz || exit 1;\
-		mv curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android curl-${CURL_VERSION_BINARY};\
-		rm curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz;           \
-	fi
-
-$(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB)
-	@mkdir -p ${ROOT}/deps;                                                     \
-	LAST_MODIF=$$(find ${ROOT}/../../builtin -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${ROOT}/../../builtin/timestamp;                                 \
-		touch ${ASSETS_TIMESTAMP};                                             \
-		echo builtin changed $$LAST_MODIF;                                     \
-	fi;                                                                        \
-	LAST_MODIF=$$(find ${ROOT}/../../client -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${ROOT}/../../client/timestamp;                                  \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	LAST_MODIF=$$(find ${ROOT}/../../doc -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${ROOT}/../../doc/timestamp;                                     \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	LAST_MODIF=$$(find ${ROOT}/../../fonts -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${ROOT}/../../fonts/timestamp;                                   \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	LAST_MODIF=$$(find ${ROOT}/../../games -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${ROOT}/../../games/timestamp;                                   \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	LAST_MODIF=$$(find ${ROOT}/../../mods -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${ROOT}/../../mods/timestamp;                                    \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	LAST_MODIF=$$(find ${ROOT}/../../po -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${ROOT}/../../po/timestamp;                                      \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	LAST_MODIF=$$(find ${ROOT}/../../textures -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${ROOT}/../../textures/timestamp;                                \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	LAST_MODIF=$$(find ${IRRLICHT_DIR}/media -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
-	if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then                     \
-		touch ${IRRLICHT_DIR}/media/timestamp;                                 \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	if [ ${ROOT}/../../minetest.conf.example -nt ${ASSETS_TIMESTAMP} ] ; then  \
-		echo "conf changed";                                                   \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	if [ ${ROOT}/../../README.txt -nt ${ASSETS_TIMESTAMP} ] ; then             \
-		touch ${ASSETS_TIMESTAMP};                                             \
-	fi;                                                                        \
-	if [ ! -e $(ASSETS_TIMESTAMP) ] ; then                                     \
-		touch $(ASSETS_TIMESTAMP);                                             \
-	fi
-	
-assets : $(ASSETS_TIMESTAMP)
-	@REFRESH=0;                                                                \
-	if [ ! -e ${ASSETS_TIMESTAMP}.old ] ; then                                 \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ${ASSETS_TIMESTAMP} -nt ${ASSETS_TIMESTAMP}.old ] ; then              \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ ! -d ${ROOT}/assets ] ; then                                          \
-		REFRESH=1;                                                             \
-	fi;                                                                        \
-	if [ $$REFRESH -ne 0 ] ; then                                              \
-	echo "assets changed, refreshing...";                                      \
-	$(MAKE) -j${PARALLEL} clean_assets;                                        \
-	mkdir -p ${ROOT}/assets/Minetest;                                          \
-	cp ${ROOT}/../../minetest.conf.example ${ROOT}/assets/Minetest;            \
-	cp ${ROOT}/../../README.txt ${ROOT}/assets/Minetest;                       \
-	cp -r ${ROOT}/../../builtin ${ROOT}/assets/Minetest;                       \
-	cp -r ${ROOT}/../../client ${ROOT}/assets/Minetest;                        \
-	cp -r ${ROOT}/../../doc ${ROOT}/assets/Minetest;                           \
-	cp -r ${ROOT}/../../fonts ${ROOT}/assets/Minetest;                         \
-	cp -r ${ROOT}/../../games ${ROOT}/assets/Minetest;                         \
-	cp -r ${ROOT}/../../mods ${ROOT}/assets/Minetest;                          \
-	cp -r ${ROOT}/../../po ${ROOT}/assets/Minetest;                            \
-	cp -r ${ROOT}/../../textures ${ROOT}/assets/Minetest;                      \
-	mkdir -p ${ROOT}/assets/Minetest/media;                                    \
-	cp -r ${IRRLICHT_DIR}/media/Shaders ${ROOT}/assets/Minetest/media;         \
-	cd ${ROOT}/assets;                                                         \
-	find . -name "timestamp" -exec rm {} \; ;                                  \
-	find . -name "*.blend" -exec rm {} \; ;                                    \
-	ls -R | grep ":$$" | sed -e 's/:$$//' -e 's/\.//' -e 's/^\///' > "index.txt"; \
-	cp ${ROOT}/${ASSETS_TIMESTAMP} ${ROOT}/${ASSETS_TIMESTAMP}.old;            \
-	else                                                                       \
-		echo "nothing to be done for assets";                                  \
-	fi
-
-clean_assets :
-	@$(RM) -r assets
-	
-apk: $(PATHCFGFILE) assets $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_TARGET)       \
-	$(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h
-	@export NDEBUG=$$NDEBUG; $(MAKE) -j${PARALLEL} manifest;                   \
-	export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK};             \
-	export ANDROID_HOME=${SDKFOLDER};                                          \
-	mkdir -p ${ROOT}/src;                                                      \
-	ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} -j${PARALLEL}                 \
-	GPROF=${GPROF} APP_ABI=${TARGET_ABI} HAVE_LEVELDB=${HAVE_LEVELDB}          \
-	APP_PLATFORM=${APP_PLATFORM}                                               \
-	TARGET_LIBDIR=${TARGET_LIBDIR}                                             \
-	TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}"                                    \
-	TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}"                                  \
-	TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" &&                             \
-	ant $$BUILD_TYPE &&                                                        \
-	echo "++ Success!" &&                                                      \
-	echo "APK: bin/Minetest-$$BUILD_TYPE.apk" &&                               \
-	echo "You can install it with \`adb install -r bin/Minetest-$$BUILD_TYPE.apk\`"
-	
-prep_srcdir :
-	@rm ${ROOT}/jni/src;                                                       \
-	ln -s ${ROOT}/../../src ${ROOT}/jni/src
-	
-clean_apk : manifest
-	@export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK};             \
-	export ANDROID_HOME=${SDKFOLDER};                                          \
-	ant clean
-	
-install_debug : 
-	@export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK};             \
-	adb install -r ${ROOT}/bin/Minetest-debug.apk
-	
-install :
-	@export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK};             \
-	adb install -r ${ROOT}/bin/Minetest-release.apk
-	
-envpaths :
-	@echo "export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}" > and_env;\
-	echo "export ANDROID_HOME=${SDKFOLDER}" >> and_env;
-	
-clean_all : 
-	@$(MAKE) -j${PARALLEL} clean_apk;                                          \
-	$(MAKE) clean_assets clean_irrlicht clean_leveldb clean_curl clean_openssl \
-	clean_openal clean_ogg clean_manifest;                                     \
-	sleep 1;                                                                   \
-	$(RM) -r gen libs obj deps bin Debug and_env
-	
-$(ROOT)/jni/src/android_version.h :
-	@echo "#define STR_HELPER(x) #x"                                           \
-	>${ROOT}/jni/src/android_version.h;                                        \
-	echo "#define STR(x) STR_HELPER(x)"                                        \
-	>> ${ROOT}/jni/src/android_version.h;                                      \
-	echo "#define VERSION_MAJOR $$(cat ${ROOT}/../../CMakeLists.txt |          \
-	grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}')"            \
-	>> ${ROOT}/jni/src/android_version.h;                                      \
-	echo "#define VERSION_MINOR $$(cat ${ROOT}/../../CMakeLists.txt |          \
-	grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | awk '{print $$2;}')"            \
-	>> ${ROOT}/jni/src/android_version.h;                                      \
-	echo "#define VERSION_PATCH $$(cat ${ROOT}/../../CMakeLists.txt |          \
-	grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')"            \
-	>> ${ROOT}/jni/src/android_version.h;                                      \
-	echo "#define VERSION_PATCH_ORIG $$(cat ${ROOT}/../../CMakeLists.txt |     \
-	grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')"            \
-	>> ${ROOT}/jni/src/android_version.h;                                      \
-	export GITHASH=$$(git rev-parse --short=8 HEAD);                           \
-	if [ "x$$GITHASH" = "x" ] ; then                                           \
-		export GITHASH=gUnknown;                                               \
-	fi;                                                                        \
-	echo "#define CMAKE_VERSION_GITHASH \"$$GITHASH\""                         \
-	>> ${ROOT}/jni/src/android_version.h;                                      \
-	echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
-	\".\"STR(VERSION_PATCH)"                                                   \
-	>> ${ROOT}/jni/src/android_version.h;
-	
-manifest :
-	@VERS_MAJOR=$$(cat ${ROOT}/../../CMakeLists.txt |                          \
-	grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | awk '{print $$2;}');            \
-	VERS_MINOR=$$(cat ${ROOT}/../../CMakeLists.txt |                           \
-	grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | awk '{print $$2;}');            \
-	VERS_PATCH=$$(cat ${ROOT}/../../CMakeLists.txt |                           \
-	grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}');            \
-	BASE_VERSION="$$VERS_MAJOR.$$VERS_MINOR.$$VERS_PATCH";                     \
-	if [ "${NDEBUG}x" != "x" ] ; then                                          \
-		DBG='';                                                                \
-		DBG_FLAG="android:debuggable=\"false\"";                               \
-	else                                                                       \
-		DBG="<uses-permission android:name=\"android.permission.SET_DEBUG_APP\" />"; \
-		DBG_FLAG="android:debuggable=\"true\"";                                \
-	fi;                                                                        \
-	cat ${ROOT}/AndroidManifest.xml.template |                                 \
-	sed s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g |                    \
-	sed s/###BASE_VERSION###/$$BASE_VERSION/g |                                \
-	sed -e "s@###DEBUG_BUILD###@$$DBG@g" |                                     \
-	sed -e "s@###DEBUG_FLAG###@$$DBG_FLAG@g" >${ROOT}/AndroidManifest.xml
-	
-clean_manifest :
-	rm -rf ${ROOT}/AndroidManifest.xml
-
-clean : clean_apk clean_assets
--- a/build/android/build.xml
+++ b/build/android/build.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Minetest" default="help">
-	<property file="local.properties" />
-	<property file="ant.properties" />
-	<property environment="env" />
-	<condition property="sdk.dir" value="${env.ANDROID_HOME}">
-		<isset property="env.ANDROID_HOME" />
-	</condition>
-	<loadproperties srcFile="project.properties" />
-	<fail
-		message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-		unless="sdk.dir"
-	/>
-	<import file="custom_rules.xml" optional="true" />
-	<import file="${sdk.dir}/tools/ant/build.xml" />
-</project>
--- a/build/android/irrlicht-back_button.patch
+++ b/build/android/irrlicht-back_button.patch
@@ -1,19 +0,0 @@
--- irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2014-06-03 20:56:21.289559503 +0200
-+++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp.orig	2014-06-03 20:57:39.281556749 +0200
-@@ -423,6 +423,7 @@
- 			}
- 			
- 			device->postEventFromUser(event);
-+			status = 1;
- 		}
- 		break;
- 		default:
-@@ -479,7 +480,7 @@
-     KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT
-     KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT
-     KeyMap[3] = KEY_HOME; // AKEYCODE_HOME
-    KeyMap[4] = KEY_BACK; // AKEYCODE_BACK
-+    KeyMap[4] = KEY_CANCEL; // AKEYCODE_BACK
-     KeyMap[5] = KEY_UNKNOWN; // AKEYCODE_CALL
-     KeyMap[6] = KEY_UNKNOWN; // AKEYCODE_ENDCALL
-     KeyMap[7] = KEY_KEY_0; // AKEYCODE_0
--- a/build/android/irrlicht-texturehack.patch
+++ b/build/android/irrlicht-texturehack.patch
@@ -1,240 +0,0 @@
--- irrlicht/source/Irrlicht/COGLESTexture.cpp.orig	2014-06-22 17:01:13.266568869 +0200
-+++ irrlicht/source/Irrlicht/COGLESTexture.cpp	2014-06-22 17:03:59.298572810 +0200
-@@ -366,112 +366,140 @@
- 	void(*convert)(const void*, s32, void*) = 0;
- 	getFormatParameters(ColorFormat, InternalFormat, filtering, PixelFormat, PixelType, convert);
- 
-	// make sure we don't change the internal format of existing images
-	if (!newTexture)
-		InternalFormat = oldInternalFormat;
-
-    Driver->setActiveTexture(0, this);
-
-	if (Driver->testGLError())
-		os::Printer::log("Could not bind Texture", ELL_ERROR);
-
-	// mipmap handling for main texture
-	if (!level && newTexture)
-	{
-		// auto generate if possible and no mipmap data is given
-		if (!IsCompressed && HasMipMaps && !mipmapData && Driver->queryFeature(EVDF_MIP_MAP_AUTO_UPDATE))
-		{
-			if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_SPEED))
-				glHint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);
-			else if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_QUALITY))
-				glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
-			else
-				glHint(GL_GENERATE_MIPMAP_HINT, GL_DONT_CARE);
-+	bool retry = false;
-+	
-+	do { 
-+		if (retry) {
-+			InternalFormat = GL_RGBA;
-+			PixelFormat = GL_RGBA;
-+			convert = CColorConverter::convert_A8R8G8B8toA8B8G8R8;
-+ 		}
-+		// make sure we don't change the internal format of existing images
-+		if (!newTexture)
-+			InternalFormat = oldInternalFormat;
- 
-            glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-			AutomaticMipmapUpdate=true;
-		}
-+		Driver->setActiveTexture(0, this);
- 
-		// enable bilinear filter without mipmaps
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
-	}
-+		if (Driver->testGLError())
-+			os::Printer::log("Could not bind Texture", ELL_ERROR);
- 
-	// now get image data and upload to GPU
-+		// mipmap handling for main texture
-+		if (!level && newTexture)
-+		{
-+			// auto generate if possible and no mipmap data is given
-+			if (!IsCompressed && HasMipMaps && !mipmapData && Driver->queryFeature(EVDF_MIP_MAP_AUTO_UPDATE))
-+			{
-+				if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_SPEED))
-+					glHint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);
-+				else if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_QUALITY))
-+					glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
-+				else
-+					glHint(GL_GENERATE_MIPMAP_HINT, GL_DONT_CARE);
-+
-+				glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-+				AutomaticMipmapUpdate=true;
-+			}
-+
-+			// enable bilinear filter without mipmaps
-+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);
-+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
-+		}
- 
-	u32 compressedImageSize = IImage::getCompressedImageSize(ColorFormat, image->getDimension().Width, image->getDimension().Height);
-+		// now get image data and upload to GPU
- 
-	void* source = image->lock();
-+		u32 compressedImageSize = IImage::getCompressedImageSize(ColorFormat, image->getDimension().Width, image->getDimension().Height);
- 
-	IImage* tmpImage = 0;
-+		void* source = image->lock();
- 
-	if (convert)
-	{
-		tmpImage = new CImage(image->getColorFormat(), image->getDimension());
-		void* dest = tmpImage->lock();
-		convert(source, image->getDimension().getArea(), dest);
-		image->unlock();
-		source = dest;
-	}
-+		IImage* tmpImage = 0;
- 
-	if (newTexture)
-	{
-		if (IsCompressed)
-+		if (convert)
- 		{
-			glCompressedTexImage2D(GL_TEXTURE_2D, 0, InternalFormat, image->getDimension().Width,
-				image->getDimension().Height, 0, compressedImageSize, source);
-+			tmpImage = new CImage(image->getColorFormat(), image->getDimension());
-+			void* dest = tmpImage->lock();
-+			convert(source, image->getDimension().getArea(), dest);
-+			image->unlock();
-+			source = dest;
- 		}
-		else
-			glTexImage2D(GL_TEXTURE_2D, level, InternalFormat, image->getDimension().Width,
-				image->getDimension().Height, 0, PixelFormat, PixelType, source);
-	}
-	else
-	{
-		if (IsCompressed)
-+
-+		if (newTexture)
- 		{
-			glCompressedTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, image->getDimension().Width,
-				image->getDimension().Height, PixelFormat, compressedImageSize, source);
-+			if (IsCompressed)
-+			{
-+				glCompressedTexImage2D(GL_TEXTURE_2D, 0, InternalFormat, image->getDimension().Width,
-+					image->getDimension().Height, 0, compressedImageSize, source);
-+			}
-+			else
-+				glTexImage2D(GL_TEXTURE_2D, level, InternalFormat, image->getDimension().Width,
-+					image->getDimension().Height, 0, PixelFormat, PixelType, source);
- 		}
- 		else
-			glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, image->getDimension().Width,
-				image->getDimension().Height, PixelFormat, PixelType, source);
-	}
-
-	if (convert)
-	{
-		tmpImage->unlock();
-		tmpImage->drop();
-	}
-	else
-		image->unlock();
-
-	if (!level && newTexture)
-	{
-		if (IsCompressed && !mipmapData)
- 		{
-			if (image->hasMipMaps())
-				mipmapData = static_cast<u8*>(image->lock())+compressedImageSize;
-+			if (IsCompressed)
-+			{
-+				glCompressedTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, image->getDimension().Width,
-+					image->getDimension().Height, PixelFormat, compressedImageSize, source);
-+			}
- 			else
-				HasMipMaps = false;
-+				glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, image->getDimension().Width,
-+					image->getDimension().Height, PixelFormat, PixelType, source);
- 		}
- 
-		regenerateMipMapLevels(mipmapData);
-
-		if (HasMipMaps) // might have changed in regenerateMipMapLevels
-+		if (convert)
- 		{
-			// enable bilinear mipmap filter
-			GLint filteringMipMaps = GL_LINEAR_MIPMAP_NEAREST;
-
-			if (filtering != GL_LINEAR)
-				filteringMipMaps = GL_NEAREST_MIPMAP_NEAREST;
-+			tmpImage->unlock();
-+			tmpImage->drop();
-+		}
-+		else
-+			image->unlock();
-+		
-+		if (glGetError() != GL_NO_ERROR) {
-+			static bool warned = false;
-+			if ((!retry) && (ColorFormat == ECF_A8R8G8B8)) {
-+
-+				if (!warned) {
-+					os::Printer::log("Your driver claims to support GL_BGRA but fails on trying to upload a texture, converting to GL_RGBA and trying again", ELL_ERROR);
-+					warned = true;
-+				}
-+			}
-+			else if (retry) {
-+				os::Printer::log("Neither uploading texture as GL_BGRA nor, converted one using GL_RGBA succeeded", ELL_ERROR);
-+			}
-+			retry = !retry;
-+			continue;
-+		} else {
-+			retry = false;
-+		}
- 
-			glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filteringMipMaps);
-			glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
-+		if (!level && newTexture)
-+		{
-+			if (IsCompressed && !mipmapData)
-+			{
-+				if (image->hasMipMaps())
-+					mipmapData = static_cast<u8*>(image->lock())+compressedImageSize;
-+				else
-+					HasMipMaps = false;
-+			}
-+
-+			regenerateMipMapLevels(mipmapData);
-+
-+			if (HasMipMaps) // might have changed in regenerateMipMapLevels
-+			{
-+				// enable bilinear mipmap filter
-+				GLint filteringMipMaps = GL_LINEAR_MIPMAP_NEAREST;
-+
-+				if (filtering != GL_LINEAR)
-+					filteringMipMaps = GL_NEAREST_MIPMAP_NEAREST;
-+
-+				glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filteringMipMaps);
-+				glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
-+			}
- 		}
-	}
- 
-	if (Driver->testGLError())
-		os::Printer::log("Could not glTexImage2D", ELL_ERROR);
-+		if (Driver->testGLError())
-+			os::Printer::log("Could not glTexImage2D", ELL_ERROR);
-+	}
-+	while(retry);
- }
- 
- 
--- irrlicht/source/Irrlicht/COGLESTexture.cpp.orig	2014-06-25 00:28:50.820501856 +0200
-+++ irrlicht/source/Irrlicht/COGLESTexture.cpp	2014-06-25 00:08:37.712544692 +0200
-@@ -422,6 +422,9 @@
- 			source = dest;
- 		}
- 
-+		//clear old error
-+		glGetError();
-+
- 		if (newTexture)
- 		{
- 			if (IsCompressed)
--- a/build/android/irrlicht-touchcount.patch
+++ b/build/android/irrlicht-touchcount.patch
@@ -1,30 +0,0 @@
--- irrlicht.orig/include/IEventReceiver.h	2014-06-03 19:43:50.433713133 +0200
-+++ irrlicht/include/IEventReceiver.h	2014-06-03 19:44:36.993711489 +0200
-@@ -375,6 +375,9 @@
-         // Y position of simple touch.
- 		s32 Y;
- 
-+		// number of current touches
-+		s32 touchedCount;
-+
- 		//! Type of touch event.
- 		ETOUCH_INPUT_EVENT Event;
- 	};
--- irrlicht.orig/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2014-06-03 19:43:50.505713130 +0200
-+++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2014-06-03 19:45:37.265709359 +0200
-@@ -315,6 +315,7 @@
- 						event.TouchInput.ID = AMotionEvent_getPointerId(androidEvent, i);
- 						event.TouchInput.X = AMotionEvent_getX(androidEvent, i);
- 						event.TouchInput.Y = AMotionEvent_getY(androidEvent, i);
-+						event.TouchInput.touchedCount = AMotionEvent_getPointerCount(androidEvent);
- 
- 						device->postEventFromUser(event);
- 					}
-@@ -326,6 +327,7 @@
- 					event.TouchInput.ID = AMotionEvent_getPointerId(androidEvent, pointerIndex);
- 					event.TouchInput.X = AMotionEvent_getX(androidEvent, pointerIndex);
- 					event.TouchInput.Y = AMotionEvent_getY(androidEvent, pointerIndex);
-+					event.TouchInput.touchedCount = AMotionEvent_getPointerCount(androidEvent);
- 
- 					device->postEventFromUser(event);
- 				}
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -1,319 +0,0 @@
-LOCAL_PATH := $(call my-dir)/..
-
-#LOCAL_ADDRESS_SANITIZER:=true
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Irrlicht
-LOCAL_SRC_FILES := deps/irrlicht/lib/Android/libIrrlicht.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-ifeq ($(HAVE_LEVELDB), 1)
-	include $(CLEAR_VARS)
-	LOCAL_MODULE := LevelDB
-	LOCAL_SRC_FILES := deps/leveldb/libleveldb.a
-	include $(PREBUILT_STATIC_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := curl
-LOCAL_SRC_FILES := deps/curl-7.35.0/lib/.libs/libcurl.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := freetype
-LOCAL_SRC_FILES := deps/freetype2-android/Android/obj/local/$(TARGET_ARCH_ABI)/libfreetype2-static.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := openal
-LOCAL_SRC_FILES := deps/openal-soft/libs/$(TARGET_LIBDIR)/libopenal.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ogg
-LOCAL_SRC_FILES := deps/libvorbis-libogg-android/libs/$(TARGET_LIBDIR)/libogg.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vorbis
-LOCAL_SRC_FILES := deps/libvorbis-libogg-android/libs/$(TARGET_LIBDIR)/libvorbis.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ssl
-LOCAL_SRC_FILES := deps/openssl-android/libs/$(TARGET_LIBDIR)/libssl.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := crypto
-LOCAL_SRC_FILES := deps/openssl-android/libs/$(TARGET_LIBDIR)/libcrypto.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := minetest
-
-LOCAL_CPP_FEATURES += exceptions
-
-ifdef GPROF
-GPROF_DEF=-DGPROF
-endif
-
-LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_      \
-				-DHAVE_TOUCHSCREENGUI         \
-				-DUSE_CURL=1                  \
-				-DUSE_SOUND=1                 \
-				-DUSE_FREETYPE=1              \
-				-DUSE_LEVELDB=$(HAVE_LEVELDB) \
-				$(GPROF_DEF)                  \
-				-pipe -fstrict-aliasing
-
-ifndef NDEBUG
-LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer
-else
-LOCAL_CFLAGS += -fexpensive-optimizations -O3
-endif
-
-ifdef GPROF
-PROFILER_LIBS := android-ndk-profiler
-LOCAL_CFLAGS += -pg
-endif
-
-# LOCAL_CFLAGS += -fsanitize=address
-# LOCAL_LDFLAGS += -fsanitize=address
-
-ifeq ($(TARGET_ARCH_ABI),x86)
-LOCAL_CFLAGS += -fno-stack-protector
-endif
-
-LOCAL_C_INCLUDES :=                               \
-		jni/src jni/src/sqlite                    \
-		jni/src/script                            \
-		jni/src/lua/src                           \
-		jni/src/json                              \
-		jni/src/cguittfont                        \
-		deps/irrlicht/include                     \
-		deps/freetype2-android/include            \
-		deps/curl-7.35.0/include                  \
-		deps/openal-soft/jni/OpenAL/include       \
-		deps/libvorbis-libogg-android/jni/include \
-		deps/leveldb/include                      \
-
-LOCAL_SRC_FILES :=                                \
-		jni/src/ban.cpp                           \
-		jni/src/base64.cpp                        \
-		jni/src/camera.cpp                        \
-		jni/src/cavegen.cpp                       \
-		jni/src/chat.cpp                          \
-		jni/src/client.cpp                        \
-		jni/src/clientiface.cpp                   \
-		jni/src/clientmap.cpp                     \
-		jni/src/clientmedia.cpp                   \
-		jni/src/clientobject.cpp                  \
-		jni/src/clouds.cpp                        \
-		jni/src/collision.cpp                     \
-		jni/src/connection.cpp                    \
-		jni/src/content_abm.cpp                   \
-		jni/src/content_cao.cpp                   \
-		jni/src/content_cso.cpp                   \
-		jni/src/content_mapblock.cpp              \
-		jni/src/content_mapnode.cpp               \
-		jni/src/content_nodemeta.cpp              \
-		jni/src/content_sao.cpp                   \
-		jni/src/convert_json.cpp                  \
-		jni/src/craftdef.cpp                      \
-		jni/src/database-dummy.cpp                \
-		jni/src/database-sqlite3.cpp              \
-		jni/src/database.cpp                      \
-		jni/src/debug.cpp                         \
-		jni/src/defaultsettings.cpp               \
-		jni/src/drawscene.cpp                     \
-		jni/src/dungeongen.cpp                    \
-		jni/src/emerge.cpp                        \
-		jni/src/environment.cpp                   \
-		jni/src/filecache.cpp                     \
-		jni/src/filesys.cpp                       \
-		jni/src/fontengine.cpp                    \
-		jni/src/game.cpp                          \
-		jni/src/genericobject.cpp                 \
-		jni/src/gettext.cpp                       \
-		jni/src/guiChatConsole.cpp                \
-		jni/src/guiEngine.cpp                     \
-		jni/src/guiFileSelectMenu.cpp             \
-		jni/src/guiFormSpecMenu.cpp               \
-		jni/src/guiKeyChangeMenu.cpp              \
-		jni/src/guiPasswordChange.cpp             \
-		jni/src/guiTable.cpp                      \
-		jni/src/guiVolumeChange.cpp               \
-		jni/src/httpfetch.cpp                     \
-		jni/src/hud.cpp                           \
-		jni/src/inventory.cpp                     \
-		jni/src/inventorymanager.cpp              \
-		jni/src/itemdef.cpp                       \
-		jni/src/keycode.cpp                       \
-		jni/src/light.cpp                         \
-		jni/src/localplayer.cpp                   \
-		jni/src/log.cpp                           \
-		jni/src/main.cpp                          \
-		jni/src/map.cpp                           \
-		jni/src/mapblock.cpp                      \
-		jni/src/mapblock_mesh.cpp                 \
-		jni/src/mapgen.cpp                        \
-		jni/src/mapgen_singlenode.cpp             \
-		jni/src/mapgen_v5.cpp                     \
-		jni/src/mapgen_v6.cpp                     \
-		jni/src/mapgen_v7.cpp                     \
-		jni/src/mapnode.cpp                       \
-		jni/src/mapsector.cpp                     \
-		jni/src/mesh.cpp                          \
-		jni/src/mg_biome.cpp                      \
-		jni/src/mg_decoration.cpp                 \
-		jni/src/mg_ore.cpp                        \
-		jni/src/mg_schematic.cpp                  \
-		jni/src/mods.cpp                          \
-		jni/src/nameidmapping.cpp                 \
-		jni/src/nodedef.cpp                       \
-		jni/src/nodemetadata.cpp                  \
-		jni/src/nodetimer.cpp                     \
-		jni/src/noise.cpp                         \
-		jni/src/object_properties.cpp             \
-		jni/src/particles.cpp                     \
-		jni/src/pathfinder.cpp                    \
-		jni/src/player.cpp                        \
-		jni/src/porting_android.cpp               \
-		jni/src/porting.cpp                       \
-		jni/src/quicktune.cpp                     \
-		jni/src/rollback.cpp                      \
-		jni/src/rollback_interface.cpp            \
-		jni/src/serialization.cpp                 \
-		jni/src/server.cpp                        \
-		jni/src/serverlist.cpp                    \
-		jni/src/serverobject.cpp                  \
-		jni/src/sha1.cpp                          \
-		jni/src/shader.cpp                        \
-		jni/src/sky.cpp                           \
-		jni/src/socket.cpp                        \
-		jni/src/sound.cpp                         \
-		jni/src/sound_openal.cpp                  \
-		jni/src/staticobject.cpp                  \
-		jni/src/subgame.cpp                       \
-		jni/src/test.cpp                          \
-		jni/src/tile.cpp                          \
-		jni/src/tool.cpp                          \
-		jni/src/treegen.cpp                       \
-		jni/src/version.cpp                       \
-		jni/src/voxel.cpp                         \
-		jni/src/voxelalgorithms.cpp               \
-		jni/src/util/directiontables.cpp          \
-		jni/src/util/numeric.cpp                  \
-		jni/src/util/pointedthing.cpp             \
-		jni/src/util/serialize.cpp                \
-		jni/src/util/string.cpp                   \
-		jni/src/util/timetaker.cpp                \
-		jni/src/touchscreengui.cpp                \
-		jni/src/database-leveldb.cpp              \
-		jni/src/settings.cpp                      \
-		jni/src/wieldmesh.cpp
-
-# lua api
-LOCAL_SRC_FILES +=                                \
-		jni/src/script/common/c_content.cpp       \
-		jni/src/script/common/c_converter.cpp     \
-		jni/src/script/common/c_internal.cpp      \
-		jni/src/script/common/c_types.cpp         \
-		jni/src/script/cpp_api/s_base.cpp         \
-		jni/src/script/cpp_api/s_entity.cpp       \
-		jni/src/script/cpp_api/s_env.cpp          \
-		jni/src/script/cpp_api/s_inventory.cpp    \
-		jni/src/script/cpp_api/s_item.cpp         \
-		jni/src/script/cpp_api/s_mainmenu.cpp     \
-		jni/src/script/cpp_api/s_node.cpp         \
-		jni/src/script/cpp_api/s_nodemeta.cpp     \
-		jni/src/script/cpp_api/s_player.cpp       \
-		jni/src/script/cpp_api/s_server.cpp       \
-		jni/src/script/cpp_api/s_async.cpp        \
-		jni/src/script/lua_api/l_base.cpp         \
-		jni/src/script/lua_api/l_craft.cpp        \
-		jni/src/script/lua_api/l_env.cpp          \
-		jni/src/script/lua_api/l_inventory.cpp    \
-		jni/src/script/lua_api/l_item.cpp         \
-		jni/src/script/lua_api/l_mainmenu.cpp     \
-		jni/src/script/lua_api/l_mapgen.cpp       \
-		jni/src/script/lua_api/l_nodemeta.cpp     \
-		jni/src/script/lua_api/l_nodetimer.cpp    \
-		jni/src/script/lua_api/l_noise.cpp        \
-		jni/src/script/lua_api/l_object.cpp       \
-		jni/src/script/lua_api/l_particles.cpp    \
-		jni/src/script/lua_api/l_rollback.cpp     \
-		jni/src/script/lua_api/l_server.cpp       \
-		jni/src/script/lua_api/l_settings.cpp     \
-		jni/src/script/lua_api/l_util.cpp         \
-		jni/src/script/lua_api/l_vmanip.cpp       \
-		jni/src/script/scripting_game.cpp         \
-		jni/src/script/scripting_mainmenu.cpp
-		
-#freetype2 support
-LOCAL_SRC_FILES +=                                \
-		jni/src/cguittfont/xCGUITTFont.cpp
-
-# lua
-LOCAL_SRC_FILES +=                                \
-		jni/src/lua/src/lapi.c                    \
-		jni/src/lua/src/lauxlib.c                 \
-		jni/src/lua/src/lbaselib.c                \
-		jni/src/lua/src/lcode.c                   \
-		jni/src/lua/src/ldblib.c                  \
-		jni/src/lua/src/ldebug.c                  \
-		jni/src/lua/src/ldo.c                     \
-		jni/src/lua/src/ldump.c                   \
-		jni/src/lua/src/lfunc.c                   \
-		jni/src/lua/src/lgc.c                     \
-		jni/src/lua/src/linit.c                   \
-		jni/src/lua/src/liolib.c                  \
-		jni/src/lua/src/llex.c                    \
-		jni/src/lua/src/lmathlib.c                \
-		jni/src/lua/src/lmem.c                    \
-		jni/src/lua/src/loadlib.c                 \
-		jni/src/lua/src/lobject.c                 \
-		jni/src/lua/src/lopcodes.c                \
-		jni/src/lua/src/loslib.c                  \
-		jni/src/lua/src/lparser.c                 \
-		jni/src/lua/src/lstate.c                  \
-		jni/src/lua/src/lstring.c                 \
-		jni/src/lua/src/lstrlib.c                 \
-		jni/src/lua/src/ltable.c                  \
-		jni/src/lua/src/ltablib.c                 \
-		jni/src/lua/src/ltm.c                     \
-		jni/src/lua/src/lundump.c                 \
-		jni/src/lua/src/lvm.c                     \
-		jni/src/lua/src/lzio.c                    \
-		jni/src/lua/src/print.c
-
-# sqlite
-LOCAL_SRC_FILES += jni/src/sqlite/sqlite3.c
-
-# jthread
-LOCAL_SRC_FILES +=                                \
-		jni/src/jthread/pthread/jevent.cpp        \
-		jni/src/jthread/pthread/jmutex.cpp        \
-		jni/src/jthread/pthread/jsemaphore.cpp    \
-		jni/src/jthread/pthread/jthread.cpp
-
-# json
-LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
-
-LOCAL_SHARED_LIBRARIES := openal ogg vorbis ssl crypto
-LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl android_native_app_glue $(PROFILER_LIBS)
-
-ifeq ($(HAVE_LEVELDB), 1)
-	LOCAL_STATIC_LIBRARIES += LevelDB
-endif
-LOCAL_LDLIBS := -lEGL -llog -lGLESv1_CM -lGLESv2 -lz -landroid
-
-include $(BUILD_SHARED_LIBRARY)
-
-# at the end of Android.mk
-ifdef GPROF
-$(call import-module,android-ndk-profiler)
-endif
-$(call import-module,android/native_app_glue)
--- a/build/android/jni/Application.mk
+++ b/build/android/jni/Application.mk
@@ -1,8 +0,0 @@
-# NDK_TOOLCHAIN_VERSION := clang3.3
-
-APP_PLATFORM := android-9
-APP_MODULES := minetest
-APP_STL := gnustl_static
-
-APP_CPPFLAGS += -fexceptions
-APP_GNUSTL_FORCE_CPP_FEATURES := rtti
--- a/build/android/libvorbis-libogg-fpu.patch
+++ b/build/android/libvorbis-libogg-fpu.patch
@@ -1,37 +0,0 @@
--- libvorbis-libogg-android/jni/libvorbis-jni/Android.mk.orig	2014-06-17 19:22:50.621559073 +0200
-+++ libvorbis-libogg-android/jni/libvorbis-jni/Android.mk	2014-06-17 19:38:20.641581140 +0200
-@@ -4,9 +4,6 @@
- 
- LOCAL_MODULE := vorbis-jni
- LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -fsigned-char
-ifeq ($(TARGET_ARCH),arm)
-	LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
-endif
- 
- LOCAL_SHARED_LIBRARIES := libogg libvorbis
- 
--- libvorbis-libogg-android/jni/libvorbis/Android.mk.orig	2014-06-17 19:22:39.077558797 +0200
-+++ libvorbis-libogg-android/jni/libvorbis/Android.mk	2014-06-17 19:38:52.121581887 +0200
-@@ -4,9 +4,6 @@
- 
- LOCAL_MODULE := libvorbis
- LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -ffast-math -fsigned-char
-ifeq ($(TARGET_ARCH),arm)
-	LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
-endif
- LOCAL_SHARED_LIBRARIES := libogg
- 
- LOCAL_SRC_FILES := \
--- libvorbis-libogg-android/jni/libogg/Android.mk.orig	2014-06-17 19:22:33.965558675 +0200
-+++ libvorbis-libogg-android/jni/libogg/Android.mk	2014-06-17 19:38:25.337581252 +0200
-@@ -4,10 +4,6 @@
- 
- LOCAL_MODULE := libogg
- LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -ffast-math -fsigned-char
-ifeq ($(TARGET_ARCH),arm)
-	LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
-endif
-
- 
- LOCAL_SRC_FILES := \
- 	bitwise.c \
--- a/build/android/project.properties
+++ b/build/android/project.properties
@@ -1 +0,0 @@
-target=android-10
--- a/build/android/res/drawable-hdpi/irr_icon.png
+++ b/build/android/res/drawable-hdpi/irr_icon.png
--- a/build/android/res/drawable-ldpi/irr_icon.png
+++ b/build/android/res/drawable-ldpi/irr_icon.png
--- a/build/android/res/drawable-mdpi/irr_icon.png
+++ b/build/android/res/drawable-mdpi/irr_icon.png
--- a/build/android/res/drawable-xhdpi/irr_icon.png
+++ b/build/android/res/drawable-xhdpi/irr_icon.png
--- a/build/android/res/layout/assetcopy.xml
+++ b/build/android/res/layout/assetcopy.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <ProgressBar
-        android:id="@+id/progressBar1"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical" />
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:text="preparing media ..."
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-</LinearLayout>
--- a/build/android/res/values/styles.xml
+++ b/build/android/res/values/styles.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="Theme.Transparent" parent="android:Theme">
-		<item name="android:windowIsTranslucent">true</item>
-		<item name="android:windowBackground">@android:color/transparent</item>
-		<item name="android:windowContentOverlay">@null</item>
-		<item name="android:windowNoTitle">true</item>
-		<item name="android:windowIsFloating">true</item>
-		<item name="android:backgroundDimEnabled">false</item>
-	</style>
-</resources>
--- a/build/android/src/org/minetest/minetest/MinetestAssetCopy.java
+++ b/build/android/src/org/minetest/minetest/MinetestAssetCopy.java
@@ -1,288 +0,0 @@
-package org.minetest.minetest;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import android.app.Activity;
-import android.content.res.AssetFileDescriptor;
-
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.view.Display;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-public class MinetestAssetCopy extends Activity {
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		setContentView(R.layout.assetcopy);
-		
-		m_ProgressBar = (ProgressBar) findViewById(R.id.progressBar1);
-		m_Filename = (TextView) findViewById(R.id.textView1);
-		
-		Display display = getWindowManager().getDefaultDisplay();
-		m_ProgressBar.getLayoutParams().width = (int) (display.getWidth() * 0.8);
-		m_ProgressBar.invalidate();
-		
-		m_AssetCopy = new copyAssetTask();
-		m_AssetCopy.execute();
-	}
-	
-	ProgressBar m_ProgressBar;
-	TextView m_Filename;
-	
-	copyAssetTask m_AssetCopy;
-	
-	private class copyAssetTask extends AsyncTask<String, Integer, String>{
-		
-		private void copyElement(String name, String path) {
-			String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath();
-			String full_path;
-			if (path != "") {
-				full_path = path + "/" + name;
-			}
-			else {
-				full_path = name;
-			}
-			//is a folder read asset list
-			if (m_foldernames.contains(full_path)) {
-				m_Foldername = full_path;
-				publishProgress(0);
-				File current_folder = new File(baseDir + "/" + full_path);
-				if (!current_folder.exists()) {
-					if (!current_folder.mkdirs()) {
-						Log.w("MinetestAssetCopy","\t failed create folder: " + baseDir + "/" + full_path);
-					}
-					else {
-						Log.w("MinetestAssetCopy","\t created folder: " + baseDir + "/" + full_path);
-					}
-				}
-				try {
-					String[] current_assets = getAssets().list(full_path);
-					for(int i=0; i < current_assets.length; i++) {
-						copyElement(current_assets[i],full_path);
-					}
-				} catch (IOException e) {
-					Log.w("MinetestAssetCopy","\t failed to read contents of folder");
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-			//is a file just copy
-			else {
-				boolean refresh = true;
-				
-				File testme = new File(baseDir + "/" + full_path);
-				
-				long asset_filesize = -1;
-				long stored_filesize = -1;
-				
-				if (testme.exists()) {
-					try {
-						AssetFileDescriptor fd = getAssets().openFd(full_path);
-						asset_filesize = fd.getLength();
-						fd.close();
-					} catch (IOException e) {
-						refresh = true;
-						m_asset_size_unknown.add(full_path);
-					}
-					
-					stored_filesize = testme.length();
-					
-					if (asset_filesize == stored_filesize) {
-						refresh = false;
-					}
-					
-				}
-				
-				if (refresh) {
-					m_tocopy.add(full_path);
-				}
-			}
-		}
-		
-		private long getFullSize(String filename) {
-			long size = 0;
-			try {
-			InputStream src = getAssets().open(filename);
-			byte[] buf = new byte[1024];
-			
-			int len = 0;
-			while ((len = src.read(buf)) > 0) {
-				size += len;
-			}
-			}
-			catch (IOException e) {
-				e.printStackTrace();
-			}
-			return size;
-		}
-
-		@Override
-		protected String doInBackground(String... files) {
-			
-			m_foldernames  = new Vector<String>();
-			m_tocopy       = new Vector<String>();
-			m_asset_size_unknown = new Vector<String>();
-			String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
-			
-			File TempFolder = new File(baseDir + "Minetest/tmp/");
-			
-			if (!TempFolder.exists()) {
-				TempFolder.mkdir();
-			}
-			else {
-				File[] todel = TempFolder.listFiles();
-				
-				for(int i=0; i < todel.length; i++) {
-					Log.w("MinetestAssetCopy","deleting: " + todel[i].getAbsolutePath());
-					todel[i].delete();
-				}
-			}
-			
-			// add a .nomedia file
-			try {
-				OutputStream dst = new FileOutputStream(baseDir + "Minetest/.nomedia");
-				dst.close();
-			} catch (IOException e) {
-				Log.w("MinetestAssetCopy","Failed to create .nomedia file");
-				e.printStackTrace();
-			}
-			
-			try {
-				InputStream is = getAssets().open("index.txt");
-				BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-		
-				String line = reader.readLine();
-				while(line != null){
-					m_foldernames.add(line);
-					line = reader.readLine();
-				}
-			} catch (IOException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-			
-			copyElement("Minetest","");
-			
-			m_copy_started = true;
-			m_ProgressBar.setMax(m_tocopy.size());
-			
-			for (int i = 0; i < m_tocopy.size(); i++) {
-				try {
-					String filename = m_tocopy.get(i);
-					publishProgress(i);
-					
-					boolean asset_size_unknown = false;
-					long filesize = -1;
-					
-					if (m_asset_size_unknown.contains(filename)) {
-						File testme = new File(baseDir + "/" + filename);
-						
-						if(testme.exists()) {
-							filesize = testme.length();
-						}
-						asset_size_unknown = true;
-					}
-					
-					InputStream src;
-					try {
-						src = getAssets().open(filename);
-					} catch (IOException e) {
-						Log.w("MinetestAssetCopy","Copying file: " + filename + " FAILED (not in assets)");
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-						continue;
-					}
-					
-					// Transfer bytes from in to out
-					byte[] buf = new byte[1*1024];
-					int len = src.read(buf, 0, 1024);
-					
-					/* following handling is crazy but we need to deal with    */
-					/* compressed assets.Flash chips limited livetime sue to   */
-					/* write operations, we can't allow large files to destroy */
-					/* users flash.                                            */
-					if (asset_size_unknown) {
-						if ( (len > 0) && (len < buf.length) && (len == filesize)) {
-							src.close();
-							continue;
-						}
-						
-						if (len == buf.length) {
-							src.close();
-							long size = getFullSize(filename);
-							if ( size == filesize) {
-								continue;
-							}
-							src = getAssets().open(filename);
-							len = src.read(buf, 0, 1024);
-						}
-					}
-					if (len > 0) {
-						int total_filesize = 0;
-						OutputStream dst;
-						try {
-							dst = new FileOutputStream(baseDir + "/" + filename);
-						} catch (IOException e) {
-							Log.w("MinetestAssetCopy","Copying file: " + baseDir + 
-							"/" + filename + " FAILED (couldn't open output file)");
-							e.printStackTrace();
-							src.close();
-							continue;
-						}
-						dst.write(buf, 0, len);
-						total_filesize += len;
-						
-						while ((len = src.read(buf)) > 0) {
-							dst.write(buf, 0, len);
-							total_filesize += len;
-						}
-						
-						dst.close();
-						Log.w("MinetestAssetCopy","Copied file: " + m_tocopy.get(i) + " (" + total_filesize + " bytes)");
-					}
-					else if (len < 0) {
-						Log.w("MinetestAssetCopy","Copying file: " + m_tocopy.get(i) + " failed, size < 0");
-					}
-					src.close();
-				} catch (IOException e) {
-					Log.w("MinetestAssetCopy","Copying file: " + m_tocopy.get(i) + " failed");
-					e.printStackTrace();
-				}
-			}
-			
-			return "";
-		}
-		
-		protected void onProgressUpdate(Integer... progress) {
-			if (m_copy_started) {
-				m_ProgressBar.setProgress(progress[0]);
-				m_Filename.setText(m_tocopy.get(progress[0]));
-			}
-			else {
-				m_Filename.setText("scanning " + m_Foldername + " ...");
-			}
-		}
-		
-		protected void onPostExecute (String result) {
-			finish();
-		}
-		boolean m_copy_started = false;
-		String m_Foldername = "media";
-		Vector<String> m_foldernames;
-		Vector<String> m_tocopy;
-		Vector<String> m_asset_size_unknown;
-	}
-}
--- a/build/android/src/org/minetest/minetest/MinetestTextEntry.java
+++ b/build/android/src/org/minetest/minetest/MinetestTextEntry.java
@@ -1,91 +0,0 @@
-package org.minetest.minetest;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.InputType;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnKeyListener;
-import android.widget.EditText;
-
-public class MinetestTextEntry extends Activity {
-	public AlertDialog mTextInputDialog;
-	public EditText mTextInputWidget;
-	
-	private final int MultiLineTextInput              = 1;
-	private final int SingleLineTextInput             = 2;
-	private final int SingleLinePasswordInput         = 3;
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		Bundle b = getIntent().getExtras();
-		String acceptButton = b.getString("EnterButton");
-		String hint         = b.getString("hint");
-		String current      = b.getString("current");
-		int    editType     = b.getInt("editType");
-		
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		mTextInputWidget = new EditText(this);
-		mTextInputWidget.setHint(hint);
-		mTextInputWidget.setText(current);
-		mTextInputWidget.setMinWidth(300);
-		if (editType == SingleLinePasswordInput) {
-			mTextInputWidget.setInputType(InputType.TYPE_CLASS_TEXT | 
-					InputType.TYPE_TEXT_VARIATION_PASSWORD);
-		}
-		else {
-			mTextInputWidget.setInputType(InputType.TYPE_CLASS_TEXT);
-		}
-		
-		
-		builder.setView(mTextInputWidget);
-		
-		if (editType == MultiLineTextInput) {
-			builder.setPositiveButton(acceptButton, new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int whichButton) 
-				{ pushResult(mTextInputWidget.getText().toString()); }
-				});
-		}
-		
-		builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-			public void onCancel(DialogInterface dialog) {
-				cancelDialog();
-			}
-		});
-		
-		mTextInputWidget.setOnKeyListener(new OnKeyListener() {
-			@Override
-			public boolean onKey(View view, int KeyCode, KeyEvent event) {
-				if ( KeyCode == KeyEvent.KEYCODE_ENTER){
-
-					pushResult(mTextInputWidget.getText().toString());
-					return true;
-				}
-				return false;
-			}
-		});
-		
-		mTextInputDialog = builder.create();
-		mTextInputDialog.show();
-	}
-	
-	public void pushResult(String text) {
-		Intent resultData = new Intent();
-		resultData.putExtra("text", text);
-		setResult(Activity.RESULT_OK,resultData);
-		mTextInputDialog.dismiss();
-		finish();
-	}
-	
-	public void cancelDialog() {
-		setResult(Activity.RESULT_CANCELED);
-		mTextInputDialog.dismiss();
-		finish();
-	}
-}
--- a/build/android/src/org/minetest/minetest/MtNativeActivity.java
+++ b/build/android/src/org/minetest/minetest/MtNativeActivity.java
@@ -1,93 +0,0 @@
-package org.minetest.minetest;
-
-import android.app.NativeActivity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.WindowManager;
-
-public class MtNativeActivity extends NativeActivity {
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		m_MessagReturnCode = -1;
-		m_MessageReturnValue = "";
-		
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-	}
-	
-	
-	public void copyAssets() {
-		Intent intent = new Intent(this, MinetestAssetCopy.class);
-		startActivity(intent);
-	}
-	
-	public void showDialog(String acceptButton, String hint, String current,
-			int editType) {
-		
-		Intent intent = new Intent(this, MinetestTextEntry.class);
-		Bundle params = new Bundle();
-		params.putString("acceptButton", acceptButton);
-		params.putString("hint", hint);
-		params.putString("current", current);
-		params.putInt("editType", editType);
-		intent.putExtras(params);
-		startActivityForResult(intent, 101);
-		m_MessageReturnValue = "";
-		m_MessagReturnCode   = -1;
-	}
-	
-	public static native void putMessageBoxResult(String text);
-	
-	/* ugly code to workaround putMessageBoxResult not beeing found */
-	public int getDialogState() {
-		return m_MessagReturnCode;
-	}
-	
-	public String getDialogValue() {
-		m_MessagReturnCode = -1;
-		return m_MessageReturnValue;
-	}
-	
-	public float getDensity() {
-		return getResources().getDisplayMetrics().density;
-	}
-	
-	public int getDisplayWidth() {
-		return getResources().getDisplayMetrics().widthPixels;
-	}
-	
-	public int getDisplayHeight() {
-		return getResources().getDisplayMetrics().heightPixels;
-	}
-	
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode,
-			Intent data) {
-		if (requestCode == 101) {
-			if (resultCode == RESULT_OK) {
-				String text = data.getStringExtra("text"); 
-				m_MessagReturnCode = 0;
-				m_MessageReturnValue = text;
-			}
-			else {
-				m_MessagReturnCode = 1;
-			}
-		}
-	}
-	
-	static {
-		System.loadLibrary("openal");
-		System.loadLibrary("ogg");
-		System.loadLibrary("vorbis");
-		System.loadLibrary("ssl");
-		System.loadLibrary("crypto");
-	}
-	
-	private int m_MessagReturnCode;
-	private String m_MessageReturnValue;
-}
--- a/builtin/async/init.lua
+++ b/builtin/async/init.lua
@@ -1,17 +0,0 @@
-
-core.log("info", "Initializing Asynchronous environment")
-
-function core.job_processor(serialized_func, serialized_param)
-	local func = loadstring(serialized_func)
-	local param = core.deserialize(serialized_param)
-	local retval = nil
-
-	if type(func) == "function" then
-		retval = core.serialize(func(param))
-	else
-		core.log("error", "ASYNC WORKER: Unable to deserialize function")
-	end
-
-	return retval or core.serialize(nil)
-end
-
--- a/builtin/common/async_event.lua
+++ b/builtin/common/async_event.lua
@@ -1,40 +0,0 @@
-
-core.async_jobs = {}
-
-local function handle_job(jobid, serialized_retval)
-	local retval = core.deserialize(serialized_retval)
-	assert(type(core.async_jobs[jobid]) == "function")
-	core.async_jobs[jobid](retval)
-	core.async_jobs[jobid] = nil
-end
-
-if core.register_globalstep then
-	core.register_globalstep(function(dtime)
-		for i, job in ipairs(core.get_finished_jobs()) do
-			handle_job(job.jobid, job.retval)
-		end
-	end)
-else
-	core.async_event_handler = handle_job
-end
-
-function core.handle_async(func, parameter, callback)
-	-- Serialize function
-	local serialized_func = string.dump(func)
-
-	assert(serialized_func ~= nil)
-
-	-- Serialize parameters
-	local serialized_param = core.serialize(parameter)
-
-	if serialized_param == nil then
-		return false
-	end
-
-	local jobid = core.do_async_callback(serialized_func, serialized_param)
-
-	core.async_jobs[jobid] = callback
-
-	return true
-end
-
--- a/builtin/common/filterlist.lua
+++ b/builtin/common/filterlist.lua
@@ -1,317 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-- TODO improve doc                                                           --
-- TODO code cleanup                                                          --
-- Generic implementation of a filter/sortable list                           --
-- Usage:                                                                     --
-- Filterlist needs to be initialized on creation. To achieve this you need to --
-- pass following functions:                                                  --
-- raw_fct() (mandatory):                                                     --
--     function returning a table containing the elements to be filtered      --
-- compare_fct(element1,element2) (mandatory):                                --
--     function returning true/false if element1 is same element as element2  --
-- uid_match_fct(element1,uid) (optional)                                     --
--     function telling if uid is attached to element1                        --
-- filter_fct(element,filtercriteria) (optional)                              --
--     function returning true/false if filtercriteria met to element         --
-- fetch_param (optional)                                                     --
--     parameter passed to raw_fct to aquire correct raw data                 --
--                                                                            --
--------------------------------------------------------------------------------
-filterlist = {}
-
--------------------------------------------------------------------------------
-function filterlist.refresh(self)
-	self.m_raw_list = self.m_raw_list_fct(self.m_fetch_param)
-	filterlist.process(self)
-end
-
--------------------------------------------------------------------------------
-function filterlist.create(raw_fct,compare_fct,uid_match_fct,filter_fct,fetch_param)
-
-	assert((raw_fct ~= nil) and (type(raw_fct) == "function"))
-	assert((compare_fct ~= nil) and (type(compare_fct) == "function"))
-	
-	local self = {}
-	
-	self.m_raw_list_fct  = raw_fct
-	self.m_compare_fct   = compare_fct
-	self.m_filter_fct    = filter_fct
-	self.m_uid_match_fct = uid_match_fct
-	
-	self.m_filtercriteria = nil
-	self.m_fetch_param = fetch_param
-	
-	self.m_sortmode = "none"
-	self.m_sort_list = {}
-
-	self.m_processed_list = nil
-	self.m_raw_list = self.m_raw_list_fct(self.m_fetch_param)
-
-	self.add_sort_mechanism = filterlist.add_sort_mechanism
-	self.set_filtercriteria = filterlist.set_filtercriteria
-	self.get_filtercriteria = filterlist.get_filtercriteria
-	self.set_sortmode       = filterlist.set_sortmode
-	self.get_list           = filterlist.get_list
-	self.get_raw_list       = filterlist.get_raw_list
-	self.get_raw_element    = filterlist.get_raw_element
-	self.get_raw_index      = filterlist.get_raw_index
-	self.get_current_index  = filterlist.get_current_index
-	self.size               = filterlist.size
-	self.uid_exists_raw     = filterlist.uid_exists_raw
-	self.raw_index_by_uid   = filterlist.raw_index_by_uid
-	self.refresh            = filterlist.refresh
-
-	filterlist.process(self)
-	
-	return self
-end
-
--------------------------------------------------------------------------------
-function filterlist.add_sort_mechanism(self,name,fct)
-	self.m_sort_list[name] = fct
-end
-
--------------------------------------------------------------------------------
-function filterlist.set_filtercriteria(self,criteria)
-	if criteria == self.m_filtercriteria and
-		type(criteria) ~= "table" then
-		return
-	end
-	self.m_filtercriteria = criteria
-	filterlist.process(self)
-end
-
--------------------------------------------------------------------------------
-function filterlist.get_filtercriteria(self)
-	return self.m_filtercriteria
-end
-
--------------------------------------------------------------------------------
--supported sort mode "alphabetic|none"
-function filterlist.set_sortmode(self,mode)
-	if (mode == self.m_sortmode) then
-		return
-	end
-	self.m_sortmode = mode
-	filterlist.process(self)
-end
-
--------------------------------------------------------------------------------
-function filterlist.get_list(self)
-	return self.m_processed_list
-end
-
--------------------------------------------------------------------------------
-function filterlist.get_raw_list(self)
-	return self.m_raw_list
-end
-
--------------------------------------------------------------------------------
-function filterlist.get_raw_element(self,idx)
-	if type(idx) ~= "number" then
-		idx = tonumber(idx)
-	end
-	
-	if idx ~= nil and idx > 0 and idx <= #self.m_raw_list then
-		return self.m_raw_list[idx]
-	end
-	
-	return nil
-end
-
--------------------------------------------------------------------------------
-function filterlist.get_raw_index(self,listindex)
-	assert(self.m_processed_list ~= nil)
-	
-	if listindex ~= nil and listindex > 0 and
-		listindex <= #self.m_processed_list then
-		local entry = self.m_processed_list[listindex]
-		
-		for i,v in ipairs(self.m_raw_list) do
-		
-			if self.m_compare_fct(v,entry) then
-				return i
-			end
-		end
-	end
-	
-	return 0
-end
-
--------------------------------------------------------------------------------
-function filterlist.get_current_index(self,listindex)
-	assert(self.m_processed_list ~= nil)
-	
-	if listindex ~= nil and listindex > 0 and
-		listindex <= #self.m_raw_list then
-		local entry = self.m_raw_list[listindex]
-		
-		for i,v in ipairs(self.m_processed_list) do
-		
-			if self.m_compare_fct(v,entry) then
-				return i
-			end
-		end
-	end
-	
-	return 0
-end
-
--------------------------------------------------------------------------------
-function filterlist.process(self)
-	assert(self.m_raw_list ~= nil)
-
-	if self.m_sortmode == "none" and
-		self.m_filtercriteria == nil then
-		self.m_processed_list = self.m_raw_list
-		return
-	end
-	
-	self.m_processed_list = {}
-	
-	for k,v in pairs(self.m_raw_list) do
-		if self.m_filtercriteria == nil or
-			self.m_filter_fct(v,self.m_filtercriteria) then
-			table.insert(self.m_processed_list,v)
-		end
-	end
-	
-	if self.m_sortmode == "none" then
-		return
-	end
-	
-	if self.m_sort_list[self.m_sortmode] ~= nil and
-		type(self.m_sort_list[self.m_sortmode]) == "function" then
-		
-		self.m_sort_list[self.m_sortmode](self)
-	end
-end
-
--------------------------------------------------------------------------------
-function filterlist.size(self)
-	if self.m_processed_list == nil then
-		return 0
-	end
-	
-	return #self.m_processed_list
-end
-
--------------------------------------------------------------------------------
-function filterlist.uid_exists_raw(self,uid)
-	for i,v in ipairs(self.m_raw_list) do
-		if self.m_uid_match_fct(v,uid) then
-			return true
-		end
-	end
-	return false
-end
-
--------------------------------------------------------------------------------
-function filterlist.raw_index_by_uid(self, uid)
-	local elementcount = 0
-	local elementidx = 0
-	for i,v in ipairs(self.m_raw_list) do
-		if self.m_uid_match_fct(v,uid) then
-			elementcount = elementcount +1
-			elementidx = i
-		end
-	end
-	
-	
-	-- If there are more elements than one with same name uid can't decide which
-	-- one is meant. self shouldn't be possible but just for sure.
-	if elementcount > 1 then
-		elementidx=0
-	end
-
-	return elementidx
-end
-
--------------------------------------------------------------------------------
-- COMMON helper functions                                                    --
--------------------------------------------------------------------------------
-
--------------------------------------------------------------------------------
-function compare_worlds(world1,world2)
-
-	if world1.path ~= world2.path then
-		return false
-	end
-	
-	if world1.name ~= world2.name then
-		return false
-	end
-	
-	if world1.gameid ~= world2.gameid then
-		return false
-	end
-
-	return true
-end
-
--------------------------------------------------------------------------------
-function sort_worlds_alphabetic(self)
-
-	table.sort(self.m_processed_list, function(a, b)
-		--fixes issue #857 (crash due to sorting nil in worldlist)
-		if a == nil or b == nil then
-			if a == nil and b ~= nil then return false end
-			if b == nil and a ~= nil then return true end
-			return false
-		end
-		if a.name:lower() == b.name:lower() then
-			return a.name < b.name
-		end
-		return a.name:lower() < b.name:lower()
-	end)
-end
-
--------------------------------------------------------------------------------
-function sort_mod_list(self)
-
-	table.sort(self.m_processed_list, function(a, b)
-		-- Show game mods at bottom
-		if a.typ ~= b.typ then
-			return b.typ == "game_mod"
-		end
-		-- If in same or no modpack, sort by name
-		if a.modpack == b.modpack then
-			if a.name:lower() == b.name:lower() then
-				return a.name < b.name
-			end
-			return a.name:lower() < b.name:lower()
-		-- Else compare name to modpack name
-		else
-			-- Always show modpack pseudo-mod on top of modpack mod list
-			if a.name == b.modpack then
-				return true
-			elseif b.name == a.modpack then
-				return false
-			end
-			
-			local name_a = a.modpack or a.name
-			local name_b = b.modpack or b.name
-			if name_a:lower() == name_b:lower() then
-				return  name_a < name_b
-			end
-			return name_a:lower() < name_b:lower()
-		end
-	end)
-end
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -1,556 +0,0 @@
-- Minetest: builtin/misc_helpers.lua
-
--------------------------------------------------------------------------------
-function basic_dump(o)
-	local tp = type(o)
-	if tp == "number" then
-		return tostring(o)
-	elseif tp == "string" then
-		return string.format("%q", o)
-	elseif tp == "boolean" then
-		return tostring(o)
-	elseif tp == "nil" then
-		return "nil"
-	-- Uncomment for full function dumping support.
-	-- Not currently enabled because bytecode isn't very human-readable and
-	-- dump's output is intended for humans.
-	--elseif tp == "function" then
-	--	return string.format("loadstring(%q)", string.dump(o))
-	else
-		return string.format("<%s>", tp)
-	end
-end
-
-local keywords = {
-	["and"] = true,
-	["break"] = true,
-	["do"] = true,
-	["else"] = true,
-	["elseif"] = true,
-	["end"] = true,
-	["false"] = true,
-	["for"] = true,
-	["function"] = true,
-	["goto"] = true,  -- Lua 5.2
-	["if"] = true,
-	["in"] = true,
-	["local"] = true,
-	["nil"] = true,
-	["not"] = true,
-	["or"] = true,
-	["repeat"] = true,
-	["return"] = true,
-	["then"] = true,
-	["true"] = true,
-	["until"] = true,
-	["while"] = true,
-}
-local function is_valid_identifier(str)
-	if not str:find("^[a-zA-Z_][a-zA-Z0-9_]*$") or keywords[str] then
-		return false
-	end
-	return true
-end
-
--------------------------------------------------------------------------------
-- Dumps values in a line-per-value format.
-- For example, {test = {"Testing..."}} becomes:
--   _["test"] = {}
--   _["test"][1] = "Testing..."
-- This handles tables as keys and circular references properly.
-- It also handles multiple references well, writing the table only once.
-- The dumped argument is internal-only.
-
-function dump2(o, name, dumped)
-	name = name or "_"
-	-- "dumped" is used to keep track of serialized tables to handle
-	-- multiple references and circular tables properly.
-	-- It only contains tables as keys.  The value is the name that
-	-- the table has in the dump, eg:
-	-- {x = {"y"}} -> dumped[{"y"}] = '_["x"]'
-	dumped = dumped or {}
-	if type(o) ~= "table" then
-		return string.format("%s = %s\n", name, basic_dump(o))
-	end
-	if dumped[o] then
-		return string.format("%s = %s\n", name, dumped[o])
-	end
-	dumped[o] = name
-	-- This contains a list of strings to be concatenated later (because
-	-- Lua is slow at individual concatenation).
-	local t = {}
-	for k, v in pairs(o) do
-		local keyStr
-		if type(k) == "table" then
-			if dumped[k] then
-				keyStr = dumped[k]
-			else
-				-- Key tables don't have a name, so use one of
-				-- the form _G["table: 0xFFFFFFF"]
-				keyStr = string.format("_G[%q]", tostring(k))
-				-- Dump key table
-				table.insert(t, dump2(k, keyStr, dumped))
-			end
-		else
-			keyStr = basic_dump(k)
-		end
-		local vname = string.format("%s[%s]", name, keyStr)
-		table.insert(t, dump2(v, vname, dumped))
-	end
-	return string.format("%s = {}\n%s", name, table.concat(t))
-end
-
--------------------------------------------------------------------------------
-- This dumps values in a one-statement format.
-- For example, {test = {"Testing..."}} becomes:
-- [[{
-- 	test = {
-- 		"Testing..."
-- 	}
-- }]]
-- This supports tables as keys, but not circular references.
-- It performs poorly with multiple references as it writes out the full
-- table each time.
-- The indent field specifies a indentation string, it defaults to a tab.
-- Use the empty string to disable indentation.
-- The dumped and level arguments are internal-only.
-
-function dump(o, indent, nested, level)
-	if type(o) ~= "table" then
-		return basic_dump(o)
-	end
-	-- Contains table -> true/nil of currently nested tables
-	nested = nested or {}
-	if nested[o] then
-		return "<circular reference>"
-	end
-	nested[o] = true
-	indent = indent or "\t"
-	level = level or 1
-	local t = {}
-	local dumped_indexes = {}
-	for i, v in ipairs(o) do
-		table.insert(t, dump(v, indent, nested, level + 1))
-		dumped_indexes[i] = true
-	end
-	for k, v in pairs(o) do
-		if not dumped_indexes[k] then
-			if type(k) ~= "string" or not is_valid_identifier(k) then
-				k = "["..dump(k, indent, nested, level + 1).."]"
-			end
-			v = dump(v, indent, nested, level + 1)
-			table.insert(t, k.." = "..v)
-		end
-	end
-	nested[o] = nil
-	if indent ~= "" then
-		local indent_str = "\n"..string.rep(indent, level)
-		local end_indent_str = "\n"..string.rep(indent, level - 1)
-		return string.format("{%s%s%s}",
-				indent_str,
-				table.concat(t, ","..indent_str),
-				end_indent_str)
-	end
-	return "{"..table.concat(t, ", ").."}"
-end
-
--------------------------------------------------------------------------------
-function string.split(str, delim, include_empty, max_splits)
-	delim = delim or ","
-	max_splits = max_splits or 0
-	local fields = {}
-	local num_splits = 0
-	local last_pos = 0
-	for part, pos in str:gmatch("(.-)[" .. delim .. "]()") do
-		last_pos = pos
-		if include_empty or part ~= "" then
-			num_splits = num_splits + 1
-			fields[num_splits] = part
-			if max_splits > 0 and num_splits + 1 >= max_splits then
-				break
-			end
-		end
-	end
-	-- Handle the last field
-	if max_splits <= 0 or num_splits <= max_splits then
-		local last_part = str:sub(last_pos)
-		if include_empty or last_part ~= "" then
-			fields[num_splits + 1] = last_part
-		end
-	end
-	return fields
-end
-
-
--------------------------------------------------------------------------------
-function file_exists(filename)
-	local f = io.open(filename, "r")
-	if f==nil then
-		return false
-	else
-		f:close()
-		return true
-	end
-end
-
--------------------------------------------------------------------------------
-function string:trim()
-	return (self:gsub("^%s*(.-)%s*$", "%1"))
-end
-
-assert(string.trim("\n \t\tfoo bar\t ") == "foo bar")
-
--------------------------------------------------------------------------------
-function math.hypot(x, y)
-	local t
-	x = math.abs(x)
-	y = math.abs(y)
-	t = math.min(x, y)
-	x = math.max(x, y)
-	if x == 0 then return 0 end
-	t = t / x
-	return x * math.sqrt(1 + t * t)
-end
-
--------------------------------------------------------------------------------
-function math.sign(x, tolerance)
-	tolerance = tolerance or 0
-	if x > tolerance then
-		return 1
-	elseif x < -tolerance then
-		return -1
-	end
-	return 0
-end
-
--------------------------------------------------------------------------------
-function get_last_folder(text,count)
-	local parts = text:split(DIR_DELIM)
-
-	if count == nil then
-		return parts[#parts]
-	end
-
-	local retval = ""
-	for i=1,count,1 do
-		retval = retval .. parts[#parts - (count-i)] .. DIR_DELIM
-	end
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-function cleanup_path(temppath)
-
-	local parts = temppath:split("-")
-	temppath = ""
-	for i=1,#parts,1 do
-		if temppath ~= "" then
-			temppath = temppath .. "_"
-		end
-		temppath = temppath .. parts[i]
-	end
-
-	parts = temppath:split(".")
-	temppath = ""
-	for i=1,#parts,1 do
-		if temppath ~= "" then
-			temppath = temppath .. "_"
-		end
-		temppath = temppath .. parts[i]
-	end
-
-	parts = temppath:split("'")
-	temppath = ""
-	for i=1,#parts,1 do
-		if temppath ~= "" then
-			temppath = temppath .. ""
-		end
-		temppath = temppath .. parts[i]
-	end
-
-	parts = temppath:split(" ")
-	temppath = ""
-	for i=1,#parts,1 do
-		if temppath ~= "" then
-			temppath = temppath
-		end
-		temppath = temppath .. parts[i]
-	end
-
-	return temppath
-end
-
-function core.formspec_escape(text)
-	if text ~= nil then
-		text = string.gsub(text,"\\","\\\\")
-		text = string.gsub(text,"%]","\\]")
-		text = string.gsub(text,"%[","\\[")
-		text = string.gsub(text,";","\\;")
-		text = string.gsub(text,",","\\,")
-	end
-	return text
-end
-
-
-function core.splittext(text,charlimit)
-	local retval = {}
-
-	local current_idx = 1
-
-	local start,stop = string.find(text," ",current_idx)
-	local nl_start,nl_stop = string.find(text,"\n",current_idx)
-	local gotnewline = false
-	if nl_start ~= nil and (start == nil or nl_start < start) then
-		start = nl_start
-		stop = nl_stop
-		gotnewline = true
-	end
-	local last_line = ""
-	while start ~= nil do
-		if string.len(last_line) + (stop-start) > charlimit then
-			table.insert(retval,last_line)
-			last_line = ""
-		end
-
-		if last_line ~= "" then
-			last_line = last_line .. " "
-		end
-
-		last_line = last_line .. string.sub(text,current_idx,stop -1)
-
-		if gotnewline then
-			table.insert(retval,last_line)
-			last_line = ""
-			gotnewline = false
-		end
-		current_idx = stop+1
-
-		start,stop = string.find(text," ",current_idx)
-		nl_start,nl_stop = string.find(text,"\n",current_idx)
-
-		if nl_start ~= nil and (start == nil or nl_start < start) then
-			start = nl_start
-			stop = nl_stop
-			gotnewline = true
-		end
-	end
-
-	--add last part of text
-	if string.len(last_line) + (string.len(text) - current_idx) > charlimit then
-			table.insert(retval,last_line)
-			table.insert(retval,string.sub(text,current_idx))
-	else
-		last_line = last_line .. " " .. string.sub(text,current_idx)
-		table.insert(retval,last_line)
-	end
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-
-if INIT == "game" then
-	local dirs1 = {9, 18, 7, 12}
-	local dirs2 = {20, 23, 22, 21}
-
-	function core.rotate_and_place(itemstack, placer, pointed_thing,
-				infinitestacks, orient_flags)
-		orient_flags = orient_flags or {}
-
-		local unode = core.get_node_or_nil(pointed_thing.under)
-		if not unode then
-			return
-		end
-		local undef = core.registered_nodes[unode.name]
-		if undef and undef.on_rightclick then
-			undef.on_rightclick(pointed_thing.under, unode, placer,
-					itemstack, pointed_thing)
-			return
-		end
-		local pitch = placer:get_look_pitch()
-		local fdir = core.dir_to_facedir(placer:get_look_dir())
-		local wield_name = itemstack:get_name()
-
-		local above = pointed_thing.above
-		local under = pointed_thing.under
-		local iswall = (above.y == under.y)
-		local isceiling = not iswall and (above.y < under.y)
-		local anode = core.get_node_or_nil(above)
-		if not anode then
-			return
-		end
-		local pos = pointed_thing.above
-		local node = anode
-
-		if undef and undef.buildable_to then
-			pos = pointed_thing.under
-			node = unode
-			iswall = false
-		end
-
-		if core.is_protected(pos, placer:get_player_name()) then
-			core.record_protection_violation(pos,
-					placer:get_player_name())
-			return
-		end
-
-		local ndef = core.registered_nodes[node.name]
-		if not ndef or not ndef.buildable_to then
-			return
-		end
-
-		if orient_flags.force_floor then
-			iswall = false
-			isceiling = false
-		elseif orient_flags.force_ceiling then
-			iswall = false
-			isceiling = true
-		elseif orient_flags.force_wall then
-			iswall = true
-			isceiling = false
-		elseif orient_flags.invert_wall then
-			iswall = not iswall
-		end
-
-		if iswall then
-			core.set_node(pos, {name = wield_name,
-					param2 = dirs1[fdir+1]})
-		elseif isceiling then
-			if orient_flags.force_facedir then
-				core.set_node(pos, {name = wield_name,
-						param2 = 20})
-			else
-				core.set_node(pos, {name = wield_name,
-						param2 = dirs2[fdir+1]})
-			end
-		else -- place right side up
-			if orient_flags.force_facedir then
-				core.set_node(pos, {name = wield_name,
-						param2 = 0})
-			else
-				core.set_node(pos, {name = wield_name,
-						param2 = fdir})
-			end
-		end
-
-		if not infinitestacks then
-			itemstack:take_item()
-			return itemstack
-		end
-	end
-
-
--------------------------------------------------------------------------------
--Wrapper for rotate_and_place() to check for sneak and assume Creative mode
--implies infinite stacks when performing a 6d rotation.
--------------------------------------------------------------------------------
-
-
-	core.rotate_node = function(itemstack, placer, pointed_thing)
-		core.rotate_and_place(itemstack, placer, pointed_thing,
-				core.setting_getbool("creative_mode"),
-				{invert_wall = placer:get_player_control().sneak})
-		return itemstack
-	end
-end
-
--------------------------------------------------------------------------------
-function core.explode_table_event(evt)
-	if evt ~= nil then
-		local parts = evt:split(":")
-		if #parts == 3 then
-			local t = parts[1]:trim()
-			local r = tonumber(parts[2]:trim())
-			local c = tonumber(parts[3]:trim())
-			if type(r) == "number" and type(c) == "number"
-					and t ~= "INV" then
-				return {type=t, row=r, column=c}
-			end
-		end
-	end
-	return {type="INV", row=0, column=0}
-end
-
--------------------------------------------------------------------------------
-function core.explode_textlist_event(evt)
-	if evt ~= nil then
-		local parts = evt:split(":")
-		if #parts == 2 then
-			local t = parts[1]:trim()
-			local r = tonumber(parts[2]:trim())
-			if type(r) == "number" and t ~= "INV" then
-				return {type=t, index=r}
-			end
-		end
-	end
-	return {type="INV", index=0}
-end
-
--------------------------------------------------------------------------------
-function core.explode_scrollbar_event(evt)
-	local retval = core.explode_textlist_event(evt)
-
-	retval.value = retval.index
-	retval.index = nil
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-function core.pos_to_string(pos)
-	return "(" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")"
-end
-
--------------------------------------------------------------------------------
-function table.copy(t, seen)
-	local n = {}
-	seen = seen or {}
-	seen[t] = n
-	for k, v in pairs(t) do
-		n[type(k) ~= "table" and k or seen[k] or table.copy(k, seen)] =
-			type(v) ~= "table" and v or seen[v] or table.copy(v, seen)
-	end
-	return n
-end
-
--------------------------------------------------------------------------------
-- mainmenu only functions
--------------------------------------------------------------------------------
-if INIT == "mainmenu" then
-	function core.get_game(index)
-		local games = game.get_games()
-
-		if index > 0 and index <= #games then
-			return games[index]
-		end
-
-		return nil
-	end
-
-	function fgettext(text, ...)
-		text = core.gettext(text)
-		local arg = {n=select('#', ...), ...}
-		if arg.n >= 1 then
-			-- Insert positional parameters ($1, $2, ...)
-			local result = ''
-			local pos = 1
-			while pos <= text:len() do
-				local newpos = text:find('[$]', pos)
-				if newpos == nil then
-					result = result .. text:sub(pos)
-					pos = text:len() + 1
-				else
-					local paramindex =
-						tonumber(text:sub(newpos+1, newpos+1))
-					result = result .. text:sub(pos, newpos-1)
-						.. tostring(arg[paramindex])
-					pos = newpos + 2
-				end
-			end
-			text = result
-		end
-		return core.formspec_escape(text)
-	end
-end
-
--- a/builtin/common/serialize.lua
+++ b/builtin/common/serialize.lua
@@ -1,209 +0,0 @@
--- Lua module to serialize values as Lua code.
-- From: https://github.com/fab13n/metalua/blob/no-dll/src/lib/serialize.lua
-- License: MIT
-- @copyright 2006-2997 Fabien Fleutot <metalua@gmail.com>
-- @author Fabien Fleutot <metalua@gmail.com>
-- @author ShadowNinja <shadowninja@minetest.net>
--------------------------------------------------------------------------------
-
--- 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:
--   * Booleans, numbers, strings, and nil.
--   * Functions; uses interpreter-dependent (and sometimes platform-dependent) bytecode!
--   * Tables; they can cantain multiple references and can be recursive, but metatables aren't saved.
-- This works in two phases:
--   1. Recursively find and record multiple references and recursion.
--   2. Recursively dump the value into a string.
-- @param x Value to serialize (nil is allowed).
-- @return load()able string containing the value.
-function core.serialize(x)
-	local local_index  = 1  -- Top index of the "_" local table in the dump
-	-- table->nil/1/2 set of tables seen.
-	-- nil = not seen, 1 = seen once, 2 = seen multiple times.
-	local seen = {}
-
-	-- 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 used by mark_nest_point:
-	-- * nested - Transient set of tables being currently traversed.
-	--   Used for detecting nested tables.
-	-- * nest_points - parent->{key=value, ...} table cantaining the nested
-	--   keys and values in the parent.  They're all dumped after all the
-	--   other table operations have been performed.
-	--
-	-- mark_nest_point(p, k, v) fills nest_points with information required
-	-- to remember that key/value (k, v) creates a nest point  in table
-	-- parent. It also marks "parent" and the nested item(s) as occuring
-	-- multiple times, since several references to it will be required in
-	-- order to patch the nest points.
-	local nest_points  = {}
-	local nested = {}
-	local function mark_nest_point(parent, k, v)
-		local nk, nv = nested[k], nested[v]
-		local np = nest_points[parent]
-		if not np then
-			np = {}
-			nest_points[parent] = np
-		end
-		np[k] = v
-		seen[parent] = 2
-		if nk then seen[k] = 2 end
-		if nv then seen[v] = 2 end
-	end
-
-	-- First phase, list the tables and functions which appear more than
-	-- once in x.
-	local function mark_multiple_occurences(x)
-		local tp = type(x)
-		if tp ~= "table" and tp ~= "function" then
-			-- No identity (comparison is done by value, not by instance)
-			return
-		end
-		if seen[x] == 1 then
-			seen[x] = 2
-		elseif seen[x] ~= 2 then
-			seen[x] = 1
-		end
-
-		if tp == "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     = {}  -- object->varname set
-	local local_defs = {}  -- Dumped local definitions as source code lines
-
-	-- Mutually recursive local functions:
-	local dump_val, dump_or_ref_val
-
-	-- If x occurs multiple times, dump the local variable rather than
-	-- the value. If it's the first time it's dumped, also dump the
-	-- content in local_defs.
-	function dump_or_ref_val(x)
-		if seen[x] ~= 2 then
-			return dump_val(x)
-		end
-		local var = dumped[x]
-		if var then  -- Already referenced
-			return var
-		end
-		-- First occurence, create and register reference
-		local val = dump_val(x)
-		local i = local_index
-		local_index = local_index + 1
-		var = "_["..i.."]"
-		table.insert(local_defs, var.." = "..val)
-		dumped[x] = var
-		return var
-	end
-
-	-- Second phase.  Dump the object; subparts occuring multiple times
-	-- are dumped in local variables which can be referenced multiple
-	-- times.  Care is taken to dump local vars in a sensible order.
-	function dump_val(x)
-		local  tp = type(x)
-		if     x  == nil        then return "nil"
-		elseif tp == "number"   then return tostring(x)
-		elseif tp == "string"   then return string.format("%q", x)
-		elseif tp == "boolean"  then return x and "true" or "false"
-		elseif tp == "function" then
-			return string.format("loadstring(%q)", string.dump(x))
-		elseif tp == "table" then
-			local vals = {}
-			local idx_dumped = {}
-			local np = nest_points[x]
-			for i, v in ipairs(x) do
-				if not np or not np[i] then
-					table.insert(vals, dump_or_ref_val(v))
-				end
-				idx_dumped[i] = true
-			end
-			for k, v in pairs(x) do
-				if (not np or not np[k]) and
-						not idx_dumped[k] then
-					table.insert(vals,
-						"["..dump_or_ref_val(k).."] = "
-						..dump_or_ref_val(v))
-				end
-			end
-			return "{"..table.concat(vals, ", ").."}"
-		else
-			error("Can't serialize data of type "..t)
-		end
-	end
-
-	local function dump_nest_points()
-		for parent, vals in pairs(nest_points) do
-			for k, v in pairs(vals) do
-				table.insert(local_defs, dump_or_ref_val(parent)
-					.."["..dump_or_ref_val(k).."] = "
-					..dump_or_ref_val(v))
-			end
-		end
-	end
-
-	mark_multiple_occurences(x)
-	local top_level = dump_or_ref_val(x)
-	dump_nest_points()
-
-	if next(local_defs) then
-		return "local _ = {}\n"
-			..table.concat(local_defs, "\n")
-			.."\nreturn "..top_level
-	else
-		return "return "..top_level
-	end
-end
-
-- Deserialization
-
-local env = {
-	loadstring = loadstring,
-}
-
-local safe_env = {
-	loadstring = function() end,
-}
-
-function core.deserialize(str, safe)
-	if str:byte(1) == 0x1B then
-		return nil, "Bytecode prohibited"
-	end
-	local f, err = loadstring(str)
-	if not f then return nil, err end
-	setfenv(f, safe and safe_env or env)
-
-	local good, data = pcall(f)
-	if good then
-		return data
-	else
-		return nil, data
-	end
-end
-
-
-- Unit tests
-local test_in = {cat={sound="nyan", speed=400}, dog={sound="woof"}}
-local test_out = core.deserialize(core.serialize(test_in))
-
-assert(test_in.cat.sound == test_out.cat.sound)
-assert(test_in.cat.speed == test_out.cat.speed)
-assert(test_in.dog.sound == test_out.dog.sound)
-
-test_in = {escape_chars="\n\r\t\v\\\"\'", non_european="θשׁ٩∂"}
-test_out = core.deserialize(core.serialize(test_in))
-assert(test_in.escape_chars == test_out.escape_chars)
-assert(test_in.non_european == test_out.non_european)
-
--- a/builtin/common/strict.lua
+++ b/builtin/common/strict.lua
@@ -1,54 +0,0 @@
-
-- Always warn when creating a global variable, even outside of a function.
-- This ignores mod namespaces (variables with the same name as the current mod).
-local WARN_INIT = false
-
-
-local function warn(message)
-	print(os.date("%H:%M:%S: WARNING: ")..message)
-end
-
-
-local meta = {}
-local declared = {}
-- Key is source file, line, and variable name; seperated by NULs
-local warned = {}
-
-function meta:__newindex(name, value)
-	local info = debug.getinfo(2, "Sl")
-	local desc = ("%s:%d"):format(info.short_src, info.currentline)
-	if not declared[name] then
-		local warn_key = ("%s\0%d\0%s"):format(info.source,
-				info.currentline, name)
-		if not warned[warn_key] and info.what ~= "main" and
-				info.what ~= "C" then
-			minetest.log("error", ("Assignment to undeclared "..
-					"global %q inside a function at %s.")
-				:format(name, desc))
-			warned[warn_key] = true
-		end
-		declared[name] = true
-	end
-	-- Ignore mod namespaces
-	if WARN_INIT and (not core.get_current_modname or
-			name ~= core.get_current_modname()) then
-		warn(("Global variable %q created at %s.")
-			:format(name, desc))
-	end
-	rawset(self, name, value)
-end
-
-
-function meta:__index(name)
-	local info = debug.getinfo(2, "Sl")
-	local warn_key = ("%s\0%d\0%s"):format(info.source, info.currentline, name)
-	if not declared[name] and not warned[warn_key] and info.what ~= "C" then
-		warn(("Undeclared global variable %q accessed at %s:%s")
-				:format(name, info.short_src, info.currentline))
-		warned[warn_key] = true
-	end
-	return rawget(self, name)
-end
-
-setmetatable(_G, meta)
-
--- a/builtin/common/vector.lua
+++ b/builtin/common/vector.lua
@@ -1,133 +0,0 @@
-
-vector = {}
-
-function vector.new(a, b, c)
-	if type(a) == "table" then
-		assert(a.x and a.y and a.z, "Invalid vector passed to vector.new()")
-		return {x=a.x, y=a.y, z=a.z}
-	elseif a then
-		assert(b and c, "Invalid arguments for vector.new()")
-		return {x=a, y=b, z=c}
-	end
-	return {x=0, y=0, z=0}
-end
-
-function vector.equals(a, b)
-	return a.x == b.x and
-	       a.y == b.y and
-	       a.z == b.z
-end
-
-function vector.length(v)
-	return math.hypot(v.x, math.hypot(v.y, v.z))
-end
-
-function vector.normalize(v)
-	local len = vector.length(v)
-	if len == 0 then
-		return {x=0, y=0, z=0}
-	else
-		return vector.divide(v, len)
-	end
-end
-
-function vector.round(v)
-	return {
-		x = math.floor(v.x + 0.5),
-		y = math.floor(v.y + 0.5),
-		z = math.floor(v.z + 0.5)
-	}
-end
-
-function vector.apply(v, func)
-	return {
-		x = func(v.x),
-		y = func(v.y),
-		z = func(v.z)
-	}
-end
-
-function vector.distance(a, b)
-	local x = a.x - b.x
-	local y = a.y - b.y
-	local z = a.z - b.z
-	return math.hypot(x, math.hypot(y, z))
-end
-
-function vector.direction(pos1, pos2)
-	local x_raw = pos2.x - pos1.x
-	local y_raw = pos2.y - pos1.y
-	local z_raw = pos2.z - pos1.z
-	local x_abs = math.abs(x_raw)
-	local y_abs = math.abs(y_raw)
-	local z_abs = math.abs(z_raw)
-	if x_abs >= y_abs and
-	   x_abs >= z_abs then
-		y_raw = y_raw * (1 / x_abs)
-		z_raw = z_raw * (1 / x_abs)
-		x_raw = x_raw / x_abs
-	end
-	if y_abs >= x_abs and
-	   y_abs >= z_abs then
-		x_raw = x_raw * (1 / y_abs)
-		z_raw = z_raw * (1 / y_abs)
-		y_raw = y_raw / y_abs
-	end
-	if z_abs >= y_abs and
-	   z_abs >= x_abs then
-		x_raw = x_raw * (1 / z_abs)
-		y_raw = y_raw * (1 / z_abs)
-		z_raw = z_raw / z_abs
-	end
-	return {x=x_raw, y=y_raw, z=z_raw}
-end
-
-
-function vector.add(a, b)
-	if type(b) == "table" then
-		return {x = a.x + b.x,
-			y = a.y + b.y,
-			z = a.z + b.z}
-	else
-		return {x = a.x + b,
-			y = a.y + b,
-			z = a.z + b}
-	end
-end
-
-function vector.subtract(a, b)
-	if type(b) == "table" then
-		return {x = a.x - b.x,
-			y = a.y - b.y,
-			z = a.z - b.z}
-	else
-		return {x = a.x - b,
-			y = a.y - b,
-			z = a.z - b}
-	end
-end
-
-function vector.multiply(a, b)
-	if type(b) == "table" then
-		return {x = a.x * b.x,
-			y = a.y * b.y,
-			z = a.z * b.z}
-	else
-		return {x = a.x * b,
-			y = a.y * b,
-			z = a.z * b}
-	end
-end
-
-function vector.divide(a, b)
-	if type(b) == "table" then
-		return {x = a.x / b.x,
-			y = a.y / b.y,
-			z = a.z / b.z}
-	else
-		return {x = a.x / b,
-			y = a.y / b,
-			z = a.z / b}
-	end
-end
-
--- a/builtin/fstk/buttonbar.lua
+++ b/builtin/fstk/buttonbar.lua
@@ -1,210 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--self 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
--(at your option) any later version.
--
--self program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser General Public License along
--with self program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-local function buttonbar_formspec(self)
-
-	if self.hidden then
-		return ""
-	end
-
-	local formspec = string.format("box[%f,%f;%f,%f;%s]",
-			self.pos.x,self.pos.y ,self.size.x,self.size.y,self.bgcolor)
-		
-	for i=self.startbutton,#self.buttons,1 do
-		local btn_name = self.buttons[i].name
-		local btn_pos = {}
-		
-		if self.orientation == "horizontal" then
-			btn_pos.x = self.pos.x + --base pos
-			(i - self.startbutton) * self.btn_size +       --button offset
-			self.btn_initial_offset
-		else
-			btn_pos.x = self.pos.x + (self.btn_size * 0.05)
-		end
-		
-		if self.orientation == "vertical" then
-			btn_pos.y = self.pos.y + --base pos
-			(i - self.startbutton) * self.btn_size +       --button offset
-			self.btn_initial_offset
-		else
-			btn_pos.y = self.pos.y + (self.btn_size * 0.05)
-		end
-		
-		if (self.orientation == "vertical" and
-			(btn_pos.y + self.btn_size <= self.pos.y + self.size.y)) or
-			(self.orientation == "horizontal" and
-			(btn_pos.x + self.btn_size <= self.pos.x + self.size.x)) then
-			
-		local borders="true"
-		
-		if self.buttons[i].image ~= nil then
-			borders="false"
-		end
-			
-		formspec = formspec ..
-			string.format("image_button[%f,%f;%f,%f;%s;%s;%s;true;%s]tooltip[%s;%s]",
-					btn_pos.x, btn_pos.y, self.btn_size, self.btn_size,
-					self.buttons[i].image, btn_name, self.buttons[i].caption,
-					borders, btn_name, self.buttons[i].tooltip)
-		else
-			--print("end of displayable buttons: orientation: " .. self.orientation)
-			--print( "button_end: " .. (btn_pos.y + self.btn_size - (self.btn_size * 0.05)))
-			--print( "bar_end: " .. (self.pos.x + self.size.x))
-			break
-		end
-	end
-
-	if (self.have_move_buttons) then
-		local btn_dec_pos = {}
-		btn_dec_pos.x = self.pos.x + (self.btn_size * 0.05)
-		btn_dec_pos.y = self.pos.y + (self.btn_size * 0.05)
-		local btn_inc_pos = {}
-		local btn_size = {}
-		
-		if self.orientation == "horizontal" then
-			btn_size.x = 0.5
-			btn_size.y = self.btn_size
-			btn_inc_pos.x = self.pos.x + self.size.x - 0.5
-			btn_inc_pos.y = self.pos.y + (self.btn_size * 0.05)
-		else
-			btn_size.x = self.btn_size
-			btn_size.y = 0.5
-			btn_inc_pos.x = self.pos.x + (self.btn_size * 0.05)
-			btn_inc_pos.y = self.pos.y + self.size.y - 0.5
-		end
-		
-		local text_dec = "<"
-		local text_inc = ">"
-		if self.orientation == "vertical" then
-			text_dec = "^"
-			text_inc = "v"
-		end
-		
-		formspec = formspec ..
-			string.format("image_button[%f,%f;%f,%f;;btnbar_dec_%s;%s;true;true]",
-					btn_dec_pos.x, btn_dec_pos.y, btn_size.x, btn_size.y,
-					self.name, text_dec)
-				
-		formspec = formspec ..
-			string.format("image_button[%f,%f;%f,%f;;btnbar_inc_%s;%s;true;true]",
-					btn_inc_pos.x, btn_inc_pos.y, btn_size.x, btn_size.y,
-					 self.name, text_inc)
-	end
-	
-	return formspec
-end
-
-local function buttonbar_buttonhandler(self, fields)
-
-	if fields["btnbar_inc_" .. self.name] ~= nil and
-		self.startbutton < #self.buttons then
-		
-		self.startbutton = self.startbutton + 1
-		return true
-	end
-	
-	if fields["btnbar_dec_" .. self.name] ~= nil and self.startbutton > 1 then
-		self.startbutton = self.startbutton - 1
-		return true
-	end
-	
-	for i=1,#self.buttons,1 do
-		if fields[self.buttons[i].name] ~= nil then
-			return self.userbuttonhandler(fields)
-		end
-	end
-end
-
-local buttonbar_metatable = {
-	handle_buttons = buttonbar_buttonhandler,
-	handle_events  = function(self, event) end,
-	get_formspec   = buttonbar_formspec,
-	
-	hide = function(self) self.hidden = true end,
-	show = function(self) self.hidden = false end,
-
-	delete = function(self) ui.delete(self) end,
-	
-	add_button = function(self, name, caption, image, tooltip)
-			if caption == nil then caption = "" end
-			if image == nil then image = "" end
-			if tooltip == nil then tooltip = "" end
-			
-			table.insert(self.buttons,{ name=name, caption=caption, image=image, tooltip=tooltip})
-			if self.orientation == "horizontal" then
-				if ( (self.btn_size * #self.buttons) + (self.btn_size * 0.05 *2)
-					> self.size.x ) then
-					
-					self.btn_initial_offset = self.btn_size * 0.05 + 0.5
-					self.have_move_buttons = true
-				end
-			else
-				if ((self.btn_size * #self.buttons) + (self.btn_size * 0.05 *2)
-					> self.size.y ) then
-					
-					self.btn_initial_offset = self.btn_size * 0.05 + 0.5
-					self.have_move_buttons = true
-				end
-			end
-		end,
-		
-	set_bgparams = function(self, bgcolor)
-			if (type(bgcolor) == "string") then
-				self.bgcolor = bgcolor
-			end
-		end,
-}
-
-buttonbar_metatable.__index = buttonbar_metatable
-
-function buttonbar_create(name, cbf_buttonhandler, pos, orientation, size)
-	assert(name ~= nil)
-	assert(cbf_buttonhandler ~= nil)
-	assert(orientation == "vertical" or orientation == "horizontal")
-	assert(pos ~= nil and type(pos) == "table")
-	assert(size ~= nil and type(size) == "table")
-
-	local self = {}
-	self.name = name
-	self.type = "addon"
-	self.bgcolor = "#000000"
-	self.pos = pos
-	self.size = size
-	self.orientation = orientation
-	self.startbutton = 1
-	self.have_move_buttons = false
-	self.hidden = false
-	
-	if self.orientation == "horizontal" then
-			self.btn_size = self.size.y
-	else
-			self.btn_size = self.size.x
-	end
-	
-	if (self.btn_initial_offset == nil) then
-		self.btn_initial_offset = self.btn_size * 0.05
-	end
-
-	self.userbuttonhandler = cbf_buttonhandler
-	self.buttons = {}
-	
-	setmetatable(self,buttonbar_metatable)
-
-	ui.add(self)
-	return self
-end
--- a/builtin/fstk/dialog.lua
+++ b/builtin/fstk/dialog.lua
@@ -1,69 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--self 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
--(at your option) any later version.
--
--self program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser General Public License along
--with self program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-local function dialog_event_handler(self,event)
-	if self.user_eventhandler == nil or
-		self.user_eventhandler(event) == false then
-
-		--close dialog on esc
-		if event == "MenuQuit" then
-			self:delete()
-			return true
-		end
-	end
-end
-
-local dialog_metatable = {
-	eventhandler = dialog_event_handler,
-	get_formspec = function(self)
-				if not self.hidden then return self.formspec(self.data) end
-			end,
-	handle_buttons = function(self,fields)
-				if not self.hidden then return self.buttonhandler(self,fields) end
-			end,
-	handle_events  = function(self,event)
-				if not self.hidden then return self.eventhandler(self,event) end
-			end,
-	hide = function(self) self.hidden = true end,
-	show = function(self) self.hidden = false end,
-	delete = function(self)
-			if self.parent ~= nil then
-				self.parent:show()
-			end
-			ui.delete(self)
-		end,
-	set_parent = function(self,parent) self.parent = parent end
-}
-dialog_metatable.__index = dialog_metatable
-
-function dialog_create(name,get_formspec,buttonhandler,eventhandler)
-	local self = {}
-
-	self.name = name
-	self.type = "toplevel"
-	self.hidden = true
-	self.data = {}
-
-	self.formspec      = get_formspec
-	self.buttonhandler = buttonhandler
-	self.user_eventhandler  = eventhandler
-	
-	setmetatable(self,dialog_metatable)
-
-	ui.add(self)
-	return self
-end
--- a/builtin/fstk/tabview.lua
+++ b/builtin/fstk/tabview.lua
@@ -1,273 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--self 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
--(at your option) any later version.
--
--self program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser General Public License along
--with self program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
--------------------------------------------------------------------------------
-- A tabview implementation                                                   --
-- Usage:                                                                     --
-- tabview.create: returns initialized tabview raw element                    --
-- element.add(tab): add a tab declaration                                    --
-- element.handle_buttons()                                                   --
-- element.handle_events()                                                    --
-- element.getFormspec() returns formspec of tabview                          --
--------------------------------------------------------------------------------
-
--------------------------------------------------------------------------------
-local function add_tab(self,tab)
-	assert(tab.size == nil or (type(tab.size) == table and
-			tab.size.x ~= nil and tab.size.y ~= nil))
-	assert(tab.cbf_formspec ~= nil and type(tab.cbf_formspec) == "function")
-	assert(tab.cbf_button_handler == nil or
-			type(tab.cbf_button_handler) == "function")
-	assert(tab.cbf_events == nil or type(tab.cbf_events) == "function")
-
-	local newtab = {
-		name = tab.name,
-		caption = tab.caption,
-		button_handler = tab.cbf_button_handler,
-		event_handler = tab.cbf_events,
-		get_formspec = tab.cbf_formspec,
-		tabsize = tab.tabsize,
-		on_change = tab.on_change,
-		tabdata = {},
-	}
-
-	table.insert(self.tablist,newtab)
-
-	if self.last_tab_index == #self.tablist then
-		self.current_tab = tab.name
-		if tab.on_activate ~= nil then
-			tab.on_activate(nil,tab.name)
-		end
-	end
-end
-
--------------------------------------------------------------------------------
-local function get_formspec(self)
-	local formspec = ""
-
-	if not self.hidden and (self.parent == nil or not self.parent.hidden) then
-	
-		if self.parent == nil then
-			local tsize = self.tablist[self.last_tab_index].tabsize or
-					{width=self.width, height=self.height}
-			formspec = formspec ..
-					string.format("size[%f,%f,%s]",tsize.width,tsize.height,
-						dump(self.fixed_size))
-		end
-		formspec = formspec .. self:tab_header()
-		formspec = formspec ..
-				self.tablist[self.last_tab_index].get_formspec(
-					self,
-					self.tablist[self.last_tab_index].name,
-					self.tablist[self.last_tab_index].tabdata,
-					self.tablist[self.last_tab_index].tabsize
-					)
-	end
-	return formspec
-end
-
--------------------------------------------------------------------------------
-local function handle_buttons(self,fields)
-
-	if self.hidden then
-		return false
-	end
-	
-	if self:handle_tab_buttons(fields) then
-		return true
-	end
-	
-	if self.glb_btn_handler ~= nil and
-		self.glb_btn_handler(self,fields) then
-		return true
-	end
-
-	if self.tablist[self.last_tab_index].button_handler ~= nil then
-		return
-			self.tablist[self.last_tab_index].button_handler(
-					self,
-					fields,
-					self.tablist[self.last_tab_index].name,
-					self.tablist[self.last_tab_index].tabdata
-					)
-	end
-
-	return false
-end
-
--------------------------------------------------------------------------------
-local function handle_events(self,event)
-	
-	if self.hidden then
-		return false
-	end
-	
-	if self.glb_evt_handler ~= nil and
-		self.glb_evt_handler(self,event) then
-		return true
-	end
-	
-	if self.tablist[self.last_tab_index].evt_handler ~= nil then
-		return
-			self.tablist[self.last_tab_index].evt_handler(
-					self,
-					event,
-					self.tablist[self.last_tab_index].name,
-					self.tablist[self.last_tab_index].tabdata
-					)
-	end
-	
-	return false
-end
-
-
--------------------------------------------------------------------------------
-local function tab_header(self)
-
-	local toadd = ""
-
-	for i=1,#self.tablist,1 do
-
-		if toadd ~= "" then
-			toadd = toadd .. ","
-		end
-
-		toadd = toadd .. self.tablist[i].caption
-	end
-	return string.format("tabheader[%f,%f;%s;%s;%i;true;false]",
-			self.header_x, self.header_y, self.name, toadd, self.last_tab_index);
-end
-
--------------------------------------------------------------------------------
-local function switch_to_tab(self, index)
-	--first call on_change for tab to leave
-	if self.tablist[self.last_tab_index].on_change ~= nil then
-		self.tablist[self.last_tab_index].on_change("LEAVE",
-				self.current_tab, self.tablist[index].name)
-	end
-	
-	--update tabview data
-	self.last_tab_index = index
-	local old_tab = self.current_tab
-	self.current_tab = self.tablist[index].name
-	
-	if (self.autosave_tab) then
-		core.setting_set(self.name .. "_LAST",self.current_tab)
-	end
-	
-	-- call for tab to enter
-	if self.tablist[index].on_change ~= nil then
-		self.tablist[index].on_change("ENTER",
-				old_tab,self.current_tab)
-	end
-end
-
--------------------------------------------------------------------------------
-local function handle_tab_buttons(self,fields)
-	--save tab selection to config file
-	if fields[self.name] then
-		local index = tonumber(fields[self.name])
-		switch_to_tab(self, index)
-		return true
-	end
-
-	return false
-end
-
--------------------------------------------------------------------------------
-local function set_tab_by_name(self, name)
-	for i=1,#self.tablist,1 do
-		if self.tablist[i].name == name then
-			switch_to_tab(self, i)
-			return true
-		end
-	end
-	
-	return false
-end
-
--------------------------------------------------------------------------------
-local function hide_tabview(self)
-	self.hidden=true
-	
-	--call on_change as we're not gonna show self tab any longer
-	if self.tablist[self.last_tab_index].on_change ~= nil then
-		self.tablist[self.last_tab_index].on_change("LEAVE",
-				self.current_tab, nil)
-	end
-end
-
--------------------------------------------------------------------------------
-local function show_tabview(self)
-	self.hidden=false
-	
-	-- call for tab to enter
-	if self.tablist[self.last_tab_index].on_change ~= nil then
-		self.tablist[self.last_tab_index].on_change("ENTER",
-				nil,self.current_tab)
-	end
-end
-
-local tabview_metatable = {
-	add                       = add_tab,
-	handle_buttons            = handle_buttons,
-	handle_events             = handle_events,
-	get_formspec              = get_formspec,
-	show                      = show_tabview,
-	hide                      = hide_tabview,
-	delete                    = function(self) ui.delete(self) end,
-	set_parent                = function(self,parent) self.parent = parent end,
-	set_autosave_tab          =
-			function(self,value) self.autosave_tab = value end,
-	set_tab                   = set_tab_by_name,
-	set_global_button_handler =
-			function(self,handler) self.glb_btn_handler = handler end,
-	set_global_event_handler =
-			function(self,handler) self.glb_evt_handler = handler end,
-	set_fixed_size =
-			function(self,state) self.fixed_size = state end,
-	tab_header = tab_header,
-	handle_tab_buttons = handle_tab_buttons
-}
-
-tabview_metatable.__index = tabview_metatable
-
--------------------------------------------------------------------------------
-function tabview_create(name, size, tabheaderpos)
-	local self = {}
-
-	self.name     = name
-	self.type     = "toplevel"
-	self.width    = size.x
-	self.height   = size.y
-	self.header_x = tabheaderpos.x
-	self.header_y = tabheaderpos.y
-
-	setmetatable(self, tabview_metatable)
-
-	self.fixed_size     = true
-	self.hidden         = true
-	self.current_tab    = nil
-	self.last_tab_index = 1
-	self.tablist        = {}
-	
-	self.autosave_tab   = false
-
-	ui.add(self)
-	return self
-end
--- a/builtin/fstk/ui.lua
+++ b/builtin/fstk/ui.lua
@@ -1,171 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--self 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
--(at your option) any later version.
--
--self program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser General Public License along
--with self program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-ui = {}
-ui.childlist = {}
-ui.default = nil
-
--------------------------------------------------------------------------------
-function ui.add(child)
-	--TODO check child
-	ui.childlist[child.name] = child
-	
-	return child.name
-end
-
--------------------------------------------------------------------------------
-function ui.delete(child)
-
-	if ui.childlist[child.name] == nil then
-		return false
-	end
-	
-	ui.childlist[child.name] = nil
-	return true
-end
-
--------------------------------------------------------------------------------
-function ui.set_default(name)
-	ui.default = name
-end
-
--------------------------------------------------------------------------------
-function ui.find_by_name(name)
-	return ui.childlist[name]
-end
-
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-- Internal functions not to be called from user
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-
--------------------------------------------------------------------------------
-function ui.update()
-	local formspec = ""
-
-	-- handle errors
-	if gamedata ~= nil and gamedata.errormessage ~= nil then
-		formspec = "size[12,3.2]" ..
-			"textarea[1,1;10,2;;ERROR: " ..
-			core.formspec_escape(gamedata.errormessage) ..
-			";]"..
-			"button[4.5,2.5;3,0.5;btn_error_confirm;" .. fgettext("Ok") .. "]"
-	else
-		local active_toplevel_ui_elements = 0
-		for key,value in pairs(ui.childlist) do
-			if (value.type == "toplevel") then
-				local retval = value:get_formspec()
-
-				if retval ~= nil and retval ~= "" then
-					active_toplevel_ui_elements = active_toplevel_ui_elements +1
-					formspec = formspec .. retval
-				end
-			end
-		end
-		
-		-- no need to show addons if there ain't a toplevel element
-		if (active_toplevel_ui_elements > 0) then
-			for key,value in pairs(ui.childlist) do
-				if (value.type == "addon") then
-					local retval = value:get_formspec()
-
-					if retval ~= nil and retval ~= "" then
-						formspec = formspec .. retval
-					end
-				end
-			end
-		end
-
-		if (active_toplevel_ui_elements > 1) then
-			print("WARNING: ui manager detected more then one active ui element, self most likely isn't intended")
-		end
-
-		if (active_toplevel_ui_elements == 0) then
-			print("WARNING: not a single toplevel ui element active switching to default")
-			ui.childlist[ui.default]:show()
-			formspec = ui.childlist[ui.default]:get_formspec()
-		end
-	end
-	core.update_formspec(formspec)
-end
-
--------------------------------------------------------------------------------
-function ui.handle_buttons(fields)
-
-	if fields["btn_error_confirm"] then
-		gamedata.errormessage = nil
-		update_menu()
-		return
-	end
-
-	for key,value in pairs(ui.childlist) do
-
-		local retval = value:handle_buttons(fields)
-
-		if retval then
-			ui.update()
-			return
-		end
-	end
-end
-
-
--------------------------------------------------------------------------------
-function ui.handle_events(event)
-	
-	for key,value in pairs(ui.childlist) do
-
-		if value.handle_events ~= nil then
-			local retval = value:handle_events(event)
-
-			if retval then
-				return retval
-			end
-		end
-	end
-end
-
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-- initialize callbacks
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-core.button_handler = function(fields)
-	if fields["btn_error_confirm"] then
-		gamedata.errormessage = nil
-		ui.update()
-		return
-	end
-
-	if ui.handle_buttons(fields) then
-		ui.update()
-	end
-end
-
--------------------------------------------------------------------------------
-core.event_handler = function(event)
-	if ui.handle_events(event) then
-		ui.update()
-		return
-	end
-
-	if event == "Refresh" then
-		ui.update()
-		return
-	end
-end
--- a/builtin/game/auth.lua
+++ b/builtin/game/auth.lua
@@ -1,200 +0,0 @@
-- Minetest: builtin/auth.lua
-
--
-- Authentication handler
--
-
-function core.string_to_privs(str, delim)
-	assert(type(str) == "string")
-	delim = delim or ','
-	local privs = {}
-	for _, priv in pairs(string.split(str, delim)) do
-		privs[priv:trim()] = true
-	end
-	return privs
-end
-
-function core.privs_to_string(privs, delim)
-	assert(type(privs) == "table")
-	delim = delim or ','
-	local list = {}
-	for priv, bool in pairs(privs) do
-		if bool then
-			table.insert(list, priv)
-		end
-	end
-	return table.concat(list, delim)
-end
-
-assert(core.string_to_privs("a,b").b == true)
-assert(core.privs_to_string({a=true,b=true}) == "a,b")
-
-core.auth_file_path = core.get_worldpath().."/auth.txt"
-core.auth_table = {}
-
-local function read_auth_file()
-	local newtable = {}
-	local file, errmsg = io.open(core.auth_file_path, 'rb')
-	if not file then
-		core.log("info", core.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 fields = line:split(":", true)
-			local name, password, privilege_string, last_login = unpack(fields)
-			last_login = tonumber(last_login)
-			if not (name and password and privilege_string) then
-				error("Invalid line in auth.txt: "..dump(line))
-			end
-			local privileges = core.string_to_privs(privilege_string)
-			newtable[name] = {password=password, privileges=privileges, last_login=last_login}
-		end
-	end
-	io.close(file)
-	core.auth_table = newtable
-	core.notify_authentication_modified()
-end
-
-local function save_auth_file()
-	local newtable = {}
-	-- Check table for validness before attempting to save
-	for name, stuff in pairs(core.auth_table) do
-		assert(type(name) == "string")
-		assert(name ~= "")
-		assert(type(stuff) == "table")
-		assert(type(stuff.password) == "string")
-		assert(type(stuff.privileges) == "table")
-		assert(stuff.last_login == nil or type(stuff.last_login) == "number")
-	end
-	local file, errmsg = io.open(core.auth_file_path, 'w+b')
-	if not file then
-		error(core.auth_file_path.." could not be opened for writing: "..errmsg)
-	end
-	for name, stuff in pairs(core.auth_table) do
-		local priv_string = core.privs_to_string(stuff.privileges)
-		local parts = {name, stuff.password, priv_string, stuff.last_login or ""}
-		file:write(table.concat(parts, ":").."\n")
-	end
-	io.close(file)
-end
-
-read_auth_file()
-
-core.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 core.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(core.auth_table[name].privileges) do
-			privileges[priv] = true
-		end
-		-- If singleplayer, give all privileges except those marked as give_to_singleplayer = false
-		if core.is_singleplayer() then
-			for priv, def in pairs(core.registered_privileges) do
-				if def.give_to_singleplayer then
-					privileges[priv] = true
-				end
-			end
-		-- For the admin, give everything
-		elseif name == core.setting_get("name") then
-			for priv, def in pairs(core.registered_privileges) do
-				privileges[priv] = true
-			end
-		end
-		-- All done
-		return {
-			password = core.auth_table[name].password,
-			privileges = privileges,
-			-- Is set to nil if unknown
-			last_login = core.auth_table[name].last_login,
-		}
-	end,
-	create_auth = function(name, password)
-		assert(type(name) == "string")
-		assert(type(password) == "string")
-		core.log('info', "Built-in authentication handler adding player '"..name.."'")
-		core.auth_table[name] = {
-			password = password,
-			privileges = core.string_to_privs(core.setting_get("default_privs")),
-			last_login = os.time(),
-		}
-		save_auth_file()
-	end,
-	set_password = function(name, password)
-		assert(type(name) == "string")
-		assert(type(password) == "string")
-		if not core.auth_table[name] then
-			core.builtin_auth_handler.create_auth(name, password)
-		else
-			core.log('info', "Built-in authentication handler setting password of player '"..name.."'")
-			core.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 core.auth_table[name] then
-			core.builtin_auth_handler.create_auth(name,
-				core.get_password_hash(name,
-					core.setting_get("default_password")))
-		end
-		core.auth_table[name].privileges = privileges
-		core.notify_authentication_modified(name)
-		save_auth_file()
-	end,
-	reload = function()
-		read_auth_file()
-		return true
-	end,
-	record_login = function(name)
-		assert(type(name) == "string")
-		assert(core.auth_table[name]).last_login = os.time()
-		save_auth_file()
-	end,
-}
-
-function core.register_authentication_handler(handler)
-	if core.registered_auth_handler then
-		error("Add-on authentication handler already registered by "..core.registered_auth_handler_modname)
-	end
-	core.registered_auth_handler = handler
-	core.registered_auth_handler_modname = core.get_current_modname()
-end
-
-function core.get_auth_handler()
-	return core.registered_auth_handler or core.builtin_auth_handler
-end
-
-local function auth_pass(name)
-	return function(...)
-		local auth_handler = core.get_auth_handler()
-		if auth_handler[name] then
-			return auth_handler[name](...)
-		end
-		return false
-	end
-end
-
-core.set_player_password = auth_pass("set_password")
-core.set_player_privs    = auth_pass("set_privileges")
-core.auth_reload         = auth_pass("reload")
-
-
-local record_login = auth_pass("record_login")
-
-core.register_on_joinplayer(function(player)
-	record_login(player:get_player_name())
-end)
-
--- a/builtin/game/builtin_biome.lua
+++ b/builtin/game/builtin_biome.lua
@@ -1,9 +0,0 @@
-minetest.register_biome({
-	name           = "Grass",
-
-	heat_point     = 50.0,
-	humidity_point = 50.0,
-	height_min = -31000,
-	height_max = 31000,
-})
-
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -1,743 +0,0 @@
-- Minetest: builtin/chatcommands.lua
-
--
-- Chat command handler
--
-
-core.chatcommands = {}
-function core.register_chatcommand(cmd, def)
-	def = def or {}
-	def.params = def.params or ""
-	def.description = def.description or ""
-	def.privs = def.privs or {}
-	core.chatcommands[cmd] = def
-end
-
-if core.setting_getbool("mod_profiling") then
-	local tracefct = profiling_print_log
-	profiling_print_log = nil
-	core.register_chatcommand("save_mod_profile",
-			{
-				params      = "",
-				description = "save mod profiling data to logfile " ..
-						"(depends on default loglevel)",
-				func        = tracefct,
-				privs       = { server=true }
-			})
-end
-
-core.register_on_chat_message(function(name, message)
-	local cmd, param = string.match(message, "^/([^ ]+) *(.*)")
-	if not param then
-		param = ""
-	end
-	local cmd_def = core.chatcommands[cmd]
-	if not cmd_def then
-		return false
-	end
-	local has_privs, missing_privs = core.check_player_privs(name, cmd_def.privs)
-	if has_privs then
-		local success, message = cmd_def.func(name, param)
-		if message then
-			core.chat_send_player(name, message)
-		end
-	else
-		core.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)
-
--
-- Chat commands
--
-core.register_chatcommand("me", {
-	params = "<action>",
-	description = "chat action (eg. /me orders a pizza)",
-	privs = {shout=true},
-	func = function(name, param)
-		core.chat_send_all("* " .. name .. " " .. param)
-	end,
-})
-
-core.register_chatcommand("help", {
-	privs = {},
-	params = "[all/privs/<cmd>]",
-	description = "Get help for commands or list privileges",
-	func = function(name, param)
-		local function format_help_line(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 = ""
-			local cmds = {}
-			for cmd, def in pairs(core.chatcommands) do
-				if core.check_player_privs(name, def.privs) then
-					table.insert(cmds, cmd)
-				end
-			end
-			table.sort(cmds)
-			return true, "Available commands: " .. table.concat(cmds, " ") .. "\n"
-					.. "Use '/help <cmd>' to get more information,"
-					.. " or '/help all' to list everything."
-		elseif param == "all" then
-			local cmds = {}
-			for cmd, def in pairs(core.chatcommands) do
-				if core.check_player_privs(name, def.privs) then
-					table.insert(cmds, format_help_line(cmd, def))
-				end
-			end
-			table.sort(cmds)
-			return true, "Available commands:\n"..table.concat(cmds, "\n")
-		elseif param == "privs" then
-			local privs = {}
-			for priv, def in pairs(core.registered_privileges) do
-				table.insert(privs, priv .. ": " .. def.description)
-			end
-			table.sort(privs)
-			return true, "Available privileges:\n"..table.concat(privs, "\n")
-		else
-			local cmd = param
-			local def = core.chatcommands[cmd]
-			if not def then
-				return false, "Command not available: "..cmd
-			else
-				return true, format_help_line(cmd, def)
-			end
-		end
-	end,
-})
-
-core.register_chatcommand("privs", {
-	params = "<name>",
-	description = "print out privileges of player",
-	func = function(name, param)
-		param = (param ~= "" and param or name)
-		return true, "Privileges of " .. param .. ": "
-			.. core.privs_to_string(
-				core.get_player_privs(param), ' ')
-	end,
-})
-core.register_chatcommand("grant", {
-	params = "<name> <privilege>|all",
-	description = "Give privilege to player",
-	func = function(name, param)
-		if not core.check_player_privs(name, {privs=true}) and
-				not core.check_player_privs(name, {basic_privs=true}) then
-			return false, "Your privileges are insufficient."
-		end
-		local grantname, grantprivstr = string.match(param, "([^ ]+) (.+)")
-		if not grantname or not grantprivstr then
-			return false, "Invalid parameters (see /help grant)"
-		elseif not core.auth_table[grantname] then
-			return false, "Player " .. grantname .. " does not exist."
-		end
-		local grantprivs = core.string_to_privs(grantprivstr)
-		if grantprivstr == "all" then
-			grantprivs = core.registered_privileges
-		end
-		local privs = core.get_player_privs(grantname)
-		local privs_unknown = ""
-		for priv, _ in pairs(grantprivs) do
-			if priv ~= "interact" and priv ~= "shout" and
-					not core.check_player_privs(name, {privs=true}) then
-				return false, "Your privileges are insufficient."
-			end
-			if not core.registered_privileges[priv] then
-				privs_unknown = privs_unknown .. "Unknown privilege: " .. priv .. "\n"
-			end
-			privs[priv] = true
-		end
-		if privs_unknown ~= "" then
-			return false, privs_unknown
-		end
-		core.set_player_privs(grantname, privs)
-		core.log("action", name..' granted ('..core.privs_to_string(grantprivs, ', ')..') privileges to '..grantname)
-		if grantname ~= name then
-			core.chat_send_player(grantname, name
-					.. " granted you privileges: "
-					.. core.privs_to_string(grantprivs, ' '))
-		end
-		return true, "Privileges of " .. grantname .. ": "
-			.. core.privs_to_string(
-				core.get_player_privs(grantname), ' ')
-	end,
-})
-core.register_chatcommand("revoke", {
-	params = "<name> <privilege>|all",
-	description = "Remove privilege from player",
-	privs = {},
-	func = function(name, param)
-		if not core.check_player_privs(name, {privs=true}) and
-				not core.check_player_privs(name, {basic_privs=true}) then
-			return false, "Your privileges are insufficient."
-		end
-		local revoke_name, revoke_priv_str = string.match(param, "([^ ]+) (.+)")
-		if not revoke_name or not revoke_priv_str then
-			return false, "Invalid parameters (see /help revoke)"
-		elseif not core.auth_table[revoke_name] then
-			return false, "Player " .. revoke_name .. " does not exist."
-		end
-		local revoke_privs = core.string_to_privs(revoke_priv_str)
-		local privs = core.get_player_privs(revoke_name)
-		for priv, _ in pairs(revoke_privs) do
-			if priv ~= "interact" and priv ~= "shout" and priv ~= "interact_extra" and
-					not core.check_player_privs(name, {privs=true}) then
-				return false, "Your privileges are insufficient."
-			end
-		end
-		if revoke_priv_str == "all" then
-			privs = {}
-		else
-			for priv, _ in pairs(revoke_privs) do
-				privs[priv] = nil
-			end
-		end
-		core.set_player_privs(revoke_name, privs)
-		core.log("action", name..' revoked ('
-				..core.privs_to_string(revoke_privs, ', ')
-				..') privileges from '..revoke_name)
-		if revoke_name ~= name then
-			core.chat_send_player(revoke_name, name
-					.. " revoked privileges from you: "
-					.. core.privs_to_string(revoke_privs, ' '))
-		end
-		return true, "Privileges of " .. revoke_name .. ": "
-			.. core.privs_to_string(
-				core.get_player_privs(revoke_name), ' ')
-	end,
-})
-
-core.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 = param:match("^([^ ]+) *$")
-			raw_password = nil
-		end
-		if not toname then
-			return false, "Name field required"
-		end
-		local actstr = "?"
-		if not raw_password then
-			core.set_player_password(toname, "")
-			actstr = "cleared"
-		else
-			core.set_player_password(toname,
-					core.get_password_hash(toname,
-							raw_password))
-			actstr = "set"
-		end
-		if toname ~= name then
-			core.chat_send_player(toname, "Your password was "
-					.. actstr .. " by " .. name)
-		end
-		return true, "Password of player \"" .. toname .. "\" " .. actstr
-	end,
-})
-
-core.register_chatcommand("clearpassword", {
-	params = "<name>",
-	description = "set empty password",
-	privs = {password=true},
-	func = function(name, param)
-		local toname = param
-		if toname == "" then
-			return false, "Name field required"
-		end
-		core.set_player_password(toname, '')
-		return true, "Password of player \"" .. toname .. "\" cleared"
-	end,
-})
-
-core.register_chatcommand("auth_reload", {
-	params = "",
-	description = "reload authentication data",
-	privs = {server=true},
-	func = function(name, param)
-		local done = core.auth_reload()
-		return done, (done and "Done." or "Failed.")
-	end,
-})
-
-core.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 = core.get_node_or_nil(p)
-				if n and n.name then
-					local def = core.registered_nodes[n.name]
-					if def and not def.walkable then
-						return p, true
-					end
-				end
-			end
-			return pos, false
-		end
-
-		local teleportee = nil
-		local p = {}
-		p.x, p.y, p.z = string.match(param, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
-		p.x = tonumber(p.x)
-		p.y = tonumber(p.y)
-		p.z = tonumber(p.z)
-		teleportee = core.get_player_by_name(name)
-		if teleportee and p.x and p.y and p.z then
-			teleportee:setpos(p)
-			return true, "Teleporting to "..core.pos_to_string(p)
-		end
-		
-		local teleportee = nil
-		local p = nil
-		local target_name = nil
-		target_name = param:match("^([^ ]+)$")
-		teleportee = core.get_player_by_name(name)
-		if target_name then
-			local target = core.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)
-			teleportee:setpos(p)
-			return true, "Teleporting to " .. target_name
-					.. " at "..core.pos_to_string(p)
-		end
-
-		if not core.check_player_privs(name, {bring=true}) then
-			return false, "You don't have permission to teleport other players (missing bring privilege)"
-		end
-
-		local teleportee = nil
-		local p = {}
-		local teleportee_name = nil
-		teleportee_name, p.x, p.y, p.z = param:match(
-				"^([^ ]+) +([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
-		p.x, p.y, p.z = tonumber(p.x), tonumber(p.y), tonumber(p.z)
-		if teleportee_name then
-			teleportee = core.get_player_by_name(teleportee_name)
-		end
-		if teleportee and p.x and p.y and p.z then
-			teleportee:setpos(p)
-			return true, "Teleporting " .. teleportee_name
-					.. " to " .. core.pos_to_string(p)
-		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 = core.get_player_by_name(teleportee_name)
-		end
-		if target_name then
-			local target = core.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)
-			teleportee:setpos(p)
-			return true, "Teleporting " .. teleportee_name
-					.. " to " .. target_name
-					.. " at " .. core.pos_to_string(p)
-		end
-		
-		return false, 'Invalid parameters ("' .. param
-				.. '") or player not found (see /help teleport)'
-	end,
-})
-
-core.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
-			core.setting_set(setname, setvalue)
-			return true, setname .. " = " .. setvalue
-		end
-		local setname, setvalue = string.match(param, "([^ ]+) (.+)")
-		if setname and setvalue then
-			if not core.setting_get(setname) then
-				return false, "Failed. Use '/set -n <name> <value>' to create a new setting."
-			end
-			core.setting_set(setname, setvalue)
-			return true, setname .. " = " .. setvalue
-		end
-		local setname = string.match(param, "([^ ]+)")
-		if setname then
-			local setvalue = core.setting_get(setname)
-			if not setvalue then
-				setvalue = "<not set>"
-			end
-			return true, setname .. " = " .. setvalue
-		end
-		return false, "Invalid parameters (see /help set)."
-	end,
-})
-
-core.register_chatcommand("mods", {
-	params = "",
-	description = "List mods installed on the server",
-	privs = {},
-	func = function(name, param)
-		return true, table.concat(core.get_modnames(), ", ")
-	end,
-})
-
-local function handle_give_command(cmd, giver, receiver, stackstring)
-	core.log("action", giver .. " invoked " .. cmd
-			.. ', stackstring="' .. stackstring .. '"')
-	local itemstack = ItemStack(stackstring)
-	if itemstack:is_empty() then
-		return false, "Cannot give an empty item"
-	elseif not itemstack:is_known() then
-		return false, "Cannot give an unknown item"
-	end
-	local receiverref = core.get_player_by_name(receiver)
-	if receiverref == nil then
-		return false, receiver .. " is not a known player"
-	end
-	local leftover = receiverref:get_inventory():add_item("main", itemstack)
-	local partiality
-	if leftover:is_empty() then
-		partiality = ""
-	elseif leftover:get_count() == itemstack:get_count() then
-		partiality = "could not be "
-	else
-		partiality = "partially "
-	end
-	-- The actual item stack string may be different from what the "giver"
-	-- entered (e.g. big numbers are always interpreted as 2^16-1).
-	stackstring = itemstack:to_string()
-	if giver == receiver then
-		return true, ("%q %sadded to inventory.")
-				:format(stackstring, partiality)
-	else
-		core.chat_send_player(receiver, ("%q %sadded to inventory.")
-				:format(stackstring, partiality))
-		return true, ("%q %sadded to %s's inventory.")
-				:format(stackstring, partiality, receiver)
-	end
-end
-
-core.register_chatcommand("give", {
-	params = "<name> <ItemString>",
-	description = "give item to player",
-	privs = {give=true},
-	func = function(name, param)
-		local toname, itemstring = string.match(param, "^([^ ]+) +(.+)$")
-		if not toname or not itemstring then
-			return false, "Name and ItemString required"
-		end
-		return handle_give_command("/give", name, toname, itemstring)
-	end,
-})
-
-core.register_chatcommand("giveme", {
-	params = "<ItemString>",
-	description = "give item to yourself",
-	privs = {give=true},
-	func = function(name, param)
-		local itemstring = string.match(param, "(.+)$")
-		if not itemstring then
-			return false, "ItemString required"
-		end
-		return handle_give_command("/giveme", name, name, itemstring)
-	end,
-})
-
-core.register_chatcommand("spawnentity", {
-	params = "<EntityName>",
-	description = "Spawn entity at your position",
-	privs = {give=true, interact=true},
-	func = function(name, param)
-		local entityname = string.match(param, "(.+)$")
-		if not entityname then
-			return false, "EntityName required"
-		end
-		core.log("action", ("/spawnentity invoked, entityname=%q")
-				:format(entityname))
-		local player = core.get_player_by_name(name)
-		if player == nil then
-			core.log("error", "Unable to spawn entity, player is nil")
-			return false, "Unable to spawn entity, player is nil"
-		end
-		local p = player:getpos()
-		p.y = p.y + 1
-		core.add_entity(p, entityname)
-		return true, ("%q spawned."):format(entityname)
-	end,
-})
-
-core.register_chatcommand("pulverize", {
-	params = "",
-	description = "Destroy item in hand",
-	func = function(name, param)
-		local player = core.get_player_by_name(name)
-		if not player then
-			core.log("error", "Unable to pulverize, no player.")
-			return false, "Unable to pulverize, no player."
-		end
-		if player:get_wielded_item():is_empty() then
-			return false, "Unable to pulverize, no item in hand."
-		end
-		player:set_wielded_item(nil)
-		return true, "An item was pulverized."
-	end,
-})
-
-- Key = player name
-core.rollback_punch_callbacks = {}
-
-core.register_on_punchnode(function(pos, node, puncher)
-	local name = puncher:get_player_name()
-	if core.rollback_punch_callbacks[name] then
-		core.rollback_punch_callbacks[name](pos, node, puncher)
-		core.rollback_punch_callbacks[name] = nil
-	end
-end)
-
-core.register_chatcommand("rollback_check", {
-	params = "[<range>] [<seconds>] [limit]",
-	description = "Check who has last touched a node or near it,"
-			.. " max. <seconds> ago (default range=0,"
-			.. " seconds=86400=24h, limit=5)",
-	privs = {rollback=true},
-	func = function(name, param)
-		local range, seconds, limit =
-			param:match("(%d+) *(%d*) *(%d*)")
-		range = tonumber(range) or 0
-		seconds = tonumber(seconds) or 86400
-		limit = tonumber(limit) or 5
-		if limit > 100 then
-			return false, "That limit is too high!"
-		end
-
-		core.rollback_punch_callbacks[name] = function(pos, node, puncher)
-			local name = puncher:get_player_name()
-			core.chat_send_player(name, "Checking " .. core.pos_to_string(pos) .. "...")
-			local actions = core.rollback_get_node_actions(pos, range, seconds, limit)
-			local num_actions = #actions
-			if num_actions == 0 then
-				core.chat_send_player(name, "Nobody has touched"
-						.. " the specified location in "
-						.. seconds .. " seconds")
-				return
-			end
-			local time = os.time()
-			for i = num_actions, 1, -1 do
-				local action = actions[i]
-				core.chat_send_player(name,
-					("%s %s %s -> %s %d seconds ago.")
-						:format(
-							core.pos_to_string(action.pos),
-							action.actor,
-							action.oldnode.name,
-							action.newnode.name,
-							time - action.time))
-			end
-		end
-
-		return true, "Punch a node (range=" .. range .. ", seconds="
-				.. seconds .. "s, limit=" .. limit .. ")"
-	end,
-})
-
-core.register_chatcommand("rollback", {
-	params = "<player name> [<seconds>] | :<actor> [<seconds>]",
-	description = "revert actions of a player; default for <seconds> is 60",
-	privs = {rollback=true},
-	func = function(name, param)
-		local target_name, seconds = string.match(param, ":([^ ]+) *(%d*)")
-		if not target_name then
-			local player_name = nil
-			player_name, seconds = string.match(param, "([^ ]+) *(%d*)")
-			if not player_name then
-				return false, "Invalid parameters. See /help rollback"
-						.. " and /help rollback_check."
-			end
-			target_name = "player:"..player_name
-		end
-		seconds = tonumber(seconds) or 60
-		core.chat_send_player(name, "Reverting actions of "
-				.. target_name .. " since "
-				.. seconds .. " seconds.")
-		local success, log = core.rollback_revert_actions_by(
-				target_name, seconds)
-		local response = ""
-		if #log > 100 then
-			response = "(log is too long to show)\n"
-		else
-			for _, line in pairs(log) do
-				response = response .. line .. "\n"
-			end
-		end
-		response = response .. "Reverting actions "
-				.. (success and "succeeded." or "FAILED.")
-		return success, response
-	end,
-})
-
-core.register_chatcommand("status", {
-	description = "Print server status",
-	func = function(name, param)
-		return true, core.get_server_status()
-	end,
-})
-
-core.register_chatcommand("time", {
-	params = "<0...24000>",
-	description = "set time of day",
-	privs = {settime=true},
-	func = function(name, param)
-		if param == "" then
-			return false, "Missing time."
-		end
-		local newtime = tonumber(param)
-		if newtime == nil then
-			return false, "Invalid time."
-		end
-		core.set_timeofday((newtime % 24000) / 24000)
-		core.log("action", name .. " sets time " .. newtime)
-		return true, "Time of day changed."
-	end,
-})
-
-core.register_chatcommand("shutdown", {
-	description = "shutdown server",
-	privs = {server=true},
-	func = function(name, param)
-		core.log("action", name .. " shuts down server")
-		core.request_shutdown()
-		core.chat_send_all("*** Server shutting down (operator request).")
-	end,
-})
-
-core.register_chatcommand("ban", {
-	params = "<name>",
-	description = "Ban IP of player",
-	privs = {ban=true},
-	func = function(name, param)
-		if param == "" then
-			return true, "Ban list: " .. core.get_ban_list()
-		end
-		if not core.get_player_by_name(param) then
-			return false, "No such player."
-		end
-		if not core.ban_player(param) then
-			return false, "Failed to ban player."
-		end
-		local desc = core.get_ban_description(param)
-		core.log("action", name .. " bans " .. desc .. ".")
-		return true, "Banned " .. desc .. "."
-	end,
-})
-
-core.register_chatcommand("unban", {
-	params = "<name/ip>",
-	description = "remove IP ban",
-	privs = {ban=true},
-	func = function(name, param)
-		if not core.unban_player_or_ip(param) then
-			return false, "Failed to unban player/IP."
-		end
-		core.log("action", name .. " unbans " .. param)
-		return true, "Unbanned " .. param
-	end,
-})
-
-core.register_chatcommand("kick", {
-	params = "<name> [reason]",
-	description = "kick a player",
-	privs = {kick=true},
-	func = function(name, param)
-		local tokick, reason = param:match("([^ ]+) (.+)")
-		tokick = tokick or param
-		if not core.kick_player(tokick, reason) then
-			return false, "Failed to kick player " .. tokick
-		end
-		core.log("action", name .. " kicked " .. tokick)
-		return true, "Kicked " .. tokick
-	end,
-})
-
-core.register_chatcommand("clearobjects", {
-	description = "clear all objects in world",
-	privs = {server=true},
-	func = function(name, param)
-		core.log("action", name .. " clears all objects.")
-		core.chat_send_all("Clearing all objects.  This may take long."
-				.. "  You may experience a timeout.  (by "
-				.. name .. ")")
-		core.clear_objects()
-		core.log("action", "Object clearing done.")
-		core.chat_send_all("*** Cleared all objects.")
-	end,
-})
-
-core.register_chatcommand("msg", {
-	params = "<name> <message>",
-	description = "Send a private message",
-	privs = {shout=true},
-	func = function(name, param)
-		local sendto, message = param:match("^(%S+)%s(.+)$")
-		if not sendto then
-			return false, "Invalid usage, see /help msg."
-		end
-		if not core.get_player_by_name(sendto) then
-			return false, "The player " .. sendto
-					.. " is not online."
-		end
-		core.log("action", "PM from " .. name .. " to " .. sendto
-				.. ": " .. message)
-		core.chat_send_player(sendto, "PM from " .. name .. ": "
-				.. message)
-		return true, "Message sent."
-	end,
-})
-
-core.register_chatcommand("last-login", {
-	params = "[name]",
-	description = "Get the last login time of a player",
-	func = function(name, param)
-		if param == "" then
-			param = name
-		end
-		local pauth = core.get_auth_handler().get_auth(param)
-		if pauth and pauth.last_login then
-			-- Time in UTC, ISO 8601 format
-			return true, "Last login time was " ..
-				os.date("!%Y-%m-%dT%H:%M:%SZ", pauth.last_login)
-		end
-		return false, "Last login time is unknown"
-	end,
-})
-
--- a/builtin/game/deprecated.lua
+++ b/builtin/game/deprecated.lua
@@ -1,53 +0,0 @@
-- Minetest: builtin/deprecated.lua
-
--
-- Default material types
--
-function digprop_err()
-	core.log("info", debug.traceback())
-	core.log("info", "WARNING: The core.digprop_* functions are obsolete and need to be replaced by item groups.")
-end
-
-core.digprop_constanttime = digprop_err
-core.digprop_stonelike = digprop_err
-core.digprop_dirtlike = digprop_err
-core.digprop_gravellike = digprop_err
-core.digprop_woodlike = digprop_err
-core.digprop_leaveslike = digprop_err
-core.digprop_glasslike = digprop_err
-
-core.node_metadata_inventory_move_allow_all = function()
-	core.log("info", "WARNING: core.node_metadata_inventory_move_allow_all is obsolete and does nothing.")
-end
-
-core.add_to_creative_inventory = function(itemstring)
-	core.log('info', "WARNING: core.add_to_creative_inventory: This function is deprecated and does nothing.")
-end
-
--
-- EnvRef
--
-core.env = {}
-local envref_deprecation_message_printed = false
-setmetatable(core.env, {
-	__index = function(table, key)
-		if not envref_deprecation_message_printed then
-			core.log("info", "WARNING: core.env:[...] is deprecated and should be replaced with core.[...]")
-			envref_deprecation_message_printed = true
-		end
-		local func = core[key]
-		if type(func) == "function" then
-			rawset(table, key, function(self, ...)
-				return func(...)
-			end)
-		else
-			rawset(table, key, nil)
-		end
-		return rawget(table, key)
-	end
-})
-
-function core.rollback_get_last_node_actor(pos, range, seconds)
-	return core.rollback_get_node_actions(pos, range, seconds, 1)[1]
-end
-
--- a/builtin/game/detached_inventory.lua
+++ b/builtin/game/detached_inventory.lua
@@ -1,19 +0,0 @@
-- Minetest: builtin/detached_inventory.lua
-
-core.detached_inventories = {}
-
-function core.create_detached_inventory(name, callbacks)
-	local stuff = {}
-	stuff.name = name
-	if callbacks then
-		stuff.allow_move = callbacks.allow_move
-		stuff.allow_put = callbacks.allow_put
-		stuff.allow_take = callbacks.allow_take
-		stuff.on_move = callbacks.on_move
-		stuff.on_put = callbacks.on_put
-		stuff.on_take = callbacks.on_take
-	end
-	core.detached_inventories[name] = stuff
-	return core.create_detached_inventory_raw(name)
-end
-
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -1,224 +0,0 @@
-- Minetest: builtin/item.lua
-
--
-- Falling stuff
--
-
-core.register_entity(":__builtin:falling_node", {
-	initial_properties = {
-		physical = true,
-		collide_with_objects = false,
-		collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
-		visual = "wielditem",
-		textures = {},
-		visual_size = {x=0.667, y=0.667},
-	},
-
-	node = {},
-
-	set_node = function(self, node)
-		self.node = node
-		local stack = ItemStack(node.name)
-		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 core.registered_items[itemname] then
-			item_texture = core.registered_items[itemname].inventory_image
-			item_type = core.registered_items[itemname].type
-		end
-		local prop = {
-			is_visible = true,
-			textures = {node.name},
-		}
-		self.object:set_properties(prop)
-	end,
-
-	get_staticdata = function(self)
-		return self.node.name
-	end,
-
-	on_activate = function(self, staticdata)
-		self.object:set_armor_groups({immortal=1})
-		self:set_node({name=staticdata})
-	end,
-
-	on_step = function(self, dtime)
-		-- Set gravity
-		self.object:setacceleration({x=0, y=-10, z=0})
-		-- Turn to actual sand when collides to ground or just move
-		local pos = self.object:getpos()
-		local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point
-		local bcn = core.get_node(bcp)
-		local bcd = core.registered_nodes[bcn.name]
-		-- Note: walkable is in the node definition, not in item groups
-		if not bcd or
-				(bcd.walkable or
-				(core.get_item_group(self.node.name, "float") ~= 0 and
-				bcd.liquidtype ~= "none")) then
-			if bcd and bcd.leveled and
-					bcn.name == self.node.name then
-				local addlevel = self.node.level
-				if addlevel == nil or addlevel <= 0 then
-					addlevel = bcd.leveled
-				end
-				if core.add_node_level(bcp, addlevel) == 0 then
-					self.object:remove()
-					return
-				end
-			elseif bcd and bcd.buildable_to and
-					(core.get_item_group(self.node.name, "float") == 0 or
-					bcd.liquidtype == "none") then
-				core.remove_node(bcp)
-				return
-			end
-			local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
-			-- Check what's here
-			local n2 = core.get_node(np)
-			-- If it's not air or liquid, remove node and replace it with
-			-- it's drops
-			if n2.name ~= "air" and (not core.registered_nodes[n2.name] or
-					core.registered_nodes[n2.name].liquidtype == "none") then
-				core.remove_node(np)
-				if core.registered_nodes[n2.name].buildable_to == false then
-					-- Add dropped items
-					local drops = core.get_node_drops(n2.name, "")
-					local _, dropped_item
-					for _, dropped_item in ipairs(drops) do
-						core.add_item(np, dropped_item)
-					end
-				end
-				-- Run script hook
-				local _, callback
-				for _, callback in ipairs(core.registered_on_dignodes) do
-					callback(np, n2, nil)
-				end
-			end
-			-- Create node and remove entity
-			core.add_node(np, self.node)
-			self.object:remove()
-			nodeupdate(np)
-			return
-		end
-		local vel = self.object:getvelocity()
-		if vector.equals(vel, {x=0,y=0,z=0}) then
-			local npos = self.object:getpos()
-			self.object:setpos(vector.round(npos))
-		end
-	end
-})
-
-function spawn_falling_node(p, node)
-	local obj = core.add_entity(p, "__builtin:falling_node")
-	obj:get_luaentity():set_node(node)
-end
-
-function drop_attached_node(p)
-	local nn = core.get_node(p).name
-	core.remove_node(p)
-	for _,item in ipairs(core.get_node_drops(nn, "")) do
-		local pos = {
-			x = p.x + math.random()/2 - 0.25,
-			y = p.y + math.random()/2 - 0.25,
-			z = p.z + math.random()/2 - 0.25,
-		}
-		core.add_item(pos, item)
-	end
-end
-
-function check_attached_node(p, n)
-	local def = core.registered_nodes[n.name]
-	local d = {x=0, y=0, z=0}
-	if def.paramtype2 == "wallmounted" then
-		if n.param2 == 0 then
-			d.y = 1
-		elseif n.param2 == 1 then
-			d.y = -1
-		elseif n.param2 == 2 then
-			d.x = 1
-		elseif n.param2 == 3 then
-			d.x = -1
-		elseif n.param2 == 4 then
-			d.z = 1
-		elseif n.param2 == 5 then
-			d.z = -1
-		end
-	else
-		d.y = -1
-	end
-	local p2 = {x=p.x+d.x, y=p.y+d.y, z=p.z+d.z}
-	local nn = core.get_node(p2).name
-	local def2 = core.registered_nodes[nn]
-	if def2 and not def2.walkable then
-		return false
-	end
-	return true
-end
-
--
-- Some common functions
--
-
-function nodeupdate_single(p, delay)
-	local n = core.get_node(p)
-	if core.get_item_group(n.name, "falling_node") ~= 0 then
-		local p_bottom = {x=p.x, y=p.y-1, z=p.z}
-		local n_bottom = core.get_node(p_bottom)
-		-- Note: walkable is in the node definition, not in item groups
-		if core.registered_nodes[n_bottom.name] and
-				(core.get_item_group(n.name, "float") == 0 or
-					core.registered_nodes[n_bottom.name].liquidtype == "none") and
-				(n.name ~= n_bottom.name or (core.registered_nodes[n_bottom.name].leveled and
-					core.get_node_level(p_bottom) < core.get_node_max_level(p_bottom))) and
-				(not core.registered_nodes[n_bottom.name].walkable or
-					core.registered_nodes[n_bottom.name].buildable_to) then
-			if delay then
-				core.after(0.1, nodeupdate_single, {x=p.x, y=p.y, z=p.z}, false)
-			else
-				n.level = core.get_node_level(p)
-				core.remove_node(p)
-				spawn_falling_node(p, n)
-				nodeupdate(p)
-			end
-		end
-	end
-
-	if core.get_item_group(n.name, "attached_node") ~= 0 then
-		if not check_attached_node(p, n) then
-			drop_attached_node(p)
-			nodeupdate(p)
-		end
-	end
-end
-
-function nodeupdate(p, delay)
-	-- Round p to prevent falling entities to get stuck
-	p.x = math.floor(p.x+0.5)
-	p.y = math.floor(p.y+0.5)
-	p.z = math.floor(p.z+0.5)
-
-	for x = -1,1 do
-	for y = -1,1 do
-	for z = -1,1 do
-		nodeupdate_single({x=p.x+x, y=p.y+y, z=p.z+z}, delay or not (x==0 and y==0 and z==0))
-	end
-	end
-	end
-end
-
--
-- Global callbacks
--
-
-function on_placenode(p, node)
-	nodeupdate(p)
-end
-core.register_on_placenode(on_placenode)
-
-function on_dignode(p, node)
-	nodeupdate(p)
-end
-core.register_on_dignode(on_dignode)
--- a/builtin/game/features.lua
+++ b/builtin/game/features.lua
@@ -1,30 +0,0 @@
-- Minetest: builtin/features.lua
-
-core.features = {
-	glasslike_framed = true,
-	nodebox_as_selectionbox = true,
-	chat_send_player_param3 = true,
-	get_all_craft_recipes_works = true,
-	use_texture_alpha = true,
-	no_legacy_abms = true,
-	texture_names_parens = true,
-}
-
-function core.has_feature(arg)
-	if type(arg) == "table" then
-		missing_features = {}
-		result = true
-		for ft, _ in pairs(arg) do
-			if not core.features[ftr] then
-				missing_features[ftr] = true
-				result = false
-			end
-		end
-		return result, missing_features
-	elseif type(arg) == "string" then
-		if not core.features[arg] then
-			return false, {[arg]=true}
-		end
-		return true, {}
-	end
-end
--- a/builtin/game/forceloading.lua
+++ b/builtin/game/forceloading.lua
@@ -1,79 +0,0 @@
-- Prevent anyone else accessing those functions
-local forceload_block = core.forceload_block
-local forceload_free_block = core.forceload_free_block
-core.forceload_block = nil
-core.forceload_free_block = nil
-
-local blocks_forceloaded
-local total_forceloaded = 0
-
-local BLOCKSIZE = 16
-local function get_blockpos(pos)
-	return {
-		x = math.floor(pos.x/BLOCKSIZE),
-		y = math.floor(pos.y/BLOCKSIZE),
-		z = math.floor(pos.z/BLOCKSIZE)}
-end
-
-function core.forceload_block(pos)
-	local blockpos = get_blockpos(pos)
-	local hash = core.hash_node_position(blockpos)
-	if blocks_forceloaded[hash] ~= nil then
-		blocks_forceloaded[hash] = blocks_forceloaded[hash] + 1
-		return true
-	else
-		if total_forceloaded >= (tonumber(core.setting_get("max_forceloaded_blocks")) or 16) then
-			return false
-		end
-		total_forceloaded = total_forceloaded+1
-		blocks_forceloaded[hash] = 1
-		forceload_block(blockpos)
-		return true
-	end
-end
-
-function core.forceload_free_block(pos)
-	local blockpos = get_blockpos(pos)
-	local hash = core.hash_node_position(blockpos)
-	if blocks_forceloaded[hash] == nil then return end
-	if blocks_forceloaded[hash] > 1 then
-		blocks_forceloaded[hash] = blocks_forceloaded[hash] - 1
-	else
-		total_forceloaded = total_forceloaded-1
-		blocks_forceloaded[hash] = nil
-		forceload_free_block(blockpos)
-	end
-end
-
-- Keep the forceloaded areas after restart
-local wpath = core.get_worldpath()
-local function read_file(filename)
-	local f = io.open(filename, "r")
-	if f==nil then return {} end
-	local t = f:read("*all")
-	f:close()
-	if t=="" or t==nil then return {} end
-	return core.deserialize(t) or {}
-end
-
-local function write_file(filename, table)
-	local f = io.open(filename, "w")
-	f:write(core.serialize(table))
-	f:close()
-end
-
-blocks_forceloaded = read_file(wpath.."/force_loaded.txt")
-for _, __ in pairs(blocks_forceloaded) do
-	total_forceloaded = total_forceloaded + 1
-end
-
-core.after(5, function()
-	for hash, _ in pairs(blocks_forceloaded) do
-		local blockpos = core.get_position_from_hash(hash)
-		forceload_block(blockpos)
-	end
-end)
-
-core.register_on_shutdown(function()
-	write_file(wpath.."/force_loaded.txt", blocks_forceloaded)
-end)
--- a/builtin/game/init.lua
+++ b/builtin/game/init.lua
@@ -1,29 +0,0 @@
-
-local scriptpath = minetest.get_builtin_path()..DIR_DELIM
-local commonpath = scriptpath.."common"..DIR_DELIM
-local gamepath = scriptpath.."game"..DIR_DELIM
-
-dofile(commonpath.."vector.lua")
-
-dofile(gamepath.."item.lua")
-dofile(gamepath.."register.lua")
-
-if core.setting_getbool("mod_profiling") then
-	dofile(gamepath.."mod_profiling.lua")
-end
-
-dofile(gamepath.."item_entity.lua")
-dofile(gamepath.."deprecated.lua")
-dofile(gamepath.."misc.lua")
-dofile(gamepath.."privileges.lua")
-dofile(gamepath.."auth.lua")
-dofile(gamepath.."chatcommands.lua")
-dofile(gamepath.."static_spawn.lua")
-dofile(gamepath.."detached_inventory.lua")
-dofile(gamepath.."falling.lua")
-dofile(gamepath.."features.lua")
-dofile(gamepath.."voxelarea.lua")
-dofile(gamepath.."forceloading.lua")
-dofile(gamepath.."statbars.lua")
-dofile(gamepath.."builtin_biome.lua")
-
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -1,600 +0,0 @@
-- Minetest: builtin/item.lua
-
-local function copy_pointed_thing(pointed_thing)
-	return {
-		type  = pointed_thing.type,
-		above = vector.new(pointed_thing.above),
-		under = vector.new(pointed_thing.under),
-		ref   = pointed_thing.ref,
-	}
-end
-
--
-- Item definition helpers
--
-
-function core.inventorycube(img1, img2, img3)
-	img2 = img2 or img1
-	img3 = img3 or img1
-	return "[inventorycube"
-			.. "{" .. img1:gsub("%^", "&")
-			.. "{" .. img2:gsub("%^", "&")
-			.. "{" .. img3:gsub("%^", "&")
-end
-
-function core.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 core.dir_to_facedir(dir, is6d)
-	--account for y if requested
-	if is6d and math.abs(dir.y) > math.abs(dir.x) and math.abs(dir.y) > math.abs(dir.z) then
-
-		--from above
-		if dir.y < 0 then
-			if math.abs(dir.x) > math.abs(dir.z) then
-				if dir.x < 0 then
-					return 19
-				else
-					return 13
-				end
-			else
-				if dir.z < 0 then
-					return 10
-				else
-					return 4
-				end
-			end
-
-		--from below
-		else
-			if math.abs(dir.x) > math.abs(dir.z) then
-				if dir.x < 0 then
-					return 15
-				else
-					return 17
-				end
-			else
-				if dir.z < 0 then
-					return 6
-				else
-					return 8
-				end
-			end
-		end
-
-	--otherwise, place horizontally
-	elseif 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 core.facedir_to_dir(facedir)
-	--a table of possible dirs
-	return ({{x=0, y=0, z=1},
-					{x=1, y=0, z=0},
-					{x=0, y=0, z=-1},
-					{x=-1, y=0, z=0},
-					{x=0, y=-1, z=0},
-					{x=0, y=1, z=0}})
-
-					--indexed into by a table of correlating facedirs
-					[({[0]=1, 2, 3, 4, 
-						5, 2, 6, 4,
-						6, 2, 5, 4,
-						1, 5, 3, 6,
-						1, 6, 3, 5,
-						1, 4, 3, 2})
-
-						--indexed into by the facedir in question
-						[facedir]]
-end
-
-function core.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 core.get_node_drops(nodename, toolname)
-	local drop = ItemStack({name=nodename}):get_definition().drop
-	if drop == nil then
-		-- default drop
-		return {nodename}
-	elseif type(drop) == "string" then
-		-- itemstring drop
-		return {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 core.item_place_node(itemstack, placer, pointed_thing, param2)
-	local item = itemstack:peek_item()
-	local def = itemstack:get_definition()
-	if def.type ~= "node" or pointed_thing.type ~= "node" then
-		return itemstack, false
-	end
-
-	local under = pointed_thing.under
-	local oldnode_under = core.get_node_or_nil(under)
-	local above = pointed_thing.above
-	local oldnode_above = core.get_node_or_nil(above)
-
-	if not oldnode_under or not oldnode_above then
-		core.log("info", placer:get_player_name() .. " tried to place"
-			.. " node in unloaded position " .. core.pos_to_string(above))
-		return itemstack, false
-	end
-
-	local olddef_under = ItemStack({name=oldnode_under.name}):get_definition()
-	olddef_under = olddef_under or core.nodedef_default
-	local olddef_above = ItemStack({name=oldnode_above.name}):get_definition()
-	olddef_above = olddef_above or core.nodedef_default
-
-	if not olddef_above.buildable_to and not olddef_under.buildable_to then
-		core.log("info", placer:get_player_name() .. " tried to place"
-			.. " node in invalid position " .. core.pos_to_string(above)
-			.. ", replacing " .. oldnode_above.name)
-		return itemstack, false
-	end
-
-	-- Place above pointed node
-	local place_to = {x = above.x, y = above.y, z = above.z}
-
-	-- If node under is buildable_to, place into it instead (eg. snow)
-	if olddef_under.buildable_to then
-		core.log("info", "node under is buildable to")
-		place_to = {x = under.x, y = under.y, z = under.z}
-	end
-
-	if core.is_protected(place_to, placer:get_player_name()) then
-		core.log("action", placer:get_player_name()
-				.. " tried to place " .. def.name
-				.. " at protected position "
-				.. core.pos_to_string(place_to))
-		core.record_protection_violation(place_to, placer:get_player_name())
-		return itemstack
-	end
-
-	core.log("action", placer:get_player_name() .. " places node "
-		.. def.name .. " at " .. core.pos_to_string(place_to))
-	
-	local oldnode = core.get_node(place_to)
-	local newnode = {name = def.name, param1 = 0, param2 = param2}
-
-	-- Calculate direction for wall mounted stuff like torches and signs
-	if def.paramtype2 == 'wallmounted' and not param2 then
-		local dir = {
-			x = under.x - above.x,
-			y = under.y - above.y,
-			z = under.z - above.z
-		}
-		newnode.param2 = core.dir_to_wallmounted(dir)
-	-- Calculate the direction for furnaces and chests and stuff
-	elseif def.paramtype2 == 'facedir' and not param2 then
-		local placer_pos = placer:getpos()
-		if placer_pos then
-			local dir = {
-				x = above.x - placer_pos.x,
-				y = above.y - placer_pos.y,
-				z = above.z - placer_pos.z
-			}
-			newnode.param2 = core.dir_to_facedir(dir)
-			core.log("action", "facedir: " .. newnode.param2)
-		end
-	end
-
-	-- Check if the node is attached and if it can be placed there
-	if core.get_item_group(def.name, "attached_node") ~= 0 and
-		not check_attached_node(place_to, newnode) then
-		core.log("action", "attached node " .. def.name ..
-			" can not be placed at " .. core.pos_to_string(place_to))
-		return itemstack, false
-	end
-
-	-- Add node and update
-	core.add_node(place_to, newnode)
-
-	local take_item = true
-
-	-- Run callback
-	if def.after_place_node then
-		-- Deepcopy place_to and pointed_thing because callback can modify it
-		local place_to_copy = {x=place_to.x, y=place_to.y, z=place_to.z}
-		local pointed_thing_copy = copy_pointed_thing(pointed_thing)
-		if def.after_place_node(place_to_copy, placer, itemstack,
-				pointed_thing_copy) then
-			take_item = false
-		end
-	end
-
-	-- Run script hook
-	local _, callback
-	for _, callback in ipairs(core.registered_on_placenodes) do
-		-- Deepcopy pos, node and pointed_thing because callback can modify them
-		local place_to_copy = {x=place_to.x, y=place_to.y, z=place_to.z}
-		local newnode_copy = {name=newnode.name, param1=newnode.param1, param2=newnode.param2}
-		local oldnode_copy = {name=oldnode.name, param1=oldnode.param1, param2=oldnode.param2}
-		local pointed_thing_copy = copy_pointed_thing(pointed_thing)
-		if callback(place_to_copy, newnode_copy, placer, oldnode_copy, itemstack, pointed_thing_copy) then
-			take_item = false
-		end
-	end
-
-	if take_item then
-		itemstack:take_item()
-	end
-	return itemstack, true
-end
-
-function core.item_place_object(itemstack, placer, pointed_thing)
-	local pos = core.get_pointed_thing_position(pointed_thing, true)
-	if pos ~= nil then
-		local item = itemstack:take_item()
-		core.add_item(pos, item)
-	end
-	return itemstack
-end
-
-function core.item_place(itemstack, placer, pointed_thing, param2)
-	-- Call on_rightclick if the pointed node defines it
-	if pointed_thing.type == "node" and placer and
-			not placer:get_player_control().sneak then
-		local n = core.get_node(pointed_thing.under)
-		local nn = n.name
-		if core.registered_nodes[nn] and core.registered_nodes[nn].on_rightclick then
-			return core.registered_nodes[nn].on_rightclick(pointed_thing.under, n,
-					placer, itemstack, pointed_thing) or itemstack, false
-		end
-	end
-
-	if itemstack:get_definition().type == "node" then
-		return core.item_place_node(itemstack, placer, pointed_thing, param2)
-	end
-	return itemstack
-end
-
-function core.item_drop(itemstack, dropper, pos)
-	if dropper.is_player then
-		local v = dropper:get_look_dir()
-		local p = {x=pos.x, y=pos.y+1.2, z=pos.z}
-		local cs = itemstack:get_count()
-		if dropper:get_player_control().sneak then
-			cs = 1
-		end
-		local item = itemstack:take_item(cs)
-		local obj = core.add_item(p, item)
-		if obj then
-			v.x = v.x*2
-			v.y = v.y*2 + 2
-			v.z = v.z*2
-			obj:setvelocity(v)
-		end
-
-	else
-		core.add_item(pos, itemstack)
-	end
-	return itemstack
-end
-
-function core.item_eat(hp_change, replace_with_item)
-	return function(itemstack, user, pointed_thing)  -- closure
-		for _, callback in pairs(core.registered_on_item_eats) do
-			local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing)
-			if result then
-				return result
-			end
-		end
-		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 core.node_punch(pos, node, puncher, pointed_thing)
-	-- Run script hook
-	for _, callback in ipairs(core.registered_on_punchnodes) do
-		-- Copy pos and node because callback can modify them
-		local pos_copy = vector.new(pos)
-		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
-		local pointed_thing_copy = pointed_thing and copy_pointed_thing(pointed_thing) or nil
-		callback(pos_copy, node_copy, puncher, pointed_thing_copy)
-	end
-end
-
-function core.handle_node_drops(pos, drops, digger)
-	-- Add dropped items to object's inventory
-	if digger:get_inventory() then
-		local _, dropped_item
-		for _, dropped_item in ipairs(drops) do
-			local left = digger:get_inventory():add_item("main", dropped_item)
-			if not left:is_empty() then
-				local p = {
-					x = pos.x + math.random()/2-0.25,
-					y = pos.y + math.random()/2-0.25,
-					z = pos.z + math.random()/2-0.25,
-				}
-				core.add_item(p, left)
-			end
-		end
-	end
-end
-
-function core.node_dig(pos, node, digger)
-	local def = ItemStack({name=node.name}):get_definition()
-	if not def.diggable or (def.can_dig and not def.can_dig(pos,digger)) then
-		core.log("info", digger:get_player_name() .. " tried to dig "
-			.. node.name .. " which is not diggable "
-			.. core.pos_to_string(pos))
-		return
-	end
-
-	if core.is_protected(pos, digger:get_player_name()) then
-		core.log("action", digger:get_player_name()
-				.. " tried to dig " .. node.name
-				.. " at protected position "
-				.. core.pos_to_string(pos))
-		core.record_protection_violation(pos, digger:get_player_name())
-		return
-	end
-
-	core.log('action', digger:get_player_name() .. " digs "
-		.. node.name .. " at " .. core.pos_to_string(pos))
-
-	local wielded = digger:get_wielded_item()
-	local drops = core.get_node_drops(node.name, wielded:get_name())
-	
-	local wdef = wielded:get_definition()
-	local tp = wielded:get_tool_capabilities()
-	local dp = core.get_dig_params(def.groups, tp)
-	if wdef and wdef.after_use then
-		wielded = wdef.after_use(wielded, digger, node, dp) or wielded
-	else
-		-- Wear out tool
-		if not core.setting_getbool("creative_mode") then
-			wielded:add_wear(dp.wear)
-		end
-	end
-	digger:set_wielded_item(wielded)
-	
-	-- Handle drops
-	core.handle_node_drops(pos, drops, digger)
-
-	local oldmetadata = nil
-	if def.after_dig_node then
-		oldmetadata = core.get_meta(pos):to_table()
-	end
-
-	-- Remove node and update
-	core.remove_node(pos)
-	
-	-- Run callback
-	if def.after_dig_node then
-		-- Copy pos and node because callback can modify them
-		local pos_copy = {x=pos.x, y=pos.y, z=pos.z}
-		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
-		def.after_dig_node(pos_copy, node_copy, oldmetadata, digger)
-	end
-
-	-- Run script hook
-	local _, callback
-	for _, callback in ipairs(core.registered_on_dignodes) do
-		-- Copy pos and node because callback can modify them
-		local pos_copy = {x=pos.x, y=pos.y, z=pos.z}
-		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
-		callback(pos_copy, node_copy, digger)
-	end
-end
-
-- This is used to allow mods to redefine core.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
--
-
-core.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(core, 'item_place'), -- core.item_place
-	on_drop = redef_wrapper(core, 'item_drop'), -- core.item_drop
-	on_use = nil,
-	can_dig = nil,
-
-	on_punch = redef_wrapper(core, 'node_punch'), -- core.node_punch
-	on_rightclick = nil,
-	on_dig = redef_wrapper(core, 'node_dig'), -- core.node_dig
-
-	on_receive_fields = nil,
-	
-	on_metadata_inventory_move = core.node_metadata_inventory_move_allow_all,
-	on_metadata_inventory_offer = core.node_metadata_inventory_offer_allow_all,
-	on_metadata_inventory_take = core.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 = true,
-	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,
-	drowning = 0,
-	light_source = 0,
-	damage_per_second = 0,
-	selection_box = {type="regular"},
-	legacy_facedir_simple = false,
-	legacy_wallmounted = false,
-}
-
-core.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(core, 'item_place'), -- core.item_place
-	on_drop = redef_wrapper(core, 'item_drop'), -- core.item_drop
-	on_use = nil,
-}
-
-core.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(core, 'item_place'), -- core.item_place
-	on_drop = redef_wrapper(core, 'item_drop'), -- core.item_drop
-	on_use = nil,
-}
-
-core.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 = redef_wrapper(core, 'item_place'),
-	on_drop = nil,
-	on_use = nil,
-}
--- a/builtin/game/item_entity.lua
+++ b/builtin/game/item_entity.lua
@@ -1,189 +0,0 @@
-- Minetest: builtin/item_entity.lua
-
-function core.spawn_item(pos, item)
-	-- Take item in any format
-	local stack = ItemStack(item)
-	local obj = core.add_entity(pos, "__builtin:item")
-	obj:get_luaentity():set_item(stack:to_string())
-	return obj
-end
-
-- If item_entity_ttl is not set, enity will have default life time 
-- Setting it to -1 disables the feature
-
-local time_to_live = tonumber(core.setting_get("item_entity_ttl"))
-if not time_to_live then
-	time_to_live = 900
-end
-
-core.register_entity(":__builtin:item", {
-	initial_properties = {
-		hp_max = 1,
-		physical = true,
-		collide_with_objects = false,
-		collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
-		visual = "wielditem",
-		visual_size = {x = 0.4, y = 0.4},
-		textures = {""},
-		spritediv = {x = 1, y = 1},
-		initial_sprite_basepos = {x = 0, y = 0},
-		is_visible = false,
-	},
-
-	itemstring = '',
-	physical_state = true,
-	age = 0,
-
-	set_item = function(self, itemstring)
-		self.itemstring = itemstring
-		local stack = ItemStack(itemstring)
-		local count = stack:get_count()
-		local max_count = stack:get_stack_max()
-		if count > max_count then
-			count = max_count
-			self.itemstring = stack:get_name().." "..max_count
-		end
-		local s = 0.2 + 0.1 * (count / max_count)
-		local c = s
-		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 core.registered_items[itemname] then
-			item_texture = core.registered_items[itemname].inventory_image
-			item_type = core.registered_items[itemname].type
-		end
-		local prop = {
-			is_visible = true,
-			visual = "wielditem",
-			textures = {itemname},
-			visual_size = {x = s, y = s},
-			collisionbox = {-c, -c, -c, c, c, c},
-			automatic_rotate = math.pi * 0.5,
-		}
-		self.object:set_properties(prop)
-	end,
-
-	get_staticdata = function(self)
-		return core.serialize({
-			itemstring = self.itemstring,
-			always_collect = self.always_collect,
-			age = self.age
-		})
-	end,
-
-	on_activate = function(self, staticdata, dtime_s)
-		if string.sub(staticdata, 1, string.len("return")) == "return" then
-			local data = core.deserialize(staticdata)
-			if data and type(data) == "table" then
-				self.itemstring = data.itemstring
-				self.always_collect = data.always_collect
-				if data.age then 
-					self.age = data.age + dtime_s
-				else
-					self.age = dtime_s
-				end
-			end
-		else
-			self.itemstring = staticdata
-		end
-		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)
-		self.age = self.age + dtime
-		if time_to_live > 0 and self.age > time_to_live then
-			self.itemstring = ''
-			self.object:remove()
-			return
-		end
-		local p = self.object:getpos()
-		p.y = p.y - 0.5
-		local nn = core.get_node(p).name
-		-- If node is not registered or node is walkably solid and resting on nodebox
-		local v = self.object:getvelocity()
-		if not core.registered_nodes[nn] or core.registered_nodes[nn].walkable and v.y == 0 then
-			if self.physical_state then
-				local own_stack = ItemStack(self.object:get_luaentity().itemstring)
-				for _,object in ipairs(core.get_objects_inside_radius(p, 0.8)) do
-					local obj = object:get_luaentity()
-					if obj and obj.name == "__builtin:item" and obj.physical_state == false then
-						local stack = ItemStack(obj.itemstring)
-						if own_stack:get_name() == stack:get_name() and stack:get_free_space() > 0 then 
-							local overflow = false
-							local count = stack:get_count() + own_stack:get_count()
-							local max_count = stack:get_stack_max()
-							if count>max_count then
-								overflow = true
-								count = count - max_count
-							else
-								self.itemstring = ''
-							end	
-							local pos=object:getpos() 
-							pos.y = pos.y + (count - stack:get_count()) / max_count * 0.15
-							object:moveto(pos, false)
-							local s, c
-							local max_count = stack:get_stack_max()
-							local name = stack:get_name()
-							if not overflow then
-								obj.itemstring = name.." "..count
-								s = 0.2 + 0.1 * (count / max_count)
-								c = s
-								object:set_properties({
-									visual_size = {x = s, y = s},
-									collisionbox = {-c, -c, -c, c, c, c}
-								})
-								self.object:remove()
-								return
-							else
-								s = 0.4
-								c = 0.3
-								object:set_properties({
-									visual_size = {x = s, y = s},
-									collisionbox = {-c, -c, -c, c, c, c}
-								})
-								obj.itemstring = name.." "..max_count
-								s = 0.2 + 0.1 * (count / max_count)
-								c = s
-								self.object:set_properties({
-									visual_size = {x = s, y = s},
-									collisionbox = {-c, -c, -c, c, c, c}
-								})
-								self.itemstring = name.." "..count
-							end
-						end
-					end
-				end
-				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
-			local left = hitter:get_inventory():add_item("main", self.itemstring)
-			if not left:is_empty() then
-				self.itemstring = left:to_string()
-				return
-			end
-		end
-		self.itemstring = ''
-		self.object:remove()
-	end,
-})
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -1,138 +0,0 @@
-- Minetest: builtin/misc.lua
-
--
-- Misc. API functions
--
-
-core.timers_to_add = {}
-core.timers = {}
-core.register_globalstep(function(dtime)
-	for _, timer in ipairs(core.timers_to_add) do
-		table.insert(core.timers, timer)
-	end
-	core.timers_to_add = {}
-	local index = 1
-	while index <= #core.timers do
-		local timer = core.timers[index]
-		timer.time = timer.time - dtime
-		if timer.time <= 0 then
-			timer.func(unpack(timer.args or {}))
-			table.remove(core.timers,index)
-		else
-			index = index + 1
-		end
-	end
-end)
-
-function core.after(time, func, ...)
-	assert(tonumber(time) and type(func) == "function",
-			"Invalid core.after invocation")
-	table.insert(core.timers_to_add, {time=time, func=func, args={...}})
-end
-
-function core.check_player_privs(name, privs)
-	local player_privs = core.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
-
-local player_list = {}
-
-core.register_on_joinplayer(function(player)
-	player_list[player:get_player_name()] = player
-end)
-
-core.register_on_leaveplayer(function(player)
-	player_list[player:get_player_name()] = nil
-end)
-
-function core.get_connected_players()
-	local temp_table = {}
-	for index, value in pairs(player_list) do
-		if value:is_player_connected() then
-			table.insert(temp_table, value)
-		end
-	end
-	return temp_table
-end
-
-function core.hash_node_position(pos)
-	return (pos.z+32768)*65536*65536 + (pos.y+32768)*65536 + pos.x+32768
-end
-
-function core.get_position_from_hash(hash)
-	local pos = {}
-	pos.x = (hash%65536) - 32768
-	hash = math.floor(hash/65536)
-	pos.y = (hash%65536) - 32768
-	hash = math.floor(hash/65536)
-	pos.z = (hash%65536) - 32768
-	return pos
-end
-
-function core.get_item_group(name, group)
-	if not core.registered_items[name] or not
-			core.registered_items[name].groups[group] then
-		return 0
-	end
-	return core.registered_items[name].groups[group]
-end
-
-function core.get_node_group(name, group)
-	core.log("deprecated", "Deprecated usage of get_node_group, use get_item_group instead")
-	return core.get_item_group(name, group)
-end
-
-function core.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(core.string_to_pos("10.0, 5, -2").x == 10)
-assert(core.string_to_pos("( 10.0, 5, -2)").z == -2)
-assert(core.string_to_pos("asd, 5, -2)") == nil)
-
-function core.setting_get_pos(name)
-	local value = core.setting_get(name)
-	if not value then
-		return nil
-	end
-	return core.string_to_pos(value)
-end
-
-- To be overriden by protection mods
-function core.is_protected(pos, name)
-	return false
-end
-
-function core.record_protection_violation(pos, name)
-	for _, func in pairs(core.registered_on_protection_violation) do
-		func(pos, name)
-	end
-end
-
--- a/builtin/game/mod_profiling.lua
+++ b/builtin/game/mod_profiling.lua
@@ -1,356 +0,0 @@
-- Minetest: builtin/game/mod_profiling.lua
-
-local mod_statistics = {}
-mod_statistics.step_total = 0
-mod_statistics.data = {}
-mod_statistics.stats = {}
-mod_statistics.stats["total"] = {
-	min_us = math.huge,
-	max_us = 0,
-	avg_us = 0,
-	min_per = 100,
-	max_per = 100,
-	avg_per = 100
-}
-
-local replacement_table = {
-	"register_globalstep",
-	"register_on_placenode",
-	"register_on_dignode",
-	"register_on_punchnode",
-	"register_on_generated",
-	"register_on_newplayer",
-	"register_on_dieplayer",
-	"register_on_respawnplayer",
-	"register_on_prejoinplayer",
-	"register_on_joinplayer",
-	"register_on_leaveplayer",
-	"register_on_cheat",
-	"register_on_chat_message",
-	"register_on_player_receive_fields",
-	"register_on_mapgen_init",
-	"register_on_craft",
-	"register_craft_predict",
-	"register_on_item_eat"
-}
-
--------------------------------------------------------------------------------
-function mod_statistics.log_time(type, modname, time_in_us)
-
-	if modname == nil then
-		modname = "builtin"
-	end
-	
-	if mod_statistics.data[modname] == nil then
-		mod_statistics.data[modname] = {}
-	end
-	
-	if mod_statistics.data[modname][type] == nil then
-		mod_statistics.data[modname][type] = 0
-	end
-	
-	mod_statistics.data[modname][type] =
-		mod_statistics.data[modname][type] + time_in_us
-	mod_statistics.step_total = mod_statistics.step_total + time_in_us
-end
-
--------------------------------------------------------------------------------
-function mod_statistics.update_statistics(dtime)
-	for modname,types in pairs(mod_statistics.data) do
-		
-		if mod_statistics.stats[modname] == nil then
-			mod_statistics.stats[modname] = {
-				min_us = math.huge,
-				max_us = 0,
-				avg_us = 0,
-				min_per = 100,
-				max_per = 0,
-				avg_per = 0
-			}
-		end
-		
-		local modtime = 0
-		for type,time in pairs(types) do
-			modtime = modtime + time
-			if mod_statistics.stats[modname].types == nil then
-				mod_statistics.stats[modname].types = {}
-			end
-			if mod_statistics.stats[modname].types[type] == nil then
-				mod_statistics.stats[modname].types[type] = {
-					min_us = math.huge,
-					max_us = 0,
-					avg_us = 0,
-					min_per = 100,
-					max_per = 0,
-					avg_per = 0
-				}
-			end
-			
-			local toupdate = mod_statistics.stats[modname].types[type]
-			
-			--update us values
-			toupdate.min_us = math.min(time, toupdate.min_us)
-			toupdate.max_us = math.max(time, toupdate.max_us)
-			--TODO find better algorithm
-			toupdate.avg_us = toupdate.avg_us * 0.99 + modtime * 0.01
-				
-			--update percentage values
-			local cur_per = (time/mod_statistics.step_total) * 100
-			toupdate.min_per = math.min(toupdate.min_per, cur_per)
-				
-			toupdate.max_per = math.max(toupdate.max_per, cur_per)
-				
-			--TODO find better algorithm
-			toupdate.avg_per = toupdate.avg_per * 0.99 + cur_per * 0.01
-			
-			mod_statistics.data[modname][type] = 0
-		end
-		
-		--per mod statistics
-		--update us values
-		mod_statistics.stats[modname].min_us =
-			math.min(modtime, mod_statistics.stats[modname].min_us)
-		mod_statistics.stats[modname].max_us =
-			math.max(modtime, mod_statistics.stats[modname].max_us)
-		--TODO find better algorithm
-		mod_statistics.stats[modname].avg_us =
-			mod_statistics.stats[modname].avg_us * 0.99 + modtime * 0.01
-			
-		--update percentage values
-		local cur_per = (modtime/mod_statistics.step_total) * 100
-		mod_statistics.stats[modname].min_per =
-			math.min(mod_statistics.stats[modname].min_per, cur_per)
-			
-		mod_statistics.stats[modname].max_per =
-			math.max(mod_statistics.stats[modname].max_per, cur_per)
-			
-		--TODO find better algorithm
-		mod_statistics.stats[modname].avg_per =
-			mod_statistics.stats[modname].avg_per * 0.99 + cur_per * 0.01
-	end
-	
-	--update "total"
-	mod_statistics.stats["total"].min_us =
-		math.min(mod_statistics.step_total, mod_statistics.stats["total"].min_us)
-	mod_statistics.stats["total"].max_us =
-		math.max(mod_statistics.step_total, mod_statistics.stats["total"].max_us)
-	--TODO find better algorithm
-	mod_statistics.stats["total"].avg_us =
-		mod_statistics.stats["total"].avg_us * 0.99 +
-		mod_statistics.step_total * 0.01
-	
-	mod_statistics.step_total = 0
-end
-
--------------------------------------------------------------------------------
-local function build_callback(log_id, fct)
-	return function( toregister )
-		local modname = core.get_current_modname()
-		
-		fct(function(...)
-			local starttime = core.get_us_time()
-			-- note maximum 10 return values are supported unless someone finds
-			-- a way to store a variable lenght return value list
-			local r0, r1, r2, r3, r4, r5, r6, r7, r8, r9 = toregister(...)
-			local delta = core.get_us_time() - starttime
-			mod_statistics.log_time(log_id, modname, delta)
-			return r0, r1, r2, r3, r4, r5, r6, r7, r8, r9
-			end
-		)
-	end
-end
-
--------------------------------------------------------------------------------
-function profiling_print_log(cmd, filter)
-
-	print("Filter:" .. dump(filter))
-
-	core.log("action", "Values below show times/percentages per server step.")
-	core.log("action", "Following suffixes are used for entities:")
-	core.log("action", "\t#oa := on_activate, #os := on_step, #op := on_punch, #or := on_rightclick, #gs := get_staticdata")
-	core.log("action",
-		string.format("%16s | %25s | %10s | %10s | %10s | %9s | %9s | %9s",
-		"modname", "type" , "min µs", "max µs", "avg µs", "min %", "max %", "avg %")
-	)
-	core.log("action",
-		"-----------------+---------------------------+-----------+" ..
-		"-----------+-----------+-----------+-----------+-----------")
-	for modname,statistics in pairs(mod_statistics.stats) do
-		if modname ~= "total" then
-		
-			if (filter == "") or (modname == filter) then
-				if modname:len() > 16 then
-					modname = "..." .. modname:sub(-13)
-				end
-			
-				core.log("action",
-					string.format("%16s | %25s | %9d | %9d | %9d | %9d | %9d | %9d",
-					modname,
-					" ",
-					statistics.min_us,
-					statistics.max_us,
-					statistics.avg_us,
-					statistics.min_per,
-					statistics.max_per,
-					statistics.avg_per)
-				)
-				if core.setting_getbool("detailed_profiling") then
-					if statistics.types ~= nil then
-						for type,typestats in pairs(statistics.types) do
-						
-							if type:len() > 25 then
-								type = "..." .. type:sub(-22)
-							end
-						
-							core.log("action",
-								string.format(
-								"%16s | %25s | %9d | %9d | %9d | %9d | %9d | %9d",
-								" ",
-								type,
-								typestats.min_us,
-								typestats.max_us,
-								typestats.avg_us,
-								typestats.min_per,
-								typestats.max_per,
-								typestats.avg_per)
-							)
-						end
-					end
-				end
-			end
-		end
-	end
-		core.log("action",
-			"-----------------+---------------------------+-----------+" ..
-			"-----------+-----------+-----------+-----------+-----------")
-			
-	if filter == "" then
-		core.log("action",
-			string.format("%16s | %25s | %9d | %9d | %9d | %9d | %9d | %9d",
-			"total",
-			" ",
-			mod_statistics.stats["total"].min_us,
-			mod_statistics.stats["total"].max_us,
-			mod_statistics.stats["total"].avg_us,
-			mod_statistics.stats["total"].min_per,
-			mod_statistics.stats["total"].max_per,
-			mod_statistics.stats["total"].avg_per)
-		)
-	end
-	core.log("action", " ")
-	
-	return true
-end
-
--------------------------------------------------------------------------------
-local function initialize_profiling()
-	core.log("action", "Initialize tracing")
-	
-	mod_statistics.entity_callbacks = {}
-	
-	-- first register our own globalstep handler
-	core.register_globalstep(mod_statistics.update_statistics)
-	
-	local rp_register_entity = core.register_entity
-	core.register_entity = function(name, prototype)
-		local modname = core.get_current_modname()
-		local new_on_activate = nil
-		local new_on_step = nil
-		local new_on_punch = nil
-		local new_rightclick = nil
-		local new_get_staticdata = nil
-		
-		if prototype.on_activate ~= nil then
-			local cbid = name .. "#oa"
-			mod_statistics.entity_callbacks[cbid] = prototype.on_activate
-			new_on_activate = function(self, staticdata, dtime_s)
-				local starttime = core.get_us_time()
-				mod_statistics.entity_callbacks[cbid](self, staticdata, dtime_s)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-			end
-		end
-		
-		if prototype.on_step ~= nil then
-			local cbid = name .. "#os"
-			mod_statistics.entity_callbacks[cbid] = prototype.on_step
-			new_on_step = function(self, dtime)
-				local starttime = core.get_us_time()
-				mod_statistics.entity_callbacks[cbid](self, dtime)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-			end
-		end
-	
-		if prototype.on_punch ~= nil then
-			local cbid = name .. "#op"
-			mod_statistics.entity_callbacks[cbid] = prototype.on_punch
-			new_on_punch = function(self, hitter)
-				local starttime = core.get_us_time()
-				mod_statistics.entity_callbacks[cbid](self, hitter)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-			end
-		end
-		
-		if prototype.rightclick ~= nil then
-			local cbid = name .. "#rc"
-			mod_statistics.entity_callbacks[cbid] = prototype.rightclick
-			new_rightclick = function(self, clicker)
-				local starttime = core.get_us_time()
-				mod_statistics.entity_callbacks[cbid](self, clicker)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-			end
-		end
-		
-		if prototype.get_staticdata ~= nil then
-			local cbid = name .. "#gs"
-			mod_statistics.entity_callbacks[cbid] = prototype.get_staticdata
-			new_get_staticdata = function(self)
-				local starttime = core.get_us_time()
-				local retval = mod_statistics.entity_callbacks[cbid](self)
-				local delta = core.get_us_time() -starttime
-				mod_statistics.log_time(cbid, modname, delta)
-				return retval
-			end
-		end
-	
-		prototype.on_activate = new_on_activate
-		prototype.on_step = new_on_step
-		prototype.on_punch = new_on_punch
-		prototype.rightclick = new_rightclick
-		prototype.get_staticdata = new_get_staticdata
-		
-		rp_register_entity(name,prototype)
-	end
-	
-	for i,v in ipairs(replacement_table) do
-		local to_replace = core[v]
-		core[v] = build_callback(v, to_replace)
-	end
-	
-	local rp_register_abm = core.register_abm
-	core.register_abm = function(spec)
-	
-		local modname = core.get_current_modname()
-	
-		local replacement_spec = {
-			nodenames = spec.nodenames,
-			neighbors = spec.neighbors,
-			interval  = spec.interval,
-			chance    = spec.chance,
-			action = function(pos, node, active_object_count, active_object_count_wider)
-				local starttime = core.get_us_time()
-				spec.action(pos, node, active_object_count, active_object_count_wider)
-				local delta = core.get_us_time() - starttime
-				mod_statistics.log_time("abm", modname, delta)
-			end
-		}
-		rp_register_abm(replacement_spec)
-	end
-	
-	core.log("action", "Mod profiling initialized")
-end
-
-initialize_profiling()
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -1,53 +0,0 @@
-- Minetest: builtin/privileges.lua
-
--
-- Privileges
--
-
-core.registered_privileges = {}
-
-function core.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)
-	core.registered_privileges[name] = def
-end
-
-core.register_privilege("interact", "Can interact with things and modify the world")
-core.register_privilege("teleport", "Can use /teleport command")
-core.register_privilege("bring", "Can teleport other players")
-core.register_privilege("settime", "Can use /time")
-core.register_privilege("privs", "Can modify privileges")
-core.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
-core.register_privilege("server", "Can do server maintenance stuff")
-core.register_privilege("shout", "Can speak in chat")
-core.register_privilege("ban", "Can ban and unban players")
-core.register_privilege("kick", "Can kick players")
-core.register_privilege("give", "Can use /give and /giveme")
-core.register_privilege("password", "Can use /setpassword and /clearpassword")
-core.register_privilege("fly", {
-	description = "Can fly using the free_move mode",
-	give_to_singleplayer = false,
-})
-core.register_privilege("fast", {
-	description = "Can walk fast using the fast_move mode",
-	give_to_singleplayer = false,
-})
-core.register_privilege("noclip", {
-	description = "Can fly through walls",
-	give_to_singleplayer = false,
-})
-core.register_privilege("rollback", "Can use the rollback functionality")
-
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -1,411 +0,0 @@
-- Minetest: builtin/misc_register.lua
-
--
-- Make raw registration functions inaccessible to anyone except this file
--
-
-local register_item_raw = core.register_item_raw
-core.register_item_raw = nil
-
-local register_alias_raw = core.register_alias_raw
-core.register_alias_raw = nil
-
--
-- Item / entity / ABM registration functions
--
-
-core.registered_abms = {}
-core.registered_entities = {}
-core.registered_items = {}
-core.registered_nodes = {}
-core.registered_craftitems = {}
-core.registered_tools = {}
-core.registered_aliases = {}
-
-- For tables that are indexed by item name:
-- If table[X] does not exist, default to table[core.registered_aliases[X]]
-local alias_metatable = {
-	__index = function(t, name)
-		return rawget(t, core.registered_aliases[name])
-	end
-}
-setmetatable(core.registered_items, alias_metatable)
-setmetatable(core.registered_nodes, alias_metatable)
-setmetatable(core.registered_craftitems, alias_metatable)
-setmetatable(core.registered_tools, alias_metatable)
-
-- 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 = core.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 core.register_abm(spec)
-	-- Add to core.registered_abms
-	core.registered_abms[#core.registered_abms+1] = spec
-end
-
-function core.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 core.registered_entities
-	core.registered_entities[name] = prototype
-end
-
-function core.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
-		-- Use the nodebox as selection box if it's not set manually
-		if itemdef.drawtype == "nodebox" and not itemdef.selection_box then
-			itemdef.selection_box = itemdef.node_box
-		elseif itemdef.drawtype == "fencelike" and not itemdef.selection_box then
-			itemdef.selection_box = {
-				type = "fixed",
-				fixed = {-1/8, -1/2, -1/8, 1/8, 1/2, 1/8},
-			}
-		end
-		setmetatable(itemdef, {__index = core.nodedef_default})
-		core.registered_nodes[itemdef.name] = itemdef
-	elseif itemdef.type == "craft" then
-		setmetatable(itemdef, {__index = core.craftitemdef_default})
-		core.registered_craftitems[itemdef.name] = itemdef
-	elseif itemdef.type == "tool" then
-		setmetatable(itemdef, {__index = core.tooldef_default})
-		core.registered_tools[itemdef.name] = itemdef
-	elseif itemdef.type == "none" then
-		setmetatable(itemdef, {__index = core.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
-		core.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
-		core.register_craft({
-			type="fuel",
-			recipe=itemdef.name,
-			burntime=itemdef.furnace_burntime
-		})
-	end
-	-- END Legacy stuff
-
-	-- Disable all further modifications
-	getmetatable(itemdef).__newindex = {}
-
-	--core.log("Registering item: " .. itemdef.name)
-	core.registered_items[itemdef.name] = itemdef
-	core.registered_aliases[itemdef.name] = nil
-	register_item_raw(itemdef)
-end
-
-function core.register_node(name, nodedef)
-	nodedef.type = "node"
-	core.register_item(name, nodedef)
-end
-
-function core.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
-
-	core.register_item(name, craftitemdef)
-end
-
-function core.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
-
-	core.register_item(name, tooldef)
-end
-
-function core.register_alias(name, convert_to)
-	if forbidden_item_names[name] then
-		error("Unable to register alias: Name is forbidden: " .. name)
-	end
-	if core.registered_items[name] ~= nil then
-		core.log("WARNING: Not registering alias, item with same name" ..
-			" is already defined: " .. name .. " -> " .. convert_to)
-	else
-		--core.log("Registering alias: " .. name .. " -> " .. convert_to)
-		core.registered_aliases[name] = convert_to
-		register_alias_raw(name, convert_to)
-	end
-end
-
-local register_biome_raw = core.register_biome
-core.registered_biomes = {}
-function core.register_biome(biome)
-	core.registered_biomes[biome.name] = biome
-	register_biome_raw(biome)
-end
-
-function core.on_craft(itemstack, player, old_craft_list, craft_inv)
-	for _, func in ipairs(core.registered_on_crafts) do
-		itemstack = func(itemstack, player, old_craft_list, craft_inv) or itemstack
-	end
-	return itemstack
-end
-
-function core.craft_predict(itemstack, player, old_craft_list, craft_inv)
-	for _, func in ipairs(core.registered_craft_predicts) do
-		itemstack = func(itemstack, player, old_craft_list, craft_inv) or itemstack
-	end
-	return itemstack
-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
-	core.registered_aliases[name] = ""
-	register_alias_raw(name, "")
-end
-
-
-- Deprecated:
-- Aliases for core.register_alias (how ironic...)
--core.alias_node = core.register_alias
--core.alias_tool = core.register_alias
--core.alias_craftitem = core.register_alias
-
--
-- Built-in node definitions. Also defined in C.
--
-
-core.register_item(":unknown", {
-	type = "none",
-	description = "Unknown Item",
-	inventory_image = "unknown_item.png",
-	on_place = core.item_place,
-	on_drop = core.item_drop,
-	groups = {not_in_creative_inventory=1},
-	diggable = true,
-})
-
-core.register_node(":air", {
-	description = "Air (you hacker you!)",
-	inventory_image = "unknown_node.png",
-	wield_image = "unknown_node.png",
-	drawtype = "airlike",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true,
-	air_equivalent = true,
-	drop = "",
-	groups = {not_in_creative_inventory=1},
-})
-
-core.register_node(":ignore", {
-	description = "Ignore (you hacker you!)",
-	inventory_image = "unknown_node.png",
-	wield_image = "unknown_node.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,
-	drop = "",
-	groups = {not_in_creative_inventory=1},
-})
-
-- The hand (bare definition)
-core.register_item(":", {
-	type = "none",
-	groups = {not_in_creative_inventory=1},
-})
-
-
-function core.override_item(name, redefinition)
-	if redefinition.name ~= nil then
-		error("Attempt to redefine name of "..name.." to "..dump(redefinition.name), 2)
-	end
-	if redefinition.type ~= nil then
-		error("Attempt to redefine type of "..name.." to "..dump(redefinition.type), 2)
-	end
-	local item = core.registered_items[name]
-	if not item then
-		error("Attempt to override non-existent item "..name, 2)
-	end
-	for k, v in pairs(redefinition) do
-		rawset(item, k, v)
-	end
-	register_item_raw(item)
-end
-
-
-function core.run_callbacks(callbacks, mode, ...)
-	assert(type(callbacks) == "table")
-	local cb_len = #callbacks
-	if cb_len == 0 then
-		if mode == 2 or mode == 3 then
-			return true
-		elseif mode == 4 or mode == 5 then
-			return false
-		end
-	end
-	local ret = nil
-	for i = 1, cb_len do
-		local cb_ret = callbacks[i](...)
-
-		if mode == 0 and i == 1 then
-			ret = cb_ret
-		elseif mode == 1 and i == cb_len then
-			ret = cb_ret
-		elseif mode == 2 then
-			if not cb_ret or i == 1 then
-				ret = cb_ret
-			end
-		elseif mode == 3 then
-			if cb_ret then
-				return cb_ret
-			end
-			ret = cb_ret
-		elseif mode == 4 then
-			if (cb_ret and not ret) or i == 1 then
-				ret = cb_ret
-			end
-		elseif mode == 5 and cb_ret then
-			return cb_ret
-		end
-	end
-	return ret
-end
-
--
-- Callback registration
--
-
-local function make_registration()
-	local t = {}
-	local registerfunc = function(func) table.insert(t, func) end
-	return t, registerfunc
-end
-
-local function make_registration_reverse()
-	local t = {}
-	local registerfunc = function(func) table.insert(t, 1, func) end
-	return t, registerfunc
-end
-
-core.registered_on_chat_messages, core.register_on_chat_message = make_registration()
-core.registered_globalsteps, core.register_globalstep = make_registration()
-core.registered_playerevents, core.register_playerevent = make_registration()
-core.registered_on_mapgen_inits, core.register_on_mapgen_init = make_registration()
-core.registered_on_shutdown, core.register_on_shutdown = make_registration()
-core.registered_on_punchnodes, core.register_on_punchnode = make_registration()
-core.registered_on_placenodes, core.register_on_placenode = make_registration()
-core.registered_on_dignodes, core.register_on_dignode = make_registration()
-core.registered_on_generateds, core.register_on_generated = make_registration()
-core.registered_on_newplayers, core.register_on_newplayer = make_registration()
-core.registered_on_dieplayers, core.register_on_dieplayer = make_registration()
-core.registered_on_respawnplayers, core.register_on_respawnplayer = make_registration()
-core.registered_on_prejoinplayers, core.register_on_prejoinplayer = make_registration()
-core.registered_on_joinplayers, core.register_on_joinplayer = make_registration()
-core.registered_on_leaveplayers, core.register_on_leaveplayer = make_registration()
-core.registered_on_player_receive_fields, core.register_on_player_receive_fields = make_registration_reverse()
-core.registered_on_cheats, core.register_on_cheat = make_registration()
-core.registered_on_crafts, core.register_on_craft = make_registration()
-core.registered_craft_predicts, core.register_craft_predict = make_registration()
-core.registered_on_protection_violation, core.register_on_protection_violation = make_registration()
-core.registered_on_item_eats, core.register_on_item_eat = make_registration()
-
--- a/builtin/game/statbars.lua
+++ b/builtin/game/statbars.lua
@@ -1,165 +0,0 @@
-
-local health_bar_definition =
-{
-	hud_elem_type = "statbar",
-	position = { x=0.5, y=1 },
-	text = "heart.png",
-	number = 20,
-	direction = 0,
-	size = { x=24, y=24 },
-	offset = { x=(-10*24)-25, y=-(48+24+10)},
-}
-
-local breath_bar_definition =
-{
-	hud_elem_type = "statbar",
-	position = { x=0.5, y=1 },
-	text = "bubble.png",
-	number = 20,
-	direction = 0,
-	size = { x=24, y=24 },
-	offset = {x=25,y=-(48+24+10)},
-}
-
-local hud_ids = {}
-
-local function initialize_builtin_statbars(player)
-
-	if not player:is_player() then
-		return
-	end
-
-	local name = player:get_player_name()
-
-	if name == "" then
-		return
-	end
-
-	if (hud_ids[name] == nil) then
-		hud_ids[name] = {}
-		-- flags are not transmitted to client on connect, we need to make sure
-		-- our current flags are transmitted by sending them actively
-		player:hud_set_flags(player:hud_get_flags())
-	end
-
-	if player:hud_get_flags().healthbar and
-			core.is_yes(core.setting_get("enable_damage")) then
-		if hud_ids[name].id_healthbar == nil then
-			health_bar_definition.number = player:get_hp()
-			hud_ids[name].id_healthbar  = player:hud_add(health_bar_definition)
-		end
-	else
-		if hud_ids[name].id_healthbar ~= nil then
-			player:hud_remove(hud_ids[name].id_healthbar)
-			hud_ids[name].id_healthbar = nil
-		end
-	end
-
-	if (player:get_breath() < 11) then
-		if player:hud_get_flags().breathbar and
-			core.is_yes(core.setting_get("enable_damage")) then
-			if hud_ids[name].id_breathbar == nil then
-				hud_ids[name].id_breathbar = player:hud_add(breath_bar_definition)
-			end
-		else
-			if hud_ids[name].id_breathbar ~= nil then
-				player:hud_remove(hud_ids[name].id_breathbar)
-				hud_ids[name].id_breathbar = nil
-			end
-		end
-	elseif hud_ids[name].id_breathbar ~= nil then
-		player:hud_remove(hud_ids[name].id_breathbar)
-		hud_ids[name].id_breathbar = nil
-	end
-end
-
-local function cleanup_builtin_statbars(player)
-
-	if not player:is_player() then
-		return
-	end
-
-	local name = player:get_player_name()
-
-	if name == "" then
-		return
-	end
-
-	hud_ids[name] = nil
-end
-
-local function player_event_handler(player,eventname)
-	assert(player:is_player())
-
-	local name = player:get_player_name()
-
-	if name == "" then
-		return
-	end
-
-	if eventname == "health_changed" then
-		initialize_builtin_statbars(player)
-
-		if hud_ids[name].id_healthbar ~= nil then
-			player:hud_change(hud_ids[name].id_healthbar,"number",player:get_hp())
-			return true
-		end
-	end
-
-	if eventname == "breath_changed" then
-		initialize_builtin_statbars(player)
-
-		if hud_ids[name].id_breathbar ~= nil then
-			player:hud_change(hud_ids[name].id_breathbar,"number",player:get_breath()*2)
-			return true
-		end
-	end
-
-	if eventname == "hud_changed" then
-		initialize_builtin_statbars(player)
-		return true
-	end
-
-	return false
-end
-
-function core.hud_replace_builtin(name, definition)
-
-	if definition == nil or
-		type(definition) ~= "table" or
-		definition.hud_elem_type ~= "statbar" then
-		return false
-	end
-
-	if name == "health" then
-		health_bar_definition = definition
-
-		for name,ids in pairs(hud_ids) do
-			local player = core.get_player_by_name(name)
-			if  player and hud_ids[name].id_healthbar then
-				player:hud_remove(hud_ids[name].id_healthbar)
-				initialize_builtin_statbars(player)
-			end
-		end
-		return true
-	end
-
-	if name == "breath" then
-		breath_bar_definition = definition
-
-		for name,ids in pairs(hud_ids) do
-			local player = core.get_player_by_name(name)
-			if  player and hud_ids[name].id_breathbar then
-				player:hud_remove(hud_ids[name].id_breathbar)
-				initialize_builtin_statbars(player)
-			end
-		end
-		return true
-	end
-
-	return false
-end
-
-core.register_on_joinplayer(initialize_builtin_statbars)
-core.register_on_leaveplayer(cleanup_builtin_statbars)
-core.register_playerevent(player_event_handler)
--- a/builtin/game/static_spawn.lua
+++ b/builtin/game/static_spawn.lua
@@ -1,33 +0,0 @@
-- Minetest: builtin/static_spawn.lua
-
-local function warn_invalid_static_spawnpoint()
-	if core.setting_get("static_spawnpoint") and
-			not core.setting_get_pos("static_spawnpoint") then
-		core.log('error', "The static_spawnpoint setting is invalid: \""..
-				core.setting_get("static_spawnpoint").."\"")
-	end
-end
-
-warn_invalid_static_spawnpoint()
-
-local function put_player_in_spawn(obj)
-	warn_invalid_static_spawnpoint()
-	local static_spawnpoint = core.setting_get_pos("static_spawnpoint")
-	if not static_spawnpoint then
-		return false
-	end
-	core.log('action', "Moving "..obj:get_player_name()..
-			" to static spawnpoint at "..
-			core.pos_to_string(static_spawnpoint))
-	obj:setpos(static_spawnpoint)
-	return true
-end
-
-core.register_on_newplayer(function(obj)
-	put_player_in_spawn(obj)
-end)
-
-core.register_on_respawnplayer(function(obj)
-	return put_player_in_spawn(obj)
-end)
-
--- a/builtin/game/voxelarea.lua
+++ b/builtin/game/voxelarea.lua
@@ -1,109 +0,0 @@
-VoxelArea = {
-	MinEdge = {x=1, y=1, z=1},
-	MaxEdge = {x=0, y=0, z=0},
-	ystride = 0,
-	zstride = 0,
-}
-
-function VoxelArea:new(o)
-	o = o or {}
-	setmetatable(o, self)
-	self.__index = self
-
-	local e = o:getExtent()
-	o.ystride = e.x
-	o.zstride = e.x * e.y
-
-	return o
-end
-
-function VoxelArea:getExtent()
-	local MaxEdge, MinEdge = self.MaxEdge, self.MinEdge
-	return {
-		x = MaxEdge.x - MinEdge.x + 1,
-		y = MaxEdge.y - MinEdge.y + 1,
-		z = MaxEdge.z - MinEdge.z + 1,
-	}
-end
-
-function VoxelArea:getVolume()
-	local e = self:getExtent()
-	return e.x * e.y * e.z
-end
-
-function VoxelArea:index(x, y, z)
-	local MinEdge = self.MinEdge
-	local i = (z - MinEdge.z) * self.zstride +
-			  (y - MinEdge.y) * self.ystride +
-			  (x - MinEdge.x) + 1
-	return math.floor(i)
-end
-
-function VoxelArea:indexp(p)
-	local MinEdge = self.MinEdge
-	local i = (p.z - MinEdge.z) * self.zstride +
-			  (p.y - MinEdge.y) * self.ystride +
-			  (p.x - MinEdge.x) + 1
-	return math.floor(i)
-end
-
-function VoxelArea:position(i)
-	local p = {}
-	local MinEdge = self.MinEdge
- 
-	i = i - 1
-
-	p.z = math.floor(i / self.zstride) + MinEdge.z
-	i = i % self.zstride
-
-	p.y = math.floor(i / self.ystride) + MinEdge.y
-	i = i % self.ystride
-
-	p.x = math.floor(i) + MinEdge.x
-
-	return p
-end
-
-function VoxelArea:contains(x, y, z)
-	local MaxEdge, MinEdge = self.MaxEdge, self.MinEdge
-	return (x >= MinEdge.x) and (x <= MaxEdge.x) and
-		   (y >= MinEdge.y) and (y <= MaxEdge.y) and
-		   (z >= MinEdge.z) and (z <= MaxEdge.z)
-end
-
-function VoxelArea:containsp(p)
-	local MaxEdge, MinEdge = self.MaxEdge, self.MinEdge
-	return (p.x >= MinEdge.x) and (p.x <= MaxEdge.x) and
-		   (p.y >= MinEdge.y) and (p.y <= MaxEdge.y) and
-		   (p.z >= MinEdge.z) and (p.z <= MaxEdge.z)
-end
-
-function VoxelArea:containsi(i)
-	return (i >= 1) and (i <= self:getVolume())
-end
-
-function VoxelArea:iter(minx, miny, minz, maxx, maxy, maxz)
-	local i = self:index(minx, miny, minz) - 1
-	local last = self:index(maxx, maxy, maxz)
-	local ystride = self.ystride
-	local zstride = self.zstride
-	local yoff = (last+1) % ystride
-	local zoff = (last+1) % zstride
-	local ystridediff = (i - last) % ystride
-	local zstridediff = (i - last) % zstride
-	return function()
-		i = i + 1
-		if i % zstride == zoff then
-			i = i + zstridediff
-		elseif i % ystride == yoff then
-			i = i + ystridediff
-		end
-		if i <= last then
-			return i
-		end
-	end
-end
-
-function VoxelArea:iterp(minp, maxp)
-	return self:iter(minp.x, minp.y, minp.z, maxp.x, maxp.y, maxp.z)
-end
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -1,38 +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 = core.debug
-math.randomseed(os.time())
-os.setlocale("C", "numeric")
-minetest = core
-
-- Load other files
-local scriptdir = core.get_builtin_path()..DIR_DELIM
-local gamepath = scriptdir.."game"..DIR_DELIM
-local commonpath = scriptdir.."common"..DIR_DELIM
-local asyncpath = scriptdir.."async"..DIR_DELIM
-
-dofile(commonpath.."strict.lua")
-dofile(commonpath.."serialize.lua")
-dofile(commonpath.."misc_helpers.lua")
-
-if INIT == "game" then
-	dofile(gamepath.."init.lua")
-elseif INIT == "mainmenu" then
-	local mainmenuscript = core.setting_get("main_menu_script")
-	if mainmenuscript ~= nil and mainmenuscript ~= "" then
-		dofile(mainmenuscript)
-	else
-		dofile(core.get_mainmenu_path()..DIR_DELIM.."init.lua")
-	end
-elseif INIT == "async" then
-	dofile(asyncpath.."init.lua")
-else
-	error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))
-end
-
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -1,217 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
--------------------------------------------------------------------------------
-- Global menu data
---------------------------------------------------------------------------------
-menudata = {}
-
--------------------------------------------------------------------------------
-- Menu helper functions
--------------------------------------------------------------------------------
-
--------------------------------------------------------------------------------
-local function render_client_count(n)
-	if n > 99 then
-		return '99+'
-	elseif n >= 0 then
-		return tostring(n)
-	else
-		return '?'
-	end
-end
-
--------------------------------------------------------------------------------
-function render_favorite(spec,render_details)
-	local text = ""
-
-	if spec.name ~= nil then
-		text = text .. core.formspec_escape(spec.name:trim())
-
--		if spec.description ~= nil and
--			core.formspec_escape(spec.description):trim() ~= "" then
--			text = text .. " (" .. core.formspec_escape(spec.description) .. ")"
--		end
-	else
-		if spec.address ~= nil then
-			text = text .. spec.address:trim()
-
-			if spec.port ~= nil then
-				text = text .. ":" .. spec.port
-			end
-		end
-	end
-
-	if not render_details then
-		return text
-	end
-
-	local details = ""
-
-	if spec.clients ~= nil and spec.clients_max ~= nil then
-		local clients_color = ''
-		local clients_percent = 100 * spec.clients / spec.clients_max
-
-		-- Choose a color depending on how many clients are connected
-		-- (relatively to clients_max)
-		if spec.clients == 0 then
-			clients_color = ''        -- 0 players: default/white
-		elseif spec.clients == spec.clients_max then
-			clients_color = '#dd5b5b' -- full server: red (darker)
-		elseif clients_percent <= 60 then
-			clients_color = '#a1e587' -- 0-60%: green
-		elseif clients_percent <= 90 then
-			clients_color = '#ffdc97' -- 60-90%: yellow
-		else
-			clients_color = '#ffba97' -- 90-100%: orange
-		end
-
-		details = details ..
-				clients_color .. ',' ..
-				render_client_count(spec.clients) .. ',' ..
-				'/,' ..
-				render_client_count(spec.clients_max) .. ','
-	else
-		details = details .. ',?,/,?,'
-	end
-
-	if spec.creative then
-		details = details .. "1,"
-	else
-		details = details .. "0,"
-	end
-
-	if spec.damage then
-		details = details .. "1,"
-	else
-		details = details .. "0,"
-	end
-
-	if spec.pvp then
-		details = details .. "1,"
-	else
-		details = details .. "0,"
-	end
-
-	return details .. text
-end
-
--------------------------------------------------------------------------------
-os.tempfolder = function()
-	if core.setting_get("TMPFolder") then
-		return core.setting_get("TMPFolder") .. DIR_DELIM .. "MT_" .. math.random(0,10000)
-	end
-
-	local filetocheck = os.tmpname()
-	os.remove(filetocheck)
-
-	local randname = "MTTempModFolder_" .. math.random(0,10000)
-	if DIR_DELIM == "\\" then
-		local tempfolder = os.getenv("TEMP")
-		return tempfolder .. filetocheck
-	else
-		local backstring = filetocheck:reverse()
-		return filetocheck:sub(0,filetocheck:len()-backstring:find(DIR_DELIM)+1) ..randname
-	end
-
-end
-
--------------------------------------------------------------------------------
-function menu_render_worldlist()
-	local retval = ""
-
-	local current_worldlist = menudata.worldlist:get_list()
-
-	for i,v in ipairs(current_worldlist) do
-		if retval ~= "" then
-			retval = retval ..","
-		end
-
-		retval = retval .. core.formspec_escape(v.name) ..
-					" \\[" .. core.formspec_escape(v.gameid) .. "\\]"
-	end
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-function menu_handle_key_up_down(fields,textlist,settingname)
-
-	if fields["key_up"] then
-		local oldidx = core.get_textlist_index(textlist)
-
-		if oldidx ~= nil and oldidx > 1 then
-			local newidx = oldidx -1
-			core.setting_set(settingname,
-				menudata.worldlist:get_raw_index(newidx))
-		end
-		return true
-	end
-
-	if fields["key_down"] then
-		local oldidx = core.get_textlist_index(textlist)
-
-		if oldidx ~= nil and oldidx < menudata.worldlist:size() then
-			local newidx = oldidx + 1
-			core.setting_set(settingname,
-				menudata.worldlist:get_raw_index(newidx))
-		end
-		
-		return true
-	end
-	
-	return false
-end
-
--------------------------------------------------------------------------------
-function asyncOnlineFavourites()
-
-	menudata.favorites = {}
-	core.handle_async(
-		function(param)
-			return core.get_favorites("online")
-		end,
-		nil,
-		function(result)
-			menudata.favorites = result
-			core.event_handler("Refresh")
-		end
-		)
-end
-
--------------------------------------------------------------------------------
-function text2textlist(xpos,ypos,width,height,tl_name,textlen,text,transparency)
-	local textlines = core.splittext(text,textlen)
-	
-	local retval = "textlist[" .. xpos .. "," .. ypos .. ";"
-								.. width .. "," .. height .. ";"
-								.. tl_name .. ";"
-	
-	for i=1, #textlines, 1 do
-		textlines[i] = textlines[i]:gsub("\r","")
-		retval = retval .. core.formspec_escape(textlines[i]) .. ","
-	end
-	
-	retval = retval .. ";0;"
-	
-	if transparency then
-		retval = retval .. "true"
-	end
-	
-	retval = retval .. "]"
-
-	return retval
-end
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -1,290 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-
-local function get_formspec(data)
-
-	local mod = data.list:get_list()[data.selected_mod]
-
-	local retval =
-		"size[11,6.5,true]" ..
-		"label[0.5,-0.25;" .. fgettext("World:") .. "]" ..
-		"label[1.75,-0.25;" .. data.worldspec.name .. "]"
-
-	if data.hide_gamemods then
-		retval = retval .. "checkbox[0,5.75;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";true]"
-	else
-		retval = retval .. "checkbox[0,5.75;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";false]"
-	end
-
-	if data.hide_modpackcontents then
-		retval = retval .. "checkbox[2,5.75;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";true]"
-	else
-		retval = retval .. "checkbox[2,5.75;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";false]"
-	end
-
-	if mod == nil then
-		mod = {name=""}
-	end
-	
-	retval = retval ..
-		"label[0,0.45;" .. fgettext("Mod:") .. "]" ..
-		"label[0.75,0.45;" .. mod.name .. "]" ..
-		"label[0,1;" .. fgettext("Depends:") .. "]" ..
-		"textlist[0,1.5;5,4.25;world_config_depends;" ..
-		modmgr.get_dependencies(mod.path) .. ";0]" ..
-		"button[9.25,6.35;2,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" ..
-		"button[7.4,6.35;2,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]"
-
-	if mod ~= nil and mod.name ~= "" and mod.typ ~= "game_mod" then
-		if mod.is_modpack then
-			local rawlist = data.list:get_raw_list()
-
-			local all_enabled = true
-			for j=1,#rawlist,1 do
-				if rawlist[j].modpack == mod.name and
-					rawlist[j].enabled ~= true then
-						all_enabled = false
-						break
-				end
-			end
-
-			if all_enabled == false then
-				retval = retval .. "button[5.5,-0.125;2,0.5;btn_mp_enable;" .. fgettext("Enable MP") .. "]"
-			else
-				retval = retval .. "button[5.5,-0.125;2,0.5;btn_mp_disable;" .. fgettext("Disable MP") .. "]"
-			end
-		else
-			if mod.enabled then
-				retval = retval .. "checkbox[5.5,-0.375;cb_mod_enable;" .. fgettext("enabled") .. ";true]"
-			else
-				retval = retval .. "checkbox[5.5,-0.375;cb_mod_enable;" .. fgettext("enabled") .. ";false]"
-			end
-		end
-	end
-
-	retval = retval ..
-		"button[8.5,-0.125;2.5,0.5;btn_all_mods;" .. fgettext("Enable all") .. "]" ..
-		"textlist[5.5,0.5;5.5,5.75;world_config_modlist;"
-
-	retval = retval .. modmgr.render_modlist(data.list)
-	retval = retval .. ";" .. data.selected_mod .."]"
-
-	return retval
-end
-
-local function enable_mod(this, toset)
-	local mod = this.data.list:get_list()[this.data.selected_mod]
-
-	if mod.typ == "game_mod" then
-		-- game mods can't be enabled or disabled
-	elseif not mod.is_modpack then
-		if toset == nil then
-			mod.enabled = not mod.enabled
-		else
-			mod.enabled = toset
-		end
-	else
-		local list = this.data.list:get_raw_list()
-		for i=1,#list,1 do
-			if list[i].modpack == mod.name then
-				if toset == nil then
-					toset = not list[i].enabled
-				end
-				list[i].enabled = toset
-			end
-		end
-	end
-end
-
-
-local function handle_buttons(this, fields)
-
-	if fields["world_config_modlist"] ~= nil then
-		local event = core.explode_textlist_event(fields["world_config_modlist"])
-		this.data.selected_mod = event.index
-
-		if event.type == "DCL" then
-			enable_mod(this)
-		end
-		
-		return true
-	end
-
-	if fields["key_enter"] ~= nil then
-		enable_mod(this)
-		return true
-	end
-
-	if fields["cb_mod_enable"] ~= nil then
-		local toset = core.is_yes(fields["cb_mod_enable"])
-		enable_mod(this,toset)
-		return true
-	end
-
-	if fields["btn_mp_enable"] ~= nil or
-		fields["btn_mp_disable"] then
-		local toset = (fields["btn_mp_enable"] ~= nil)
-		enable_mod(this,toset)
-		return true
-	end
-
-	if fields["cb_hide_gamemods"] ~= nil or
-		fields["cb_hide_mpcontent"] ~= nil then
-		local current = this.data.list:get_filtercriteria()
-
-		if current == nil then
-			current = {}
-		end
-
-		if core.is_yes(fields["cb_hide_gamemods"]) then
-			current.hide_game = true
-			this.data.hide_gamemods = true
-		else
-			current.hide_game = false
-			this.data.hide_gamemods = false
-		end
-		
-		if core.is_yes(fields["cb_hide_mpcontent"]) then
-			current.hide_modpackcontents = true
-			this.data.hide_modpackcontents = true
-		else
-			current.hide_modpackcontents = false
-			this.data.hide_modpackcontents = false
-		end
-
-		this.data.list:set_filtercriteria(current)
-		return true
-	end
-
-	if fields["btn_config_world_save"] then
-
-		local filename = this.data.worldspec.path ..
-				DIR_DELIM .. "world.mt"
-
-		local worldfile = Settings(filename)
-		local mods = worldfile:to_table()
-
-		local rawlist = this.data.list:get_raw_list()
-
-		local i,mod
-		for i,mod in ipairs(rawlist) do
-			if not mod.is_modpack and
-					mod.typ ~= "game_mod" then
-				if mod.enabled then
-					worldfile:set("load_mod_"..mod.name, "true")
-				else
-					worldfile:set("load_mod_"..mod.name, "false")
-				end
-				mods["load_mod_"..mod.name] = nil
-			end
-		end
-
-		-- Remove mods that are not present anymore
-		for key,value in pairs(mods) do
-			if key:sub(1,9) == "load_mod_" then
-				worldfile:remove(key)
-			end
-		end
-
-		if not worldfile:write() then
-			core.log("error", "Failed to write world config file")
-		end
-	
-		this:delete()
-		return true
-	end
-
-	if fields["btn_config_world_cancel"] then
-		this:delete()
-		return true
-	end
-
-	if fields["btn_all_mods"] then
-		local list = this.data.list:get_raw_list()
-
-		for i=1,#list,1 do
-			if list[i].typ ~= "game_mod" and
-				not list[i].is_modpack then
-				list[i].enabled = true
-			end
-		end
-		return true
-	end
-
-	return false
-end
-
-function create_configure_world_dlg(worldidx)
-
-	local dlg = dialog_create("sp_config_world",
-					get_formspec,
-					handle_buttons,
-					nil)
-
-	--TODO read from settings
-	dlg.data.hide_gamemods = false
-	dlg.data.hide_modpackcontents = false
-	dlg.data.selected_mod = 0
-
-	dlg.data.worldspec = core.get_worlds()[worldidx]
-	if dlg.data.worldspec == nil then dlg:delete() return nil end
-
-	dlg.data.worldconfig = modmgr.get_worldconfig(dlg.data.worldspec.path)
-	
-	if dlg.data.worldconfig == nil or dlg.data.worldconfig.id == nil or
-			dlg.data.worldconfig.id == "" then
-
-		dlg:delete()
-		return nil
-	end
-	
-	dlg.data.list = filterlist.create(
-			modmgr.preparemodlist, --refresh
-			modmgr.comparemod, --compare
-			function(element,uid) --uid match
-					if element.name == uid then
-						return true
-					end
-				end,
-				function(element,criteria)
-					if criteria.hide_game and
-						element.typ == "game_mod" then
-							return false
-					end
-
-					if criteria.hide_modpackcontents and
-						element.modpack ~= nil then
-							return false
-						end
-					return true
-				end, --filter
-				{ worldpath= dlg.data.worldspec.path,
-				  gameid = dlg.data.worldspec.gameid }
-			)
-			
-	dlg.data.list:set_filtercriteria(
-		{
-			hide_game=dlg.data.hide_gamemods,
-			hide_modpackcontents= dlg.data.hide_modpackcontents
-		})
-	dlg.data.list:add_sort_mechanism("alphabetic", sort_mod_list)
-	dlg.data.list:set_sortmode("alphabetic")
-	
-	return dlg
-end
--- a/builtin/mainmenu/dlg_create_world.lua
+++ b/builtin/mainmenu/dlg_create_world.lua
@@ -1,143 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
-local function create_world_formspec(dialogdata)
-	local mapgens = {"v5", "v6", "v7", "singlenode"}
-
-	local current_seed = core.setting_get("fixed_map_seed") or ""
-	local current_mg   = core.setting_get("mg_name")
-
-	local mglist = ""
-	local selindex = 1
-	local i = 1
-	for k,v in pairs(mapgens) do
-		if current_mg == v then
-			selindex = i
-		end
-		i = i + 1
-		mglist = mglist .. v .. ","
-	end
-	mglist = mglist:sub(1, -2)
-	
-	local gameid = core.setting_get("menu_last_game")
-	
-	local game, gameidx = nil , 0
-	if gameid ~= nil then
-		game, gameidx = gamemgr.find_by_gameid(gameid)
-		
-		if gameidx == nil then
-			gameidx = 0
-		end
-	end
-
-	current_seed = core.formspec_escape(current_seed)
-	local retval =
-		"size[12,6,true]" ..
-		"label[2,0;" .. fgettext("World name") .. "]"..
-		"field[4.5,0.4;6,0.5;te_world_name;;]" ..
-
-		"label[2,1;" .. fgettext("Seed") .. "]"..
-		"field[4.5,1.4;6,0.5;te_seed;;".. current_seed .. "]" ..
-
-		"label[2,2;" .. fgettext("Mapgen") .. "]"..
-		"dropdown[4.2,2;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" ..
-
-		"label[2,3;" .. fgettext("Game") .. "]"..
-		"textlist[4.2,3;5.8,2.3;games;" .. gamemgr.gamelist() ..
-		";" .. gameidx .. ";true]" ..
-
-		"button[5,5.5;2.6,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
-		"button[7.5,5.5;2.8,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
-		
-	if #gamemgr.games == 0 then
-		retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" ..
-				fgettext("You have no subgames installed.") .. "]label[2.25,4.4;" ..
-				fgettext("Download one from minetest.net") .. "]"
-	elseif #gamemgr.games == 1 and gamemgr.games[1].id == "minimal" then
-		retval = retval .. "box[1.75,4;8.7,1;#ff8800]label[2,4;" ..
-				fgettext("Warning: The minimal development test is meant for developers.") .. "]label[2,4.4;" ..
-				fgettext("Download a subgame, such as minetest_game, from minetest.net") .. "]"
-	end
-
-	return retval
-
-end
-
-local function create_world_buttonhandler(this, fields)
-
-	if fields["world_create_confirm"] or
-		fields["key_enter"] then
-
-		local worldname = fields["te_world_name"]
-		local gameindex = core.get_textlist_index("games")
-
-		if gameindex ~= nil and
-			worldname ~= "" then
-
-			local message = nil
-
-			if not menudata.worldlist:uid_exists_raw(worldname) then
-				core.setting_set("mg_name",fields["dd_mapgen"])
-				message = core.create_world(worldname,gameindex)
-			else
-				message = fgettext("A world named \"$1\" already exists", worldname)
-			end
-
-			core.setting_set("fixed_map_seed", fields["te_seed"])
-
-			if message ~= nil then
-				gamedata.errormessage = message
-			else
-				core.setting_set("menu_last_game",gamemgr.games[gameindex].id)
-				if this.data.update_worldlist_filter then
-					menudata.worldlist:set_filtercriteria(gamemgr.games[gameindex].id)
-					mm_texture.update("singleplayer", gamemgr.games[gameindex].id)
-				end
-				menudata.worldlist:refresh()
-				core.setting_set("mainmenu_last_selected_world",
-									menudata.worldlist:raw_index_by_uid(worldname))
-			end
-		else
-			gamedata.errormessage =
-				fgettext("No worldname given or no game selected")
-		end
-		this:delete()
-		return true
-	end
-
-	if fields["games"] then
-		return true
-	end
-	
-	if fields["world_create_cancel"] then
-		this:delete()
-		return true
-	end
-
-	return false
-end
-
-
-function create_create_world_dlg(update_worldlistfilter)
-	local retval = dialog_create("sp_create_world",
-					create_world_formspec,
-					create_world_buttonhandler,
-					nil)
-	retval.update_worldlist_filter = update_worldlistfilter
-	
-	return retval
-end
--- a/builtin/mainmenu/dlg_delete_mod.lua
+++ b/builtin/mainmenu/dlg_delete_mod.lua
@@ -1,68 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-
-local function delete_mod_formspec(dialogdata)
-	
-	dialogdata.mod = modmgr.global_mods:get_list()[dialogdata.selected]
-
-	local retval =
-		"size[12.4,5,true]" ..
-		"field[1.75,1;10,3;;" .. fgettext("Are you sure you want to delete \"$1\"?", dialogdata.mod.name) ..  ";]"..
-		"button[4,4.2;1,0.5;dlg_delete_mod_confirm;" .. fgettext("Yes") .. "]" ..
-		"button[6.5,4.2;3,0.5;dlg_delete_mod_cancel;" .. fgettext("No of course not!") .. "]"
-	
-	return retval
-end
-
--------------------------------------------------------------------------------
-local function delete_mod_buttonhandler(this, fields)
-	if fields["dlg_delete_mod_confirm"] ~= nil then
-
-		if this.data.mod.path ~= nil and
-			this.data.mod.path ~= "" and
-			this.data.mod.path ~= core.get_modpath() then
-			if not core.delete_dir(this.data.mod.path) then
-				gamedata.errormessage = fgettext("Modmgr: failed to delete \"$1\"", this.data.mod.path)
-			end
-			modmgr.refresh_globals()
-		else
-			gamedata.errormessage = fgettext("Modmgr: invalid modpath \"$1\"", this.data.mod.path)
-		end
-		this:delete()
-		return true
-	end
-	
-	if fields["dlg_delete_mod_cancel"] then
-		this:delete()
-		return true
-	end
-
-	return false
-end
-
--------------------------------------------------------------------------------
-function create_delete_mod_dlg(selected_index)
-
-	local retval = dialog_create("dlg_delete_mod",
-					delete_mod_formspec,
-					delete_mod_buttonhandler,
-					nil)
-	retval.data.selected = selected_index
-	return retval
-end
--- a/builtin/mainmenu/dlg_delete_world.lua
+++ b/builtin/mainmenu/dlg_delete_world.lua
@@ -1,64 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
-
-local function delete_world_formspec(dialogdata)
-
-	local retval =
-		"size[12,6,true]" ..
-		"label[2,2;" ..
-		fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]"..
-		"button[3.5,4.2;2.6,0.5;world_delete_confirm;" .. fgettext("Yes").. "]" ..
-		"button[6,4.2;2.8,0.5;world_delete_cancel;" .. fgettext("No") .. "]"
-	return retval
-end
-
-local function delete_world_buttonhandler(this, fields)
-	if fields["world_delete_confirm"] then
-
-		if this.data.delete_index > 0 and
-			this.data.delete_index <= #menudata.worldlist:get_raw_list() then
-			core.delete_world(this.data.delete_index)
-			menudata.worldlist:refresh()
-		end
-		this:delete()
-		return true
-	end
-	
-	if fields["world_delete_cancel"] then
-		this:delete()
-		return true
-	end
-	
-	return false
-end
-
-
-function create_delete_world_dlg(name_to_del,index_to_del)
-
-	assert(name_to_del ~= nil and type(name_to_del) == "string" and name_to_del ~= "")
-	assert(index_to_del ~= nil and type(index_to_del) == "number")
-
-	local retval = dialog_create("delete_world",
-					delete_world_formspec,
-					delete_world_buttonhandler,
-					nil)
-	retval.data.delete_name  = name_to_del
-	retval.data.delete_index = index_to_del
-	
-	return retval
-end
--- a/builtin/mainmenu/dlg_rename_modpack.lua
+++ b/builtin/mainmenu/dlg_rename_modpack.lua
@@ -1,69 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-
-local function rename_modpack_formspec(dialogdata)
-	
-	dialogdata.mod = modmgr.global_mods:get_list()[dialogdata.selected]
-
-	local retval =
-		"size[12.4,5,true]" ..
-		"label[1.75,1;".. fgettext("Rename Modpack:") .. "]"..
-		"field[4.5,1.4;6,0.5;te_modpack_name;;" ..
-		dialogdata.mod.name ..
-		"]" ..
-		"button[5,4.2;2.6,0.5;dlg_rename_modpack_confirm;"..
-				fgettext("Accept") .. "]" ..
-		"button[7.5,4.2;2.8,0.5;dlg_rename_modpack_cancel;"..
-				fgettext("Cancel") .. "]"
-	
-	return retval
-end
-
--------------------------------------------------------------------------------
-local function rename_modpack_buttonhandler(this, fields)
-	if fields["dlg_rename_modpack_confirm"] ~= nil then
-		local oldpath = core.get_modpath() .. DIR_DELIM .. this.data.mod.name
-		local targetpath = core.get_modpath() .. DIR_DELIM .. fields["te_modpack_name"]
-		core.copy_dir(oldpath,targetpath,false)
-		modmgr.refresh_globals()
-		modmgr.selected_mod = modmgr.global_mods:get_current_index(
-			modmgr.global_mods:raw_index_by_uid(fields["te_modpack_name"]))
-			
-		this:delete()
-		return true
-	end
-	
-	if fields["dlg_rename_modpack_cancel"] then
-		this:delete()
-		return true
-	end
-
-	return false
-end
-
--------------------------------------------------------------------------------
-function create_rename_modpack_dlg(selected_index)
-
-	local retval = dialog_create("dlg_delete_mod",
-					rename_modpack_formspec,
-					rename_modpack_buttonhandler,
-					nil)
-	retval.data.selected = selected_index
-	return retval
-end
--- a/builtin/mainmenu/gamemgr.lua
+++ b/builtin/mainmenu/gamemgr.lua
@@ -1,83 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
-gamemgr = {}
-
--------------------------------------------------------------------------------
-function gamemgr.find_by_gameid(gameid)
-	for i=1,#gamemgr.games,1 do
-		if gamemgr.games[i].id == gameid then
-			return gamemgr.games[i], i
-		end
-	end
-	return nil, nil
-end
-
--------------------------------------------------------------------------------
-function gamemgr.get_game_mods(gamespec, retval)
-	if gamespec ~= nil and
-		gamespec.gamemods_path ~= nil and
-		gamespec.gamemods_path ~= "" then
-		get_mods(gamespec.gamemods_path, retval)
-	end
-end
-
--------------------------------------------------------------------------------
-function gamemgr.get_game_modlist(gamespec)
-	local retval = ""
-	local game_mods = {}
-	gamemgr.get_game_mods(gamespec, game_mods)
-	for i=1,#game_mods,1 do
-		if retval ~= "" then
-			retval = retval..","
-		end
-		retval = retval .. game_mods[i].name
-	end
-	return retval
-end
-
--------------------------------------------------------------------------------
-function gamemgr.get_game(index)
-	if index > 0 and index <= #gamemgr.games then
-		return gamemgr.games[index]
-	end
-
-	return nil
-end
-
--------------------------------------------------------------------------------
-function gamemgr.update_gamelist()
-	gamemgr.games = core.get_games()
-end
-
--------------------------------------------------------------------------------
-function gamemgr.gamelist()
-	local retval = ""
-	if #gamemgr.games > 0 then
-		retval = retval .. gamemgr.games[1].name
-
-		for i=2,#gamemgr.games,1 do
-			retval = retval .. "," .. gamemgr.games[i].name
-		end
-	end
-	return retval
-end
-
--------------------------------------------------------------------------------
-- read initial data
--------------------------------------------------------------------------------
-gamemgr.update_gamelist()
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -1,164 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
-mt_color_grey  = "#AAAAAA"
-mt_color_blue  = "#0000DD"
-mt_color_green = "#00DD00"
-mt_color_dark_green = "#003300"
-
--for all other colors ask sfan5 to complete his work!
-
-local menupath = core.get_mainmenu_path()
-local basepath = core.get_builtin_path()
-defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
-					DIR_DELIM .. "pack" .. DIR_DELIM
-
-dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "async_event.lua")
-dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "filterlist.lua")
-dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "buttonbar.lua")
-dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "dialog.lua")
-dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "tabview.lua")
-dofile(basepath .. DIR_DELIM .. "fstk" .. DIR_DELIM .. "ui.lua")
-dofile(menupath .. DIR_DELIM .. "common.lua")
-dofile(menupath .. DIR_DELIM .. "gamemgr.lua")
-dofile(menupath .. DIR_DELIM .. "modmgr.lua")
-dofile(menupath .. DIR_DELIM .. "store.lua")
-dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
-dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
-dofile(menupath .. DIR_DELIM .. "tab_mods.lua")
-dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
-if PLATFORM ~= "Android" then
-	dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua")
-	dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua")
-	dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua")
-	dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
-	dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua")
-	dofile(menupath .. DIR_DELIM .. "tab_server.lua")
-	dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
-	dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
-	dofile(menupath .. DIR_DELIM .. "textures.lua")
-else
-	dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua")
-end
-
--------------------------------------------------------------------------------
-local function main_event_handler(tabview, event)
-	if event == "MenuQuit" then
-		core.close()
-	end
-	return true
-end
-
--------------------------------------------------------------------------------
-local function init_globals()
-	-- Init gamedata
-	gamedata.worldindex = 0
-
-
-	if PLATFORM ~= "Android" then
-		menudata.worldlist = filterlist.create(
-			core.get_worlds,
-			compare_worlds,
-			-- Unique id comparison function
-			function(element, uid)
-				return element.name == uid
-			end,
-			-- Filter function
-			function(element, gameid)
-				return element.gameid == gameid
-			end
-		)
-
-		menudata.worldlist:add_sort_mechanism("alphabetic", sort_worlds_alphabetic)
-		menudata.worldlist:set_sortmode("alphabetic")
-
-		if not core.setting_get("menu_last_game") then
-			local default_game = core.setting_get("default_game") or "minetest"
-			core.setting_set("menu_last_game", default_game )
-		end
-
-		mm_texture.init()
-	else
-		local world_list = core.get_worlds()
-
-		local found_singleplayerworld = false
-
-		for i,world in pairs(world_list) do
-			if world.name == "singleplayerworld" then
-				found_singleplayerworld = true
-				gamedata.worldindex = i
-				break
-			end
-		end
-
-		if not found_singleplayerworld then
-			core.create_world("singleplayerworld", 1)
-
-			local world_list = core.get_worlds()
-
-			for i,world in pairs(world_list) do
-				if world.name == "singleplayerworld" then
-					gamedata.worldindex = i
-					break
-				end
-			end
-		end
-	end
-
-	-- Create main tabview
-	local tv_main = tabview_create("maintab",{x=12,y=5.2},{x=0,y=0})
-	if PLATFORM ~= "Android" then
-		tv_main:set_autosave_tab(true)
-	end
-	if PLATFORM ~= "Android" then
-		tv_main:add(tab_singleplayer)
-		tv_main:add(tab_multiplayer)
-		tv_main:add(tab_server)
-	else
-		tv_main:add(tab_simple_main)
-	end
-	tv_main:add(tab_settings)
-	if PLATFORM ~= "Android" then
-		tv_main:add(tab_texturepacks)
-	end
-	tv_main:add(tab_mods)
-	tv_main:add(tab_credits)
-
-	tv_main:set_global_event_handler(main_event_handler)
-
-	if PLATFORM == "Android" then
-		tv_main:set_fixed_size(false)
-	else
-		tv_main:set_tab(core.setting_get("maintab_LAST"))
-	end
-	ui.set_default("maintab")
-	tv_main:show()
-
-	-- Create modstore ui
-	if PLATFORM == "Android" then
-		modstore.init({x=12, y=6}, 3, 2)
-	else
-		modstore.init({x=12, y=8}, 4, 3)
-	end
-
-	ui.update()
-
-	core.sound_play("main_menu", true)
-end
-
-init_globals()
-
--- a/builtin/mainmenu/modmgr.lua
+++ b/builtin/mainmenu/modmgr.lua
@@ -1,564 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-function get_mods(path,retval,modpack)
-	local mods = core.get_dirlist(path, true)
-	
-	for i=1, #mods, 1 do
-		if mods[i]:sub(1,1) ~= "." then
-			local toadd = {}
-			local modpackfile = nil
-
-			toadd.name = mods[i]
-			toadd.path = path .. DIR_DELIM .. mods[i] .. DIR_DELIM
-			if modpack ~= nil and
-				modpack ~= "" then
-				toadd.modpack = modpack
-			else
-				local filename = path .. DIR_DELIM .. mods[i] .. DIR_DELIM .. "modpack.txt"
-				local error = nil
-				modpackfile,error = io.open(filename,"r")
-			end
-
-			if modpackfile ~= nil then
-				modpackfile:close()
-				toadd.is_modpack = true
-				table.insert(retval,toadd)
-				get_mods(path .. DIR_DELIM .. mods[i],retval,mods[i])
-			else
-				table.insert(retval,toadd)
-			end
-		end
-	end
-end
-
--modmanager implementation
-modmgr = {}
-
--------------------------------------------------------------------------------
-function modmgr.extract(modfile)
-	if modfile.type == "zip" then
-		local tempfolder = os.tempfolder()
-
-		if tempfolder ~= nil and
-			tempfolder ~= "" then
-			core.create_dir(tempfolder)
-			if core.extract_zip(modfile.name,tempfolder) then
-				return tempfolder
-			end
-		end
-	end
-	return nil
-end
-
-------------------------------------------------------------------------------
-function modmgr.getbasefolder(temppath)
-
-	if temppath == nil then
-		return {
-		type = "invalid",
-		path = ""
-		}
-	end
-
-	local testfile = io.open(temppath .. DIR_DELIM .. "init.lua","r")
-	if testfile ~= nil then
-		testfile:close()
-		return {
-				type="mod",
-				path=temppath
-				}
-	end
-
-	testfile = io.open(temppath .. DIR_DELIM .. "modpack.txt","r")
-	if testfile ~= nil then
-		testfile:close()
-		return {
-				type="modpack",
-				path=temppath
-				}
-	end
-
-	local subdirs = core.get_dirlist(temppath,true)
-
-	--only single mod or modpack allowed
-	if #subdirs ~= 1 then
-		return {
-			type = "invalid",
-			path = ""
-			}
-	end
-
-	testfile =
-	io.open(temppath .. DIR_DELIM .. subdirs[1] ..DIR_DELIM .."init.lua","r")
-	if testfile ~= nil then
-		testfile:close()
-		return {
-			type="mod",
-			path= temppath .. DIR_DELIM .. subdirs[1]
-			}
-	end
-
-	testfile =
-	io.open(temppath .. DIR_DELIM .. subdirs[1] ..DIR_DELIM .."modpack.txt","r")
-	if testfile ~= nil then
-		testfile:close()
-		return {
-			type="modpack",
-			path=temppath ..  DIR_DELIM .. subdirs[1]
-			}
-	end
-
-	return {
-		type = "invalid",
-		path = ""
-		}
-end
-
--------------------------------------------------------------------------------
-function modmgr.isValidModname(modpath)
-	if modpath:find("-") ~= nil then
-		return false
-	end
-
-	return true
-end
-
--------------------------------------------------------------------------------
-function modmgr.parse_register_line(line)
-	local pos1 = line:find("\"")
-	local pos2 = nil
-	if pos1 ~= nil then
-		pos2 = line:find("\"",pos1+1)
-	end
-
-	if pos1 ~= nil and pos2 ~= nil then
-		local item = line:sub(pos1+1,pos2-1)
-
-		if item ~= nil and
-			item ~= "" then
-			local pos3 = item:find(":")
-
-			if pos3 ~= nil then
-				local retval = item:sub(1,pos3-1)
-				if retval ~= nil and
-					retval ~= "" then
-					return retval
-				end
-			end
-		end
-	end
-	return nil
-end
-
--------------------------------------------------------------------------------
-function modmgr.parse_dofile_line(modpath,line)
-	local pos1 = line:find("\"")
-	local pos2 = nil
-	if pos1 ~= nil then
-		pos2 = line:find("\"",pos1+1)
-	end
-
-	if pos1 ~= nil and pos2 ~= nil then
-		local filename = line:sub(pos1+1,pos2-1)
-
-		if filename ~= nil and
-			filename ~= "" and
-			filename:find(".lua") then
-			return modmgr.identify_modname(modpath,filename)
-		end
-	end
-	return nil
-end
-
--------------------------------------------------------------------------------
-function modmgr.identify_modname(modpath,filename)
-	local testfile = io.open(modpath .. DIR_DELIM .. filename,"r")
-	if testfile ~= nil then
-		local line = testfile:read()
-
-		while line~= nil do
-			local modname = nil
-
-			if line:find("minetest.register_tool") then
-				modname = modmgr.parse_register_line(line)
-			end
-
-			if line:find("minetest.register_craftitem") then
-				modname = modmgr.parse_register_line(line)
-			end
-
-
-			if line:find("minetest.register_node") then
-				modname = modmgr.parse_register_line(line)
-			end
-
-			if line:find("dofile") then
-				modname = modmgr.parse_dofile_line(modpath,line)
-			end
-
-			if modname ~= nil then
-				testfile:close()
-				return modname
-			end
-
-			line = testfile:read()
-		end
-		testfile:close()
-	end
-
-	return nil
-end
--------------------------------------------------------------------------------
-function modmgr.render_modlist(render_list)
-	local retval = ""
-
-	if render_list == nil then
-		if modmgr.global_mods == nil then
-			modmgr.refresh_globals()
-		end
-		render_list = modmgr.global_mods
-	end
-
-	local list = render_list:get_list()
-	local last_modpack = nil
-
-	for i,v in ipairs(list) do
-		if retval ~= "" then
-			retval = retval ..","
-		end
-
-		local color = ""
-
-		if v.is_modpack then
-			local rawlist = render_list:get_raw_list()
-
-			local all_enabled = true
-			for j=1,#rawlist,1 do
-				if rawlist[j].modpack == list[i].name and
-					rawlist[j].enabled ~= true then
-						all_enabled = false
-						break
-				end
-			end
-
-			if all_enabled == false then
-				color = mt_color_grey
-			else
-				color = mt_color_dark_green
-			end
-		end
-
-		if v.typ == "game_mod" then
-			color = mt_color_blue
-		else
-			if v.enabled then
-				color = mt_color_green
-			end
-		end
-
-		retval = retval .. color
-		if v.modpack  ~= nil then
-			retval = retval .. "    "
-		end
-		retval = retval .. v.name
-	end
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-function modmgr.get_dependencies(modfolder)
-	local toadd = ""
-	if modfolder ~= nil then
-		local filename = modfolder ..
-					DIR_DELIM .. "depends.txt"
-
-		local dependencyfile = io.open(filename,"r")
-
-		if dependencyfile then
-			local dependency = dependencyfile:read("*l")
-			while dependency do
-				if toadd ~= "" then
-					toadd = toadd .. ","
-				end
-				toadd = toadd .. dependency
-				dependency = dependencyfile:read()
-			end
-			dependencyfile:close()
-		end
-	end
-
-	return toadd
-end
-
--------------------------------------------------------------------------------
-function modmgr.get_worldconfig(worldpath)
-	local filename = worldpath ..
-				DIR_DELIM .. "world.mt"
-
-	local worldfile = Settings(filename)
-
-	local worldconfig = {}
-	worldconfig.global_mods = {}
-	worldconfig.game_mods = {}
-
-	for key,value in pairs(worldfile:to_table()) do
-		if key == "gameid" then
-			worldconfig.id = value
-		else
-			worldconfig.global_mods[key] = core.is_yes(value)
-		end
-	end
-
-	--read gamemods
-	local gamespec = gamemgr.find_by_gameid(worldconfig.id)
-	gamemgr.get_game_mods(gamespec, worldconfig.game_mods)
-
-	return worldconfig
-end
-
--------------------------------------------------------------------------------
-function modmgr.installmod(modfilename,basename)
-	local modfile = modmgr.identify_filetype(modfilename)
-	local modpath = modmgr.extract(modfile)
-
-	if modpath == nil then
-		gamedata.errormessage = fgettext("Install Mod: file: \"$1\"", modfile.name) ..
-			fgettext("\nInstall Mod: unsupported filetype \"$1\" or broken archive", modfile.type)
-		return
-	end
-
-	local basefolder = modmgr.getbasefolder(modpath)
-
-	if basefolder.type == "modpack" then
-		local clean_path = nil
-
-		if basename ~= nil then
-			clean_path = "mp_" .. basename
-		end
-
-		if clean_path == nil then
-			clean_path = get_last_folder(cleanup_path(basefolder.path))
-		end
-
-		if clean_path ~= nil then
-			local targetpath = core.get_modpath() .. DIR_DELIM .. clean_path
-			if not core.copy_dir(basefolder.path,targetpath) then
-				gamedata.errormessage = fgettext("Failed to install $1 to $2", basename, targetpath)
-			end
-		else
-			gamedata.errormessage = fgettext("Install Mod: unable to find suitable foldername for modpack $1", modfilename)
-		end
-	end
-
-	if basefolder.type == "mod" then
-		local targetfolder = basename
-
-		if targetfolder == nil then
-			targetfolder = modmgr.identify_modname(basefolder.path,"init.lua")
-		end
-
-		--if heuristic failed try to use current foldername
-		if targetfolder == nil then
-			targetfolder = get_last_folder(basefolder.path)
-		end
-
-		if targetfolder ~= nil and modmgr.isValidModname(targetfolder) then
-			local targetpath = core.get_modpath() .. DIR_DELIM .. targetfolder
-			core.copy_dir(basefolder.path,targetpath)
-		else
-			gamedata.errormessage = fgettext("Install Mod: unable to find real modname for: $1", modfilename)
-		end
-	end
-
-	core.delete_dir(modpath)
-
-	modmgr.refresh_globals()
-
-end
-
--------------------------------------------------------------------------------
-function modmgr.preparemodlist(data)
-	local retval = {}
-
-	local global_mods = {}
-	local game_mods = {}
-
-	--read global mods
-	local modpath = core.get_modpath()
-
-	if modpath ~= nil and
-		modpath ~= "" then
-		get_mods(modpath,global_mods)
-	end
-
-	for i=1,#global_mods,1 do
-		global_mods[i].typ = "global_mod"
-		table.insert(retval,global_mods[i])
-	end
-
-	--read game mods
-	local gamespec = gamemgr.find_by_gameid(data.gameid)
-	gamemgr.get_game_mods(gamespec, game_mods)
-
-	for i=1,#game_mods,1 do
-		game_mods[i].typ = "game_mod"
-		table.insert(retval,game_mods[i])
-	end
-
-	if data.worldpath == nil then
-		return retval
-	end
-
-	--read world mod configuration
-	local filename = data.worldpath ..
-				DIR_DELIM .. "world.mt"
-
-	local worldfile = Settings(filename)
-
-	for key,value in pairs(worldfile:to_table()) do
-		if key:sub(1, 9) == "load_mod_" then
-			key = key:sub(10)
-			local element = nil
-			for i=1,#retval,1 do
-				if retval[i].name == key and
-					not retval[i].is_modpack then
-					element = retval[i]
-					break
-				end
-			end
-			if element ~= nil then
-				element.enabled = core.is_yes(value)
-			else
-				core.log("info", "Mod: " .. key .. " " .. dump(value) .. " but not found")
-			end
-		end
-	end
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-function modmgr.comparemod(elem1,elem2)
-	if elem1 == nil or elem2 == nil then
-		return false
-	end
-	if elem1.name ~= elem2.name then
-		return false
-	end
-	if elem1.is_modpack ~= elem2.is_modpack then
-		return false
-	end
-	if elem1.typ ~= elem2.typ then
-		return false
-	end
-	if elem1.modpack ~= elem2.modpack then
-		return false
-	end
-
-	if elem1.path ~= elem2.path then
-		return false
-	end
-
-	return true
-end
-
--------------------------------------------------------------------------------
-function modmgr.mod_exists(basename)
-
-	if modmgr.global_mods == nil then
-		modmgr.refresh_globals()
-	end
-
-	if modmgr.global_mods:raw_index_by_uid(basename) > 0 then
-		return true
-	end
-
-	return false
-end
-
--------------------------------------------------------------------------------
-function modmgr.get_global_mod(idx)
-
-	if modmgr.global_mods == nil then
-		return nil
-	end
-
-	if idx == nil or idx < 1 or
-		idx > modmgr.global_mods:size() then
-		return nil
-	end
-
-	return modmgr.global_mods:get_list()[idx]
-end
-
--------------------------------------------------------------------------------
-function modmgr.refresh_globals()
-	modmgr.global_mods = filterlist.create(
-					modmgr.preparemodlist, --refresh
-					modmgr.comparemod, --compare
-					function(element,uid) --uid match
-						if element.name == uid then
-							return true
-						end
-					end,
-					nil, --filter
-					{}
-					)
-	modmgr.global_mods:add_sort_mechanism("alphabetic", sort_mod_list)
-	modmgr.global_mods:set_sortmode("alphabetic")
-end
-
--------------------------------------------------------------------------------
-function modmgr.identify_filetype(name)
-
-	if name:sub(-3):lower() == "zip" then
-		return {
-				name = name,
-				type = "zip"
-				}
-	end
-
-	if name:sub(-6):lower() == "tar.gz" or
-		name:sub(-3):lower() == "tgz"then
-		return {
-				name = name,
-				type = "tgz"
-				}
-	end
-
-	if name:sub(-6):lower() == "tar.bz2" then
-		return {
-				name = name,
-				type = "tbz"
-				}
-	end
-
-	if name:sub(-2):lower() == "7z" then
-		return {
-				name = name,
-				type = "7z"
-				}
-	end
-
-	return {
-		name = name,
-		type = "ukn"
-	}
-end
--- a/builtin/mainmenu/store.lua
+++ b/builtin/mainmenu/store.lua
@@ -1,618 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-
--modstore implementation
-modstore = {}
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] init
-function modstore.init(size, unsortedmods, searchmods)
-
-	modstore.mods_on_unsorted_page = unsortedmods
-	modstore.mods_on_search_page = searchmods
-	modstore.modsperpage = modstore.mods_on_unsorted_page
-
-	modstore.basetexturedir = core.get_texturepath() .. DIR_DELIM .. "base" ..
-						DIR_DELIM .. "pack" .. DIR_DELIM
-
-	modstore.lastmodtitle = ""
-	modstore.last_search = ""
-
-	modstore.searchlist = filterlist.create(
-		function()
-			if modstore.modlist_unsorted ~= nil and
-				modstore.modlist_unsorted.data ~= nil then
-				return modstore.modlist_unsorted.data
-			end
-			return {}
-		end,
-		function(element,modid)
-			if element.id == modid then
-				return true
-			end
-			return false
-		end, --compare fct
-		nil, --uid match fct
-		function(element,substring)
-			if substring == nil or
-				substring == "" then
-				return false
-			end
-			substring = substring:upper()
-
-			if element.title ~= nil and
-				element.title:upper():find(substring) ~= nil then
-				return true
-			end
-
-			if element.details ~= nil and
-				element.details.author ~= nil and
-				element.details.author:upper():find(substring) ~= nil then
-				return true
-			end
-
-			if element.details ~= nil and
-				element.details.description ~= nil and
-				element.details.description:upper():find(substring) ~= nil then
-				return true
-			end
-			return false
-		end --filter fct
-		)
-
-	modstore.current_list = nil
-
-	modstore.tv_store = tabview_create("modstore",size,{x=0,y=0})
-
-	modstore.tv_store:set_global_event_handler(modstore.handle_events)
-
-	modstore.tv_store:add(
-		{
-		name = "unsorted",
-		caption = fgettext("Unsorted"),
-		cbf_formspec       = modstore.unsorted_tab,
-		cbf_button_handler = modstore.handle_buttons,
-		on_change          =
-			function() modstore.modsperpage = modstore.mods_on_unsorted_page end
-		}
-	)
-
-	modstore.tv_store:add(
-		{
-		name = "search",
-		caption            = fgettext("Search"),
-		cbf_formspec       = modstore.getsearchpage,
-		cbf_button_handler = modstore.handle_buttons,
-		on_change          = modstore.activate_search_tab
-		}
-	)
-end
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] nametoindex
-function modstore.nametoindex(name)
-
-	for i=1,#modstore.tabnames,1 do
-		if modstore.tabnames[i] == name then
-			return i
-		end
-	end
-
-	return 1
-end
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] showdownloading
-function modstore.showdownloading(title)
-	local new_dlg = dialog_create("store_downloading",
-		function(data)
-			return "size[6,2]label[0.25,0.75;" .. fgettext("Downloading") ..
-				" " .. data.title .. " " ..
-				fgettext("please wait...") .. "]"
-		end,
-		function(this,fields)
-			if fields["btn_hidden_close_download"] ~= nil then
-				if fields["btn_hidden_close_download"].successfull then
-					modstore.lastmodentry = fields["btn_hidden_close_download"]
-					modstore.successfulldialog()
-				else
-					modstore.lastmodtitle = ""
-				end
-
-				this:delete()
-				return true
-			end
-
-			return false
-		end,
-		nil,
-		modstore.tv_store)
-
-	new_dlg.data.title = title
-	new_dlg:show()
-end
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] successfulldialog
-function modstore.successfulldialog()
-	local new_dlg = dialog_create("store_downloading",
-		function(data)
-			local retval = ""
-			retval = retval .. "size[6,2,true]"
-			if modstore.lastmodentry ~= nil then
-				retval = retval .. "label[0,0.25;" .. fgettext("Successfully installed:") .. "]"
-				retval = retval .. "label[3,0.25;" .. modstore.lastmodentry.moddetails.title .. "]"
-
-
-				retval = retval .. "label[0,0.75;" .. fgettext("Shortname:") .. "]"
-				retval = retval .. "label[3,0.75;" .. core.formspec_escape(modstore.lastmodentry.moddetails.basename) .. "]"
-
-			end
-			retval = retval .. "button[2.5,1.5;1,0.5;btn_confirm_mod_successfull;" .. fgettext("ok") .. "]"
-		end,
-		function(this,fields)
-			if fields["btn_confirm_mod_successfull"] ~= nil then
-				this.parent:show()
-				this:hide()
-				this:delete()
-
-				return true
-			end
-
-			return false
-		end,
-		nil,
-		modstore.tv_store)
-
-	new_dlg.data.title = title
-	new_dlg:show()
-end
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] handle_buttons
-function modstore.handle_buttons(parent, fields, name, data)
-
-	if fields["btn_modstore_page_up"] then
-		if modstore.current_list ~= nil and modstore.current_list.page > 0 then
-			modstore.current_list.page = modstore.current_list.page - 1
-		end
-		return true
-	end
-
-	if fields["btn_modstore_page_down"] then
-		if modstore.current_list ~= nil and
-			modstore.current_list.page <modstore.current_list.pagecount-1 then
-			modstore.current_list.page = modstore.current_list.page +1
-		end
-		return true
-	end
-
-	if fields["btn_modstore_search"] or
-		(fields["key_enter"] and fields["te_modstore_search"] ~= nil) then
-		modstore.last_search = fields["te_modstore_search"]
-		filterlist.set_filtercriteria(modstore.searchlist,fields["te_modstore_search"])
-		filterlist.refresh(modstore.searchlist)
-		modstore.currentlist = {
-			page = 0,
-			pagecount =  math.ceil(filterlist.size(modstore.searchlist) / modstore.modsperpage),
-			data = filterlist.get_list(modstore.searchlist),
-		}
-		return true
-	end
-
-	if fields["btn_modstore_close"] then
-		parent:hide()
-		return true
-	end
-
-	for key,value in pairs(fields) do
-		local foundat = key:find("btn_install_mod_")
-		if ( foundat == 1) then
-			local modid = tonumber(key:sub(17))
-			for i=1,#modstore.modlist_unsorted.data,1 do
-				if modstore.modlist_unsorted.data[i].id == modid then
-					local moddetails = modstore.modlist_unsorted.data[i].details
-
-					if modstore.lastmodtitle ~= "" then
-						modstore.lastmodtitle = modstore.lastmodtitle .. ", "
-					end
-
-					modstore.lastmodtitle = modstore.lastmodtitle .. moddetails.title
-
-					if not core.handle_async(
-						function(param)
-							local fullurl = core.setting_get("modstore_download_url") ..
-											param.moddetails.download_url
-
-							if param.version ~= nil then
-								local found = false
-								for i=1,#param.moddetails.versions, 1 do
-									if param.moddetails.versions[i].date:sub(1,10) == param.version then
-										fullurl = core.setting_get("modstore_download_url") ..
-														param.moddetails.versions[i].download_url
-										found = true
-									end
-								end
-
-								if not found then
-									core.log("error","no download url found for version " .. dump(param.version))
-									return {
-										moddetails = param.moddetails,
-										successfull = false
-									}
-								end
-							end
-
-							if core.download_file(fullurl,param.filename) then
-								return {
-									texturename = param.texturename,
-									moddetails = param.moddetails,
-									filename = param.filename,
-									successfull = true
-								}
-							else
-								core.log("error","downloading " .. dump(fullurl) .. " failed")
-								return {
-									moddetails = param.moddetails,
-									successfull = false
-								}
-							end
-						end,
-						{
-							moddetails = moddetails,
-							version = fields["dd_version" .. modid],
-							filename = os.tempfolder() .. "_MODNAME_" .. moddetails.basename .. ".zip",
-							texturename = modstore.modlist_unsorted.data[i].texturename
-						},
-						function(result)
-							print("Result from async: " .. dump(result.successfull))
-							if result.successfull then
-								modmgr.installmod(result.filename,result.moddetails.basename)
-								os.remove(result.filename)
-							else
-								gamedata.errormessage = "Failed to download " .. result.moddetails.title
-							end
-
-							if gamedata.errormessage == nil then
-								core.button_handler({btn_hidden_close_download=result})
-							else
-								core.button_handler({btn_hidden_close_download={successfull=false}})
-							end
-						end
-					) then
-						print("ERROR: async event failed")
-						gamedata.errormessage = "Failed to download " .. modstore.lastmodtitle
-					end
-					parent:hide()
-					modstore.showdownloading(modstore.lastmodtitle)
-					return true
-				end
-			end
-			return true
-		end
-	end
-
-	return false
-end
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] handle_events
-function modstore.handle_events(this,event)
-	if (event == "MenuQuit") then
-		this:hide()
-		return true
-	end
-end
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] update_modlist
-function modstore.update_modlist()
-	modstore.modlist_unsorted = {}
-	modstore.modlist_unsorted.data = {}
-	modstore.modlist_unsorted.pagecount = 1
-	modstore.modlist_unsorted.page = 0
-
-	core.handle_async(
-		function(param)
-			return core.get_modstore_list()
-		end,
-		nil,
-		function(result)
-			if result ~= nil then
-				modstore.modlist_unsorted = {}
-				modstore.modlist_unsorted.data = result
-
-				if modstore.modlist_unsorted.data ~= nil then
-					modstore.modlist_unsorted.pagecount =
-						math.ceil((#modstore.modlist_unsorted.data / modstore.modsperpage))
-				else
-					modstore.modlist_unsorted.data = {}
-					modstore.modlist_unsorted.pagecount = 1
-				end
-				modstore.modlist_unsorted.page = 0
-				modstore.fetchdetails()
-				core.event_handler("Refresh")
-			end
-		end
-	)
-end
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] fetchdetails
-function modstore.fetchdetails()
-
-	for i=1,#modstore.modlist_unsorted.data,1 do
-		core.handle_async(
-		function(param)
-			param.details = core.get_modstore_details(tostring(param.modid))
-			return param
-		end,
-		{
-			modid=modstore.modlist_unsorted.data[i].id,
-			listindex=i
-		},
-		function(result)
-			if result ~= nil and
-				modstore.modlist_unsorted ~= nil
-				and modstore.modlist_unsorted.data ~= nil and
-				modstore.modlist_unsorted.data[result.listindex] ~= nil and
-				modstore.modlist_unsorted.data[result.listindex].id ~= nil then
-
-				modstore.modlist_unsorted.data[result.listindex].details = result.details
-				core.event_handler("Refresh")
-			end
-		end
-		)
-	end
-end
-
--------------------------------------------------------------------------------
-- @function [parent=#modstore] getscreenshot
-function modstore.getscreenshot(ypos,listentry)
-
-	if	listentry.details ~= nil and
-		(listentry.details.screenshot_url == nil or
-		listentry.details.screenshot_url == "") then
-
-		if listentry.texturename == nil then
-			listentry.texturename = modstore.basetexturedir .. "no_screenshot.png"
-		end
-
-		return "image[0,".. ypos .. ";3,2;" ..
-			core.formspec_escape(listentry.texturename) .. "]"
-	end
-
-	if listentry.details ~= nil and
-		listentry.texturename == nil then
-		--make sure we don't download multiple times
-		listentry.texturename = "in progress"
-
-		--prepare url and filename
-		local fullurl = core.setting_get("modstore_download_url") ..
-					listentry.details.screenshot_url
-		local filename = os.tempfolder() .. "_MID_" .. listentry.id
-
-		--trigger download
-		core.handle_async(
-			--first param is downloadfct
-			function(param)
-				param.successfull = core.download_file(param.fullurl,param.filename)
-				return param
-			end,
-			--second parameter is data passed to async job
-			{
-				fullurl = fullurl,
-				filename = filename,
-				modid = listentry.id
-			},
-			--integrate result to raw list
-			function(result)
-				if result.successfull then
-					local found = false
-					for i=1,#modstore.modlist_unsorted.data,1 do
-						if modstore.modlist_unsorted.data[i].id == result.modid then
-							found = true
-							modstore.modlist_unsorted.data[i].texturename = result.filename
-							break
-						end
-					end
-					if found then
-						core.event_handler("Refresh")
-					else
-						core.log("error","got screenshot but didn't find matching mod: " .. result.modid)
-					end
-				end
-			end
-		)
-	end
-
-	if listentry.texturename ~= nil and
-		listentry.texturename ~= "in progress" then
-		return "image[0,".. ypos .. ";3,2;" ..
-			core.formspec_escape(listentry.texturename) .. "]"
-	end
-
-	return ""
-end
-
--------------------------------------------------------------------------------
--@function [parent=#modstore] getshortmodinfo
-function modstore.getshortmodinfo(ypos,listentry,details)
-	local retval = ""
-
-	retval = retval .. "box[0," .. ypos .. ";11.4,1.75;#FFFFFF]"
-
-	--screenshot
-	retval = retval .. modstore.getscreenshot(ypos,listentry)
-
-	--title + author
-	retval = retval .."label[2.75," .. ypos .. ";" ..
-		core.formspec_escape(details.title) .. " (" .. details.author .. ")]"
-
-	--description
-	local descriptiony = ypos + 0.5
-	retval = retval .. "textarea[3," .. descriptiony .. ";6.5,1.55;;" ..
-		core.formspec_escape(details.description) .. ";]"
-
-	--rating
-	local ratingy = ypos
-	retval = retval .."label[7," .. ratingy .. ";" ..
-					fgettext("Rating") .. ":]"
-	retval = retval .. "label[8.7," .. ratingy .. ";" .. details.rating .."]"
-
-	--versions (IMPORTANT has to be defined AFTER rating)
-	if details.versions ~= nil and
-		#details.versions > 1 then
-		local versiony = ypos + 0.05
-		retval = retval .. "dropdown[9.1," .. versiony .. ";2.48,0.25;dd_version" .. details.id .. ";"
-		local versions = ""
-		for i=1,#details.versions , 1 do
-			if versions ~= "" then
-				versions = versions .. ","
-			end
-
-			versions = versions .. details.versions[i].date:sub(1,10)
-		end
-		retval = retval .. versions .. ";1]"
-	end
-
-	if details.basename then
-		--install button
-		local buttony = ypos + 1.2
-		retval = retval .."button[9.1," .. buttony .. ";2.5,0.5;btn_install_mod_" .. details.id .. ";"
-
-		if modmgr.mod_exists(details.basename) then
-			retval = retval .. fgettext("re-Install") .."]"
-		else
-			retval = retval .. fgettext("Install") .."]"
-		end
-	end
-
-	return retval
-end
-
--------------------------------------------------------------------------------
--@function [parent=#modstore] getmodlist
-function modstore.getmodlist(list,yoffset)
-	modstore.current_list = list
-
-	if yoffset == nil then
-		yoffset = 0
-	end
-
-	local sb_y_start = 0.2 + yoffset
-	local sb_y_end   = (modstore.modsperpage * 1.75) + ((modstore.modsperpage-1) * 0.15)
-	local close_button = "button[4," .. (sb_y_end + 0.3 + yoffset) ..
-			";4,0.5;btn_modstore_close;" .. fgettext("Close store") .. "]"
-
-	if #list.data == 0 then
-		return close_button
-	end
-
-	local scrollbar = ""
-	scrollbar = scrollbar .. "label[0.1,".. (sb_y_end + 0.25 + yoffset) ..";"
-				.. fgettext("Page $1 of $2", list.page+1, list.pagecount) .. "]"
-	scrollbar = scrollbar .. "box[11.6," .. sb_y_start .. ";0.28," .. sb_y_end .. ";#000000]"
-	local scrollbarpos = (sb_y_start + 0.5) +
-				((sb_y_end -1.6)/(list.pagecount-1)) * list.page
-	scrollbar = scrollbar .. "box[11.6," ..scrollbarpos .. ";0.28,0.5;#32CD32]"
-	scrollbar = scrollbar .. "button[11.6," .. (sb_y_start)
-				.. ";0.5,0.5;btn_modstore_page_up;^]"
-	scrollbar = scrollbar .. "button[11.6," .. (sb_y_start + sb_y_end - 0.5)
-				.. ";0.5,0.5;btn_modstore_page_down;v]"
-
-	local retval = ""
-
-	local endmod = (list.page * modstore.modsperpage) + modstore.modsperpage
-
-	if (endmod > #list.data) then
-		endmod = #list.data
-	end
-
-	for i=(list.page * modstore.modsperpage) +1, endmod, 1 do
-		--getmoddetails
-		local details = list.data[i].details
-
-		if details == nil then
-			details = {}
-			details.title = list.data[i].title
-			details.author = ""
-			details.rating = -1
-			details.description = ""
-		end
-
-		if details ~= nil then
-			local screenshot_ypos =
-				yoffset +(i-1 - (list.page * modstore.modsperpage))*1.9 +0.2
-
-			retval = retval .. modstore.getshortmodinfo(screenshot_ypos,
-														list.data[i],
-														details)
-		end
-	end
-
-	return retval .. scrollbar .. close_button
-end
-
--------------------------------------------------------------------------------
--@function [parent=#modstore] getsearchpage
-function modstore.getsearchpage(tabview, name, tabdata)
-	local retval = ""
-	local search = ""
-
-	if modstore.last_search ~= nil then
-		search = modstore.last_search
-	end
-
-	retval = retval ..
-		"button[9.5,0.2;2.5,0.5;btn_modstore_search;".. fgettext("Search") .. "]" ..
-		"field[0.5,0.5;9,0.5;te_modstore_search;;" .. search .. "]"
-
-	retval = retval ..
-		modstore.getmodlist(
-			modstore.currentlist,
-			1.75)
-
-	return retval;
-end
-
--------------------------------------------------------------------------------
--@function [parent=#modstore] unsorted_tab
-function modstore.unsorted_tab()
-	return modstore.getmodlist(modstore.modlist_unsorted)
-end
-
--------------------------------------------------------------------------------
--@function [parent=#modstore] activate_search_tab
-function modstore.activate_search_tab(type, old_tab, new_tab)
-
-	if old_tab == new_tab then
-		return
-	end
-	filterlist.set_filtercriteria(modstore.searchlist,modstore.last_search)
-	filterlist.refresh(modstore.searchlist)
-	modstore.modsperpage = modstore.mods_on_search_page
-	modstore.currentlist = {
-		page = 0,
-		pagecount =
-			math.ceil(filterlist.size(modstore.searchlist) / modstore.modsperpage),
-		data = filterlist.get_list(modstore.searchlist),
-	}
-end
-
--- a/builtin/mainmenu/tab_credits.lua
+++ b/builtin/mainmenu/tab_credits.lua
@@ -1,65 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-
-tab_credits = {
-	name = "credits",
-	caption = fgettext("Credits"),
-	cbf_formspec = function (tabview, name, tabdata)
-			local logofile = defaulttexturedir .. "logo.png"
-			return "label[0.5,3.2;Minetest " .. core.get_version() .. "]" ..
-				"label[0.5,3.5;http://minetest.net]" ..
-				"image[0.5,1;" .. core.formspec_escape(logofile) .. "]" ..
-				"textlist[3.5,-0.25;8.5,5.8;list_credits;" ..
-				"#FFFF00" .. fgettext("Core Developers") .."," ..
-				"Perttu Ahola (celeron55) <celeron55@gmail.com>,"..
-				"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>,"..
-				"PilzAdam <pilzadam@minetest.net>," ..
-				"Lisa Milne (darkrose) <lisa@ltmnet.com>,"..
-				"Maciej Kasatkin (RealBadAngel) <mk@realbadangel.pl>,"..
-				"sfan5 <sfan5@live.de>,"..
-				"kahrl <kahrl@gmx.net>,"..
-				"sapier,"..
-				"ShadowNinja <shadowninja@minetest.net>,"..
-				"Nathanael Courant (Nore/Novatux) <nore@mesecons.net>,"..
-				"BlockMen,"..
-				"Craig Robbins (Zeno),"..
-				","..
-				"#FFFF00" .. fgettext("Active Contributors") .. "," ..
-				"TriBlade9 <triblade9@mail.com>,"..
-				"SmallJoker <mk939@ymail.com>,"..
-				"Zefram <zefram@fysh.org>,"..
-				"," ..
-				"#FFFF00" .. fgettext("Previous Contributors") .. "," ..
-				"Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>,"..
-				"Jurgen Doser (doserj) <jurgen.doser@gmail.com>,"..
-				"Jeija <jeija@mesecons.net>,"..
-				"MirceaKitsune <mirceakitsune@gmail.com>,"..
-				"dannydark <the_skeleton_of_a_child@yahoo.co.uk>,"..
-				"0gb.us <0gb.us@0gb.us>,"..
-				"proller <proler@gmail.com>,"..
-				"Ilya Zhuravlev (xyz) <xyz@minetest.net>,"..
-				"Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com>,"..
-				"Jonathan Neuschafer <j.neuschaefer@gmx.net>,"..
-				"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>,"..
-				"Constantin Wenger (SpeedProg) <constantin.wenger@googlemail.com>,"..
-				"matttpt <matttpt@gmail.com>,"..
-				"JacobF <queatz@gmail.com>,"..
-				";0;true]"
-			end
-	}
--- a/builtin/mainmenu/tab_mods.lua
+++ b/builtin/mainmenu/tab_mods.lua
@@ -1,169 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-local function get_formspec(tabview, name, tabdata)
-
-	if modmgr.global_mods == nil then
-		modmgr.refresh_globals()
-	end
-
-	if tabdata.selected_mod == nil then
-		tabdata.selected_mod = 1
-	end
-
-	local retval =
-		"label[0.05,-0.25;".. fgettext("Installed Mods:") .. "]" ..
-		"textlist[0,0.25;5.1,4.35;modlist;" ..
-		modmgr.render_modlist(modmgr.global_mods) ..
-		";" .. tabdata.selected_mod .. "]"
-
-	retval = retval ..
--		"label[0.8,4.2;" .. fgettext("Add mod:") .. "]" ..
--		TODO Disabled due to upcoming release 0.4.8 and irrlicht messing up localization
--		"button[0.75,4.85;1.8,0.5;btn_mod_mgr_install_local;".. fgettext("Local install") .. "]" ..
-		"button[0,4.85;5.25,0.5;btn_modstore;".. fgettext("Online mod repository") .. "]"
-
-	local selected_mod = nil
-
-	if filterlist.size(modmgr.global_mods) >= tabdata.selected_mod then
-		selected_mod = modmgr.global_mods:get_list()[tabdata.selected_mod]
-	end
-
-	if selected_mod ~= nil then
-		local modscreenshot = nil
-
-		--check for screenshot beeing available
-		local screenshotfilename = selected_mod.path .. DIR_DELIM .. "screenshot.png"
-		local error = nil
-		local screenshotfile,error = io.open(screenshotfilename,"r")
-		if error == nil then
-			screenshotfile:close()
-			modscreenshot = screenshotfilename
-		end
-
-		if modscreenshot == nil then
-				modscreenshot = modstore.basetexturedir .. "no_screenshot.png"
-		end
-
-		retval = retval
-				.. "image[5.5,0;3,2;" .. core.formspec_escape(modscreenshot) .. "]"
-				.. "label[8.25,0.6;" .. selected_mod.name .. "]"
-
-		local descriptionlines = nil
-		error = nil
-		local descriptionfilename = selected_mod.path .. "description.txt"
-		local descriptionfile,error = io.open(descriptionfilename,"r")
-		if error == nil then
-			local descriptiontext = descriptionfile:read("*all")
-
-			descriptionlines = core.splittext(descriptiontext,42)
-			descriptionfile:close()
-		else
-			descriptionlines = {}
-			table.insert(descriptionlines,fgettext("No mod description available"))
-		end
-
-		retval = retval ..
-			"label[5.5,1.7;".. fgettext("Mod information:") .. "]" ..
-			"textlist[5.5,2.2;6.2,2.4;description;"
-
-		for i=1,#descriptionlines,1 do
-			retval = retval .. core.formspec_escape(descriptionlines[i]) .. ","
-		end
-
-
-		if selected_mod.is_modpack then
-			retval = retval .. ";0]" ..
-				"button[10,4.85;2,0.5;btn_mod_mgr_rename_modpack;" ..
-				fgettext("Rename") .. "]"
-			retval = retval .. "button[5.5,4.85;4.5,0.5;btn_mod_mgr_delete_mod;"
-				.. fgettext("Uninstall selected modpack") .. "]"
-		else
-			--show dependencies
-
-			retval = retval .. ",Depends:,"
-
-			local toadd = modmgr.get_dependencies(selected_mod.path)
-
-			retval = retval .. toadd .. ";0]"
-
-			retval = retval .. "button[5.5,4.85;4.5,0.5;btn_mod_mgr_delete_mod;"
-				.. fgettext("Uninstall selected mod") .. "]"
-		end
-	end
-	return retval
-end
-
--------------------------------------------------------------------------------
-local function handle_buttons(tabview, fields, tabname, tabdata)
-	if fields["modlist"] ~= nil then
-		local event = core.explode_textlist_event(fields["modlist"])
-		tabdata.selected_mod = event.index
-		return true
-	end
-
-	if fields["btn_mod_mgr_install_local"] ~= nil then
-		core.show_file_open_dialog("mod_mgt_open_dlg",fgettext("Select Mod File:"))
-		return true
-	end
-
-	if fields["btn_modstore"] ~= nil then
-		local modstore_ui = ui.find_by_name("modstore")
-		if modstore_ui ~= nil then
-			tabview:hide()
-			modstore.update_modlist()
-			modstore_ui:show()
-		else
-			print("modstore ui element not found")
-		end
-		return true
-	end
-
-	if fields["btn_mod_mgr_rename_modpack"] ~= nil then
-		local dlg_renamemp = create_rename_modpack_dlg(tabdata.selected_mod)
-		dlg_renamemp:set_parent(tabview)
-		tabview:hide()
-		dlg_renamemp:show()
-		return true
-	end
-
-	if fields["btn_mod_mgr_delete_mod"] ~= nil then
-		local dlg_delmod = create_delete_mod_dlg(tabdata.selected_mod)
-		dlg_delmod:set_parent(tabview)
-		tabview:hide()
-		dlg_delmod:show()
-		return true
-	end
-
-	if fields["mod_mgt_open_dlg_accepted"] ~= nil and
-		fields["mod_mgt_open_dlg_accepted"] ~= "" then
-		modmgr.installmod(fields["mod_mgt_open_dlg_accepted"],nil)
-		return true
-	end
-
-	return false
-end
-
--------------------------------------------------------------------------------
-tab_mods = {
-	name = "mods",
-	caption = fgettext("Mods"),
-	cbf_formspec = get_formspec,
-	cbf_button_handler = handle_buttons,
-	on_change = gamemgr.update_gamelist
-}
--- a/builtin/mainmenu/tab_multiplayer.lua
+++ b/builtin/mainmenu/tab_multiplayer.lua
@@ -1,256 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-local function get_formspec(tabview, name, tabdata)
-	local render_details = core.is_yes(core.setting_getbool("public_serverlist"))
-	
-	local retval =
-		"label[0,4.25;" .. fgettext("Address/Port") .. "]" ..
-		"label[9,2.75;" .. fgettext("Name/Password") .. "]" ..
-		"field[0.25,5.25;5.5,0.5;te_address;;" ..
-		core.formspec_escape(core.setting_get("address")) .. "]" ..
-		"field[5.75,5.25;2.25,0.5;te_port;;" ..
-		core.formspec_escape(core.setting_get("remote_port")) .. "]" ..
-		"checkbox[0,3.6;cb_public_serverlist;" .. fgettext("Public Serverlist") .. ";" ..
-		dump(core.setting_getbool("public_serverlist")) .. "]"
-
-	if not core.setting_getbool("public_serverlist") then
-		retval = retval ..
-		"button[6.45,3.95;2.25,0.5;btn_delete_favorite;" .. fgettext("Delete") .. "]"
-	end
-
-	retval = retval ..
-		"button[9,4.95;2.5,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]" ..
-		"field[9.3,3.75;2.5,0.5;te_name;;" ..
-		core.formspec_escape(core.setting_get("name")) .. "]" ..
-		"pwdfield[9.3,4.5;2.5,0.5;te_pwd;]" ..
-		"textarea[9.3,0;2.5,3.1;;"
-		
-	if tabdata.fav_selected ~= nil and
-		menudata.favorites[tabdata.fav_selected] ~= nil and
-		menudata.favorites[tabdata.fav_selected].description ~= nil then
-		retval = retval ..
-			core.formspec_escape(menudata.favorites[tabdata.fav_selected].description,true)
-	end
-
-	retval = retval ..
-		";]"
-
-	--favourites
-	local function image_column(tooltip, flagname)
-		return "image," ..
-			"tooltip=" .. core.formspec_escape(tooltip) .. "," ..
-			"0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," ..
-			"1=" .. core.formspec_escape(defaulttexturedir .. "server_flags_" .. flagname .. ".png")
-	end
-	if render_details then
-		retval = retval .. "tablecolumns[" ..
-			"color,span=3;" ..
-			"text,align=right;" ..                -- clients
-			"text,align=center,padding=0.25;" ..  -- "/"
-			"text,align=right,padding=0.25;" ..   -- clients_max
-			image_column("Creative mode", "creative") .. ",padding=1;" ..
-			image_column("Damage enabled", "damage") .. ",padding=0.25;" ..
-			image_column("PvP enabled", "pvp") .. ",padding=0.25;" ..
-			"text,padding=1]"                               -- name
-	else
-		retval = retval .. "tablecolumns[text]"
-	end
-	retval = retval ..
-		"table[0,0;8.5,3.7;favourites;"
-
-	if #menudata.favorites > 0 then
-		retval = retval .. render_favorite(menudata.favorites[1],render_details)
-
-		for i=2,#menudata.favorites,1 do
-			retval = retval .. "," .. render_favorite(menudata.favorites[i],render_details)
-		end
-	end
-
-	if tabdata.fav_selected ~= nil then
-		retval = retval .. ";" .. tabdata.fav_selected .. "]"
-	else
-		retval = retval .. ";0]"
-	end
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-local function main_button_handler(tabview, fields, name, tabdata)
-
-	if fields["te_name"] ~= nil then
-		gamedata.playername = fields["te_name"]
-		core.setting_set("name", fields["te_name"])
-	end
-
-	if fields["favourites"] ~= nil then
-		local event = core.explode_table_event(fields["favourites"])
-		if event.type == "DCL" then
-			if event.row <= #menudata.favorites then
-				gamedata.address    = menudata.favorites[event.row].address
-				gamedata.port       = menudata.favorites[event.row].port
-				gamedata.playername = fields["te_name"]
-				if fields["te_pwd"] ~= nil then
-					gamedata.password		= fields["te_pwd"]
-				end
-				gamedata.selected_world = 0
-
-				if menudata.favorites ~= nil then
-					gamedata.servername        = menudata.favorites[event.row].name
-					gamedata.serverdescription = menudata.favorites[event.row].description
-				end
-
-				if gamedata.address ~= nil and
-					gamedata.port ~= nil then
-					core.setting_set("address",gamedata.address)
-					core.setting_set("remote_port",gamedata.port)
-					core.start()
-				end
-			end
-			return true
-		end
-
-		if event.type == "CHG" then
-			if event.row <= #menudata.favorites then
-				local address = menudata.favorites[event.row].address
-				local port    = menudata.favorites[event.row].port
-
-				if address ~= nil and
-					port ~= nil then
-					core.setting_set("address",address)
-					core.setting_set("remote_port",port)
-				end
-
-				tabdata.fav_selected = event.row
-			end
-			
-			return true
-		end
-	end
-
-	if fields["key_up"] ~= nil or
-		fields["key_down"] ~= nil then
-
-		local fav_idx = core.get_table_index("favourites")
-
-		if fav_idx ~= nil then
-			if fields["key_up"] ~= nil and fav_idx > 1 then
-				fav_idx = fav_idx -1
-			else if fields["key_down"] and fav_idx < #menudata.favorites then
-				fav_idx = fav_idx +1
-			end end
-		else
-			fav_idx = 1
-		end
-		
-		if menudata.favorites == nil or
-			menudata.favorites[fav_idx] == nil then
-			tabdata.fav_selected = 0
-			return true
-		end
-	
-		local address = menudata.favorites[fav_idx].address
-		local port    = menudata.favorites[fav_idx].port
-
-		if address ~= nil and
-			port ~= nil then
-			core.setting_set("address",address)
-			core.setting_set("remote_port",port)
-		end
-
-		tabdata.fav_selected = fav_idx
-		return true
-	end
-
-	if fields["cb_public_serverlist"] ~= nil then
-		core.setting_set("public_serverlist", fields["cb_public_serverlist"])
-
-		if core.setting_getbool("public_serverlist") then
-			asyncOnlineFavourites()
-		else
-			menudata.favorites = core.get_favorites("local")
-		end
-		tabdata.fav_selected = nil
-		return true
-	end
-
-	if fields["btn_delete_favorite"] ~= nil then
-		local current_favourite = core.get_table_index("favourites")
-		if current_favourite == nil then return end
-		core.delete_favorite(current_favourite)
-		menudata.favorites   = core.get_favorites()
-		tabdata.fav_selected = nil
-
-		core.setting_set("address","")
-		core.setting_set("remote_port","30000")
-
-		return true
-	end
-
-	if fields["btn_mp_connect"] ~= nil or
-		fields["key_enter"] ~= nil then
-
-		gamedata.playername     = fields["te_name"]
-		gamedata.password       = fields["te_pwd"]
-		gamedata.address        = fields["te_address"]
-		gamedata.port           = fields["te_port"]
-
-		local fav_idx = core.get_table_index("favourites")
-
-		if fav_idx ~= nil and fav_idx <= #menudata.favorites and
-			menudata.favorites[fav_idx].address == fields["te_address"] and
-			menudata.favorites[fav_idx].port    == fields["te_port"] then
-
-			gamedata.servername        = menudata.favorites[fav_idx].name
-			gamedata.serverdescription = menudata.favorites[fav_idx].description
-		else
-			gamedata.servername        = ""
-			gamedata.serverdescription = ""
-		end
-
-		gamedata.selected_world = 0
-
-		core.setting_set("address",    fields["te_address"])
-		core.setting_set("remote_port",fields["te_port"])
-
-		core.start()
-		return true
-	end
-	return false
-end
-
-local function on_change(type,old_tab,new_tab)
-	if type == "LEAVE" then
-		return
-	end
-	if core.setting_getbool("public_serverlist") then
-		asyncOnlineFavourites()
-	else
-		menudata.favorites = core.get_favorites("local")
-	end
-end
-
--------------------------------------------------------------------------------
-tab_multiplayer = {
-	name = "multiplayer",
-	caption = fgettext("Client"),
-	cbf_formspec = get_formspec,
-	cbf_button_handler = main_button_handler,
-	on_change = on_change
-	}
--- a/builtin/mainmenu/tab_server.lua
+++ b/builtin/mainmenu/tab_server.lua
@@ -1,178 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-local function get_formspec(tabview, name, tabdata)
-	
-	local index = menudata.worldlist:get_current_index(
-				tonumber(core.setting_get("mainmenu_last_selected_world"))
-				)
-
-	local retval =
-		"button[4,4.15;2.6,0.5;world_delete;" .. fgettext("Delete") .. "]" ..
-		"button[6.5,4.15;2.8,0.5;world_create;" .. fgettext("New") .. "]" ..
-		"button[9.2,4.15;2.55,0.5;world_configure;" .. fgettext("Configure") .. "]" ..
-		"button[8.5,4.95;3.25,0.5;start_server;" .. fgettext("Start Game") .. "]" ..
-		"label[4,-0.25;" .. fgettext("Select World:") .. "]" ..
-		"checkbox[0.25,0.25;cb_creative_mode;" .. fgettext("Creative Mode") .. ";" ..
-		dump(core.setting_getbool("creative_mode")) .. "]" ..
-		"checkbox[0.25,0.7;cb_enable_damage;" .. fgettext("Enable Damage") .. ";" ..
-		dump(core.setting_getbool("enable_damage")) .. "]" ..
-		"checkbox[0.25,1.15;cb_server_announce;" .. fgettext("Public") .. ";" ..
-		dump(core.setting_getbool("server_announce")) .. "]" ..
-		"label[0.25,2.2;" .. fgettext("Name/Password") .. "]" ..
-		"field[0.55,3.2;3.5,0.5;te_playername;;" ..
-		core.formspec_escape(core.setting_get("name")) .. "]" ..
-		"pwdfield[0.55,4;3.5,0.5;te_passwd;]"
-
-	local bind_addr = core.setting_get("bind_address")
-	if bind_addr ~= nil and bind_addr ~= "" then
-		retval = retval ..
-			"field[0.55,5.2;2.25,0.5;te_serveraddr;" .. fgettext("Bind Address") .. ";" ..
-			core.formspec_escape(core.setting_get("bind_address")) .. "]" ..
-			"field[2.8,5.2;1.25,0.5;te_serverport;" .. fgettext("Port") .. ";" ..
-			core.formspec_escape(core.setting_get("port")) .. "]"
-	else
-		retval = retval ..
-			"field[0.55,5.2;3.5,0.5;te_serverport;" .. fgettext("Server Port") .. ";" ..
-			core.formspec_escape(core.setting_get("port")) .. "]"
-	end
-	
-	retval = retval ..
-		"textlist[4,0.25;7.5,3.7;srv_worlds;" ..
-		menu_render_worldlist() ..
-		";" .. index .. "]"
-	
-	return retval
-end
-
--------------------------------------------------------------------------------
-local function main_button_handler(this, fields, name, tabdata)
-
-	local world_doubleclick = false
-
-	if fields["srv_worlds"] ~= nil then
-		local event = core.explode_textlist_event(fields["srv_worlds"])
-
-		if event.type == "DCL" then
-			world_doubleclick = true
-		end
-		if event.type == "CHG" then
-			core.setting_set("mainmenu_last_selected_world",
-				menudata.worldlist:get_raw_index(core.get_textlist_index("srv_worlds")))
-			return true
-		end
-	end
-
-	if menu_handle_key_up_down(fields,"srv_worlds","mainmenu_last_selected_world") then
-		return true
-	end
-
-	if fields["cb_creative_mode"] then
-		core.setting_set("creative_mode", fields["cb_creative_mode"])
-		return true
-	end
-
-	if fields["cb_enable_damage"] then
-		core.setting_set("enable_damage", fields["cb_enable_damage"])
-		return true
-	end
-
-	if fields["cb_server_announce"] then
-		core.setting_set("server_announce", fields["cb_server_announce"])
-		return true
-	end
-
-	if fields["start_server"] ~= nil or
-		world_doubleclick or
-		fields["key_enter"] then
-		local selected = core.get_textlist_index("srv_worlds")
-		if selected ~= nil then
-			gamedata.playername     = fields["te_playername"]
-			gamedata.password       = fields["te_passwd"]
-			gamedata.port           = fields["te_serverport"]
-			gamedata.address        = ""
-			gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
-
-			core.setting_set("port",gamedata.port)
-			if fields["te_serveraddr"] ~= nil then
-				core.setting_set("bind_address",fields["te_serveraddr"])
-			end
-
-			--update last game
-			local world = menudata.worldlist:get_raw_element(gamedata.selected_world)
-			
-			local game,index = gamemgr.find_by_gameid(world.gameid)
-			core.setting_set("menu_last_game",game.id)
-			core.start()
-			return true
-		end
-	end
-
-	if fields["world_create"] ~= nil then
-		local create_world_dlg = create_create_world_dlg(true)
-		create_world_dlg:set_parent(this)
-		create_world_dlg:show()
-		this:hide()
-		return true
-	end
-
-	if fields["world_delete"] ~= nil then
-		local selected = core.get_textlist_index("srv_worlds")
-		if selected ~= nil and
-			selected <= menudata.worldlist:size() then
-			local world = menudata.worldlist:get_list()[selected]
-			if world ~= nil and
-				world.name ~= nil and
-				world.name ~= "" then
-				local index = menudata.worldlist:get_raw_index(selected)
-				local delete_world_dlg = create_delete_world_dlg(world.name,index)
-				delete_world_dlg:set_parent(this)
-				delete_world_dlg:show()
-				this:hide()
-			end
-		end
-		
-		return true
-	end
-
-	if fields["world_configure"] ~= nil then
-		local selected = core.get_textlist_index("srv_worlds")
-		if selected ~= nil then
-			local configdialog =
-				create_configure_world_dlg(
-						menudata.worldlist:get_raw_index(selected))
-			
-			if (configdialog ~= nil) then
-				configdialog:set_parent(this)
-				configdialog:show()
-				this:hide()
-			end
-		end
-		return true
-	end
-	return false
-end
-
--------------------------------------------------------------------------------
-tab_server = {
-	name = "server",
-	caption = fgettext("Server"),
-	cbf_formspec = get_formspec,
-	cbf_button_handler = main_button_handler,
-	on_change = nil
-	}
--- a/builtin/mainmenu/tab_settings.lua
+++ b/builtin/mainmenu/tab_settings.lua
@@ -1,333 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-
-local function dlg_confirm_reset_formspec(data)
-	local retval =
-		"size[8,3]" ..
-		"label[1,1;".. fgettext("Are you sure to reset your singleplayer world?") .. "]"..
-		"button[1,2;2.6,0.5;dlg_reset_singleplayer_confirm;"..
-				fgettext("Yes") .. "]" ..
-		"button[4,2;2.8,0.5;dlg_reset_singleplayer_cancel;"..
-				fgettext("No!!!") .. "]"
-	return retval
-end
-
-local function dlg_confirm_reset_btnhandler(this, fields, dialogdata)
-
-	if fields["dlg_reset_singleplayer_confirm"] ~= nil then
-		local worldlist = core.get_worlds()
-		local found_singleplayerworld = false
-
-		for i=1,#worldlist,1 do
-			if worldlist[i].name == "singleplayerworld" then
-				found_singleplayerworld = true
-				gamedata.worldindex = i
-			end
-		end
-
-		if found_singleplayerworld then
-			core.delete_world(gamedata.worldindex)
-		end
-
-		core.create_world("singleplayerworld", 1)
-
-		worldlist = core.get_worlds()
-
-		found_singleplayerworld = false
-
-		for i=1,#worldlist,1 do
-			if worldlist[i].name == "singleplayerworld" then
-				found_singleplayerworld = true
-				gamedata.worldindex = i
-			end
-		end
-	end
-
-	this.parent:show()
-	this:hide()
-	this:delete()
-	return true
-end
-
-local function showconfirm_reset(tabview)
-	local new_dlg = dialog_create("reset_spworld",
-		dlg_confirm_reset_formspec,
-		dlg_confirm_reset_btnhandler,
-		nil)
-	new_dlg:set_parent(tabview)
-	tabview:hide()
-	new_dlg:show()
-end
-
-local function gui_scale_to_scrollbar()
-
-	local current_value = tonumber(core.setting_get("gui_scaling"))
-
-	if (current_value == nil) or current_value < 0.25 then
-		return 0
-	end
-
-	if current_value <= 1.25 then
-		return ((current_value - 0.25)/ 1.0) * 700
-	end
-
-	if current_value <= 6 then
-		return ((current_value -1.25) * 100) + 700
-	end
-
-	return 1000
-end
-
-local function scrollbar_to_gui_scale(value)
-
-	value = tonumber(value)
-
-	if (value <= 700) then
-		return ((value / 700) * 1.0) + 0.25
-	end
-
-	if (value <=1000) then
-		return ((value - 700) / 100) + 1.25
-	end
-
-	return 1
-end
-
-local function formspec(tabview, name, tabdata)
-	local video_drivers = core.get_video_drivers()
-	
-	local video_driver_string = ""
-	local current_video_driver_idx = 0
-	local current_video_driver = core.setting_get("video_driver")
-	for i=1, #video_drivers, 1 do
-	
-		if i ~= 1 then
-			video_driver_string = video_driver_string .. ","
-		end
-		video_driver_string = video_driver_string .. video_drivers[i]
-		
-		local video_driver = string.gsub(video_drivers[i], " ", "")
-		if current_video_driver:lower() == video_driver:lower() then
-			current_video_driver_idx = i
-		end
-	end
-	
-	
-	local tab_string =
-		"box[0,0;3.5,4;#999999]" ..
-		"checkbox[0.25,0;cb_smooth_lighting;".. fgettext("Smooth Lighting")
-				.. ";".. dump(core.setting_getbool("smooth_lighting")) .. "]"..
-		"checkbox[0.25,0.5;cb_particles;".. fgettext("Enable Particles") .. ";"
-				.. dump(core.setting_getbool("enable_particles"))	.. "]"..
-		"checkbox[0.25,1;cb_3d_clouds;".. fgettext("3D Clouds") .. ";"
-				.. dump(core.setting_getbool("enable_3d_clouds")) .. "]"..
-		"checkbox[0.25,1.5;cb_fancy_trees;".. fgettext("Fancy Trees") .. ";"
-				.. dump(core.setting_getbool("new_style_leaves")) .. "]"..
-		"checkbox[0.25,2.0;cb_opaque_water;".. fgettext("Opaque Water") .. ";"
-				.. dump(core.setting_getbool("opaque_water")) .. "]"..
-		"checkbox[0.25,2.5;cb_connected_glass;".. fgettext("Connected Glass") .. ";"
-				.. dump(core.setting_getbool("connected_glass"))	.. "]"..
-		"dropdown[0.25,3.25;3.25;dd_video_driver;"
-			.. video_driver_string .. ";" .. current_video_driver_idx .. "]" ..
-		"tooltip[dd_video_driver;" ..
-			fgettext("Restart minetest for driver change to take effect") .. "]" ..
-		"box[3.75,0;3.75,2.5;#999999]" ..
-		"checkbox[4,0;cb_mipmapping;".. fgettext("Mip-Mapping") .. ";"
-				.. dump(core.setting_getbool("mip_map")) .. "]"..
-		"checkbox[4,0.5;cb_anisotrophic;".. fgettext("Anisotropic Filtering") .. ";"
-				.. dump(core.setting_getbool("anisotropic_filter")) .. "]"..
-		"checkbox[4,1.0;cb_bilinear;".. fgettext("Bi-Linear Filtering") .. ";"
-				.. dump(core.setting_getbool("bilinear_filter")) .. "]"..
-		"checkbox[4,1.5;cb_trilinear;".. fgettext("Tri-Linear Filtering") .. ";"
-				.. dump(core.setting_getbool("trilinear_filter")) .. "]"..
-		"box[7.75,0;4,4;#999999]" ..
-		"checkbox[8,0;cb_shaders;".. fgettext("Shaders") .. ";"
-				.. dump(core.setting_getbool("enable_shaders")) .. "]"
-	if PLATFORM ~= "Android" then
-		tab_string = tab_string ..
-		"button[8,4.75;3.75,0.5;btn_change_keys;".. fgettext("Change keys") .. "]"
-	else
-		tab_string = tab_string ..
-		"button[8,4.75;3.75,0.5;btn_reset_singleplayer;".. fgettext("Reset singleplayer world") .. "]"
-	end
-	tab_string = tab_string ..
-		"box[0,4.25;3.5,1.25;#999999]" ..
-		"label[0.25,4.25;" .. fgettext("GUI scale factor") .. "]" ..
-		"scrollbar[0.25,4.75;3,0.4;sb_gui_scaling;horizontal;" ..
-		 gui_scale_to_scrollbar() .. "]" ..
-		"tooltip[sb_gui_scaling;" ..
-			fgettext("Scaling factor applied to menu elements: ") ..
-			dump(core.setting_get("gui_scaling")) .. "]"
-
-	if PLATFORM == "Android" then
-		tab_string = tab_string ..
-		"box[4.25,2.75;3.25,2.15;#999999]" ..
-		"checkbox[4.5,2.75;cb_touchscreen_target;".. fgettext("Touch free target") .. ";"
-				.. dump(core.setting_getbool("touchtarget")) .. "]"
-	end
-
-	if core.setting_get("touchscreen_threshold") ~= nil then
-		tab_string = tab_string ..
-				"label[4.5,3.5;" .. fgettext("Touchthreshold (px)") .. "]" ..
-				"dropdown[4.5,4;3;dd_touchthreshold;0,10,20,30,40,50;" ..
-				((tonumber(core.setting_get("touchscreen_threshold"))/10)+1) .. "]"
-	end
-
-	if core.setting_getbool("enable_shaders") then
-		tab_string = tab_string ..
-				"checkbox[8,0.5;cb_bumpmapping;".. fgettext("Bumpmapping") .. ";"
-						.. dump(core.setting_getbool("enable_bumpmapping")) .. "]"..
-				"checkbox[8,1.0;cb_generate_normalmaps;".. fgettext("Generate Normalmaps") .. ";"
-						.. dump(core.setting_getbool("generate_normalmaps")) .. "]"..
-				"checkbox[8,1.5;cb_parallax;".. fgettext("Parallax Occlusion") .. ";"
-						.. dump(core.setting_getbool("enable_parallax_occlusion")) .. "]"..
-				"checkbox[8,2.0;cb_waving_water;".. fgettext("Waving Water") .. ";"
-						.. dump(core.setting_getbool("enable_waving_water")) .. "]"..
-				"checkbox[8,2.5;cb_waving_leaves;".. fgettext("Waving Leaves") .. ";"
-						.. dump(core.setting_getbool("enable_waving_leaves")) .. "]"..
-				"checkbox[8,3.0;cb_waving_plants;".. fgettext("Waving Plants") .. ";"
-						.. dump(core.setting_getbool("enable_waving_plants")) .. "]"
-	else
-		tab_string = tab_string ..
-				"textlist[8.33,0.7;4,1;;#888888" .. fgettext("Bumpmapping") .. ";0;true]" ..
-				"textlist[8.33,1.2;4,1;;#888888" .. fgettext("Generate Normalmaps") .. ";0;true]" ..
-				"textlist[8.33,1.7;4,1;;#888888" .. fgettext("Parallax Occlusion") .. ";0;true]" ..
-				"textlist[8.33,2.2;4,1;;#888888" .. fgettext("Waving Water") .. ";0;true]" ..
-				"textlist[8.33,2.7;4,1;;#888888" .. fgettext("Waving Leaves") .. ";0;true]" ..
-				"textlist[8.33,3.2;4,1;;#888888" .. fgettext("Waving Plants") .. ";0;true]"
-		end
-	return tab_string
-end
-
--------------------------------------------------------------------------------
-local function handle_settings_buttons(this, fields, tabname, tabdata)
-	if fields["cb_fancy_trees"] then
-		core.setting_set("new_style_leaves", fields["cb_fancy_trees"])
-		return true
-	end
-	if fields["cb_smooth_lighting"] then
-		core.setting_set("smooth_lighting", fields["cb_smooth_lighting"])
-		return true
-	end
-	if fields["cb_3d_clouds"] then
-		core.setting_set("enable_3d_clouds", fields["cb_3d_clouds"])
-		return true
-	end
-	if fields["cb_opaque_water"] then
-		core.setting_set("opaque_water", fields["cb_opaque_water"])
-		return true
-	end
-	if fields["cb_mipmapping"] then
-		core.setting_set("mip_map", fields["cb_mipmapping"])
-		return true
-	end
-	if fields["cb_anisotrophic"] then
-		core.setting_set("anisotropic_filter", fields["cb_anisotrophic"])
-		return true
-	end
-	if fields["cb_bilinear"] then
-		core.setting_set("bilinear_filter", fields["cb_bilinear"])
-		return true
-	end
-	if fields["cb_trilinear"] then
-		core.setting_set("trilinear_filter", fields["cb_trilinear"])
-		return true
-	end
-	if fields["cb_shaders"] then
-		if (core.setting_get("video_driver") == "direct3d8" or core.setting_get("video_driver") == "direct3d9") then
-			core.setting_set("enable_shaders", "false")
-			gamedata.errormessage = fgettext("To enable shaders the OpenGL driver needs to be used.")
-		else
-			core.setting_set("enable_shaders", fields["cb_shaders"])
-		end
-		return true
-	end
-	if fields["cb_connected_glass"] then
-		core.setting_set("connected_glass", fields["cb_connected_glass"])
-		return true
-	end
-	if fields["cb_particles"] then
-		core.setting_set("enable_particles", fields["cb_particles"])
-		return true
-	end
-	if fields["cb_bumpmapping"] then
-		core.setting_set("enable_bumpmapping", fields["cb_bumpmapping"])
-	end
-	if fields["cb_generate_normalmaps"] then
-		core.setting_set("generate_normalmaps", fields["cb_generate_normalmaps"])
-	end
-	if fields["cb_parallax"] then
-		core.setting_set("enable_parallax_occlusion", fields["cb_parallax"])
-		return true
-	end
-	if fields["cb_waving_water"] then
-		core.setting_set("enable_waving_water", fields["cb_waving_water"])
-		return true
-	end
-	if fields["cb_waving_leaves"] then
-		core.setting_set("enable_waving_leaves", fields["cb_waving_leaves"])
-	end
-	if fields["cb_waving_plants"] then
-		core.setting_set("enable_waving_plants", fields["cb_waving_plants"])
-		return true
-	end
-	if fields["btn_change_keys"] ~= nil then
-		core.show_keys_menu()
-		return true
-	end
-
-	if fields["sb_gui_scaling"] then
-		local event = core.explode_scrollbar_event(fields["sb_gui_scaling"])
-
-		if event.type == "CHG" then
-			local tosave = string.format("%.2f",scrollbar_to_gui_scale(event.value))
-			core.setting_set("gui_scaling",tosave)
-			return true
-		end
-	end
-	if fields["cb_touchscreen_target"] then
-		core.setting_set("touchtarget", fields["cb_touchscreen_target"])
-		return true
-	end
-	if fields["btn_reset_singleplayer"] then
-		showconfirm_reset(this)
-		return true
-	end
-
-	--Note dropdowns have to be handled LAST!
-	local ddhandled = false
-	if fields["dd_touchthreshold"] then
-		core.setting_set("touchscreen_threshold",fields["dd_touchthreshold"])
-		ddhandled = true
-	end
-	if fields["dd_video_driver"] then
-		local video_driver = string.gsub(fields["dd_video_driver"], " ", "")
-		core.setting_set("video_driver",string.lower(video_driver))
-		ddhandled = true
-	end
-	
-	return ddhandled
-end
-
-tab_settings = {
-	name = "settings",
-	caption = fgettext("Settings"),
-	cbf_formspec = formspec,
-	cbf_button_handler = handle_settings_buttons
-	}
--- a/builtin/mainmenu/tab_simple_main.lua
+++ b/builtin/mainmenu/tab_simple_main.lua
@@ -1,195 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-local function get_formspec(tabview, name, tabdata)
-	local retval = ""
-
-	local render_details = dump(core.setting_getbool("public_serverlist"))
-
-	retval = retval ..
-		"label[8,0.5;".. fgettext("Name/Password") .. "]" ..
-		"field[0.25,3.25;5.5,0.5;te_address;;" ..
-		core.formspec_escape(core.setting_get("address")) .."]" ..
-		"field[5.75,3.25;2.25,0.5;te_port;;" ..
-		core.formspec_escape(core.setting_get("remote_port")) .."]" ..
-		"checkbox[8,-0.25;cb_public_serverlist;".. fgettext("Public Serverlist") .. ";" ..
-		render_details .. "]"
-
-	retval = retval ..
-		"button[8,2.5;4,1.5;btn_mp_connect;".. fgettext("Connect") .. "]" ..
-		"field[8.75,1.5;3.5,0.5;te_name;;" ..
-		core.formspec_escape(core.setting_get("name")) .."]" ..
-		"pwdfield[8.75,2.3;3.5,0.5;te_pwd;]"
-
-	--favourites
-	retval = retval ..
-		"textlist[-0.05,0.0;7.55,2.75;favourites;"
-
-	if #menudata.favorites > 0 then
-		retval = retval .. render_favorite(menudata.favorites[1],render_details)
-
-		for i=2,#menudata.favorites,1 do
-			retval = retval .. "," .. render_favorite(menudata.favorites[i],render_details)
-		end
-	end
-
-	if tabdata.fav_selected ~= nil then
-		retval = retval .. ";" .. tabdata.fav_selected .. "]"
-	else
-		retval = retval .. ";0]"
-	end
-
-	-- separator
-	retval = retval ..
-		"box[-0.3,3.75;12.4,0.1;#FFFFFF]"
-
-	-- checkboxes
-	retval = retval ..
-		"checkbox[1.0,3.9;cb_creative;".. fgettext("Creative Mode") .. ";" ..
-		dump(core.setting_getbool("creative_mode")) .. "]"..
-		"checkbox[5.0,3.9;cb_damage;".. fgettext("Enable Damage") .. ";" ..
-		dump(core.setting_getbool("enable_damage")) .. "]" ..
-		"checkbox[8,3.9;cb_fly_mode;".. fgettext("Fly mode") .. ";" ..
-		dump(core.setting_getbool("free_move")) .. "]"
-	-- buttons
-	retval = retval ..
-		"button[2.0,4.5;6,1.5;btn_start_singleplayer;" .. fgettext("Start Singleplayer") .. "]" ..
-		"button[8.25,4.5;2.5,1.5;btn_config_sp_world;" .. fgettext("Config mods") .. "]"
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-
-local function main_button_handler(tabview, fields, name, tabdata)
-
-	if fields["btn_start_singleplayer"] then
-		gamedata.selected_world	= gamedata.worldindex
-		gamedata.singleplayer	= true
-		core.start()
-		return true
-	end
-
-	if fields["favourites"] ~= nil then
-		local event = core.explode_textlist_event(fields["favourites"])
-
-		if event.type == "CHG" then
-			if event.index <= #menudata.favorites then
-				local address = menudata.favorites[event.index].address
-				local port = menudata.favorites[event.index].port
-
-				if address ~= nil and
-					port ~= nil then
-					core.setting_set("address",address)
-					core.setting_set("remote_port",port)
-				end
-
-				tabdata.fav_selected = event.index
-			end
-		end
-		return true
-	end
-
-	if fields["cb_public_serverlist"] ~= nil then
-		core.setting_set("public_serverlist", fields["cb_public_serverlist"])
-
-		if core.setting_getbool("public_serverlist") then
-			asyncOnlineFavourites()
-		else
-			menudata.favorites = core.get_favorites("local")
-		end
-		return true
-	end
-
-	if fields["cb_creative"] then
-		core.setting_set("creative_mode", fields["cb_creative"])
-		return true
-	end
-
-	if fields["cb_damage"] then
-		core.setting_set("enable_damage", fields["cb_damage"])
-		return true
-	end
-
-	if fields["cb_fly_mode"] then
-		core.setting_set("free_move", fields["cb_fly_mode"])
-		return true
-	end
-
-	if fields["btn_mp_connect"] ~= nil or
-		fields["key_enter"] ~= nil then
-
-		gamedata.playername		= fields["te_name"]
-		gamedata.password		= fields["te_pwd"]
-		gamedata.address		= fields["te_address"]
-		gamedata.port			= fields["te_port"]
-
-		local fav_idx = core.get_textlist_index("favourites")
-
-		if fav_idx ~= nil and fav_idx <= #menudata.favorites and
-			menudata.favorites[fav_idx].address == fields["te_address"] and
-			menudata.favorites[fav_idx].port    == fields["te_port"] then
-
-			gamedata.servername			= menudata.favorites[fav_idx].name
-			gamedata.serverdescription	= menudata.favorites[fav_idx].description
-		else
-			gamedata.servername			= ""
-			gamedata.serverdescription	= ""
-		end
-
-		gamedata.selected_world = 0
-
-		core.setting_set("address",fields["te_address"])
-		core.setting_set("remote_port",fields["te_port"])
-
-		core.start()
-		return true
-	end
-
-	if fields["btn_config_sp_world"] ~= nil then
-		local configdialog = create_configure_world_dlg(1)
-
-		if (configdialog ~= nil) then
-			configdialog:set_parent(tabview)
-			tabview:hide()
-			configdialog:show()
-		end
-		return true
-	end
-end
-
--------------------------------------------------------------------------------
-local function on_activate(type,old_tab,new_tab)
-	if type == "LEAVE" then
-		return
-	end
-	if core.setting_getbool("public_serverlist") then
-		asyncOnlineFavourites()
-	else
-		menudata.favorites = core.get_favorites("local")
-	end
-end
-
--------------------------------------------------------------------------------
-tab_simple_main = {
-	name = "main",
-	caption = fgettext("Main"),
-	cbf_formspec = get_formspec,
-	cbf_button_handler = main_button_handler,
-	on_change = on_activate
-	}
--- a/builtin/mainmenu/tab_singleplayer.lua
+++ b/builtin/mainmenu/tab_singleplayer.lua
@@ -1,228 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
-local function current_game()
-	local last_game_id = core.setting_get("menu_last_game")
-	local game, index = gamemgr.find_by_gameid(last_game_id)
-	
-	return game
-end
-
-local function singleplayer_refresh_gamebar()
-	
-	local old_bar = ui.find_by_name("game_button_bar")
-	
-	if old_bar ~= nil then
-		old_bar:delete()
-	end
-
-	local function game_buttonbar_button_handler(fields)
-		for key,value in pairs(fields) do
-			for j=1,#gamemgr.games,1 do
-				if ("game_btnbar_" .. gamemgr.games[j].id == key) then
-					mm_texture.update("singleplayer", gamemgr.games[j])
-					core.set_topleft_text(gamemgr.games[j].name)
-					core.setting_set("menu_last_game",gamemgr.games[j].id)
-					menudata.worldlist:set_filtercriteria(gamemgr.games[j].id)
-					return true
-				end
-			end
-		end
-	end
-
-	local btnbar = buttonbar_create("game_button_bar",
-		game_buttonbar_button_handler,
-		{x=-0.3,y=5.65}, "horizontal", {x=12.4,y=1.15})
-
-	for i=1,#gamemgr.games,1 do
-		local btn_name = "game_btnbar_" .. gamemgr.games[i].id
-		
-		local image = nil
-		local text = nil
-		local tooltip = core.formspec_escape(gamemgr.games[i].name)
-		
-		if gamemgr.games[i].menuicon_path ~= nil and
-			gamemgr.games[i].menuicon_path ~= "" then
-			image = core.formspec_escape(gamemgr.games[i].menuicon_path)
-		else
-		
-			local part1 = gamemgr.games[i].id:sub(1,5)
-			local part2 = gamemgr.games[i].id:sub(6,10)
-			local part3 = gamemgr.games[i].id:sub(11)
-			
-			text = part1 .. "\n" .. part2
-			if part3 ~= nil and
-				part3 ~= "" then
-				text = text .. "\n" .. part3
-			end
-		end
-		btnbar:add_button(btn_name, text, image, tooltip)
-	end
-end
-
-local function get_formspec(tabview, name, tabdata)
-	local retval = ""
-	
-	local index = filterlist.get_current_index(menudata.worldlist,
-				tonumber(core.setting_get("mainmenu_last_selected_world"))
-				)
-
-	retval = retval ..
-			"button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
-			"button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
-			"button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
-			"button[8.5,4.95;3.25,0.5;play;".. fgettext("Play") .. "]" ..
-			"label[4,-0.25;".. fgettext("Select World:") .. "]"..
-			"checkbox[0.25,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
-			dump(core.setting_getbool("creative_mode")) .. "]"..
-			"checkbox[0.25,0.7;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
-			dump(core.setting_getbool("enable_damage")) .. "]"..
-			"textlist[4,0.25;7.5,3.7;sp_worlds;" ..
-			menu_render_worldlist() ..
-			";" .. index .. "]"
-	return retval
-end
-
-local function main_button_handler(this, fields, name, tabdata)
-
-	assert(name == "singleplayer")
-
-	local world_doubleclick = false
-
-	if fields["sp_worlds"] ~= nil then
-		local event = core.explode_textlist_event(fields["sp_worlds"])
-
-		if event.type == "DCL" then
-			world_doubleclick = true
-		end
-
-		if event.type == "CHG" then
-			core.setting_set("mainmenu_last_selected_world",
-				menudata.worldlist:get_raw_index(core.get_textlist_index("sp_worlds")))
-			return true
-		end
-	end
-
-	if menu_handle_key_up_down(fields,"sp_worlds","mainmenu_last_selected_world") then
-		return true
-	end
-
-	if fields["cb_creative_mode"] then
-		core.setting_set("creative_mode", fields["cb_creative_mode"])
-		return true
-	end
-
-	if fields["cb_enable_damage"] then
-		core.setting_set("enable_damage", fields["cb_enable_damage"])
-		return true
-	end
-
-	if fields["play"] ~= nil or
-		world_doubleclick or
-		fields["key_enter"] then
-		local selected = core.get_textlist_index("sp_worlds")
-		
-		if selected ~= nil then
-			gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
-			gamedata.singleplayer   = true
-			
-			core.start()
-		end
-		return true
-	end
-
-	if fields["world_create"] ~= nil then
-		local create_world_dlg = create_create_world_dlg(true)
-		create_world_dlg:set_parent(this)
-		this:hide()
-		create_world_dlg:show()
-		mm_texture.update("singleplayer",current_game())
-		return true
-	end
-
-	if fields["world_delete"] ~= nil then
-		local selected = core.get_textlist_index("sp_worlds")
-		if selected ~= nil and
-			selected <= menudata.worldlist:size() then
-			local world = menudata.worldlist:get_list()[selected]
-			if world ~= nil and
-				world.name ~= nil and
-				world.name ~= "" then
-				local index = menudata.worldlist:get_raw_index(selected)
-				local delete_world_dlg = create_delete_world_dlg(world.name,index)
-				delete_world_dlg:set_parent(this)
-				this:hide()
-				delete_world_dlg:show()
-				mm_texture.update("singleplayer",current_game())
-			end
-		end
-		
-		return true
-	end
-
-	if fields["world_configure"] ~= nil then
-		local selected = core.get_textlist_index("sp_worlds")
-		if selected ~= nil then
-			local configdialog =
-				create_configure_world_dlg(
-						menudata.worldlist:get_raw_index(selected))
-			
-			if (configdialog ~= nil) then
-				configdialog:set_parent(this)
-				this:hide()
-				configdialog:show()
-				mm_texture.update("singleplayer",current_game())
-			end
-		end
-		
-		return true
-	end
-end
-
-local function on_change(type, old_tab, new_tab)
-	local buttonbar = ui.find_by_name("game_button_bar")
-	
-	if ( buttonbar == nil ) then
-		singleplayer_refresh_gamebar()
-		buttonbar = ui.find_by_name("game_button_bar")
-	end
-	
-	if (type == "ENTER") then
-		local game = current_game()
-		
-		if game then
-			menudata.worldlist:set_filtercriteria(game.id)
-			core.set_topleft_text(game.name)
-			mm_texture.update("singleplayer",game)
-		end
-		buttonbar:show()
-	else
-		menudata.worldlist:set_filtercriteria(nil)
-		buttonbar:hide()
-		core.set_topleft_text("")
-		mm_texture.update(new_tab,nil)
-	end
-end
-
--------------------------------------------------------------------------------
-tab_singleplayer = {
-	name = "singleplayer",
-	caption = fgettext("Singleplayer"),
-	cbf_formspec = get_formspec,
-	cbf_button_handler = main_button_handler,
-	on_change = on_change
-	}
--- a/builtin/mainmenu/tab_texturepacks.lua
+++ b/builtin/mainmenu/tab_texturepacks.lua
@@ -1,118 +0,0 @@
--Minetest
--Copyright (C) 2014 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
--------------------------------------------------------------------------------
-local function filter_texture_pack_list(list)
-	local retval = {"None"}
-	for _, item in ipairs(list) do
-		if item ~= "base" then
-			table.insert(retval, item)
-		end
-	end
-	return retval
-end
-
--------------------------------------------------------------------------------
-local function render_texture_pack_list(list)
-	local retval = ""
-
-	for i, v in ipairs(list) do
-		if v:sub(1,1) ~= "." then
-			if retval ~= "" then
-				retval = retval ..","
-			end
-
-			retval = retval .. core.formspec_escape(v)
-		end
-	end
-
-	return retval
-end
-
--------------------------------------------------------------------------------
-local function get_formspec(tabview, name, tabdata)
-	
-	local retval = "label[4,-0.25;".. fgettext("Select texture pack:") .. "]"..
-			"textlist[4,0.25;7.5,5.0;TPs;"
-
-	local current_texture_path = core.setting_get("texture_path")
-	local list = filter_texture_pack_list(core.get_dirlist(core.get_texturepath(), true))
-	local index = tonumber(core.setting_get("mainmenu_last_selected_TP"))
-
-	if index == nil then index = 1 end
-
-	if current_texture_path == "" then
-		retval = retval ..
-			render_texture_pack_list(list) ..
-			";" .. index .. "]"
-		return retval
-	end
-
-	local infofile = current_texture_path ..DIR_DELIM.."info.txt"
-	local infotext = ""
-	local f = io.open(infofile, "r")
-	if f==nil then
-		infotext = fgettext("No information available")
-	else
-		infotext = f:read("*all")
-		f:close()
-	end
-
-	local screenfile = current_texture_path..DIR_DELIM.."screenshot.png"
-	local no_screenshot = nil
-	if not file_exists(screenfile) then
-		screenfile = nil
-		no_screenshot = defaulttexturedir .. "no_screenshot.png"
-	end
-
-	return	retval ..
-			render_texture_pack_list(list) ..
-			";" .. index .. "]" ..
-			"image[0.25,0.25;4.0,3.7;"..core.formspec_escape(screenfile or no_screenshot).."]"..
-			"textarea[0.6,3.25;3.7,1.5;;"..core.formspec_escape(infotext or "")..";]"
-end
-
--------------------------------------------------------------------------------
-local function main_button_handler(tabview, fields, name, tabdata)
-	if fields["TPs"] ~= nil then
-		local event = core.explode_textlist_event(fields["TPs"])
-		if event.type == "CHG" or event.type == "DCL" then
-			local index = core.get_textlist_index("TPs")
-			core.setting_set("mainmenu_last_selected_TP",
-				index)
-			local list = filter_texture_pack_list(core.get_dirlist(core.get_texturepath(), true))
-			local current_index = core.get_textlist_index("TPs")
-			if current_index ~= nil and #list >= current_index then
-				local new_path = core.get_texturepath()..DIR_DELIM..list[current_index]
-				if list[current_index] == "None" then new_path = "" end
-
-				core.setting_set("texture_path", new_path)
-			end
-		end
-		return true
-	end
-	return false
-end
-
--------------------------------------------------------------------------------
-tab_texturepacks = {
-	name = "texturepacks",
-	caption = fgettext("Texturepacks"),
-	cbf_formspec = get_formspec,
-	cbf_button_handler = main_button_handler,
-	on_change = nil
-	}
--- a/builtin/mainmenu/textures.lua
+++ b/builtin/mainmenu/textures.lua
@@ -1,166 +0,0 @@
--Minetest
--Copyright (C) 2013 sapier
--
--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
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU Lesser General Public License for more details.
--
--You should have received a copy of the GNU Lesser 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.
-
-
-mm_texture = {}
-
--------------------------------------------------------------------------------
-function mm_texture.init()
-	mm_texture.defaulttexturedir = core.get_texturepath() .. DIR_DELIM .. "base" ..
-						DIR_DELIM .. "pack" .. DIR_DELIM
-	mm_texture.basetexturedir = mm_texture.defaulttexturedir
-	
-	mm_texture.texturepack = core.setting_get("texture_path")
-	
-	mm_texture.gameid = nil
-end
-
--------------------------------------------------------------------------------
-function mm_texture.update(tab,gamedetails)
-	if tab ~= "singleplayer" then
-		mm_texture.reset()
-		return
-	end
-
-	if gamedetails == nil then
-		return
-	end
-	
-	mm_texture.update_game(gamedetails)
-end
-
--------------------------------------------------------------------------------
-function mm_texture.reset()
-	mm_texture.gameid = nil
-	local have_bg      = false
-	local have_overlay = mm_texture.set_generic("overlay")
-	
-	if not have_overlay then
-		have_bg = mm_texture.set_generic("background")
-	end
-	
-	mm_texture.clear("header")
-	mm_texture.clear("footer")
-	core.set_clouds(false)
-	
-	mm_texture.set_generic("footer")
-	mm_texture.set_generic("header")
-	
-	if not have_bg then
-		if core.setting_getbool("menu_clouds") then
-			core.set_clouds(true)
-		else
-			mm_texture.set_dirt_bg()
-		end
-	end
-end
-
--------------------------------------------------------------------------------
-function mm_texture.update_game(gamedetails)
-	if mm_texture.gameid == gamedetails.id then
-		return
-	end
-	
-	local have_bg      = false
-	local have_overlay = mm_texture.set_game("overlay",gamedetails)
-	
-	if not have_overlay then
-		have_bg = mm_texture.set_game("background",gamedetails)
-	end
-	
-	mm_texture.clear("header")
-	mm_texture.clear("footer")
-	core.set_clouds(false)
-	
-	if not have_bg then
-		
-		if core.setting_getbool("menu_clouds") then
-			core.set_clouds(true)
-		else
-			mm_texture.set_dirt_bg()
-		end
-	end
-	
-	mm_texture.set_game("footer",gamedetails)
-	mm_texture.set_game("header",gamedetails)
-	
-	mm_texture.gameid = gamedetails.id
-end
-
--------------------------------------------------------------------------------
-function mm_texture.clear(identifier)
-	core.set_background(identifier,"")
-end
-
--------------------------------------------------------------------------------
-function mm_texture.set_generic(identifier)
-	--try texture pack first
-	if mm_texture.texturepack ~= nil then
-		local path = mm_texture.texturepack .. DIR_DELIM .."menu_" ..
-										identifier .. ".png"
-		if core.set_background(identifier,path) then
-			return true
-		end
-	end
-	
-	if mm_texture.defaulttexturedir ~= nil then
-		local path = mm_texture.defaulttexturedir .. DIR_DELIM .."menu_" ..
-										identifier .. ".png"
-		if core.set_background(identifier,path) then
-			return true
-		end
-	end
-	
-	return false
-end
-
--------------------------------------------------------------------------------
-function mm_texture.set_game(identifier,gamedetails)
-	
-	if gamedetails == nil then
-		return false
-	end
-
-	if mm_texture.texturepack ~= nil then
-		local path = mm_texture.texturepack .. DIR_DELIM ..
-						gamedetails.id .. "_menu_" .. identifier .. ".png"
-		if core.set_background(identifier,path) then
-			return true
-		end
-	end
-	
-	local path = gamedetails.path .. DIR_DELIM .."menu" ..
-									 DIR_DELIM .. identifier .. ".png"
-	if core.set_background(identifier,path) then
-		return true
-	end
-	
-	return false
-end
-
-function mm_texture.set_dirt_bg()
-	if mm_texture.texturepack ~= nil then
-		local path = mm_texture.texturepack .. DIR_DELIM .."default_dirt.png"
-		if core.set_background("background", path, true, 128) then
-			return true
-		end
-	end
-	
-	--use base pack
-	local minimalpath = defaulttexturedir .. "dirt_bg.png"
-	core.set_background("background", minimalpath, true, 128)
-end
--- a/client/serverlist/.gitignore
+++ b/client/serverlist/.gitignore
@@ -1,2 +0,0 @@
-*
-!.gitignore
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -1,116 +0,0 @@
-uniform sampler2D baseTexture;
-uniform sampler2D normalTexture;
-uniform sampler2D useNormalmap;
-
-uniform vec4 skyBgColor;
-uniform float fogDistance;
-uniform vec3 eyePosition;
-
-varying vec3 vPosition;
-varying vec3 worldPosition;
-
-varying vec3 eyeVec;
-varying vec3 tsEyeVec;
-varying vec3 lightVec;
-varying vec3 tsLightVec;
-
-bool normalTexturePresent = false; 
-
-const float e = 2.718281828459;
-const float BS = 10.0;
- 
-float intensity (vec3 color){
-	return (color.r + color.g + color.b) / 3.0;
-}
-
-float get_rgb_height (vec2 uv){
-	return intensity(texture2D(baseTexture,uv).rgb);
-}
-
-vec4 get_normal_map(vec2 uv){
-	vec4 bump = texture2D(normalTexture, uv).rgba;
-	bump.xyz = normalize(bump.xyz * 2.0 -1.0);
-	bump.y = -bump.y;
-	return bump;
-}
-
-void main (void)
-{
-	vec3 color;
-	vec4 bump;
-	vec2 uv = gl_TexCoord[0].st;
-	bool use_normalmap = false;
-	
-#ifdef USE_NORMALMAPS
-	if (texture2D(useNormalmap,vec2(1.0,1.0)).r > 0.0){
-		normalTexturePresent = true;
-	}
-#endif
-
-#ifdef ENABLE_PARALLAX_OCCLUSION
-	if (normalTexturePresent){
-		vec3 tsEye = normalize(tsEyeVec);
-		float height = PARALLAX_OCCLUSION_SCALE * texture2D(normalTexture, uv).a - PARALLAX_OCCLUSION_BIAS;
-		uv = uv + texture2D(normalTexture, uv).z * height * vec2(tsEye.x,-tsEye.y);
-	}
-#endif
-
-#ifdef USE_NORMALMAPS
-	if (normalTexturePresent){
-		bump = get_normal_map(uv);
-		use_normalmap = true;
-	} 
-#endif
-		
-#ifdef GENERATE_NORMALMAPS
-	if (use_normalmap == false){
-		float tl = get_rgb_height (vec2(uv.x-SAMPLE_STEP,uv.y+SAMPLE_STEP));
-		float t  = get_rgb_height (vec2(uv.x-SAMPLE_STEP,uv.y-SAMPLE_STEP));
-		float tr = get_rgb_height (vec2(uv.x+SAMPLE_STEP,uv.y+SAMPLE_STEP));
-		float r  = get_rgb_height (vec2(uv.x+SAMPLE_STEP,uv.y));
-		float br = get_rgb_height (vec2(uv.x+SAMPLE_STEP,uv.y-SAMPLE_STEP));
-		float b  = get_rgb_height (vec2(uv.x,uv.y-SAMPLE_STEP));
-		float bl = get_rgb_height (vec2(uv.x-SAMPLE_STEP,uv.y-SAMPLE_STEP));
-		float l  = get_rgb_height (vec2(uv.x-SAMPLE_STEP,uv.y));
-		float dX = (tr + 2.0 * r + br) - (tl + 2.0 * l + bl);
-		float dY = (bl + 2.0 * b + br) - (tl + 2.0 * t + tr);
-		bump = vec4 (normalize(vec3 (dX, -dY, NORMALMAPS_STRENGTH)),1.0);
-		use_normalmap = true;
-	}
-#endif
-
-vec4 base = texture2D(baseTexture, uv).rgba;
-	
-#ifdef ENABLE_BUMPMAPPING
-	if (use_normalmap){
-		vec3 L = normalize(lightVec);
-		vec3 E = normalize(eyeVec);
-		float specular = pow(clamp(dot(reflect(L, bump.xyz), E), 0.0, 1.0),0.5); 
-		float diffuse = dot(E,bump.xyz);		
-		color = 0.05*base.rgb + diffuse*base.rgb + 0.2*specular*base.rgb;
-	} else {
-		color = base.rgb;
-	}
-#else
-	color = base.rgb;
-#endif
-
-#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
-	float alpha = gl_Color.a;
-	vec4 col = vec4(color.rgb, alpha);
-	col *= gl_Color;
-	if(fogDistance != 0.0){
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
-		alpha = mix(alpha, 0.0, d);
-	}
-	gl_FragColor = vec4(col.rgb, alpha);
-#else
-	vec4 col = vec4(color.rgb, base.a);
-	col *= gl_Color;
-	if(fogDistance != 0.0){
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
-		col = mix(col, skyBgColor, d);
-	}
-	gl_FragColor = vec4(col.rgb, base.a);
-#endif
-}
--- a/client/shaders/nodes_shader/opengl_vertex.glsl
+++ b/client/shaders/nodes_shader/opengl_vertex.glsl
@@ -1,127 +0,0 @@
-uniform mat4 mWorldViewProj;
-uniform mat4 mInvWorld;
-uniform mat4 mTransWorld;
-uniform mat4 mWorld;
-
-uniform float dayNightRatio;
-uniform vec3 eyePosition;
-uniform float animationTimer;
-
-varying vec3 vPosition;
-varying vec3 worldPosition;
-
-varying vec3 eyeVec;
-varying vec3 lightVec;
-varying vec3 tsEyeVec;
-varying vec3 tsLightVec;
-
-const float e = 2.718281828459;
-const float BS = 10.0;
-
-float smoothCurve( float x ) {
-  return x * x *( 3.0 - 2.0 * x );
-}
-float triangleWave( float x ) {
-  return abs( fract( x + 0.5 ) * 2.0 - 1.0 );
-}
-float smoothTriangleWave( float x ) {
-  return smoothCurve( triangleWave( x ) ) * 2.0 - 1.0;
-}
-
-void main(void)
-{
-	gl_TexCoord[0] = gl_MultiTexCoord0;
-	
-#if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER
-	vec4 pos = gl_Vertex;
-	pos.y -= 2.0;
-	pos.y -= sin (pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) * WATER_WAVE_HEIGHT
-		+ sin ((pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) / 7.0) * WATER_WAVE_HEIGHT;
-	gl_Position = mWorldViewProj * pos;
-#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES
-	vec4 pos = gl_Vertex;
-	vec4 pos2 = mWorld * gl_Vertex;
-	pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2.x * 0.01 + pos2.z * 0.01) * 2.0 - 1.0) * 0.4;
-	pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.2;
-	pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.4;
-	gl_Position = mWorldViewProj * pos;
-#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS
-	vec4 pos = gl_Vertex;
-	vec4 pos2 = mWorld * gl_Vertex;
-	if (gl_TexCoord[0].y < 0.05) {
-		pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2.x * 0.1 + pos2.z * 0.1) * 2.0 - 1.0) * 0.8;
-		pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2.x * -0.5 + pos2.z * -0.5) * 2.0 - 1.0) * 0.4;
-	}
-	gl_Position = mWorldViewProj * pos;
-#else
-	gl_Position = mWorldViewProj * gl_Vertex;
-#endif
-
-	vPosition = gl_Position.xyz;
-	worldPosition = (mWorld * gl_Vertex).xyz;
-	vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0);
-
-	vec3 normal, tangent, binormal;
-	normal = normalize(gl_NormalMatrix * gl_Normal);
-	if (gl_Normal.x > 0.5) {
-		//  1.0,  0.0,  0.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 0.0,  0.0, -1.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));
-	} else if (gl_Normal.x < -0.5) {
-		// -1.0,  0.0,  0.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 0.0,  0.0,  1.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));
-	} else if (gl_Normal.y > 0.5) {
-		//  0.0,  1.0,  0.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 1.0,  0.0,  0.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0,  0.0,  1.0));
-	} else if (gl_Normal.y < -0.5) {
-		//  0.0, -1.0,  0.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 1.0,  0.0,  0.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0,  0.0,  1.0));
-	} else if (gl_Normal.z > 0.5) {
-		//  0.0,  0.0,  1.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 1.0,  0.0,  0.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));
-	} else if (gl_Normal.z < -0.5) {
-		//  0.0,  0.0, -1.0
-		tangent  = normalize(gl_NormalMatrix * vec3(-1.0,  0.0,  0.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));
-	}
-	mat3 tbnMatrix = mat3(	tangent.x, binormal.x, normal.x,
-							tangent.y, binormal.y, normal.y,
-							tangent.z, binormal.z, normal.z);
-
-	lightVec = sunPosition - worldPosition;
-	tsLightVec = lightVec * tbnMatrix;
-	eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz;
-	tsEyeVec = eyeVec * tbnMatrix;
-
-	vec4 color;
-	float day = gl_Color.r;
-	float night = gl_Color.g;
-	float light_source = gl_Color.b;
-
-	float rg = mix(night, day, dayNightRatio);
-	rg += light_source * 2.5; // Make light sources brighter
-	float b = rg;
-
-	// Moonlight is blue
-	b += (day - night) / 13.0;
-	rg -= (day - night) / 23.0;
-
-	// Emphase blue a bit in darker places
-	// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
-	b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025);
-
-	// Artificial light is yellow-ish
-	// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
-	rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065);
-
-	color.r = rg;
-	color.g = rg;
-	color.b = b;
-
-	color.a = gl_Color.a;
-	gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0);
-}
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -1,116 +0,0 @@
-uniform sampler2D baseTexture;
-uniform sampler2D normalTexture;
-uniform sampler2D useNormalmap;
-
-uniform vec4 skyBgColor;
-uniform float fogDistance;
-uniform vec3 eyePosition;
-
-varying vec3 vPosition;
-varying vec3 worldPosition;
-
-varying vec3 eyeVec;
-varying vec3 tsEyeVec;
-varying vec3 lightVec;
-varying vec3 tsLightVec;
-
-bool normalTexturePresent = false; 
-
-const float e = 2.718281828459;
-const float BS = 10.0;
- 
-float intensity (vec3 color){
-	return (color.r + color.g + color.b) / 3.0;
-}
-
-float get_rgb_height (vec2 uv){
-	return intensity(texture2D(baseTexture,uv).rgb);
-}
-
-vec4 get_normal_map(vec2 uv){
-	vec4 bump = texture2D(normalTexture, uv).rgba;
-	bump.xyz = normalize(bump.xyz * 2.0 -1.0);
-	bump.y = -bump.y;
-	return bump;
-}
-
-void main (void)
-{
-	vec3 color;
-	vec4 bump;
-	vec2 uv = gl_TexCoord[0].st;
-	bool use_normalmap = false;
-	
-#ifdef USE_NORMALMAPS
-	if (texture2D(useNormalmap,vec2(1.0,1.0)).r > 0.0){
-		normalTexturePresent = true;
-	}
-#endif
-
-#ifdef ENABLE_PARALLAX_OCCLUSION
-	if (normalTexturePresent){
-		vec3 tsEye = normalize(tsEyeVec);
-		float height = PARALLAX_OCCLUSION_SCALE * texture2D(normalTexture, uv).a - PARALLAX_OCCLUSION_BIAS;
-		uv = uv + texture2D(normalTexture, uv).z * height * vec2(tsEye.x,-tsEye.y);
-	}
-#endif
-
-#ifdef USE_NORMALMAPS
-	if (normalTexturePresent){
-		bump = get_normal_map(uv);
-		use_normalmap = true;
-	} 
-#endif
-		
-#ifdef GENERATE_NORMALMAPS
-	if (use_normalmap == false){
-		float tl = get_rgb_height (vec2(uv.x-SAMPLE_STEP,uv.y+SAMPLE_STEP));
-		float t  = get_rgb_height (vec2(uv.x-SAMPLE_STEP,uv.y-SAMPLE_STEP));
-		float tr = get_rgb_height (vec2(uv.x+SAMPLE_STEP,uv.y+SAMPLE_STEP));
-		float r  = get_rgb_height (vec2(uv.x+SAMPLE_STEP,uv.y));
-		float br = get_rgb_height (vec2(uv.x+SAMPLE_STEP,uv.y-SAMPLE_STEP));
-		float b  = get_rgb_height (vec2(uv.x,uv.y-SAMPLE_STEP));
-		float bl = get_rgb_height (vec2(uv.x-SAMPLE_STEP,uv.y-SAMPLE_STEP));
-		float l  = get_rgb_height (vec2(uv.x-SAMPLE_STEP,uv.y));
-		float dX = (tr + 2.0 * r + br) - (tl + 2.0 * l + bl);
-		float dY = (bl + 2.0 * b + br) - (tl + 2.0 * t + tr);
-		bump = vec4 (normalize(vec3 (dX, -dY, NORMALMAPS_STRENGTH)),1.0);
-		use_normalmap = true;
-	}
-#endif
-
-vec4 base = texture2D(baseTexture, uv).rgba;
-	
-#ifdef ENABLE_BUMPMAPPING
-	if (use_normalmap){
-		vec3 L = normalize(lightVec);
-		vec3 E = normalize(eyeVec);
-		float specular = pow(clamp(dot(reflect(L, bump.xyz), E), 0.0, 1.0),0.5); 
-		float diffuse = dot(E,bump.xyz);		
-		color = 0.05*base.rgb + diffuse*base.rgb + 0.2*specular*base.rgb;
-	} else {
-		color = base.rgb;
-	}
-#else
-	color = base.rgb;
-#endif
-
-#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
-	float alpha = gl_Color.a;
-	vec4 col = vec4(color.rgb, alpha);
-	col *= gl_Color;
-	if(fogDistance != 0.0){
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
-		alpha = mix(alpha, 0.0, d);
-	}
-	gl_FragColor = vec4(col.rgb, alpha);
-#else
-	vec4 col = vec4(color.rgb, base.a);
-	col *= gl_Color;
-	if(fogDistance != 0.0){
-		float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
-		col = mix(col, skyBgColor, d);
-	}
-	gl_FragColor = vec4(col.rgb, base.a);
-#endif
-}
--- a/client/shaders/water_surface_shader/opengl_vertex.glsl
+++ b/client/shaders/water_surface_shader/opengl_vertex.glsl
@@ -1,127 +0,0 @@
-uniform mat4 mWorldViewProj;
-uniform mat4 mInvWorld;
-uniform mat4 mTransWorld;
-uniform mat4 mWorld;
-
-uniform float dayNightRatio;
-uniform vec3 eyePosition;
-uniform float animationTimer;
-
-varying vec3 vPosition;
-varying vec3 worldPosition;
-
-varying vec3 eyeVec;
-varying vec3 lightVec;
-varying vec3 tsEyeVec;
-varying vec3 tsLightVec;
-
-const float e = 2.718281828459;
-const float BS = 10.0;
-
-float smoothCurve( float x ) {
-  return x * x *( 3.0 - 2.0 * x );
-}
-float triangleWave( float x ) {
-  return abs( fract( x + 0.5 ) * 2.0 - 1.0 );
-}
-float smoothTriangleWave( float x ) {
-  return smoothCurve( triangleWave( x ) ) * 2.0 - 1.0;
-}
-
-void main(void)
-{
-	gl_TexCoord[0] = gl_MultiTexCoord0;
-	
-#if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER
-	vec4 pos = gl_Vertex;
-	pos.y -= 2.0;
-	pos.y -= sin (pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) * WATER_WAVE_HEIGHT
-		+ sin ((pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) / 7.0) * WATER_WAVE_HEIGHT;
-	gl_Position = mWorldViewProj * pos;
-#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES
-	vec4 pos = gl_Vertex;
-	vec4 pos2 = mWorld * gl_Vertex;
-	pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2.x * 0.01 + pos2.z * 0.01) * 2.0 - 1.0) * 0.4;
-	pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.2;
-	pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.4;
-	gl_Position = mWorldViewProj * pos;
-#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS
-	vec4 pos = gl_Vertex;
-	vec4 pos2 = mWorld * gl_Vertex;
-	if (gl_TexCoord[0].y < 0.05) {
-		pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2.x * 0.1 + pos2.z * 0.1) * 2.0 - 1.0) * 0.8;
-		pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2.x * -0.5 + pos2.z * -0.5) * 2.0 - 1.0) * 0.4;	
-	}
-	gl_Position = mWorldViewProj * pos;
-#else
-	gl_Position = mWorldViewProj * gl_Vertex;
-#endif
-
-	vPosition = gl_Position.xyz;
-	worldPosition = (mWorld * gl_Vertex).xyz;
-	vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0);
-
-	vec3 normal, tangent, binormal;
-	normal = normalize(gl_NormalMatrix * gl_Normal);
-	if (gl_Normal.x > 0.5) {
-		//  1.0,  0.0,  0.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 0.0,  0.0, -1.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));
-	} else if (gl_Normal.x < -0.5) {
-		// -1.0,  0.0,  0.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 0.0,  0.0,  1.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));
-	} else if (gl_Normal.y > 0.5) {
-		//  0.0,  1.0,  0.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 1.0,  0.0,  0.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0,  0.0,  1.0));
-	} else if (gl_Normal.y < -0.5) {
-		//  0.0, -1.0,  0.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 1.0,  0.0,  0.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0,  0.0,  1.0));
-	} else if (gl_Normal.z > 0.5) {
-		//  0.0,  0.0,  1.0
-		tangent  = normalize(gl_NormalMatrix * vec3( 1.0,  0.0,  0.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));
-	} else if (gl_Normal.z < -0.5) {
-		//  0.0,  0.0, -1.0
-		tangent  = normalize(gl_NormalMatrix * vec3(-1.0,  0.0,  0.0));
-		binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));
-	}
-	mat3 tbnMatrix = mat3(	tangent.x, binormal.x, normal.x,
-							tangent.y, binormal.y, normal.y,
-							tangent.z, binormal.z, normal.z);
-
-	lightVec = sunPosition - worldPosition;
-	tsLightVec = lightVec * tbnMatrix;
-	eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz;
-	tsEyeVec = eyeVec * tbnMatrix;
-
-	vec4 color;
-	float day = gl_Color.r;
-	float night = gl_Color.g;
-	float light_source = gl_Color.b;
-
-	float rg = mix(night, day, dayNightRatio);
-	rg += light_source * 2.5; // Make light sources brighter
-	float b = rg;
-
-	// Moonlight is blue
-	b += (day - night) / 13.0;
-	rg -= (day - night) / 23.0;
-
-	// Emphase blue a bit in darker places
-	// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
-	b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025);
-
-	// Artificial light is yellow-ish
-	// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
-	rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065);
-
-	color.r = rg;
-	color.g = rg;
-	color.b = b;
-
-	color.a = gl_Color.a;
-	gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0);
-}
--- a/cmake/Modules/FindCURL.cmake
+++ b/cmake/Modules/FindCURL.cmake
@@ -1,47 +0,0 @@
-# - Find curl
-# Find the native CURL headers and libraries.
-#
-#  CURL_INCLUDE_DIR - where to find curl/curl.h, etc.
-#  CURL_LIBRARY    - List of libraries when using curl.
-#  CURL_FOUND        - True if curl found.
-
-if( UNIX )
-  FIND_PATH(CURL_INCLUDE_DIR NAMES curl.h
-    PATHS
-    /usr/local/include/curl
-    /usr/include/curl
-  )
-
-  FIND_LIBRARY(CURL_LIBRARY NAMES curl
-    PATHS
-    /usr/local/lib
-    /usr/lib
-  )
-else( UNIX )
-  FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h) # Look for the header file.
-  FIND_LIBRARY(CURL_LIBRARY NAMES curl) # Look for the library.
-  FIND_FILE(CURL_DLL NAMES libcurl.dll
-			PATHS
-			"c:/windows/system32"
-			DOC "Path of the cURL dll (for installation)")
-  INCLUDE(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR) # all listed variables are TRUE
-endif( UNIX )
-
-if( WIN32 )
-  if( CURL_LIBRARY AND CURL_INCLUDE_DIR AND CURL_DLL ) # libcurl.dll is required on Windows
-    SET(CURL_FOUND TRUE)
-  else( CURL_LIBRARY AND CURL_INCLUDE_DIR AND CURL_DLL )
-    SET(CURL_FOUND FALSE)
-  endif( CURL_LIBRARY AND CURL_INCLUDE_DIR AND CURL_DLL )
-else ( WIN32 )
-  if( CURL_LIBRARY AND CURL_INCLUDE_DIR )
-    SET(CURL_FOUND TRUE)
-  else( CURL_LIBRARY AND CURL_INCLUDE_DIR )
-    SET(CURL_FOUND FALSE)
-  endif( CURL_LIBRARY AND CURL_INCLUDE_DIR )
-endif ( WIN32 )
-
-MESSAGE(STATUS "CURL_INCLUDE_DIR = ${CURL_INCLUDE_DIR}")
-MESSAGE(STATUS "CURL_LIBRARY = ${CURL_LIBRARY}")
-MESSAGE(STATUS "CURL_DLL = ${CURL_DLL}")
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/cmake/Modules/FindGettextLib.cmake
@@ -16,18 +16,6 @@ FIND_PROGRAM(GETTEXT_MSGFMT
 	PATHS "${CUSTOM_GETTEXT_PATH}/bin"
 	DOC "path to msgfmt")

-if(APPLE)
-	FIND_LIBRARY(GETTEXT_LIBRARY
-		NAMES libintl.a
-		PATHS "${CUSTOM_GETTEXT_PATH}/lib"
-		DOC "gettext *intl*.lib")
-
-	FIND_LIBRARY(ICONV_LIBRARY
-		NAMES libiconv.dylib
-		PATHS "/usr/lib"
-		DOC "iconv lib")
-endif(APPLE)
-
 # modern Linux, as well as Mac, seem to not need require special linking
 # they do not because gettext is part of glibc
 # TODO check the requirements on other BSDs and older Linux
@@ -71,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/FindJson.cmake
+++ b/cmake/Modules/FindJson.cmake
@@ -1,18 +0,0 @@
-# Look for json, use our own if not found
-
-#FIND_PATH(JSON_INCLUDE_DIR json.h)
-
-#FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp)
-
-#IF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
-#	SET( JSON_FOUND TRUE )
-#ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
-
-#IF(JSON_FOUND)
-#	MESSAGE(STATUS "Found system jsoncpp header file in ${JSON_INCLUDE_DIR}")
-#	MESSAGE(STATUS "Found system jsoncpp library ${JSON_LIBRARY}")
-#ELSE(JSON_FOUND)
-	SET(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json)
-	SET(JSON_LIBRARY jsoncpp)
-	MESSAGE(STATUS "Using project jsoncpp library")
-#ENDIF(JSON_FOUND)
--- a/cmake/Modules/FindJthread.cmake
+++ b/cmake/Modules/FindJthread.cmake
@@ -0,0 +1,18 @@
+# Look for jthread, use our own if not found
+
+FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
+
+FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
+
+IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
+	SET( JTHREAD_FOUND TRUE )
+ENDIF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
+
+IF(JTHREAD_FOUND)
+	MESSAGE(STATUS "Found system jthread header file in ${JTHREAD_INCLUDE_DIR}")
+	MESSAGE(STATUS "Found system jthread library ${JTHREAD_LIBRARY}")
+ELSE(JTHREAD_FOUND)
+	SET(JTHREAD_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jthread)
+	SET(JTHREAD_LIBRARY jthread)
+	MESSAGE(STATUS "Using project jthread library")
+ENDIF(JTHREAD_FOUND)
--- a/cmake/Modules/FindOpenGLES2.cmake
+++ b/cmake/Modules/FindOpenGLES2.cmake
@@ -1,130 +0,0 @@
-#-------------------------------------------------------------------
-# This file is stolen from part of the CMake build system for OGRE (Object-oriented Graphics Rendering Engine) http://www.ogre3d.org/
-#
-# The contents of this file are placed in the public domain. Feel
-# free to make use of it in any way you like.
-#-------------------------------------------------------------------
-
-# - Try to find OpenGLES and EGL
-# Once done this will define
-#
-#  OPENGLES2_FOUND        - system has OpenGLES
-#  OPENGLES2_INCLUDE_DIR  - the GL include directory
-#  OPENGLES2_LIBRARIES    - Link these to use OpenGLES
-#
-#  EGL_FOUND        - system has EGL
-#  EGL_INCLUDE_DIR  - the EGL include directory
-#  EGL_LIBRARIES    - Link these to use EGL
-
-# win32, apple, android NOT TESED
-# linux tested and works
-
-IF (WIN32)
-  IF (CYGWIN)
-
-    FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h )
-
-    FIND_LIBRARY(OPENGLES2_gl_LIBRARY libGLESv2 )
-
-  ELSE (CYGWIN)
-
-    IF(BORLAND)
-      SET (OPENGLES2_gl_LIBRARY import32 CACHE STRING "OpenGL ES 2.x library for win32")
-    ELSE(BORLAND)
-      # todo
-      # SET (OPENGLES_gl_LIBRARY ${SOURCE_DIR}/Dependencies/lib/release/libGLESv2.lib CACHE STRING "OpenGL ES 2.x library for win32"
-    ENDIF(BORLAND)
-
-  ENDIF (CYGWIN)
-
-ELSE (WIN32)
-
-  IF (APPLE)
-
-	create_search_paths(/Developer/Platforms)
-	findpkg_framework(OpenGLES2)
-    set(OPENGLES2_gl_LIBRARY "-framework OpenGLES")
-
-  ELSE(APPLE)
-
-    FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
-      /usr/openwin/share/include
-      /opt/graphics/OpenGL/include /usr/X11R6/include
-      /usr/include
-    )
-
-    FIND_LIBRARY(OPENGLES2_gl_LIBRARY
-      NAMES GLESv2
-      PATHS /opt/graphics/OpenGL/lib
-            /usr/openwin/lib
-            /usr/shlib /usr/X11R6/lib
-            /usr/lib
-    )
-
-    IF (NOT BUILD_ANDROID)
-		FIND_PATH(EGL_INCLUDE_DIR EGL/egl.h
-		  /usr/openwin/share/include
-		  /opt/graphics/OpenGL/include /usr/X11R6/include
-		  /usr/include
-		)
-
-		FIND_LIBRARY(EGL_egl_LIBRARY
-		  NAMES EGL
-		  PATHS /opt/graphics/OpenGL/lib
-				/usr/openwin/lib
-				/usr/shlib /usr/X11R6/lib
-				/usr/lib
-		)
-
-		# On Unix OpenGL most certainly always requires X11.
-		# Feel free to tighten up these conditions if you don't 
-		# think this is always true.
-		# It's not true on OSX.
-
-		IF (OPENGLES2_gl_LIBRARY)
-		  IF(NOT X11_FOUND)
-			INCLUDE(FindX11)
-		  ENDIF(NOT X11_FOUND)
-		  IF (X11_FOUND)
-			IF (NOT APPLE)
-			  SET (OPENGLES2_LIBRARIES ${X11_LIBRARIES})
-			ENDIF (NOT APPLE)
-		  ENDIF (X11_FOUND)
-		ENDIF (OPENGLES2_gl_LIBRARY)
-    ENDIF ()
-
-  ENDIF(APPLE)
-ENDIF (WIN32)
-
-#SET( OPENGLES2_LIBRARIES ${OPENGLES2_gl_LIBRARY} ${OPENGLES2_LIBRARIES})
-
-IF (BUILD_ANDROID)
-  IF(OPENGLES2_gl_LIBRARY)
-      SET( OPENGLES2_LIBRARIES ${OPENGLES2_gl_LIBRARY} ${OPENGLES2_LIBRARIES})
-      SET( EGL_LIBRARIES)
-      SET( OPENGLES2_FOUND "YES" )
-  ENDIF(OPENGLES2_gl_LIBRARY)
-ELSE ()
-
-  SET( OPENGLES2_LIBRARIES ${OPENGLES2_gl_LIBRARY} ${OPENGLES2_LIBRARIES})
-
-  IF(OPENGLES2_gl_LIBRARY AND EGL_egl_LIBRARY)
-    SET( OPENGLES2_LIBRARIES ${OPENGLES2_gl_LIBRARY} ${OPENGLES2_LIBRARIES})
-    SET( EGL_LIBRARIES ${EGL_egl_LIBRARY} ${EGL_LIBRARIES})
-    SET( OPENGLES2_FOUND "YES" )
-  ENDIF(OPENGLES2_gl_LIBRARY AND EGL_egl_LIBRARY)
-
-ENDIF ()
-
-MARK_AS_ADVANCED(
-  OPENGLES2_INCLUDE_DIR
-  OPENGLES2_gl_LIBRARY
-  EGL_INCLUDE_DIR
-  EGL_egl_LIBRARY
-)
-
-IF(OPENGLES2_FOUND)
-    MESSAGE(STATUS "Found system opengles2 library ${OPENGLES2_LIBRARIES}")
-ELSE ()
-    SET(OPENGLES2_LIBRARIES "")
-ENDIF ()
--- 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/cmake/Modules/GenerateVersion.cmake
+++ b/cmake/Modules/GenerateVersion.cmake
@@ -1,20 +0,0 @@
-# Always run during 'make'
-
-if(VERSION_EXTRA)
-	set(VERSION_GITHASH "${VERSION_STRING}")
-else(VERSION_EXTRA)
-	execute_process(COMMAND git describe --always --tag --dirty
-		WORKING_DIRECTORY "${GENERATE_VERSION_SOURCE_DIR}"
-		OUTPUT_VARIABLE VERSION_GITHASH OUTPUT_STRIP_TRAILING_WHITESPACE
-		ERROR_QUIET)
-
-	if(VERSION_GITHASH)
-		message(STATUS "*** Detected git version ${VERSION_GITHASH} ***")
-	else()
-		set(VERSION_GITHASH "${VERSION_STRING}")
-	endif()
-endif()
-
-configure_file(
-	${GENERATE_VERSION_SOURCE_DIR}/cmake_config_githash.h.in
-	${GENERATE_VERSION_BINARY_DIR}/cmake_config_githash.h)
--- a/data/builtin.lua
+++ b/data/builtin.lua
@@ -0,0 +1,872 @@
+--
+-- This file contains built-in stuff in Minetest implemented in Lua.
+--
+-- It is always loaded and executed after registration of the C API,
+-- before loading and running any mods.
+--
+
+function basic_dump2(o)
+	if type(o) == "number" then
+		return tostring(o)
+	elseif type(o) == "string" then
+		return string.format("%q", o)
+	elseif type(o) == "boolean" then
+		return tostring(o)
+	elseif type(o) == "function" then
+		return "<function>"
+	elseif type(o) == "userdata" then
+		return "<userdata>"
+	elseif type(o) == "nil" then
+		return "nil"
+	else
+		error("cannot dump a " .. type(o))
+		return nil
+	end
+end
+
+function dump2(o, name, dumped)
+	name = name or "_"
+	dumped = dumped or {}
+	io.write(name, " = ")
+	if type(o) == "number" or type(o) == "string" or type(o) == "boolean"
+			or type(o) == "function" or type(o) == "nil"
+			or type(o) == "userdata" then
+		io.write(basic_dump2(o), "\n")
+	elseif type(o) == "table" then
+		if dumped[o] then
+			io.write(dumped[o], "\n")
+		else
+			dumped[o] = name
+			io.write("{}\n") -- new table
+			for k,v in pairs(o) do
+				local fieldname = string.format("%s[%s]", name, basic_dump2(k))
+				dump2(v, fieldname, dumped)
+			end
+		end
+	else
+		error("cannot dump a " .. type(o))
+		return nil
+	end
+end
+
+function dump(o, dumped)
+	dumped = dumped or {}
+	if type(o) == "number" then
+		return tostring(o)
+	elseif type(o) == "string" then
+		return string.format("%q", o)
+	elseif type(o) == "table" then
+		if dumped[o] then
+			return "<circular reference>"
+		end
+		dumped[o] = true
+		local t = {}
+		for k,v in pairs(o) do
+			t[#t+1] = "" .. k .. " = " .. dump(v, dumped)
+		end
+		return "{" .. table.concat(t, ", ") .. "}"
+	elseif type(o) == "boolean" then
+		return tostring(o)
+	elseif type(o) == "function" then
+		return "<function>"
+	elseif type(o) == "userdata" then
+		return "<userdata>"
+	elseif type(o) == "nil" then
+		return "nil"
+	else
+		error("cannot dump a " .. type(o))
+		return nil
+	end
+end
+
+--
+-- 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.pos_to_string(pos)
+	return "(" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")"
+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' 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)
+
+		-- Set metadata owner
+		if def.metadata_name ~= "" then
+			minetest.env:get_meta(pos):set_owner(placer:get_player_name())
+		end
+
+		-- Run script hook
+		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)
+	minetest.env:add_item(pos, itemstack)
+	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 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
+
+	local meta = minetest.env:get_meta(pos)
+	if meta ~= nil and not meta:get_allow_removal() then
+		minetest.debug("dig prevented by metadata")
+		minetest.log("info", digger:get_player_name() .. " tried to dig "
+			.. node.name .. ", but removal is disabled by metadata "
+			.. 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
+		mp = def.material
+		tp = wielded:get_tool_digging_properties()
+		dp = minetest.get_digging_properties(mp, tp)
+		wielded:add_wear(dp.wear)
+		digger:set_wielded_item(wielded)
+
+		-- Add dropped items
+		local _, dropped_item
+		for _, dropped_item in ipairs(drops) do
+			digger:get_inventory():add_item("main", dropped_item)
+		end
+	end
+
+	-- Remove node and update
+	minetest.env:remove_node(pos)
+
+	-- Run script hook
+	local _, callback
+	for _, callback in ipairs(minetest.registered_on_dignodes) do
+		callback(pos, node, digger)
+	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_digging_properties = nil,
+
+	-- Interaction callbacks
+	on_place = minetest.item_place,
+	on_drop = minetest.item_drop,
+	on_use = nil,
+
+	on_punch = minetest.node_punch,
+	on_dig = minetest.node_dig,
+
+	-- Node properties
+	drawtype = "normal",
+	visual_scale = 1.0,
+	tile_images = {""},
+	special_materials = {
+		{image="", backface_culling=true},
+		{image="", backface_culling=true},
+	},
+	alpha = 255,
+	post_effect_color = {a=0, r=0, g=0, b=0},
+	paramtype = "none",
+	paramtype2 = "none",
+	is_ground_content = false,
+	sunlight_propagates = false,
+	walkable = true,
+	pointable = true,
+	diggable = true,
+	climbable = false,
+	buildable_to = false,
+	metadata_name = "",
+	liquidtype = "none",
+	liquid_alternative_flowing = "",
+	liquid_alternative_source = "",
+	liquid_viscosity = 0,
+	light_source = 0,
+	damage_per_second = 0,
+	selection_box = {type="regular"},
+	material = {
+		diggablity = "normal",
+		weight = 0,
+		crackiness = 0,
+		crumbliness = 0,
+		cuttability = 0,
+		flammability = 0,
+	},
+	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_digging_properties = nil,
+
+	-- Interaction callbacks
+	on_place = minetest.item_place,
+	on_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_digging_properties = nil,
+
+	-- Interaction callbacks
+	on_place = minetest.item_place,
+	on_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_digging_properties = nil,
+
+	-- Interaction callbacks
+	on_place = nil,
+	on_drop = nil,
+	on_use = nil,
+}
+
+--
+-- Make raw registration functions inaccessible to anyone except builtin.lua
+--
+
+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_digging_properties == 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_digging_properties = {
+			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(":", {
+	type = "none",
+	wield_image = "wieldhand.png",
+	wield_scale = {x=1,y=1,z=2.5},
+	tool_digging_properties = {
+		full_punch_interval = 2.0,
+		basetime = 0.5,
+		dt_weight = 1,
+		dt_crackiness = 0,
+		dt_crumbliness = -1,
+		dt_cuttability = 0,
+		basedurability = 50,
+		dd_weight = 0,
+		dd_crackiness = 0,
+		dd_crumbliness = 0,
+		dd_cuttability = 0,
+	}
+})
+
+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,
+})
+
+--
+-- Default material types
+--
+
+function minetest.digprop_constanttime(time)
+	return {
+		diggability = "constant",
+		constant_time = time,
+	}
+end
+
+function minetest.digprop_stonelike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 5,
+		crackiness = 1,
+		crumbliness = -0.1,
+		cuttability = -0.2,
+	}
+end
+
+function minetest.digprop_dirtlike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 1.2,
+		crackiness = 0,
+		crumbliness = 1.2,
+		cuttability = -0.4,
+	}
+end
+
+function minetest.digprop_gravellike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 2,
+		crackiness = 0.2,
+		crumbliness = 1.5,
+		cuttability = -1.0,
+	}
+end
+
+function minetest.digprop_woodlike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 1.0,
+		crackiness = 0.75,
+		crumbliness = -1.0,
+		cuttability = 1.5,
+	}
+end
+
+function minetest.digprop_leaveslike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * (-0.5),
+		crackiness = 0,
+		crumbliness = 0,
+		cuttability = 2.0,
+	}
+end
+
+function minetest.digprop_glasslike(toughness)
+	return {
+		diggablity = "normal",
+		weight = toughness * 0.1,
+		crackiness = 2.0,
+		crumbliness = -1.0,
+		cuttability = -1.0,
+	}
+end
+
+--
+-- Creative inventory
+--
+
+minetest.creative_inventory = {}
+
+minetest.add_to_creative_inventory = function(itemstring)
+	table.insert(minetest.creative_inventory, itemstring)
+end
+
+--
+-- Callback registration
+--
+
+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_placenodes, minetest.register_on_placenode = make_registration()
+minetest.registered_on_dignodes, minetest.register_on_dignode = make_registration()
+minetest.registered_on_punchnodes, minetest.register_on_punchnode = make_registration()
+minetest.registered_on_generateds, minetest.register_on_generated = make_registration()
+minetest.registered_on_newplayers, minetest.register_on_newplayer = make_registration()
+minetest.registered_on_dieplayers, minetest.register_on_dieplayer = make_registration()
+minetest.registered_on_respawnplayers, minetest.register_on_respawnplayer = make_registration()
+
+--
+-- Set random seed
+--
+
+math.randomseed(os.time())
+
+-- END
--- a/data/clienttextures/fontlucida.png
+++ b/data/clienttextures/fontlucida.png
--- a/games/minimal/mods/default/textures/default_dirt.png
+++ b/games/minimal/mods/default/textures/default_dirt.png
--- a/data/clienttextures/menulogo.png
+++ b/data/clienttextures/menulogo.png
--- a/data/clienttextures/unknown_block.png
+++ b/data/clienttextures/unknown_block.png
--- a/data/clienttextures/unknown_item.png
+++ b/data/clienttextures/unknown_item.png
--- a/data/clienttextures/unknown_object.png
+++ b/data/clienttextures/unknown_object.png
--- a/games/minimal/mods/bucket/depends.txt
+++ b/games/minimal/mods/bucket/depends.txt
--- a/games/minimal/mods/bucket/init.lua
+++ b/games/minimal/mods/bucket/init.lua
@@ -41,13 +41,13 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image)
 					return
 				end
 				-- Check if pointing to a liquid
-				n = minetest.get_node(pointed_thing.under)
+				n = minetest.env:get_node(pointed_thing.under)
 				if bucket.liquids[n.name] == nil then
 					-- Not a liquid
-					minetest.add_node(pointed_thing.above, {name=source})
+					minetest.env:add_node(pointed_thing.above, {name=source})
 				elseif n.name ~= source then
 					-- It's a liquid
-					minetest.add_node(pointed_thing.under, {name=source})
+					minetest.env:add_node(pointed_thing.under, {name=source})
 				end
 				return {name="bucket:bucket_empty"}
 			end
@@ -65,10 +65,10 @@ minetest.register_craftitem("bucket:bucket_empty", {
 			return
 		end
 		-- Check if pointing to a liquid source
-		n = minetest.get_node(pointed_thing.under)
+		n = minetest.env:get_node(pointed_thing.under)
 		liquiddef = bucket.liquids[n.name]
 		if liquiddef ~= nil and liquiddef.source == n.name and liquiddef.itemname ~= nil then
-			minetest.add_node(pointed_thing.under, {name="air"})
+			minetest.env:add_node(pointed_thing.under, {name="air"})
 			return {name=liquiddef.itemname}
 		end
 	end,
@@ -90,6 +90,6 @@ bucket.register_liquid(

 minetest.register_craft({
 	type = "fuel",
-	recipe = "bucket:bucket_lava",
+	recipe = "default:bucket_lava",
 	burntime = 60,
 })
--- a/data/mods/bucket/textures/bucket.png
+++ b/data/mods/bucket/textures/bucket.png
--- a/data/mods/bucket/textures/bucket_lava.png
+++ b/data/mods/bucket/textures/bucket_lava.png
--- a/data/mods/bucket/textures/bucket_water.png
+++ b/data/mods/bucket/textures/bucket_water.png
--- a/data/mods/default/init.lua
+++ b/data/mods/default/init.lua
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sapier	52996cd5eb	maualy merged object linking interface from cao_sao_split patch	2012-02-07 21:37:42 +01:00
sapier	61ae136431	Merge branch 'master' into sapier_experimental	2012-02-07 20:52:20 +01:00
sapier	30f16ded7e	Merge branch 'object_object_collision' into sapier_experimental	2012-02-07 17:04:32 +01:00
sapier	d9ffd30445	added changes missing in last commit	2012-02-07 17:01:04 +01:00
sapier	c525330153	Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_collision	2012-02-07 16:57:36 +01:00
sapier	435ea846db	move getCollisionBox from ActiveObject to interface class Collidableobject	2012-02-07 16:52:32 +01:00
Kahrl	34eabf4df0	Fix rail's selection box and tweak the logic that computes pointedthing.node_abovesurface -- you no longer can place torches above each other, or do similar placement with other nodes with non-full selection box.	2012-02-07 03:05:15 +01:00
sapier	413afa77d0	Merge branch 'object_object_collision' into sapier_experimental	2012-02-05 20:35:54 +01:00
sapier	ffe6025f61	Added object <-> object collision handling (player + luaentity support only)	2012-02-05 17:23:08 +01:00
sapier	f34f75291b	disabled optimization for debug build to enable step by step debugging in gdb	2012-02-05 12:47:10 +01:00
sapier	8929a47296	Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_collision	2012-02-05 12:41:01 +01:00
sapier	0947644729	added drawallfaces to luaentities	2012-02-04 18:08:25 +01:00
sapier	77df09540c	Merge remote branch 'upstream/master' into sapier_experimental Conflicts: src/scriptapi.cpp	2012-02-04 12:41:25 +01:00
Kahrl	6bf4931fc2	NDT_NODEBOX, collision code rewrite with step height, stairs mod -- rebased after itemdef	2012-02-02 19:20:52 +01:00
sapier	3454e67793	added new entity style irregular_cube	2012-01-15 20:30:26 +01:00
sapier	0c78767754	fixed invalid comment for plant mesh declaration	2012-01-15 20:28:39 +01:00
sapier	f0679969b2	added plantlike luaentity	2012-01-15 20:22:41 +01:00
sapier	285f5a0259	added lua command get_nodes_inside_radius	2012-01-15 20:09:55 +01:00
sapier	71186974fa	fixed missing removal in static fix	2012-01-15 20:06:56 +01:00
sapier	525bc8855f	added derived object to add linkable object support	2012-01-15 19:55:58 +01:00
sapier	de166e75a1	sao prototype global variables no longer depend on link order to be correctly added to factory	2012-01-15 19:43:31 +01:00
				`@@ -0,0 +1 @@`
				`a519d683251105654d2a146ae7b91d3850b6504c 0.2.20110731_3`