Call this 0.4.dev-20120320

- Do not rewrite if nothing needs to be changed
- Update at program exit, in addition to updating when continuing from main menu to game

.gitignore

@@ -1,5 +1,27 @@
-map/*
+## Generic ignorable patterns and files
-world/*
+*~
+.*.swp
+*bak*
+tags
+*.vim
+
+## Non-static Minetest directories
+bin/
+games/
+!games/mesetint
+cache/
+textures/
+sounds/
+mods/
+!mods/mesetint/mods_here.txt
+worlds/
+world/
+
+## Configuration/log files
+minetest.conf
+debug.txt
+
+## Build files
 CMakeFiles/*
 src/CMakeFiles/*
 src/Makefile
@@ -9,19 +31,13 @@ src/jthread/CMakeFiles/*
 src/jthread/Makefile
 src/jthread/cmake_config.h
 src/jthread/cmake_install.cmake
-.*.swp
+src/jthread/libjthread.a
-minetest.conf
+src/lua/build/
-bin/
+src/lua/CMakeFiles/
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
 Makefile
 cmake_install.cmake
-src/jthread/libjthread.a
-debug.txt
-bin/debug.txt
-minetestmapper/map.png
 locale/
-src/lua/build/
+
-src/lua/CMakeFiles/
-*bak*

.hgignore

@@ -1,25 +0,0 @@
-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/*

.hgtags

@@ -1 +0,0 @@
-a519d683251105654d2a146ae7b91d3850b6504c 0.2.20110731_3

CMakeLists.txt

@@ -10,7 +10,7 @@ project(minetest)
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH dev-20120122-1)
+set(VERSION_PATCH dev-20120320)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
@@ -49,26 +49,59 @@ find_package(Irrlicht)
 #
 
 if(WIN32)
-	set(DATADIR "data")
+	set(SHAREDIR ".")
 	set(BINDIR "bin")
 	set(DOCDIR "doc")
 	set(EXAMPLE_CONF_DIR ".")
+	set(LOCALEDIR "locale")
 elseif(APPLE)
-	# random placeholders
+	# Random placeholders; this isn't usually used and may not work
-	set(DATADIR "share/${PROJECT_NAME}")
+	# See https://github.com/toabi/minetest-mac/
+	set(SHAREDIR "share/${PROJECT_NAME}")
 	set(BINDIR "bin")
 	set(DOCDIR "share/doc/${PROJECT_NAME}")
-	set(EXAMPLE_CONF_DIR ".")
+	set(EXAMPLE_CONF_DIR ${DOCDIR})
+	set(LOCALEDIR "locale")
 elseif(UNIX) # Linux, BSD etc
-	set(DATADIR "share/${PROJECT_NAME}")
+	if(RUN_IN_PLACE)
-	set(BINDIR "bin")
+		set(SHAREDIR ".")
-	set(DOCDIR "share/doc/${PROJECT_NAME}")
+		set(BINDIR "bin")
-	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
+		set(DOCDIR "doc")
+		set(EXAMPLE_CONF_DIR ".")
+		set(MANDIR "unix/man")
+		set(XDG_APPS_DIR "unix/applications")
+		set(ICONDIR "unix/icons")
+		set(LOCALEDIR "locale")
+	else()
+		set(SHAREDIR "share/${PROJECT_NAME}")
+		set(BINDIR "bin")
+		set(DOCDIR "share/doc/${PROJECT_NAME}")
+		set(MANDIR "share/man")
+		set(EXAMPLE_CONF_DIR ${DOCDIR})
+		set(XDG_APPS_DIR "share/applications")
+		set(ICONDIR "share/icons")
+		set(LOCALEDIR "share/locale")
+	endif()
+endif()
+
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/mesetint" DESTINATION "${SHAREDIR}/games")
+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/mesetint/mods_here.txt" DESTINATION "${SHAREDIR}/mods/mesetint")
 endif()
 
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
-install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
+install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
-install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
+
+if(UNIX)
+	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
+	install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
+	install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+endif()
 
 #
 # Subdirectories

README.txt

@@ -1,7 +1,7 @@
 Minetest-c55
 ---------------
 An InfiniMiner/Minecraft inspired game.
-Copyright (c) 2010-2011 Perttu Ahola <celeron55@gmail.com>
+Copyright (c) 2010-2012 Perttu Ahola <celeron55@gmail.com>
 (see source files for other contributors)
 
 Further documentation:
@@ -100,6 +100,7 @@ Compiling on Windows:
 	- 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):
@@ -176,24 +177,37 @@ 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-c55 textures and sounds
 -------------------------------------------
@@ -277,3 +291,21 @@ 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.
+
+

builtin/builtin.lua

@@ -5,6 +5,16 @@
 -- before loading and running any mods.
 --
 
+--
+-- Override some Lua library functions
+--
+
+print = minetest.debug
+
+--
+--
+--
+
 function basic_dump2(o)
 	if type(o) == "number" then
 		return tostring(o)
@@ -106,7 +116,7 @@ function minetest.get_pointed_thing_position(pointed_thing, above)
 			return pointed_thing.under
 		end
 	elseif pointed_thing.type == "object" then
-		obj = pointed.thing.ref
+		obj = pointed_thing.ref
 		if obj ~= nil then
 			return obj:getpos()
 		else
@@ -327,9 +337,8 @@ function minetest.node_dig(pos, node, digger)
 		local drops = minetest.get_node_drops(node.name, wielded:get_name())
 
 		-- Wear out tool
-		mp = def.material
+		tp = wielded:get_tool_capabilities()
-		tp = wielded:get_tool_digging_properties()
+		dp = minetest.get_dig_params(def.groups, tp)
-		dp = minetest.get_digging_properties(mp, tp)
 		wielded:add_wear(dp.wear)
 		digger:set_wielded_item(wielded)
 
@@ -359,13 +368,14 @@ minetest.nodedef_default = {
 	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,
+	tool_capabilities = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -402,14 +412,6 @@ minetest.nodedef_default = {
 	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,
 }
@@ -418,12 +420,13 @@ 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,
+	tool_capabilities = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -435,12 +438,13 @@ 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,
+	tool_capabilities = nil,
 
 	-- Interaction callbacks
 	on_place = minetest.item_place,
@@ -452,12 +456,13 @@ 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,
+	tool_capabilities = nil,
 
 	-- Interaction callbacks
 	on_place = nil,
@@ -639,7 +644,7 @@ function minetest.register_tool(name, tooldef)
 	if tooldef.inventory_image == nil and tooldef.image ~= nil then
 		tooldef.inventory_image = tooldef.image
 	end
-	if tooldef.tool_digging_properties == nil and
+	if tooldef.tool_capabilities == nil and
 	   (tooldef.full_punch_interval ~= nil or
 	    tooldef.basetime ~= nil or
 	    tooldef.dt_weight ~= nil or
@@ -651,7 +656,7 @@ function minetest.register_tool(name, tooldef)
 	    tooldef.dd_crackiness ~= nil or
 	    tooldef.dd_crumbliness ~= nil or
 	    tooldef.dd_cuttability ~= nil) then
-		tooldef.tool_digging_properties = {
+		tooldef.tool_capabilities = {
 			full_punch_interval = tooldef.full_punch_interval,
 			basetime = tooldef.basetime,
 			dt_weight = tooldef.dt_weight,
@@ -703,25 +708,6 @@ end
 -- 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",
@@ -758,76 +744,26 @@ minetest.register_node(":ignore", {
 	air_equivalent = true,
 })
 
+-- The hand (bare definition)
+minetest.register_item(":", {
+	type = "none",
+})
+
 --
 -- Default material types
 --
-
+function digprop_err()
-function minetest.digprop_constanttime(time)
+	minetest.log("info", debug.traceback())
-	return {
+	minetest.log("info", "WARNING: The minetest.digprop_* functions are obsolete and need to be replaced by item groups.")
-		diggability = "constant",
-		constant_time = time,
-	}
 end
 
-function minetest.digprop_stonelike(toughness)
+minetest.digprop_constanttime = digprop_err
-	return {
+minetest.digprop_stonelike = digprop_err
-		diggablity = "normal",
+minetest.digprop_dirtlike = digprop_err
-		weight = toughness * 5,
+minetest.digprop_gravellike = digprop_err
-		crackiness = 1,
+minetest.digprop_woodlike = digprop_err
-		crumbliness = -0.1,
+minetest.digprop_leaveslike = digprop_err
-		cuttability = -0.2,
+minetest.digprop_glasslike = digprop_err
-	}
-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

cmake/Modules/FindGettextLib.cmake

@@ -59,7 +59,7 @@ ENDIF()
 IF(GETTEXT_FOUND)
 	SET(GETTEXT_PO_PATH ${CMAKE_SOURCE_DIR}/po)
 	SET(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale/<locale>/LC_MESSAGES)
-	SET(GETTEXT_MO_DEST_PATH ${DATADIR}/../locale/<locale>/LC_MESSAGES)
+	SET(GETTEXT_MO_DEST_PATH ${LOCALEDIR}/<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)

doc/minetest.6

@@ -0,0 +1,85 @@
+.\" Minetest man page
+.TH minetest 6 "11 March 2012" "" ""
+
+.SH NAME
+minetest \- Multiplayer infinite-world block sandbox
+
+.SH SYNOPSIS
+.B minetest
+[ OPTION ... ]
+
+.SH DESCRIPTION
+.B Minetest
+is one of the first InfiniMiner/Minecraft(/whatever) inspired games (started October 2010), with a goal of taking the survival multiplayer gameplay to a slightly different direction.
+.PP
+The main design philosophy is to keep it technically simple, stable and portable. It will be kept lightweight enough to run on fairly old hardware.
+
+.SH OPTIONS
+.TP
+\-\-address <value>
+Address to connect to
+.TP
+\-\-config <value>
+Load configuration from specified file
+.TP
+\-\-disable\-unittests
+Disable unit tests
+.TP
+\-\-enable\-unittests
+Enable unit tests
+.TP
+\-\-gameid <value>
+Set gameid
+.TP
+\-\-go
+Disable main menu
+.TP
+\-\-help
+Show allowed options
+.TP
+\-\-logfile <value>
+Set logfile path (debug.txt)
+.TP
+\-\-map\-dir <value>
+Same as --world (deprecated)
+.TP
+\-\-name <value>
+Set player name
+.TP
+\-\-password <value>
+Set password
+.TP
+\-\-port <value>
+Set network port (UDP) to use
+.TP
+\-\-random\-input
+Enable random user input, for testing
+.TP
+\-\-server
+Run dedicated server
+.TP
+\-\-speedtests
+Run speed tests
+.TP
+\-\-verbose
+Print more information to console
+.TP
+\-\-world <value>
+Set world path
+
+.SH BUGS
+Please report all bugs to Perttu Ahola <celeron55@gmail.com>.
+
+.SH AUTHOR
+.PP
+Perttu Ahola <celeron55@gmail.com>
+and contributors.
+.PP
+This man page was originally written by
+Juhani Numminen <juhaninumminen0@gmail.com>.
+
+.SH WWW
+http://c55.me/minetest/
+
+.SH "SEE ALSO"
+.BR minetestserver(6)

doc/minetestserver.6

@@ -0,0 +1,64 @@
+.\" Minetestserver man page
+.TH minetestserver 6 "11 March 2012" "" ""
+
+.SH NAME
+minetestserver \- Minetest server
+
+.SH SYNOPSIS
+.B minetestserver
+[ OPTION ... ]
+
+.SH DESCRIPTION
+.B Minetest
+is one of the first InfiniMiner/Minecraft(/whatever) inspired games (started October 2010), with a goal of taking the survival multiplayer gameplay to a slightly different direction.
+.PP
+The main design philosophy is to keep it technically simple, stable and portable. It will be kept lightweight enough to run on fairly old hardware.
+
+.SH OPTIONS
+.TP
+\-\-config <value>
+Load configuration from specified file
+.TP
+\-\-disable\-unittests
+Disable unit tests
+.TP
+\-\-enable\-unittests
+Enable unit tests
+.TP
+\-\-gameid <value>
+Set gameid
+.TP
+\-\-help
+Show allowed options
+.TP
+\-\-logfile <value>
+Set logfile path (debug.txt)
+.TP
+\-\-map\-dir <value>
+Same as --world (deprecated)
+.TP
+\-\-port <value>
+Set network port (UDP) to use
+.TP
+\-\-verbose
+Print more information to console
+.TP
+\-\-world <value>
+Set world path
+
+.SH BUGS
+Please report all bugs to Perttu Ahola <celeron55@gmail.com>.
+
+.SH AUTHOR
+.PP
+Perttu Ahola <celeron55@gmail.com>
+and contributors.
+.PP
+This man page was originally written by
+Juhani Numminen <juhaninumminen0@gmail.com>.
+
+.SH WWW
+http://c55.me/minetest/
+
+.SH "SEE ALSO"
+.BR minetest(6)

games/mesetint/mods/default/init.lua

@@ -118,6 +118,9 @@
 --                  {type="node", pos={x=, y=, z=}}
 -- minetest.get_current_modname() -> string
 -- minetest.get_modpath(modname) -> eg. "/home/user/.minetest/usermods/modname"
+-- ^ Useful for loading additional .lua modules or static data from mod
+-- minetest.get_worldpath(modname) -> eg. "/home/user/.minetest/world"
+-- ^ Useful for storing custom data
 --
 -- minetest.debug(line)
 -- ^ Goes to dstream
@@ -199,7 +202,7 @@
 -- - getpos() -> {x=num, y=num, z=num}
 -- - setpos(pos); pos={x=num, y=num, z=num}
 -- - moveto(pos, continuous=false): interpolated move
--- - punch(puncher, time_from_last_punch)
+-- - punch(puncher, time_from_last_punch, tool_capabilities, direction)
 --   ^ puncher = an another ObjectRef,
 --   ^ time_from_last_punch = time since last punch action of the puncher
 -- - right_click(clicker); clicker = an another ObjectRef
@@ -222,6 +225,7 @@
 -- -           select_horiz_by_yawpitch=false)
 -- - ^ Select sprite from spritesheet with optional animation and DM-style
 -- -   texture selection based on yaw relative to camera
+-- - set_armor_groups({group1=rating, group2=rating, ...})
 -- - get_entity_name() (DEPRECATED: Will be removed in a future version)
 -- - get_luaentity()
 -- Player-only: (no-op for other objects)
@@ -260,7 +264,7 @@
 -- - get_free_space(): returns get_stack_max() - get_count()
 -- - is_known(): returns true if the item name refers to a defined item type
 -- - get_definition(): returns the item definition table
--- - get_tool_digging_properties(): returns the digging properties of the item,
+-- - get_tool_capabilities(): returns the digging properties of the item,
 --   ^ or those of the hand if none are defined for this item type
 -- - add_wear(amount): increases wear by amount if the item is a tool
 -- - add_item(item): put some item or stack onto this stack,
@@ -308,23 +312,26 @@
 -- Item definition options (register_node, register_craftitem, register_tool)
 -- {
 --     description = "Steel Axe",
+--     groups = {}, -- key=name, value=rating; rating=1..3.
+--                     if rating not applicable, use 1.
+--                     eg. {wool=1, fluffy=3}
+--                         {soil=2, outerspace=1, crumbly=1}
+--                         {bendy=2, snappy=1},
+--                         {hard=1, metal=1, spikes=1}
 --     inventory_image = "default_tool_steelaxe.png",
 --     wield_image = "",
 --     wield_scale = {x=1,y=1,z=1},
 --     stack_max = 99,
 --     liquids_pointable = false,
---     tool_digging_properties = {
+--     tool_capabilities = {
 --         full_punch_interval = 1.0,
---         basetime = 1.0,
+--         max_drop_level=0,
---         dt_weight = 0.5,
+--         groupcaps={
---         dt_crackiness = -0.2,
+--             -- For example:
---         dt_crumbliness = 1,
+--             fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
---         dt_cuttability = -0.5,
+--             snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
---         basedurability = 330,
+--             choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
---         dd_weight = 0,
+--         }
---         dd_crackiness = 0,
---         dd_crumbliness = 0,
---         dd_cuttability = 0,
 --     }
 --     on_drop = func(item, dropper, pos),
 --     on_place = func(item, placer, pointed_thing),
@@ -362,14 +369,6 @@
 --     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, -- Support maps made in and before January 2012
 --     legacy_wallmounted = false, -- Support maps made in and before January 2012
 -- }
@@ -430,6 +429,18 @@
 --     chance = 1, -- (chance of trigger is 1.0/this)
 --     action = func(pos, node, active_object_count, active_object_count_wider),
 -- }
+--
+-- Item groups:
+-- - Groups always have a rating associated with them. If there is no
+--   useful meaning for a rating for a given group, it shall be 1.
+-- - When not defined, the rating of a group defaults to 0.
+--
+-- Special groups:
+-- - dig_immediate:
+--   - 2: node is removed without tool wear after 1 second or so
+--   - 3: node is removed without tool wear immediately (like a torch)
+-- - level: Can be used to give an additional sense of progression in the game.
+--   - 0 is something that is directly accessible at the start of gameplay
 
 WATER_ALPHA = 160
 WATER_VISC = 1
@@ -443,212 +454,166 @@ default = {}
 -- Tool definition
 --
 
+-- The hand
+minetest.register_item(":", {
+	type = "none",
+	wield_image = "wieldhand.png",
+	wield_scale = {x=1,y=1,z=2.5},
+	tool_capabilities = {
+		full_punch_interval = 1.0,
+		max_drop_level = 0,
+		groupcaps = {
+			fleshy = {times={[2]=2.00, [3]=1.00}, maxwear=0, maxlevel=1},
+			crumbly = {times={[3]=0.70}, maxwear=0, maxlevel=1},
+			snappy = {times={[3]=0.40}, maxwear=0, maxlevel=1},
+			oddly_breakable_by_hand = {times={[1]=3.50,[2]=2.00,[3]=0.70}, maxwear=0, maxlevel=3},
+		}
+	}
+})
+
 minetest.register_tool("default:pick_wood", {
 	description = "Wooden Pickaxe",
 	inventory_image = "default_tool_woodpick.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 2.0,
+		max_drop_level=0,
-		dt_weight = 0,
+		groupcaps={
-		dt_crackiness = -0.5,
+			cracky={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1}
-		dt_crumbliness = 2,
+		}
-		dt_cuttability = 0,
-		basedurability = 30,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:pick_stone", {
 	description = "Stone Pickaxe",
 	inventory_image = "default_tool_stonepick.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 1.5,
+		max_drop_level=0,
-		dt_weight = 0,
+		groupcaps={
-		dt_crackiness = -0.5,
+			cracky={times={[1]=1.50, [2]=0.80, [3]=0.60}, maxwear=0.05, maxlevel=1}
-		dt_crumbliness = 2,
+		}
-		dt_cuttability = 0,
-		basedurability = 100,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:pick_steel", {
 	description = "Steel Pickaxe",
 	inventory_image = "default_tool_steelpick.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 1.0,
+		max_drop_level=1,
-		dt_weight = 0,
+		groupcaps={
-		dt_crackiness = -0.5,
+			cracky={times={[1]=1.00, [2]=0.60, [3]=0.40}, maxwear=0.1, maxlevel=2}
-		dt_crumbliness = 2,
+		}
-		dt_cuttability = 0,
-		basedurability = 333,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:pick_mese", {
 	description = "Mese Pickaxe",
 	inventory_image = "default_tool_mesepick.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 0,
+		full_punch_interval = 1.0,
-		dt_weight = 0,
+		max_drop_level=3,
-		dt_crackiness = 0,
+		groupcaps={
-		dt_crumbliness = 0,
+			cracky={times={[1]=0.2, [2]=0.2, [3]=0.2}, maxwear=0.05, maxlevel=3},
-		dt_cuttability = 0,
+			crumbly={times={[1]=0.2, [2]=0.2, [3]=0.2}, maxwear=0.05, maxlevel=3},
-		basedurability = 1337,
+			snappy={times={[1]=0.2, [2]=0.2, [3]=0.2}, maxwear=0.05, maxlevel=3}
-		dd_weight = 0,
+		}
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:shovel_wood", {
 	description = "Wooden Shovel",
 	inventory_image = "default_tool_woodshovel.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 2.0,
+		max_drop_level=0,
-		dt_weight = 0.5,
+		groupcaps={
-		dt_crackiness = 2,
+			crumbly={times={[1]=1.50, [2]=0.80, [3]=0.50}, maxwear=0.1, maxlevel=1}
-		dt_crumbliness = -1.5,
+		}
-		dt_cuttability = 0.3,
-		basedurability = 30,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:shovel_stone", {
 	description = "Stone Shovel",
 	inventory_image = "default_tool_stoneshovel.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 1.5,
+		max_drop_level=0,
-		dt_weight = 0.5,
+		groupcaps={
-		dt_crackiness = 2,
+			crumbly={times={[1]=0.80, [2]=0.50, [3]=0.30}, maxwear=0.05, maxlevel=1}
-		dt_crumbliness = -1.5,
+		}
-		dt_cuttability = 0.1,
-		basedurability = 100,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:shovel_steel", {
 	description = "Steel Shovel",
 	inventory_image = "default_tool_steelshovel.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 1.0,
+		max_drop_level=1,
-		dt_weight = 0.5,
+		groupcaps={
-		dt_crackiness = 2,
+			crumbly={times={[1]=0.50, [2]=0.35, [3]=0.30}, maxwear=0.1, maxlevel=2}
-		dt_crumbliness = -1.5,
+		}
-		dt_cuttability = 0.0,
-		basedurability = 330,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:axe_wood", {
 	description = "Wooden Axe",
 	inventory_image = "default_tool_woodaxe.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 2.0,
+		max_drop_level=0,
-		dt_weight = 0.5,
+		groupcaps={
-		dt_crackiness = -0.2,
+			choppy={times={[2]=1.40, [3]=0.80}, maxwear=0.1, maxlevel=1},
-		dt_crumbliness = 1,
+			fleshy={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1}
-		dt_cuttability = -0.5,
+		}
-		basedurability = 30,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:axe_stone", {
 	description = "Stone Axe",
 	inventory_image = "default_tool_stoneaxe.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 1.5,
+		max_drop_level=0,
-		dt_weight = 0.5,
+		groupcaps={
-		dt_crackiness = -0.2,
+			choppy={times={[1]=1.50, [2]=1.00, [3]=0.60}, maxwear=0.05, maxlevel=1},
-		dt_crumbliness = 1,
+			fleshy={times={[2]=1.30, [3]=0.70}, maxwear=0.05, maxlevel=1}
-		dt_cuttability = -0.5,
+		}
-		basedurability = 100,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:axe_steel", {
 	description = "Steel Axe",
 	inventory_image = "default_tool_steelaxe.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 1.0,
+		max_drop_level=1,
-		dt_weight = 0.5,
+		groupcaps={
-		dt_crackiness = -0.2,
+			choppy={times={[1]=1.00, [2]=0.80, [3]=0.50}, maxwear=0.1, maxlevel=2},
-		dt_crumbliness = 1,
+			fleshy={times={[2]=1.10, [3]=0.60}, maxwear=0.03, maxlevel=1}
-		dt_cuttability = -0.5,
+		}
-		basedurability = 330,
-		dd_weight = 0,
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	},
 })
 minetest.register_tool("default:sword_wood", {
 	description = "Wooden Sword",
 	inventory_image = "default_tool_woodsword.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 3.0,
+		full_punch_interval = 1.0,
-		dt_weight = 3,
+		max_drop_level=0,
-		dt_crackiness = 0,
+		groupcaps={
-		dt_crumbliness = 1,
+			fleshy={times={[2]=1.10, [3]=0.60}, maxwear=0.1, maxlevel=1},
-		dt_cuttability = -1,
+			snappy={times={[2]=1.00, [3]=0.50}, maxwear=0.1, maxlevel=1},
-		basedurability = 30,
+			choppy={times={[3]=1.00}, maxwear=0.05, maxlevel=0}
-		dd_weight = 0,
+		}
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	}
 })
 minetest.register_tool("default:sword_stone", {
 	description = "Stone Sword",
 	inventory_image = "default_tool_stonesword.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 2.5,
+		full_punch_interval = 1.0,
-		dt_weight = 3,
+		max_drop_level=0,
-		dt_crackiness = 0,
+		groupcaps={
-		dt_crumbliness = 1,
+			fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
-		dt_cuttability = -1,
+			snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
-		basedurability = 100,
+			choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
-		dd_weight = 0,
+		}
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	}
 })
 minetest.register_tool("default:sword_steel", {
 	description = "Steel Sword",
 	inventory_image = "default_tool_steelsword.png",
-	tool_digging_properties = {
+	tool_capabilities = {
-		basetime = 2.0,
+		full_punch_interval = 1.0,
-		dt_weight = 3,
+		max_drop_level=1,
-		dt_crackiness = 0,
+		groupcaps={
-		dt_crumbliness = 1,
+			fleshy={times={[1]=1.00, [2]=0.40, [3]=0.20}, maxwear=0.1, maxlevel=2},
-		dt_cuttability = -1,
+			snappy={times={[2]=0.70, [3]=0.30}, maxwear=0.03, maxlevel=1},
-		basedurability = 330,
+			choppy={times={[3]=0.70}, maxwear=0.03, maxlevel=0}
-		dd_weight = 0,
+		}
-		dd_crackiness = 0,
-		dd_crumbliness = 0,
-		dd_cuttability = 0,
 	}
 })
 
@@ -1101,7 +1066,7 @@ minetest.register_node("default:stone", {
 	description = "Stone",
 	tile_images = {"default_stone.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(1.0),
+	groups = {cracky=3},
 	drop = 'default:cobble',
 	legacy_mineral = true,
 })
@@ -1110,7 +1075,7 @@ minetest.register_node("default:stone_with_coal", {
 	description = "Stone with coal",
 	tile_images = {"default_stone.png^default_mineral_coal.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(1.0),
+	groups = {cracky=3},
 	drop = 'default:coal_lump',
 })
 
@@ -1118,7 +1083,7 @@ minetest.register_node("default:stone_with_iron", {
 	description = "Stone with iron",
 	tile_images = {"default_stone.png^default_mineral_iron.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(1.0),
+	groups = {cracky=3},
 	drop = 'default:iron_lump',
 })
 
@@ -1126,7 +1091,7 @@ minetest.register_node("default:dirt_with_grass", {
 	description = "Dirt with grass",
 	tile_images = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 	drop = 'default:dirt',
 })
 
@@ -1134,7 +1099,7 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 	description = "Dirt with grass and footsteps",
 	tile_images = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 	drop = 'default:dirt',
 })
 
@@ -1142,28 +1107,28 @@ minetest.register_node("default:dirt", {
 	description = "Dirt",
 	tile_images = {"default_dirt.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 })
 
 minetest.register_node("default:sand", {
 	description = "Sand",
 	tile_images = {"default_sand.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 })
 
 minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tile_images = {"default_gravel.png"},
 	is_ground_content = true,
-	material = minetest.digprop_gravellike(1.0),
+	groups = {crumbly=2},
 })
 
 minetest.register_node("default:sandstone", {
 	description = "Sandstone",
 	tile_images = {"default_sandstone.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),  -- FIXME should this be stonelike?
+	groups = {crumbly=2,cracky=2},
 	drop = 'default:sand',
 })
 
@@ -1171,7 +1136,7 @@ minetest.register_node("default:clay", {
 	description = "Clay",
 	tile_images = {"default_clay.png"},
 	is_ground_content = true,
-	material = minetest.digprop_dirtlike(1.0),
+	groups = {crumbly=3},
 	drop = 'default:clay_lump 4',
 })
 
@@ -1179,7 +1144,7 @@ minetest.register_node("default:brick", {
 	description = "Brick",
 	tile_images = {"default_brick.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(1.0),
+	groups = {cracky=3},
 	drop = 'default:clay_brick 4',
 })
 
@@ -1187,14 +1152,14 @@ minetest.register_node("default:tree", {
 	description = "Tree",
 	tile_images = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
 	is_ground_content = true,
-	material = minetest.digprop_woodlike(1.0),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=1},
 })
 
 minetest.register_node("default:jungletree", {
 	description = "Jungle Tree",
 	tile_images = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
 	is_ground_content = true,
-	material = minetest.digprop_woodlike(1.0),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=1},
 })
 
 minetest.register_node("default:junglegrass", {
@@ -1206,7 +1171,7 @@ minetest.register_node("default:junglegrass", {
 	wield_image = "default_junglegrass.png",
 	paramtype = "light",
 	walkable = false,
-	material = minetest.digprop_leaveslike(1.0),
+	groups = {snappy=3},
 })
 
 minetest.register_node("default:leaves", {
@@ -1215,7 +1180,7 @@ minetest.register_node("default:leaves", {
 	visual_scale = 1.3,
 	tile_images = {"default_leaves.png"},
 	paramtype = "light",
-	material = minetest.digprop_leaveslike(1.0),
+	groups = {snappy=3},
 	drop = {
 		max_items = 1,
 		items = {
@@ -1237,7 +1202,7 @@ minetest.register_node("default:cactus", {
 	description = "Cactus",
 	tile_images = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
 	is_ground_content = true,
-	material = minetest.digprop_woodlike(0.75),
+	groups = {snappy=2,choppy=3},
 })
 
 minetest.register_node("default:papyrus", {
@@ -1249,14 +1214,14 @@ minetest.register_node("default:papyrus", {
 	paramtype = "light",
 	is_ground_content = true,
 	walkable = false,
-	material = minetest.digprop_leaveslike(0.5),
+	groups = {snappy=3},
 })
 
 minetest.register_node("default:bookshelf", {
 	description = "Bookshelf",
 	tile_images = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
 	is_ground_content = true,
-	material = minetest.digprop_woodlike(0.75),
+	groups = {snappy=2,choppy=3,oddly_breakable_by_hand=2},
 })
 
 minetest.register_node("default:glass", {
@@ -1267,7 +1232,7 @@ minetest.register_node("default:glass", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = true,
-	material = minetest.digprop_glasslike(1.0),
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
 })
 
 minetest.register_node("default:fence_wood", {
@@ -1282,7 +1247,7 @@ minetest.register_node("default:fence_wood", {
 		type = "fixed",
 		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
 	},
-	material = minetest.digprop_woodlike(0.75),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 })
 
 minetest.register_node("default:rail", {
@@ -1298,7 +1263,7 @@ minetest.register_node("default:rail", {
 		type = "fixed",
 		--fixed = <default>
 	},
-	material = minetest.digprop_dirtlike(0.75),
+	groups = {bendy=2,snappy=1,dig_immediate=2},
 })
 
 minetest.register_node("default:ladder", {
@@ -1318,7 +1283,7 @@ minetest.register_node("default:ladder", {
 		--wall_bottom = = <default>
 		--wall_side = = <default>
 	},
-	material = minetest.digprop_woodlike(0.5),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
 	legacy_wallmounted = true,
 })
 
@@ -1326,14 +1291,14 @@ minetest.register_node("default:wood", {
 	description = "Wood",
 	tile_images = {"default_wood.png"},
 	is_ground_content = true,
-	material = minetest.digprop_woodlike(0.75),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 })
 
 minetest.register_node("default:mese", {
 	description = "Mese",
 	tile_images = {"default_mese.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(0.5),
+	groups = {cracky=1},
 })
 
 minetest.register_node("default:cloud", {
@@ -1362,6 +1327,7 @@ minetest.register_node("default:water_flowing", {
 		{image="default_water.png", backface_culling=false},
 		{image="default_water.png", backface_culling=true},
 	},
+	groups = {water=3, liquid=3},
 })
 
 minetest.register_node("default:water_source", {
@@ -1384,6 +1350,7 @@ minetest.register_node("default:water_source", {
 		-- New-style water source material (mostly unused)
 		{image="default_water.png", backface_culling=false},
 	},
+	groups = {water=3, liquid=3},
 })
 
 minetest.register_node("default:lava_flowing", {
@@ -1407,6 +1374,7 @@ minetest.register_node("default:lava_flowing", {
 		{image="default_lava.png", backface_culling=false},
 		{image="default_lava.png", backface_culling=true},
 	},
+	groups = {lava=3, liquid=2, hot=3},
 })
 
 minetest.register_node("default:lava_source", {
@@ -1430,6 +1398,7 @@ minetest.register_node("default:lava_source", {
 		-- New-style lava source material (mostly unused)
 		{image="default_lava.png", backface_culling=false},
 	},
+	groups = {lava=3, liquid=2, hot=3},
 })
 
 minetest.register_node("default:torch", {
@@ -1449,7 +1418,7 @@ minetest.register_node("default:torch", {
 		wall_bottom = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
 		wall_side = {-0.5, -0.3, -0.1, -0.5+0.3, 0.3, 0.1},
 	},
-	material = minetest.digprop_constanttime(0.0),
+	groups = {choppy=2,dig_immediate=3},
 	legacy_wallmounted = true,
 })
 
@@ -1470,7 +1439,7 @@ minetest.register_node("default:sign_wall", {
 		--wall_bottom = <default>
 		--wall_side = <default>
 	},
-	material = minetest.digprop_constanttime(0.5),
+	groups = {choppy=2,dig_immediate=2},
 	legacy_wallmounted = true,
 })
 
@@ -1480,7 +1449,7 @@ minetest.register_node("default:chest", {
 		"default_chest_side.png", "default_chest_side.png", "default_chest_front.png"},
 	paramtype2 = "facedir",
 	metadata_name = "chest",
-	material = minetest.digprop_woodlike(1.0),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	legacy_facedir_simple = true,
 })
 
@@ -1490,7 +1459,7 @@ minetest.register_node("default:chest_locked", {
 		"default_chest_side.png", "default_chest_side.png", "default_chest_lock.png"},
 	paramtype2 = "facedir",
 	metadata_name = "locked_chest",
-	material = minetest.digprop_woodlike(1.0),
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	legacy_facedir_simple = true,
 })
 
@@ -1500,7 +1469,7 @@ minetest.register_node("default:furnace", {
 		"default_furnace_side.png", "default_furnace_side.png", "default_furnace_front.png"},
 	paramtype2 = "facedir",
 	metadata_name = "furnace",
-	material = minetest.digprop_stonelike(3.0),
+	groups = {cracky=2},
 	legacy_facedir_simple = true,
 })
 
@@ -1508,21 +1477,21 @@ minetest.register_node("default:cobble", {
 	description = "Cobble",
 	tile_images = {"default_cobble.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(0.9),
+	groups = {cracky=3},
 })
 
 minetest.register_node("default:mossycobble", {
 	description = "Mossy Cobble",
 	tile_images = {"default_mossycobble.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(0.8),
+	groups = {cracky=3},
 })
 
 minetest.register_node("default:steelblock", {
 	description = "Steel Block",
 	tile_images = {"default_steel_block.png"},
 	is_ground_content = true,
-	material = minetest.digprop_stonelike(5.0),
+	groups = {snappy=1,bendy=2},
 })
 
 minetest.register_node("default:nyancat", {
@@ -1531,7 +1500,7 @@ minetest.register_node("default:nyancat", {
 		"default_nc_side.png", "default_nc_back.png", "default_nc_front.png"},
 	inventory_image = "default_nc_front.png",
 	paramtype2 = "facedir",
-	material = minetest.digprop_stonelike(3.0),
+	groups = {cracky=2},
 	legacy_facedir_simple = true,
 })
 
@@ -1539,7 +1508,7 @@ minetest.register_node("default:nyancat_rainbow", {
 	description = "Nyancat Rainbow",
 	tile_images = {"default_nc_rb.png"},
 	inventory_image = "default_nc_rb.png",
-	material = minetest.digprop_stonelike(3.0),
+	groups = {cracky=2},
 })
 
 minetest.register_node("default:sapling", {
@@ -1551,7 +1520,7 @@ minetest.register_node("default:sapling", {
 	wield_image = "default_sapling.png",
 	paramtype = "light",
 	walkable = false,
-	material = minetest.digprop_constanttime(0.0),
+	groups = {snappy=2,dig_immediate=3},
 })
 
 minetest.register_node("default:apple", {
@@ -1563,7 +1532,7 @@ minetest.register_node("default:apple", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	material = minetest.digprop_constanttime(0.0),
+	groups = {fleshy=3,dig_immediate=3},
 	on_use = minetest.item_eat(4),
 })
 
@@ -1641,7 +1610,7 @@ minetest.add_to_creative_inventory('default:cactus')
 minetest.add_to_creative_inventory('default:papyrus')
 minetest.add_to_creative_inventory('default:bookshelf')
 minetest.add_to_creative_inventory('default:glass')
-minetest.add_to_creative_inventory('default:fence')
+minetest.add_to_creative_inventory('default:fence_wood')
 minetest.add_to_creative_inventory('default:rail')
 minetest.add_to_creative_inventory('default:mese')
 minetest.add_to_creative_inventory('default:chest')
@@ -1772,6 +1741,9 @@ local function handle_give_command(cmd, giver, receiver, stackstring)
 	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
 		minetest.chat_send_player(giver, '"'..stackstring
 			..'" '..partiality..'added to inventory.');