Fire: Slow down fire spread and reduce lua load

Increase chance value of ABMs
Disable ignition from a distance
Only detect neighbouring extinguishing nodes
Fix code style issues and add comments

.gitignore

@@ -5,3 +5,5 @@
 tags
 *.vim
 
+## Files related to minetest development cycle
+*.patch

game_api.txt

@@ -24,6 +24,42 @@ The bucket API allows registering new types of buckets for non-default liquids.
 		"Lava Bucket"				-- Bucket description
 	)
 
+Beds API
+--------
+	beds.register_bed(
+		"beds:bed",			-- Bed name
+		def: See [#Bed definition]	-- Bed definition
+	)
+
+	beds.read_spawns()			-- returns a table containing players respawn positions
+	beds.kick_players()			-- forces all players to leave bed
+	beds.skip_night()			-- sets world time to morning and saves respawn position of all players currently sleeping
+
+#Bed definition
+---------------
+{
+	description = "Simple Bed",
+	inventory_image = "beds_bed.png",
+	wield_image = "beds_bed.png",
+	tiles = {
+	    bottom = {[Tile definition],
+		^ the tiles of the bottom part of the bed
+	    },
+	    top = {[Tile definition],
+		^ the tiles of the bottom part of the bed
+	    }
+	},
+	nodebox = {
+	    bottom = regular nodebox, see [Node boxes],		-- bottm part of bed
+	    top = regular nodebox, see [Node boxes],		-- top part of bed
+	},
+	selectionbox = regular nodebox, see [Node boxes],	-- for both nodeboxes
+	recipe = {	-- Craft recipe
+		{"group:wool", "group:wool", "group:wool"},
+		{"group:wood", "group:wood", "group:wood"}
+	}
+}
+
 Doors API
 ---------
 The doors mod allows modders to register custom doors and trapdoors.
@@ -89,7 +125,8 @@ farming.register_plant(name, Plant definition)
 	description = "",	-- Description for tooltip
 	inventory_image = "unknown_item.png",	-- Image to be used as wield- and inventory image
 	max_uses = 30,	-- Uses until destroyed
-	recipe = {	-- Craft recipe
+	material = "",	-- Material for recipes
+	recipe = {	-- Craft recipe, if material isn't used
 		{"air", "air", "air"},
 		{"", "group:stick"},
 		{"", "group:stick"},
@@ -102,11 +139,26 @@ farming.register_plant(name, Plant definition)
 	description = "",	-- Description of seed item
 	inventory_image = "unknown_item.png",	-- Image to be used as seed's wield- and inventory image
 	steps = 8,	-- How many steps the plant has to grow, until it can be harvested
-	^ Always provide a plant texture for ech step, format: modname_plantname_i.png (i = stepnumber)
+	^ Always provide a plant texture for each step, format: modname_plantname_i.png (i = stepnumber)
 	minlight = 13, -- Minimum light to grow
 	maxlight = default.LIGHT_MAX -- Maximum light to grow
 }
 
+Screwdriver API
+---------------
+The screwdriver API allows you to control a node's behaviour when a screwdriver is used on it.
+To use it, add the on_screwdriver function to the node definition.
+on_rotate(pos, node, user, mode, new_param2)
+^ pos: position of the node that the screwdriver is being used on
+^ node: that node
+^ user: the player who used the screwdriver
+^ mode: screwdriver.ROTATE_FACE or screwdriver.ROTATE_AXIS
+^ new_param2: the new value of param2 that would have been set if on_rotate wasn't there
+^ return value: false to disallow rotation, nil to keep default behaviour, true to allow
+  it but to indicate that changed have already been made (so the screwdriver will wear out)
+^ use on_rotate = screwdriver.disallow to always disallow rotation
+^ use on_rotate = screwdriver.rotate_simple to allow only face rotation
+
 Stairs API
 ----------
 The stairs API lets you register stairs and slabs and ensures that they are registered the same way as those
@@ -157,6 +209,24 @@ xpanes.register_pane(subname, def)
 	^ Recipe field only
 }
 
+Raillike definitions
+--------------------
+The following nodes use the group `connect_to_raillike` and will only connect to
+raillike nodes within this group and the same group value.
+Use `minetest.raillike_group(<Name>)` to get the group value.
+
+| Node type		| Raillike group name
++-----------------------+----------------------------------
+| default:rail		| "rail"
+| tnt:gunpowder		| "gunpowder"
+| tnt:gunpowder_burning	| "gunpowder"
+
+Example:
+If you want to add a new rail type and want it to connect with default:rail,
+add `connect_to_raillike=minetest.raillike_group("rail")` into the `groups` table
+of your node.
+
+
 Default sounds
 --------------
 Sounds inside the default table can be used within the sounds field of node definitions.

minetest.conf

@@ -1,3 +0,0 @@
-mg_flags = dungeons
-mgv6_spflags = biomeblend, jungles
-

minetest.conf.example

@@ -22,3 +22,7 @@
 
 # The radius of a TNT explosion
 #tnt_radius = 3
+
+# Enable the stairs mod ABM that replaces the old 'upside down'
+# stair and slab nodes in old maps with the new param2 versions.
+#enable_stairs_replace_abm = false

mods/beds/Changelog.txt

@@ -0,0 +1,18 @@
+1.0.1 beta
+----------
+- Add backwards compatibility with PilzAdam's beds mod
+- Fix placement
+- Fix small bugs
+- Prevent possible crash
+
+1.1
+---
+- Add fancy bed model (based on jp's model)
+- Add API to register beds
+- Allow players always to detach from bed (by donat-b) 
+- If more than 50% of players want sleep they can skip the night
+- Don't show sleep dialog in singleplayer
+
+1.1.1
+-----
+- Prevent possbile crash by trying to reposition leaving players

mods/beds/README.txt

@@ -0,0 +1,29 @@
+Minetest mod "Beds"
+===================
+by BlockMen (c) 2014-2015
+
+Version: 1.1.1
+
+About
+~~~~~
+This mod adds a bed to Minetest which allows to skip the night. To sleep rightclick the bed, if playing 
+in singleplayer mode the night gets skipped imideatly. If playing on server you get shown how many other
+players are in bed too. If all players are sleeping the night gets skipped aswell. Also the night skip can be forced
+if more than 50% of the players are lying in bed and use this option.
+
+Another feature is a controled respawning. If you have slept in bed (not just lying in it) your respawn point
+is set to the beds location and you will respawn there after death.
+You can disable the respawn at beds by setting "enable_bed_respawn = false" in minetest.conf
+
+
+
+License of source code, textures: WTFPL
+---------------------------------------
+(c) Copyright BlockMen (2014-2015)
+
+
+This program is free software. It comes without any warranty, to
+the extent permitted by applicable law. You can redistribute it
+and/or modify it under the terms of the Do What The Fuck You Want
+To Public License, Version 2, as published by Sam Hocevar. See
+http://sam.zoy.org/wtfpl/COPYING for more details.

mods/beds/api.lua

@@ -0,0 +1,111 @@
+function beds.register_bed(name, def)
+	minetest.register_node(name .. "_bottom", {
+		description = def.description,
+		inventory_image = def.inventory_image,
+		wield_image = def.wield_image,
+		drawtype = "nodebox",
+		tiles = def.tiles.bottom,
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		stack_max = 1,
+		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 1},
+		sounds = default.node_sound_wood_defaults(),
+		node_box = {
+			type = "fixed",
+			fixed = def.nodebox.bottom,
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = def.selectionbox,
+				
+		},
+		after_place_node = function(pos, placer, itemstack)
+			local n = minetest.get_node_or_nil(pos)
+			if not n or not n.param2 then
+				minetest.remove_node(pos)
+				return true
+			end
+			local dir = minetest.facedir_to_dir(n.param2)
+			local p = vector.add(pos, dir)
+			local n2 = minetest.get_node_or_nil(p)
+			local def = n2 and minetest.registered_items[n2.name]
+			if not def or not def.buildable_to then
+				minetest.remove_node(pos)
+				return true
+			end
+			minetest.set_node(p, {name = n.name:gsub("%_bottom", "_top"), param2 = n.param2})
+			return false
+		end,	
+		on_destruct = function(pos)
+			local n = minetest.get_node_or_nil(pos)
+			if not n then return end
+			local dir = minetest.facedir_to_dir(n.param2)
+			local p = vector.add(pos, dir)
+			local n2 = minetest.get_node(p)
+			if minetest.get_item_group(n2.name, "bed") == 2 and n.param2 == n2.param2 then
+				minetest.remove_node(p)
+			end
+		end,
+		on_rightclick = function(pos, node, clicker)
+			beds.on_rightclick(pos, clicker)
+		end,
+		on_rotate = function(pos, node, user, mode, new_param2)
+			local dir = minetest.facedir_to_dir(node.param2)
+			local p = vector.add(pos, dir)
+			local node2 = minetest.get_node_or_nil(p)
+			if not node2 or not minetest.get_item_group(node2.name, "bed") == 2 or
+					not node.param2 == node2.param2 then
+				return false
+			end
+			if minetest.is_protected(p, user:get_player_name()) then
+				minetest.record_protection_violation(p, user:get_player_name())
+				return false
+			end
+			if mode ~= screwdriver.ROTATE_FACE then
+				return false
+			end
+			local newp = vector.add(pos, minetest.facedir_to_dir(new_param2))
+			local node3 = minetest.get_node_or_nil(newp)
+			local def = node3 and minetest.registered_nodes[node3.name]
+			if not def or not def.buildable_to then
+				return false
+			end
+			if minetest.is_protected(newp, user:get_player_name()) then
+				minetest.record_protection_violation(newp, user:get_player_name())
+				return false
+			end
+			node.param2 = new_param2
+			minetest.swap_node(pos, node)
+			minetest.remove_node(p)
+			minetest.set_node(newp, {name = node.name:gsub("%_bottom", "_top"), param2 = new_param2})
+			return true
+		end,
+	})
+
+	minetest.register_node(name .. "_top", {
+		drawtype = "nodebox",
+		tiles = def.tiles.top,
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
+		sounds = default.node_sound_wood_defaults(),
+		node_box = {
+			type = "fixed",
+			fixed = def.nodebox.top,
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = {0, 0, 0, 0, 0, 0},
+		},
+	})
+
+	minetest.register_alias(name, name .. "_bottom")
+
+	-- register recipe
+	minetest.register_craft({
+		output = name,
+		recipe = def.recipe
+	})
+end

mods/beds/beds.lua

@@ -0,0 +1,88 @@
+-- fancy shaped bed
+beds.register_bed("beds:fancy_bed", {
+	description = "Fancy Bed",
+	inventory_image = "beds_bed_fancy.png",
+	wield_image = "beds_bed_fancy.png",
+	tiles = {
+	    bottom = {
+		"beds_bed_top1.png",
+		"default_wood.png",
+		"beds_bed_side1.png",
+		"beds_bed_side1.png^[transformFX",
+		"default_wood.png",
+		"beds_bed_foot.png",
+	    },
+	    top = {
+		"beds_bed_top2.png",
+		"default_wood.png",
+		"beds_bed_side2.png",
+		"beds_bed_side2.png^[transformFX",
+		"beds_bed_head.png",
+		"default_wood.png",
+	    }
+	},
+	nodebox = {
+	    bottom = {
+		{-0.5, -0.5, -0.5, -0.375, -0.065, -0.4375},
+		{0.375, -0.5, -0.5, 0.5, -0.065, -0.4375},
+		{-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375},
+		{-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5},
+		{0.4375, -0.375, -0.5, 0.5, -0.125, 0.5},
+		{-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5},
+	      },
+	      top = {
+		{-0.5, -0.5, 0.4375, -0.375, 0.1875, 0.5},
+		{0.375, -0.5, 0.4375, 0.5, 0.1875, 0.5},
+		{-0.5, 0, 0.4375, 0.5, 0.125, 0.5},
+		{-0.5, -0.375, 0.4375, 0.5, -0.125, 0.5},
+		{-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5},
+		{0.4375, -0.375, -0.5, 0.5, -0.125, 0.5},
+		{-0.4375, -0.3125, -0.5, 0.4375, -0.0625, 0.4375},
+	      }
+	},
+	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+	recipe = {
+		{"", "", "group:stick"},
+		{"wool:red", "wool:red", "wool:white"},
+		{"group:wood", "group:wood", "group:wood"},
+	},
+})
+
+-- simple shaped bed
+beds.register_bed("beds:bed", {
+	description = "Simple Bed",
+	inventory_image = "beds_bed.png",
+	wield_image = "beds_bed.png",
+	tiles = {
+	    bottom = {
+		"beds_bed_top_bottom.png^[transformR90",
+		"default_wood.png",
+		"beds_bed_side_bottom_r.png",
+		"beds_bed_side_bottom_r.png^[transformfx",
+		"beds_transparent.png",
+		"beds_bed_side_bottom.png"
+	    },
+	    top = {
+		"beds_bed_top_top.png^[transformR90",
+		"default_wood.png", 
+		"beds_bed_side_top_r.png",
+		"beds_bed_side_top_r.png^[transformfx",
+		"beds_bed_side_top.png",
+		"beds_transparent.png",
+	    }
+	},
+	nodebox = {
+	    bottom = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+	    top = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+	},
+	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
+	recipe = {
+		{"wool:red", "wool:red", "wool:white"},
+		{"group:wood", "group:wood", "group:wood"}
+	},
+
+})
+
+-- aliases for PA's beds mod
+minetest.register_alias("beds:bed_bottom_red", "beds:bed_bottom")
+minetest.register_alias("beds:bed_top_red", "beds:bed_top")

mods/beds/depends.txt

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

mods/beds/functions.lua

@@ -0,0 +1,213 @@
+local player_in_bed = 0
+local is_sp = minetest.is_singleplayer()
+local enable_respawn = minetest.setting_getbool("enable_bed_respawn")
+if enable_respawn == nil then
+	enable_respawn = true
+end
+
+
+-- helper functions
+
+local function get_look_yaw(pos)
+	local n = minetest.get_node(pos)
+	if n.param2 == 1 then
+		return 7.9, n.param2
+	elseif n.param2 == 3 then
+		return 4.75, n.param2
+	elseif n.param2 == 0 then
+		return 3.15, n.param2
+	else
+		return 6.28, n.param2
+	end
+end
+
+local function check_in_beds(players)
+	local in_bed = beds.player
+	if not players then
+		players = minetest.get_connected_players()
+	end
+
+	for n, player in ipairs(players) do
+		local name = player:get_player_name()
+		if not in_bed[name] then
+			return false
+		end
+	end
+
+	return #players > 0
+end
+
+local function lay_down(player, pos, bed_pos, state, skip)
+	local name = player:get_player_name()
+	local hud_flags = player:hud_get_flags()
+
+	if not player or not name then
+		return
+	end
+
+	-- stand up
+	if state ~= nil and not state then
+		local p = beds.pos[name] or nil
+		if beds.player[name] ~= nil then
+			beds.player[name] = nil
+			player_in_bed = player_in_bed - 1
+		end
+		-- skip here to prevent sending player specific changes (used for leaving players)
+		if skip then
+			return
+		end
+		if p then 
+			player:setpos(p)
+		end
+
+		-- physics, eye_offset, etc
+		player:set_eye_offset({x=0,y=0,z=0}, {x=0,y=0,z=0})
+		player:set_look_yaw(math.random(1, 180)/100)
+		default.player_attached[name] = false
+		player:set_physics_override(1, 1, 1)
+		hud_flags.wielditem = true
+		default.player_set_animation(player, "stand" , 30)
+
+	-- lay down
+	else
+		beds.player[name] = 1
+		beds.pos[name] = pos
+		player_in_bed = player_in_bed + 1
+
+		-- physics, eye_offset, etc
+		player:set_eye_offset({x=0,y=-13,z=0}, {x=0,y=0,z=0})
+		local yaw, param2 = get_look_yaw(bed_pos)
+		player:set_look_yaw(yaw)
+		local dir = minetest.facedir_to_dir(param2)
+		local p = {x=bed_pos.x+dir.x/2,y=bed_pos.y,z=bed_pos.z+dir.z/2}
+		player:set_physics_override(0, 0, 0)
+		player:setpos(p)
+		default.player_attached[name] = true
+		hud_flags.wielditem = false
+		default.player_set_animation(player, "lay" , 0)
+	end
+
+	player:hud_set_flags(hud_flags)
+end
+
+local function update_formspecs(finished)
+	local ges = #minetest.get_connected_players()
+	local form_n = ""
+	local is_majority = (ges/2) < player_in_bed
+
+	if finished then
+		form_n = beds.formspec ..
+			"label[2.7,11; Good morning.]"
+	else
+		form_n = beds.formspec ..
+			"label[2.2,11;"..tostring(player_in_bed).." of "..tostring(ges).." players are in bed]"	
+		if is_majority then
+			form_n = form_n ..
+				"button_exit[2,8;4,0.75;force;Force night skip]"
+		end
+	end
+
+	for name,_ in pairs(beds.player) do
+		minetest.show_formspec(name, "beds_form", form_n)
+	end
+end
+
+
+-- public functions
+
+function beds.kick_players()
+	for name,_ in pairs(beds.player) do
+		local player = minetest.get_player_by_name(name)
+		lay_down(player, nil, nil, false)
+	end
+end
+
+function beds.skip_night()
+	minetest.set_timeofday(0.23)
+	beds.set_spawns()
+end
+
+function beds.on_rightclick(pos, player)
+	local name = player:get_player_name()
+	local ppos = player:getpos()
+	local tod = minetest.get_timeofday()
+
+	if tod > 0.2 and tod < 0.805 then
+		if beds.player[name] then
+			lay_down(player, nil, nil, false)
+		end
+		minetest.chat_send_player(name, "You can only sleep at night.")
+		return
+	end
+
+	-- move to bed
+	if not beds.player[name] then
+		lay_down(player, ppos, pos)
+	else
+		lay_down(player, nil, nil, false)
+	end
+
+	if not is_sp then
+		update_formspecs(false)
+	end
+
+	-- skip the night and let all players stand up
+	if check_in_beds() then
+		minetest.after(2, function()
+			beds.skip_night()
+			if not is_sp then
+				update_formspecs(true)
+			end
+			beds.kick_players()
+		end)
+	end
+end
+
+
+-- callbacks
+
+minetest.register_on_joinplayer(function(player)
+	beds.read_spawns()
+end)
+
+-- respawn player at bed if enabled and valid position is found
+minetest.register_on_respawnplayer(function(player)
+	if not enable_respawn then
+		return false
+	end
+	local name = player:get_player_name()
+	local pos = beds.spawn[name] or nil
+	if pos then
+		player:setpos(pos)
+		return true
+	end
+end)
+
+minetest.register_on_leaveplayer(function(player)
+	local name = player:get_player_name()
+	lay_down(player, nil, nil, false, true)
+	beds.player[name] = nil
+	if check_in_beds() then
+		minetest.after(2, function()
+			beds.skip_night()
+			update_formspecs(true)
+			beds.kick_players()
+		end)
+	end
+end)
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	if formname ~= "beds_form" then
+		return
+	end
+	if fields.quit or fields.leave then
+		lay_down(player, nil, nil, false)
+		update_formspecs(false)
+	end
+
+	if fields.force then
+		beds.skip_night()
+		update_formspecs(true)
+		beds.kick_players()
+	end
+end)

mods/beds/init.lua

@@ -0,0 +1,16 @@
+beds = {}
+beds.player = {}
+beds.pos = {}
+beds.spawn = {}
+
+beds.formspec = "size[8,15;true]"..
+		"bgcolor[#080808BB; true]"..
+		"button_exit[2,12;4,0.75;leave;Leave Bed]"
+
+local modpath = minetest.get_modpath("beds")
+
+-- load files
+dofile(modpath.."/functions.lua")
+dofile(modpath.."/api.lua")
+dofile(modpath.."/beds.lua")
+dofile(modpath.."/spawns.lua")

mods/beds/spawns.lua

@@ -0,0 +1,58 @@
+local world_path = minetest.get_worldpath()
+local org_file = world_path .. "/beds_spawns"
+local file = world_path .. "/beds_spawns"
+local bkwd = false
+
+-- check for PA's beds mod spawns
+local cf = io.open(world_path .. "/beds_player_spawns", "r")
+if cf ~= nil then
+	io.close(cf)
+	file = world_path .. "/beds_player_spawns"
+	bkwd = true
+end
+
+function beds.read_spawns()
+	local spawns = beds.spawn
+	local input = io.open(file, "r")
+	if input and not bkwd then
+		repeat
+			local x = input:read("*n")
+			if x == nil then
+            			break
+            		end
+			local y = input:read("*n")
+			local z = input:read("*n")
+			local name = input:read("*l")
+			spawns[name:sub(2)] = {x = x, y = y, z = z}
+		until input:read(0) == nil
+		io.close(input)
+	elseif input and bkwd then
+		beds.spawn = minetest.deserialize(input:read("*all"))
+		input:close()
+		beds.save_spawns()
+		os.rename(file, file .. ".backup")
+		file = org_file
+	else
+		spawns = {}
+	end
+end
+
+function beds.save_spawns()
+	if not beds.spawn then
+		return
+	end
+	local output = io.open(org_file, "w")
+	for i, v in pairs(beds.spawn) do
+		output:write(v.x.." "..v.y.." "..v.z.." "..i.."\n")
+	end
+	io.close(output)
+end
+
+function beds.set_spawns()
+	for name,_ in pairs(beds.player) do
+		local player = minetest.get_player_by_name(name)
+		local p = player:getpos()
+		beds.spawn[name] = p
+	end
+	beds.save_spawns()
+end

mods/boats/init.lua

@@ -1,4 +1,3 @@
-
 --
 -- Helper functions
 --
@@ -8,6 +7,7 @@ local function is_water(pos)
 	return minetest.get_item_group(nn, "water") ~= 0
 end
 
+
 local function get_sign(i)
 	if i == 0 then
 		return 0
@@ -16,12 +16,14 @@ local function get_sign(i)
 	end
 end
 
+
 local function get_velocity(v, yaw, y)
 	local x = -math.sin(yaw) * v
 	local z =  math.cos(yaw) * v
 	return {x = x, y = y, z = z}
 end
 
+
 local function get_v(v)
 	return math.sqrt(v.x ^ 2 + v.z ^ 2)
 end
@@ -32,9 +34,9 @@ end
 
 local boat = {
 	physical = true,
-	collisionbox = {-0.5, -0.4, -0.5, 0.5, 0.3, 0.5},
+	collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5},
 	visual = "mesh",
-	mesh = "boat.x",
+	mesh = "boat.obj",
 	textures = {"default_wood.png"},
 
 	driver = nil,
@@ -43,6 +45,7 @@ local boat = {
 	removed = false
 }
 
+
 function boat.on_rightclick(self, clicker)
 	if not clicker or not clicker:is_player() then
 		return
@@ -53,9 +56,15 @@ function boat.on_rightclick(self, clicker)
 		clicker:set_detach()
 		default.player_attached[name] = false
 		default.player_set_animation(clicker, "stand" , 30)
+		local pos = clicker:getpos()
+		pos = {x = pos.x, y = pos.y + 0.2, z = pos.z}
+		minetest.after(0.1, function()
+			clicker:setpos(pos)
+		end)
 	elseif not self.driver then
 		self.driver = clicker
-		clicker:set_attach(self.object, "", {x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
+		clicker:set_attach(self.object, "",
+			{x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
 		default.player_attached[name] = true
 		minetest.after(0.2, function()
 			default.player_set_animation(clicker, "sit" , 30)
@@ -64,6 +73,7 @@ function boat.on_rightclick(self, clicker)
 	end
 end
 
+
 function boat.on_activate(self, staticdata, dtime_s)
 	self.object:set_armor_groups({immortal = 1})
 	if staticdata then
@@ -72,11 +82,14 @@ function boat.on_activate(self, staticdata, dtime_s)
 	self.last_v = self.v
 end
 
+
 function boat.get_staticdata(self)
 	return tostring(self.v)
 end
 
-function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, direction)
+
+function boat.on_punch(self, puncher, time_from_last_punch,
+		tool_capabilities, direction)
 	if not puncher or not puncher:is_player() or self.removed then
 		return
 	end
@@ -97,6 +110,7 @@ function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, d
 	end
 end
 
+
 function boat.on_step(self, dtime)
 	self.v = get_v(self.object:getvelocity()) * get_sign(self.v)
 	if self.driver then
@@ -149,7 +163,8 @@ function boat.on_step(self, dtime)
 		else
 			new_acce = {x = 0, y = -9.8, z = 0}
 		end
-		new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y)
+		new_velo = get_velocity(self.v, self.object:getyaw(),
+			self.object:getvelocity().y)
 		self.object:setpos(self.object:getpos())
 	else
 		p.y = p.y + 1
@@ -172,7 +187,8 @@ function boat.on_step(self, dtime)
 				self.object:setpos(pos)
 				new_velo = get_velocity(self.v, self.object:getyaw(), 0)
 			else
-				new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y)
+				new_velo = get_velocity(self.v, self.object:getyaw(),
+					self.object:getvelocity().y)
 				self.object:setpos(self.object:getpos())
 			end
 		end
@@ -181,8 +197,10 @@ function boat.on_step(self, dtime)
 	self.object:setacceleration(new_acce)
 end
 
+
 minetest.register_entity("boats:boat", boat)
 
+
 minetest.register_craftitem("boats:boat", {
 	description = "Boat",
 	inventory_image = "boat_inventory.png",
@@ -206,6 +224,7 @@ minetest.register_craftitem("boats:boat", {
 	end,
 })
 
+
 minetest.register_craft({
 	output = "boats:boat",
 	recipe = {
@@ -214,4 +233,3 @@ minetest.register_craft({
 		{"group:wood", "group:wood", "group:wood"},
 	},
 })
-

mods/bucket/init.lua

@@ -34,8 +34,10 @@ end
 --    flowing = name of the flowing node
 --    itemname = name of the new bucket item (or nil if liquid is not takeable)
 --    inventory_image = texture of the new bucket item (ignored if itemname == nil)
+--    name = text description of the bucket item
+--    groups = (optional) groups of the bucket item, for example {water_bucket = 1}
 -- This function can be called from any mod (that depends on bucket).
-function bucket.register_liquid(source, flowing, itemname, inventory_image, name)
+function bucket.register_liquid(source, flowing, itemname, inventory_image, name, groups)
 	bucket.liquids[source] = {
 		source = source,
 		flowing = flowing,
@@ -49,6 +51,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 			inventory_image = inventory_image,
 			stack_max = 1,
 			liquids_pointable = true,
+			groups = groups,
 			on_place = function(itemstack, user, pointed_thing)
 				-- Must be pointing to node
 				if pointed_thing.type ~= "node" then
@@ -105,7 +108,7 @@ end
 minetest.register_craftitem("bucket:bucket_empty", {
 	description = "Empty Bucket",
 	inventory_image = "bucket.png",
-	stack_max = 1,
+	stack_max = 99,
 	liquids_pointable = true,
 	on_use = function(itemstack, user, pointed_thing)
 		-- Must be pointing to node
@@ -115,17 +118,41 @@ minetest.register_craftitem("bucket:bucket_empty", {
 		-- Check if pointing to a liquid source
 		local node = minetest.get_node(pointed_thing.under)
 		local liquiddef = bucket.liquids[node.name]
-		if liquiddef ~= nil and liquiddef.itemname ~= nil and
+		local item_count = user:get_wielded_item():get_count()
-				node.name == liquiddef.source then
+
+		if liquiddef ~= nil
+		and liquiddef.itemname ~= nil
+		and node.name == liquiddef.source then
 			if check_protection(pointed_thing.under,
 					user:get_player_name(),
 					"take ".. node.name) then
 				return
 			end
 
+			-- default set to return filled bucket
+			local giving_back = liquiddef.itemname
+
+			-- check if holding more than 1 empty bucket
+			if item_count > 1 then
+
+				-- if space in inventory add filled bucked, otherwise drop as item
+				local inv = user:get_inventory()
+				if inv:room_for_item("main", {name=liquiddef.itemname}) then
+					inv:add_item("main", liquiddef.itemname)
+				else
+					local pos = user:getpos()
+					pos.y = math.floor(pos.y + 0.5)
+					core.add_item(pos, liquiddef.itemname)
+				end
+
+				-- set to return empty buckets minus 1
+				giving_back = "bucket:bucket_empty "..tostring(item_count-1)
+
+			end
+
 			minetest.add_node(pointed_thing.under, {name="air"})
 
-			return ItemStack(liquiddef.itemname)
+			return ItemStack(giving_back)
 		end
 	end,
 })
@@ -135,7 +162,17 @@ bucket.register_liquid(
 	"default:water_flowing",
 	"bucket:bucket_water",
 	"bucket_water.png",
-	"Water Bucket"
+	"Water Bucket",
+	{water_bucket = 1}
+)
+
+bucket.register_liquid(
+	"default:river_water_source",
+	"default:river_water_flowing",
+	"bucket:bucket_river_water",
+	"bucket_river_water.png",
+	"River Water Bucket",
+	{water_bucket = 1}
 )
 
 bucket.register_liquid(
@@ -152,3 +189,4 @@ minetest.register_craft({
 	burntime = 60,
 	replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}},
 })
+

mods/creative/init.lua

@@ -87,6 +87,10 @@ creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
 			"label[2.0,6.55;"..tostring(pagenum).."/"..tostring(pagemax).."]"..
 			"button[0.3,6.5;1.6,1;creative_prev;<<]"..
 			"button[2.7,6.5;1.6,1;creative_next;>>]"..
+			"listring[current_player;main]"..
+			"listring[current_player;craft]"..
+			"listring[current_player;main]"..
+			"listring[detached:creative;main]"..
 			"label[5,1.5;Trash:]"..
 			"list[detached:creative_trash;main;5,2;1,1;]"..
 			default.get_hotbar_bg(5,3.5)

mods/default/README.txt

@@ -24,7 +24,6 @@ Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 Cisoun's WTFPL texture pack:
   default_jungletree.png
-  default_jungletree_top.png
   default_lava.png
   default_leaves.png
   default_sapling.png
@@ -57,12 +56,10 @@ VanessaE (WTFPL):
   default_nc_front.png
   default_nc_rb.png
   default_nc_side.png
-  default_grass_*.png
   default_desert_sand.png
   default_desert_stone.png
-  default_desert_stone_brick.png
   default_sand.png
-  default_sandstone_brick.png
+  default_jungletree_top.png
 
 Calinou (CC BY-SA):
   default_brick.png
@@ -79,7 +76,6 @@ Jordach (CC BY-SA 3.0):
 PilzAdam (WTFPL):
   default_jungleleaves.png
   default_junglesapling.png
-  default_junglewood.png
   default_obsidian_glass.png
   default_obsidian_shard.png
   default_mineral_gold.png
@@ -94,7 +90,6 @@ InfinityProject (WTFPL):
 Splizard (CC BY-SA 3.0):
   default_snow.png
   default_snow_side.png
-  default_ice.png
   default_pine_sapling.png
 
 Zeg9 (CC BY-SA 3.0):
@@ -105,23 +100,39 @@ Zeg9 (CC BY-SA 3.0):
   default_gold_block.png
 
 paramat (CC BY-SA 3.0):
-  wieldhand.png, based on character.png by Jordach (CC BY-SA 3.0)
+  wieldhand.png, derived from character.png by Jordach (CC BY-SA 3.0)
   default_pinetree.png
   default_pinetree_top.png
   default_pinewood.png
+  default_sandstone_brick.png
+  default_obsidian_brick.png
+  default_river_water.png
+  default_river_water_source_animated.png
+  default_river_water_flowing_animated.png
+  default_acacia_leaves.png
+  default_acacia_sapling.png
+  default_acacia_tree.png
+  default_acacia_tree_top.png
+  default_acacia_wood.png
+  default_dry_grass.png
+  default_dry_grass_side.png
+  default_dry_grass_*.png
+  default_junglewood.png, derived from a texture by BlockMen (CC BY-SA 3.0)
+  default_grass.png, derived from a texture by Philipbenr (CC BY-SA 3.0)
+  default_grass_side.png, derived from a texture by Philipbenr (CC BY-SA 3.0)
+  default_stone_brick.png, derived from a texture by Cisoun (WTFPL)
+  default_desert_stone_brick.png, derived from a texture by VanessaE (WTFPL)
 
 brunob.santos (CC BY-SA 4.0):
   default_desert_cobble.png
 
 BlockMen (CC BY-SA 3.0):
-  default_stone_brick.png
   default_wood.png
   default_clay_brick.png
   default_iron_ingot.png
   default_gold_ingot.png
   default_tool_steelsword.png
   default_diamond.png
-  default_diamond_block.png
   default_book.png
   default_tool_*.png
   default_lava_source_animated.png
@@ -131,6 +142,8 @@ BlockMen (CC BY-SA 3.0):
   default_chest_lock.png
   default_chest_side.png
   default_chest_top.png
+  default_mineral_mese.png
+  default_meselamp.png
   bubble.png
   heart.png
   gui_*.png
@@ -142,9 +155,20 @@ Neuromancer (CC BY-SA 3.0):
   default_dirt.png
   default_furnace_*.png
 
-Philipbenr (CC BY-SA 3.0):
+Gambit (WTFPL):
-  default_grass.png
+  default_bronze_ingot.png
-  default_grass_side.png
+  default_copper_ingot.png
+  default_copper_lump.png
+  default_iron_lump.png
+  default_gold_lump.png
+  default_clay_lump.png
+  default_coal.png
+  default_grass_*.png
+  default_paper.png
+  default_diamond_block.png
+
+asl97 (WTFPL):
+  default_ice.png
 
 Glass breaking sounds (CC BY 3.0):
   1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
@@ -185,14 +209,3 @@ Mito551 (sounds) (CC BY-SA):
   default_dirt_footstep.1.ogg
   default_dirt_footstep.2.ogg
   default_glass_footstep.ogg
-
-Gambit (WTFPL):
-  default_bronze_ingot.png
-  default_copper_ingot.png
-  default_copper_lump.png
-  default_iron_lump.png
-  default_gold_lump.png
-  default_clay_lump.png
-  default_coal.png
-  default_grass_*.png
-  default_paper.png

mods/default/aliases.lua

@@ -68,5 +68,9 @@ minetest.register_alias("steel_ingot", "default:steel_ingot")
 minetest.register_alias("clay_brick", "default:clay_brick")
 minetest.register_alias("snow", "default:snow")
 
--- Mese now comes in the form of blocks, ore, crystal and fragments
+-- 'mese_block' was used for a while for the block form of mese
-minetest.register_alias("default:mese", "default:mese_block")
+minetest.register_alias("default:mese_block", "default:mese")
+
+-- Aliases for corrected pine node names
+minetest.register_alias("default:pinetree", "default:pine_tree")
+minetest.register_alias("default:pinewood", "default:pine_wood")

mods/default/crafting.lua

@@ -15,9 +15,16 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:pinewood 4',
+	output = 'default:pine_wood 4',
 	recipe = {
-		{'default:pinetree'},
+		{'default:pine_tree'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:acacia_wood 4',
+	recipe = {
+		{'default:acacia_tree'},
 	}
 })
 
@@ -324,7 +331,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:rail 15',
+	output = 'default:rail 24',
 	recipe = {
 		{'default:steel_ingot', '', 'default:steel_ingot'},
 		{'default:steel_ingot', 'group:stick', 'default:steel_ingot'},
@@ -564,6 +571,14 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:meselamp 1',
+	recipe = {
+		{'', 'default:mese_crystal',''},
+		{'default:mese_crystal', 'default:glass', 'default:mese_crystal'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:obsidian_shard 9',
 	recipe = {
@@ -788,7 +803,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:sapling",
+	recipe = "group:sapling",
 	burntime = 10,
 })
 
@@ -810,12 +825,6 @@ minetest.register_craft({
 	burntime = 370,
 })
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:junglesapling",
-	burntime = 10,
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:grass_1",
@@ -824,7 +833,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:pine_sapling",
+	recipe = "default:dry_grass_1",
-	burntime = 10,
+	burntime = 2,
 })
 

mods/default/craftitems.lua

@@ -11,10 +11,80 @@ minetest.register_craftitem("default:paper", {
 	inventory_image = "default_paper.png",
 })
 
+local function book_on_use(itemstack, user, pointed_thing)
+	local player_name = user:get_player_name()
+	local data = minetest.deserialize(itemstack:get_metadata())
+	local title, text, owner = "", "", player_name
+	if data then
+		title, text, owner = data.title, data.text, data.owner
+	end
+	local formspec
+	if owner == player_name then
+		formspec = "size[8,8]"..default.gui_bg..
+			"field[0.5,1;7.5,0;title;Title:;"..
+				minetest.formspec_escape(title).."]"..
+			"textarea[0.5,1.5;7.5,7;text;Contents:;"..
+				minetest.formspec_escape(text).."]"..
+			"button_exit[2.5,7.5;3,1;save;Save]"
+	else
+		formspec = "size[8,8]"..default.gui_bg..
+			"label[0.5,0.5;by "..owner.."]"..
+			"label[0.5,0;"..minetest.formspec_escape(title).."]"..
+			"textarea[0.5,1.5;7.5,7;;"..minetest.formspec_escape(text)..";]"
+	end
+	minetest.show_formspec(user:get_player_name(), "default:book", formspec)
+end
+
+minetest.register_on_player_receive_fields(function(player, form_name, fields)
+	if form_name ~= "default:book" or not fields.save or
+			fields.title == "" or fields.text == "" then
+		return
+	end
+	local inv = player:get_inventory()
+	local stack = player:get_wielded_item()
+	local new_stack, data
+	if stack:get_name() ~= "default:book_written" then
+		local count = stack:get_count()
+		if count == 1 then
+			stack:set_name("default:book_written")
+		else
+			stack:set_count(count - 1)
+			new_stack = ItemStack("default:book_written")
+		end
+	else
+		data = minetest.deserialize(stack:get_metadata())
+	end
+	if not data then data = {} end
+	data.title = fields.title
+	data.text = fields.text
+	data.owner = player:get_player_name()
+	local data_str = minetest.serialize(data)
+	if new_stack then
+		new_stack:set_metadata(data_str)
+		if inv:room_for_item("main", new_stack) then
+			inv:add_item("main", new_stack)
+		else
+			minetest.add_item(player:getpos(), new_stack)
+		end
+	else
+		stack:set_metadata(data_str)
+	end
+	player:set_wielded_item(stack)
+end)
+
 minetest.register_craftitem("default:book", {
 	description = "Book",
 	inventory_image = "default_book.png",
 	groups = {book=1},
+	on_use = book_on_use,
+})
+
+minetest.register_craftitem("default:book_written", {
+	description = "Book With Text",
+	inventory_image = "default_book.png",
+	groups = {book=1, not_in_creative_inventory=1},
+	stack_max = 1,
+	on_use = book_on_use,
 })
 
 minetest.register_craftitem("default:coal_lump", {

mods/default/functions.lua

@@ -83,27 +83,30 @@ function default.node_sound_glass_defaults(table)
 	return table
 end
 
+
 --
 -- Lavacooling
 --
 
 default.cool_lava_source = function(pos)
 	minetest.set_node(pos, {name = "default:obsidian"})
-	minetest.sound_play("default_cool_lava", {pos = pos,  gain = 0.25})
+	minetest.sound_play("default_cool_lava",
+		{pos = pos, max_hear_distance = 16, gain = 0.25})
 end
 
 default.cool_lava_flowing = function(pos)
 	minetest.set_node(pos, {name = "default:stone"})
-	minetest.sound_play("default_cool_lava", {pos = pos,  gain = 0.25})
+	minetest.sound_play("default_cool_lava",
+		{pos = pos, max_hear_distance = 16, gain = 0.25})
 end
 
 minetest.register_abm({
 	nodenames = {"default:lava_flowing"},
 	neighbors = {"group:water"},
 	interval = 1,
-	chance = 1,
+	chance = 2,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(...)
-		default.cool_lava_flowing(pos, node, active_object_count, active_object_count_wider)
+		default.cool_lava_flowing(...)
 	end,
 })
 
@@ -111,38 +114,72 @@ minetest.register_abm({
 	nodenames = {"default:lava_source"},
 	neighbors = {"group:water"},
 	interval = 1,
-	chance = 1,
+	chance = 2,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(...)
-		default.cool_lava_source(pos, node, active_object_count, active_object_count_wider)
+		default.cool_lava_source(...)
 	end,
 })
 
+
 --
 -- Papyrus and cactus growing
 --
 
+-- wrapping the functions in abm action is necessary to make overriding them possible
+
+function default.grow_cactus(pos, node)
+	if node.param2 >= 4 then
+		return
+	end
+	pos.y = pos.y - 1
+	if minetest.get_item_group(minetest.get_node(pos).name, "sand") == 0 then
+		return
+	end
+	pos.y = pos.y + 1
+	local height = 0
+	while node.name == "default:cactus" and height < 4 do
+		height = height + 1
+		pos.y = pos.y + 1
+		node = minetest.get_node(pos)
+	end
+	if height == 4 or node.name ~= "air" then
+		return
+	end
+	minetest.set_node(pos, {name = "default:cactus"})
+	return true
+end
+
+function default.grow_papyrus(pos, node)
+	pos.y = pos.y - 1
+	local name = minetest.get_node(pos).name
+	if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
+		return
+	end
+	if not minetest.find_node_near(pos, 3, {"group:water"}) then
+		return
+	end
+	pos.y = pos.y + 1
+	local height = 0
+	while node.name == "default:papyrus" and height < 4 do
+		height = height + 1
+		pos.y = pos.y + 1
+		node = minetest.get_node(pos)
+	end
+	if height == 4 or node.name ~= "air" then
+		return
+	end
+	minetest.set_node(pos, {name = "default:papyrus"})
+	return true
+end
+
 minetest.register_abm({
 	nodenames = {"default:cactus"},
 	neighbors = {"group:sand"},
 	interval = 50,
 	chance = 20,
-	action = function(pos, node)
+	action = function(...)
-		pos.y = pos.y-1
+		default.grow_cactus(...)
-		local name = minetest.get_node(pos).name
-		if minetest.get_item_group(name, "sand") ~= 0 then
-			pos.y = pos.y+1
-			local height = 0
-			while minetest.get_node(pos).name == "default:cactus" and height < 4 do
-				height = height+1
-				pos.y = pos.y+1
 	end
-			if height < 4 then
-				if minetest.get_node(pos).name == "air" then
-					minetest.set_node(pos, {name="default:cactus"})
-				end
-			end
-		end
-	end,
 })
 
 minetest.register_abm({
@@ -150,28 +187,12 @@ minetest.register_abm({
 	neighbors = {"default:dirt", "default:dirt_with_grass"},
 	interval = 50,
 	chance = 20,
-	action = function(pos, node)
+	action = function(...)
-		pos.y = pos.y-1
+		default.grow_papyrus(...)
-		local name = minetest.get_node(pos).name
-		if name == "default:dirt" or name == "default:dirt_with_grass" then
-			if minetest.find_node_near(pos, 3, {"group:water"}) == nil then
-				return
 	end
-			pos.y = pos.y+1
-			local height = 0
-			while minetest.get_node(pos).name == "default:papyrus" and height < 4 do
-				height = height+1
-				pos.y = pos.y+1
-			end
-			if height < 4 then
-				if minetest.get_node(pos).name == "air" then
-					minetest.set_node(pos, {name="default:papyrus"})
-				end
-			end
-		end
-	end,
 })
 
+
 --
 -- dig upwards
 --
@@ -185,6 +206,7 @@ function default.dig_up(pos, node, digger)
 	end
 end
 
+
 --
 -- Leafdecay
 --
@@ -233,8 +255,10 @@ minetest.register_abm({
 			if trunkp then
 				local n = minetest.get_node(trunkp)
 				local reg = minetest.registered_nodes[n.name]
-				-- Assume ignore is a trunk, to make the thing work at the border of the active area
+				-- Assume ignore is a trunk, to make the thing
-				if n.name == "ignore" or (reg and reg.groups.tree and reg.groups.tree ~= 0) then
+				-- work at the border of the active area
+				if n.name == "ignore" or (reg and reg.groups.tree and
+						reg.groups.tree ~= 0) then
 					--print("cached trunk still exists")
 					return
 				end
@@ -248,7 +272,8 @@ minetest.register_abm({
 		end
 		default.leafdecay_trunk_find_allow_accumulator =
 				default.leafdecay_trunk_find_allow_accumulator - 1
-		-- Assume ignore is a trunk, to make the thing work at the border of the active area
+		-- Assume ignore is a trunk, to make the thing
+		-- work at the border of the active area
 		local p1 = minetest.find_node_near(p0, d, {"ignore", "group:tree"})
 		if p1 then
 			do_preserve = true
@@ -279,6 +304,7 @@ minetest.register_abm({
 	end
 })
 
+
 --
 -- Grass growing
 --
@@ -291,9 +317,9 @@ minetest.register_abm({
 		local above = {x = pos.x, y = pos.y + 1, z = pos.z}
 		local name = minetest.get_node(above).name
 		local nodedef = minetest.registered_nodes[name]
-		if nodedef and (nodedef.sunlight_propagates or nodedef.paramtype == "light")
+		if nodedef and (nodedef.sunlight_propagates or nodedef.paramtype == "light") and
-				and nodedef.liquidtype == "none"
+				nodedef.liquidtype == "none" and
-				and (minetest.get_node_light(above) or 0) >= 13 then
+				(minetest.get_node_light(above) or 0) >= 13 then
 			if name == "default:snow" or name == "default:snowblock" then
 				minetest.set_node(pos, {name = "default:dirt_with_snow"})
 			else
@@ -304,17 +330,18 @@ minetest.register_abm({
 })
 
 minetest.register_abm({
-	nodenames = {"default:dirt_with_grass"},
+	nodenames = {"default:dirt_with_grass", "default:dirt_with_dry_grass"},
 	interval = 2,
 	chance = 20,
 	action = function(pos, node)
 		local above = {x = pos.x, y = pos.y + 1, z = pos.z}
 		local name = minetest.get_node(above).name
 		local nodedef = minetest.registered_nodes[name]
-		if name ~= "ignore" and nodedef
+		if name ~= "ignore" and nodedef and not ((nodedef.sunlight_propagates or
-				and not ((nodedef.sunlight_propagates or nodedef.paramtype == "light")
+				nodedef.paramtype == "light") and
-				and nodedef.liquidtype == "none") then
+				nodedef.liquidtype == "none") then
 			minetest.set_node(pos, {name = "default:dirt"})
 		end
 	end
 })
+

mods/default/furnace.lua

@@ -18,6 +18,10 @@ local function active_formspec(fuel_percent, item_percent)
 		"list[current_name;dst;4.75,0.96;2,2;]"..
 		"list[current_player;main;0,4.25;8,1;]"..
 		"list[current_player;main;0,5.5;8,3;8]"..
+		"listring[current_name;dst]"..
+		"listring[current_player;main]"..
+		"listring[current_name;src]"..
+		"listring[current_player;main]"..
 		default.get_hotbar_bg(0, 4.25)
 	return formspec
 end
@@ -34,6 +38,10 @@ local inactive_formspec =
 	"list[current_name;dst;4.75,0.96;2,2;]"..
 	"list[current_player;main;0,4.25;8,1;]"..
 	"list[current_player;main;0,5.5;8,3;8]"..
+	"listring[current_name;dst]"..
+	"listring[current_player;main]"..
+	"listring[current_name;src]"..
+	"listring[current_player;main]"..
 	default.get_hotbar_bg(0, 4.25)
 
 --

mods/default/init.lua

@@ -30,6 +30,8 @@ default.gui_survival_form = "size[8,8.5]"..
 			"list[current_player;craft;1.75,0.5;3,3;]"..
 			"list[current_player;craftpreview;5.75,1.5;1,1;]"..
 			"image[4.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
+			"listring[current_player;main]"..
+			"listring[current_player;craft]"..
 			default.get_hotbar_bg(0,4.25)
 
 -- Load files

mods/default/nodes.lua

@@ -1,5 +1,15 @@
 -- mods/default/nodes.lua
 
+
+--[[ Node name convention:
+
+Although many node names are in combined-word form, the required form for new
+node names is words separated by underscores. If both forms are used in written
+language (for example pinewood and pine wood) the underscore form should be used.
+
+--]]
+
+
 --[[ Index:
 
 Stone
@@ -28,6 +38,7 @@ Soft / Non-Stone
 default:dirt
 default:dirt_with_grass
 default:dirt_with_grass_footsteps
+default:dirt_with_dry_grass
 default:dirt_with_snow
 
 default:sand
@@ -57,11 +68,16 @@ default:junglewood
 default:jungleleaves
 default:junglesapling
 
-default:pinetree
+default:pine_tree
-default:pinewood
+default:pine_wood
 default:pine_needles
 default:pine_sapling
 
+default:acacia_tree
+default:acacia_wood
+default:acacia_leaves
+default:acacia_sapling
+
 Ores
 ----
 (1. In stone 2. Block)
@@ -91,12 +107,19 @@ default:cactus
 default:papyrus
 default:dry_shrub
 default:junglegrass
+
 default:grass_1
 default:grass_2
 default:grass_3
 default:grass_4
 default:grass_5
 
+default:dry_grass_1
+default:dry_grass_2
+default:dry_grass_3
+default:dry_grass_4
+default:dry_grass_5
+
 Liquids
 -------
 (1. Source 2. Flowing)
@@ -104,6 +127,9 @@ Liquids
 default:water_source
 default:water_flowing
 
+default:river_water_source
+default:river_water_flowing
+
 default:lava_source
 default:lava_flowing
 
@@ -127,6 +153,8 @@ default:rail
 
 default:brick
 
+default:meselamp
+
 Misc
 ----
 default:cloud
@@ -142,7 +170,6 @@ default:nyancat_rainbow
 minetest.register_node("default:stone", {
 	description = "Stone",
 	tiles = {"default_stone.png"},
-	is_ground_content = true,
 	groups = {cracky=3, stone=1},
 	drop = 'default:cobble',
 	legacy_mineral = true,
@@ -152,7 +179,7 @@ minetest.register_node("default:stone", {
 minetest.register_node("default:cobble", {
 	description = "Cobblestone",
 	tiles = {"default_cobble.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=3, stone=2},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -160,6 +187,7 @@ minetest.register_node("default:cobble", {
 minetest.register_node("default:stonebrick", {
 	description = "Stone Brick",
 	tiles = {"default_stone_brick.png"},
+	is_ground_content = false,
 	groups = {cracky=2, stone=1},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -167,7 +195,7 @@ minetest.register_node("default:stonebrick", {
 minetest.register_node("default:mossycobble", {
 	description = "Mossy Cobblestone",
 	tiles = {"default_mossycobble.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=3, stone=1},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -177,7 +205,6 @@ minetest.register_node("default:mossycobble", {
 minetest.register_node("default:desert_stone", {
 	description = "Desert Stone",
 	tiles = {"default_desert_stone.png"},
-	is_ground_content = true,
 	groups = {cracky=3, stone=1},
 	drop = 'default:desert_cobble',
 	legacy_mineral = true,
@@ -187,7 +214,7 @@ minetest.register_node("default:desert_stone", {
 minetest.register_node("default:desert_cobble", {
 	description = "Desert Cobblestone",
 	tiles = {"default_desert_cobble.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=3, stone=2},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -195,6 +222,7 @@ minetest.register_node("default:desert_cobble", {
 minetest.register_node("default:desert_stonebrick", {
 	description = "Desert Stone Brick",
 	tiles = {"default_desert_stone_brick.png"},
+	is_ground_content = false,
 	groups = {cracky=2, stone=1},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -204,7 +232,6 @@ minetest.register_node("default:desert_stonebrick", {
 minetest.register_node("default:sandstone", {
 	description = "Sandstone",
 	tiles = {"default_sandstone.png"},
-	is_ground_content = true,
 	groups = {crumbly=2,cracky=3},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -212,7 +239,7 @@ minetest.register_node("default:sandstone", {
 minetest.register_node("default:sandstonebrick", {
 	description = "Sandstone Brick",
 	tiles = {"default_sandstone_brick.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=2},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -222,7 +249,6 @@ minetest.register_node("default:sandstonebrick", {
 minetest.register_node("default:obsidian", {
 	description = "Obsidian",
 	tiles = {"default_obsidian.png"},
-	is_ground_content = true,
 	sounds = default.node_sound_stone_defaults(),
 	groups = {cracky=1,level=2},
 })
@@ -230,6 +256,7 @@ minetest.register_node("default:obsidian", {
 minetest.register_node("default:obsidianbrick", {
 	description = "Obsidian Brick",
 	tiles = {"default_obsidian_brick.png"},
+	is_ground_content = false,
 	sounds = default.node_sound_stone_defaults(),
 	groups = {cracky=1,level=2},
 })
@@ -241,15 +268,15 @@ minetest.register_node("default:obsidianbrick", {
 minetest.register_node("default:dirt", {
 	description = "Dirt",
 	tiles = {"default_dirt.png"},
-	is_ground_content = true,
 	groups = {crumbly=3,soil=1},
 	sounds = default.node_sound_dirt_defaults(),
 })
 
 minetest.register_node("default:dirt_with_grass", {
 	description = "Dirt with Grass",
-	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	tiles = {"default_grass.png", "default_dirt.png",
-	is_ground_content = true,
+		{name = "default_dirt.png^default_grass_side.png",
+			tileable_vertical = false}},
 	groups = {crumbly=3,soil=1},
 	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
@@ -259,8 +286,9 @@ minetest.register_node("default:dirt_with_grass", {
 
 minetest.register_node("default:dirt_with_grass_footsteps", {
 	description = "Dirt with Grass and Footsteps",
-	tiles = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	tiles = {"default_grass.png^default_footprint.png", "default_dirt.png",
-	is_ground_content = true,
+		{name = "default_dirt.png^default_grass_side.png",
+			tileable_vertical = false}},
 	groups = {crumbly=3,soil=1,not_in_creative_inventory=1},
 	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
@@ -268,10 +296,24 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 	}),
 })
 
+minetest.register_node("default:dirt_with_dry_grass", {
+	description = "Dirt with Dry Grass",
+	tiles = {"default_dry_grass.png",
+		"default_dirt.png",
+		{name = "default_dirt.png^default_dry_grass_side.png",
+			tileable_vertical = false}},
+	groups = {crumbly = 3, soil = 1},
+	drop = 'default:dirt',
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name = "default_grass_footstep", gain = 0.4},
+	}),
+})
+
 minetest.register_node("default:dirt_with_snow", {
 	description = "Dirt with Snow",
-	tiles = {"default_snow.png", "default_dirt.png", "default_dirt.png^default_snow_side.png"},
+	tiles = {"default_snow.png", "default_dirt.png",
-	is_ground_content = true,
+		{name = "default_dirt.png^default_snow_side.png",
+			tileable_vertical = false}},
 	groups = {crumbly=3,soil=1},
 	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
@@ -280,11 +322,9 @@ minetest.register_node("default:dirt_with_snow", {
 })
 
 
-
 minetest.register_node("default:sand", {
 	description = "Sand",
 	tiles = {"default_sand.png"},
-	is_ground_content = true,
 	groups = {crumbly=3, falling_node=1, sand=1},
 	sounds = default.node_sound_sand_defaults(),
 })
@@ -292,7 +332,6 @@ minetest.register_node("default:sand", {
 minetest.register_node("default:desert_sand", {
 	description = "Desert Sand",
 	tiles = {"default_desert_sand.png"},
-	is_ground_content = true,
 	groups = {crumbly=3, falling_node=1, sand=1},
 	sounds = default.node_sound_sand_defaults(),
 })
@@ -302,7 +341,6 @@ minetest.register_node("default:desert_sand", {
 minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tiles = {"default_gravel.png"},
-	is_ground_content = true,
 	groups = {crumbly=2, falling_node=1},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_gravel_footstep", gain=0.5},
@@ -315,7 +353,6 @@ minetest.register_node("default:gravel", {
 minetest.register_node("default:clay", {
 	description = "Clay",
 	tiles = {"default_clay.png"},
-	is_ground_content = true,
 	groups = {crumbly=3},
 	drop = 'default:clay_lump 4',
 	sounds = default.node_sound_dirt_defaults(),
@@ -328,14 +365,13 @@ minetest.register_node("default:snow", {
 	tiles = {"default_snow.png"},
 	inventory_image = "default_snowball.png",
 	wield_image = "default_snowball.png",
-	is_ground_content = true,
 	paramtype = "light",
 	buildable_to = true,
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.5, -0.5,  0.5, -0.5+2/16, 0.5},
+			{-0.5, -0.5, -0.5, 0.5, -0.25, 0.5},
 		},
 	},
 	groups = {crumbly = 3, falling_node = 1},
@@ -351,12 +387,11 @@ minetest.register_node("default:snow", {
 		end
 	end,
 })
-minetest.register_alias("snow", "default:snow")
+
 
 minetest.register_node("default:snowblock", {
 	description = "Snow Block",
 	tiles = {"default_snow.png"},
-	is_ground_content = true,
 	groups = {crumbly=3},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_snow_footstep", gain=0.25},
@@ -369,7 +404,7 @@ minetest.register_node("default:snowblock", {
 minetest.register_node("default:ice", {
 	description = "Ice",
 	tiles = {"default_ice.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	paramtype = "light",
 	groups = {cracky=3},
 	sounds = default.node_sound_glass_defaults(),
@@ -393,6 +428,7 @@ minetest.register_node("default:tree", {
 minetest.register_node("default:wood", {
 	description = "Wooden Planks",
 	tiles = {"default_wood.png"},
+	is_ground_content = false,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -405,8 +441,8 @@ minetest.register_node("default:sapling", {
 	inventory_image = "default_sapling.png",
 	wield_image = "default_sapling.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
-	is_ground_content = true,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
@@ -421,6 +457,7 @@ minetest.register_node("default:leaves", {
 	waving = 1,
 	visual_scale = 1.3,
 	tiles = {"default_leaves.png"},
+	special_tiles = {"default_leaves_simple.png"},
 	paramtype = "light",
 	is_ground_content = false,
 	groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
@@ -453,13 +490,13 @@ minetest.register_node("default:apple", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	is_ground_content = true,
+	is_ground_content = false,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
 	},
 	groups = {fleshy=3,dig_immediate=3,flammable=2,leafdecay=3,leafdecay_drop=1},
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(2),
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = function(pos, placer, itemstack)
@@ -485,6 +522,7 @@ minetest.register_node("default:jungletree", {
 minetest.register_node("default:junglewood", {
 	description = "Junglewood Planks",
 	tiles = {"default_junglewood.png"},
+	is_ground_content = false,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -495,6 +533,7 @@ minetest.register_node("default:jungleleaves", {
 	waving = 1,
 	visual_scale = 1.3,
 	tiles = {"default_jungleleaves.png"},
+	special_tiles = {"default_jungleleaves_simple.png"},
 	paramtype = "light",
 	is_ground_content = false,
 	groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
@@ -526,6 +565,7 @@ minetest.register_node("default:junglesapling", {
 	inventory_image = "default_junglesapling.png",
 	wield_image = "default_junglesapling.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
@@ -537,9 +577,10 @@ minetest.register_node("default:junglesapling", {
 
 
 
-minetest.register_node("default:pinetree", {
+minetest.register_node("default:pine_tree", {
 	description = "Pine Tree",
-	tiles = {"default_pinetree_top.png", "default_pinetree_top.png", "default_pinetree.png"},
+	tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png",
+		"default_pine_tree.png"},
 	paramtype2 = "facedir",
 	is_ground_content = false,
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
@@ -548,9 +589,10 @@ minetest.register_node("default:pinetree", {
 	on_place = minetest.rotate_node
 })
 
-minetest.register_node("default:pinewood", {
+minetest.register_node("default:pine_wood", {
-	description = "Pinewood Planks",
+	description = "Pine Wood Planks",
-	tiles = {"default_pinewood.png"},
+	tiles = {"default_pine_wood.png"},
+	is_ground_content = false,
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -567,16 +609,8 @@ minetest.register_node("default:pine_needles",{
 	drop = {
 		max_items = 1,
 		items = {
-			{
+			{items = {"default:pine_sapling"}, rarity = 20},
-				-- player will get sapling with 1/20 chance
+			{items = {"default:pine_needles"}}
-				items = {"default:pine_sapling"},
-				rarity = 20,
-			},
-			{
-				-- player will get leaves only if he get no saplings,
-				-- this is because max_items is 1
-				items = {"default:pine_needles"},
-			}
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
@@ -592,13 +626,73 @@ minetest.register_node("default:pine_sapling", {
 	inventory_image = "default_pine_sapling.png",
 	wield_image = "default_pine_sapling.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
-	is_ground_content = true,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
 	},
-	groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
+	groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+		attached_node = 1, sapling = 1},
+	sounds = default.node_sound_leaves_defaults(),
+})
+
+minetest.register_node("default:acacia_tree", {
+	description = "Acacia Tree",
+	tiles = {"default_acacia_tree_top.png", "default_acacia_tree_top.png",
+		"default_acacia_tree.png"},
+	paramtype2 = "facedir",
+	is_ground_content = false,
+	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
+	sounds = default.node_sound_wood_defaults(),
+
+	on_place = minetest.rotate_node
+})
+
+minetest.register_node("default:acacia_wood", {
+	description = "Acacia Wood Planks",
+	tiles = {"default_acacia_wood.png"},
+	is_ground_content = false,
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("default:acacia_leaves", {
+	description = "Acacia Leaves",
+	drawtype = "allfaces_optional",
+	visual_scale = 1.3,
+	tiles = {"default_acacia_leaves.png"},
+	paramtype = "light",
+	is_ground_content = false,
+	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {"default:acacia_sapling"}, rarity = 20},
+			{items = {"default:acacia_leaves"}}
+		}
+	},
+	sounds = default.node_sound_leaves_defaults(),
+
+	after_place_node = default.after_place_leaves,
+})
+
+minetest.register_node("default:acacia_sapling", {
+	description = "Acacia Tree Sapling",
+	drawtype = "plantlike",
+	visual_scale = 1.0,
+	tiles = {"default_acacia_sapling.png"},
+	inventory_image = "default_acacia_sapling.png",
+	wield_image = "default_acacia_sapling.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
+	},
+	groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+		attached_node = 1, sapling = 1},
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -609,7 +703,6 @@ minetest.register_node("default:pine_sapling", {
 minetest.register_node("default:stone_with_coal", {
 	description = "Coal Ore",
 	tiles = {"default_stone.png^default_mineral_coal.png"},
-	is_ground_content = true,
 	groups = {cracky=3},
 	drop = 'default:coal_lump',
 	sounds = default.node_sound_stone_defaults(),
@@ -618,7 +711,7 @@ minetest.register_node("default:stone_with_coal", {
 minetest.register_node("default:coalblock", {
 	description = "Coal Block",
 	tiles = {"default_coal_block.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=3},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -628,7 +721,6 @@ minetest.register_node("default:coalblock", {
 minetest.register_node("default:stone_with_iron", {
 	description = "Iron Ore",
 	tiles = {"default_stone.png^default_mineral_iron.png"},
-	is_ground_content = true,
 	groups = {cracky=2},
 	drop = 'default:iron_lump',
 	sounds = default.node_sound_stone_defaults(),
@@ -637,7 +729,7 @@ minetest.register_node("default:stone_with_iron", {
 minetest.register_node("default:steelblock", {
 	description = "Steel Block",
 	tiles = {"default_steel_block.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=1,level=2},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -647,7 +739,6 @@ minetest.register_node("default:steelblock", {
 minetest.register_node("default:stone_with_copper", {
 	description = "Copper Ore",
 	tiles = {"default_stone.png^default_mineral_copper.png"},
-	is_ground_content = true,
 	groups = {cracky=2},
 	drop = 'default:copper_lump',
 	sounds = default.node_sound_stone_defaults(),
@@ -656,7 +747,7 @@ minetest.register_node("default:stone_with_copper", {
 minetest.register_node("default:copperblock", {
 	description = "Copper Block",
 	tiles = {"default_copper_block.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=1,level=2},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -664,7 +755,7 @@ minetest.register_node("default:copperblock", {
 minetest.register_node("default:bronzeblock", {
 	description = "Bronze Block",
 	tiles = {"default_bronze_block.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=1,level=2},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -674,27 +765,28 @@ minetest.register_node("default:bronzeblock", {
 minetest.register_node("default:stone_with_mese", {
 	description = "Mese Ore",
 	tiles = {"default_stone.png^default_mineral_mese.png"},
-	is_ground_content = true,
+	paramtype = "light",
 	groups = {cracky = 1},
 	drop = "default:mese_crystal",
 	sounds = default.node_sound_stone_defaults(),
+	light_source = 1,
 })
 
 minetest.register_node("default:mese", {
 	description = "Mese Block",
 	tiles = {"default_mese_block.png"},
-	is_ground_content = true,
+	paramtype = "light",
 	groups = {cracky = 1, level = 2},
 	sounds = default.node_sound_stone_defaults(),
+	light_source = 3,
 })
-minetest.register_alias("default:mese_block", "default:mese")
+
 
 
 
 minetest.register_node("default:stone_with_gold", {
 	description = "Gold Ore",
 	tiles = {"default_stone.png^default_mineral_gold.png"},
-	is_ground_content = true,
 	groups = {cracky=2},
 	drop = "default:gold_lump",
 	sounds = default.node_sound_stone_defaults(),
@@ -703,7 +795,7 @@ minetest.register_node("default:stone_with_gold", {
 minetest.register_node("default:goldblock", {
 	description = "Gold Block",
 	tiles = {"default_gold_block.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=1},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -713,7 +805,6 @@ minetest.register_node("default:goldblock", {
 minetest.register_node("default:stone_with_diamond", {
 	description = "Diamond Ore",
 	tiles = {"default_stone.png^default_mineral_diamond.png"},
-	is_ground_content = true,
 	groups = {cracky=1},
 	drop = "default:diamond",
 	sounds = default.node_sound_stone_defaults(),
@@ -722,7 +813,7 @@ minetest.register_node("default:stone_with_diamond", {
 minetest.register_node("default:diamondblock", {
 	description = "Diamond Block",
 	tiles = {"default_diamond_block.png"},
-	is_ground_content = true,
+	is_ground_content = false,
 	groups = {cracky=1,level=3},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -735,7 +826,6 @@ minetest.register_node("default:cactus", {
 	description = "Cactus",
 	tiles = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
 	paramtype2 = "facedir",
-	is_ground_content = true,
 	groups = {snappy=1,choppy=3,flammable=2},
 	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node,
@@ -752,8 +842,8 @@ minetest.register_node("default:papyrus", {
 	inventory_image = "default_papyrus.png",
 	wield_image = "default_papyrus.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
-	is_ground_content = true,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
@@ -775,8 +865,8 @@ minetest.register_node("default:dry_shrub", {
 	inventory_image = "default_dry_shrub.png",
 	wield_image = "default_dry_shrub.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
-	is_ground_content = true,
 	buildable_to = true,
 	groups = {snappy=3,flammable=3,attached_node=1},
 	sounds = default.node_sound_leaves_defaults(),
@@ -795,9 +885,9 @@ minetest.register_node("default:junglegrass", {
 	inventory_image = "default_junglegrass.png",
 	wield_image = "default_junglegrass.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
 	buildable_to = true,
-	is_ground_content = true,
 	groups = {snappy=3,flammable=2,flora=1,attached_node=1},
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@@ -815,8 +905,8 @@ minetest.register_node("default:grass_1", {
 	inventory_image = "default_grass_3.png",
 	wield_image = "default_grass_3.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
-	is_ground_content = true,
 	buildable_to = true,
 	groups = {snappy=3,flammable=3,flora=1,attached_node=1},
 	sounds = default.node_sound_leaves_defaults(),
@@ -842,9 +932,9 @@ for i=2,5 do
 		inventory_image = "default_grass_"..i..".png",
 		wield_image = "default_grass_"..i..".png",
 		paramtype = "light",
+		sunlight_propagates = true,
 		walkable = false,
 		buildable_to = true,
-		is_ground_content = true,
 		drop = "default:grass_1",
 		groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
 		sounds = default.node_sound_leaves_defaults(),
@@ -855,6 +945,54 @@ for i=2,5 do
 	})
 end
 
+minetest.register_node("default:dry_grass_1", {
+	description = "Dry Grass",
+	drawtype = "plantlike",
+	waving = 1,
+	tiles = {"default_dry_grass_1.png"},
+	inventory_image = "default_dry_grass_3.png",
+	wield_image = "default_dry_grass_3.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	groups = {snappy=3,flammable=3,flora=1,attached_node=1},
+	sounds = default.node_sound_leaves_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	},
+
+	on_place = function(itemstack, placer, pointed_thing)
+		-- place a random dry grass node
+		local stack = ItemStack("default:dry_grass_"..math.random(1,5))
+		local ret = minetest.item_place(stack, placer, pointed_thing)
+		return ItemStack("default:dry_grass_1 "..itemstack:get_count()-(1-ret:get_count()))
+	end,
+})
+
+for i=2,5 do
+	minetest.register_node("default:dry_grass_"..i, {
+		description = "Dry Grass",
+		drawtype = "plantlike",
+		waving = 1,
+		tiles = {"default_dry_grass_"..i..".png"},
+		inventory_image = "default_dry_grass_"..i..".png",
+		wield_image = "default_dry_grass_"..i..".png",
+		paramtype = "light",
+		sunlight_propagates = true,
+		walkable = false,
+		buildable_to = true,
+		groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
+		drop = "default:dry_grass_1",
+		sounds = default.node_sound_leaves_defaults(),
+		selection_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+		},
+	})
+end
+
 --
 -- Liquids
 --
@@ -893,13 +1031,14 @@ minetest.register_node("default:water_source", {
 	pointable = false,
 	diggable = false,
 	buildable_to = true,
+	is_ground_content = false,
 	drop = "",
 	drowning = 1,
 	liquidtype = "source",
 	liquid_alternative_flowing = "default:water_flowing",
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = 1,
-	post_effect_color = {a=64, r=100, g=100, b=200},
+	post_effect_color = {a=120, r=30, g=60, b=90},
 	groups = {water=3, liquid=3, puts_out_fire=1},
 })
 
@@ -937,13 +1076,108 @@ minetest.register_node("default:water_flowing", {
 	pointable = false,
 	diggable = false,
 	buildable_to = true,
+	is_ground_content = false,
 	drop = "",
 	drowning = 1,
 	liquidtype = "flowing",
 	liquid_alternative_flowing = "default:water_flowing",
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = 1,
-	post_effect_color = {a=64, r=100, g=100, b=200},
+	post_effect_color = {a=120, r=30, g=60, b=90},
+	groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1},
+})
+
+
+minetest.register_node("default:river_water_source", {
+	description = "River Water Source",
+	inventory_image = minetest.inventorycube("default_river_water.png"),
+	drawtype = "liquid",
+	tiles = {
+		{
+			name = "default_river_water_source_animated.png",
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 2.0,
+			},
+		},
+	},
+	special_tiles = {
+		{
+			name = "default_river_water_source_animated.png",
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 2.0,
+			},
+			backface_culling = false,
+		},
+	},
+	alpha = 160,
+	paramtype = "light",
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	is_ground_content = false,
+	drop = "",
+	drowning = 1,
+	liquidtype = "source",
+	liquid_alternative_flowing = "default:river_water_flowing",
+	liquid_alternative_source = "default:river_water_source",
+	liquid_viscosity = 1,
+	liquid_renewable = false,
+	liquid_range = 2,
+	post_effect_color = {a=120, r=30, g=76, b=90},
+	groups = {water=3, liquid=3, puts_out_fire=1},
+})
+
+minetest.register_node("default:river_water_flowing", {
+	description = "Flowing River Water",
+	inventory_image = minetest.inventorycube("default_river_water.png"),
+	drawtype = "flowingliquid",
+	tiles = {"default_river_water.png"},
+	special_tiles = {
+		{
+			name = "default_river_water_flowing_animated.png",
+			backface_culling = false,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 0.8,
+			},
+		},
+		{
+			name = "default_river_water_flowing_animated.png",
+			backface_culling = true,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 0.8,
+			},
+		},
+	},
+	alpha = 160,
+	paramtype = "light",
+	paramtype2 = "flowingliquid",
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	is_ground_content = false,
+	drop = "",
+	drowning = 1,
+	liquidtype = "flowing",
+	liquid_alternative_flowing = "default:river_water_flowing",
+	liquid_alternative_source = "default:river_water_source",
+	liquid_viscosity = 1,
+	liquid_renewable = false,
+	liquid_range = 2,
+	post_effect_color = {a=120, r=30, g=76, b=90},
 	groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1},
 })
 
@@ -983,6 +1217,7 @@ minetest.register_node("default:lava_source", {
 	pointable = false,
 	diggable = false,
 	buildable_to = true,
+	is_ground_content = false,
 	drop = "",
 	drowning = 1,
 	liquidtype = "source",
@@ -1029,6 +1264,7 @@ minetest.register_node("default:lava_flowing", {
 	pointable = false,
 	diggable = false,
 	buildable_to = true,
+	is_ground_content = false,
 	drop = "",
 	drowning = 1,
 	liquidtype = "flowing",
@@ -1106,6 +1342,8 @@ local chest_formspec =
 	"list[current_name;main;0,0.3;8,4;]"..
 	"list[current_player;main;0,4.85;8,1;]"..
 	"list[current_player;main;0,6.08;8,3;8]"..
+	"listring[current_name;main]"..
+	"listring[current_player;main]"..
 	default.get_hotbar_bg(0,4.85)
 
 local function get_locked_chest_formspec(pos)
@@ -1118,6 +1356,8 @@ local function get_locked_chest_formspec(pos)
 		"list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"..
 		"list[current_player;main;0,4.85;8,1;]"..
 		"list[current_player;main;0,6.08;8,3;8]"..
+		"listring[nodemeta:".. spos .. ";main]"..
+		"listring[current_player;main]"..
 		default.get_hotbar_bg(0,4.85)
  return formspec
 end
@@ -1234,6 +1474,7 @@ minetest.register_node("default:chest_locked", {
 			)
 		end
 	end,
+	on_blast = function() end,
 })
 
 
@@ -1246,6 +1487,8 @@ local bookshelf_formspec =
 	"list[context;books;0,0.3;8,2;]"..
 	"list[current_player;main;0,2.85;8,1;]"..
 	"list[current_player;main;0,4.08;8,3;8]"..
+	"listring[context;books]"..
+	"listring[current_player;main]"..
 	default.get_hotbar_bg(0,2.85)
 
 minetest.register_node("default:bookshelf", {
@@ -1287,7 +1530,8 @@ minetest.register_node("default:bookshelf", {
 		local stack = inv:get_stack(from_list, from_index)
 		local to_stack = inv:get_stack(to_list, to_index)
 		if to_list == "books" then
-			if stack:get_name() == "default:book" and to_stack:is_empty() then
+			if minetest.get_item_group(stack:get_name(), "book") ~= 0
+					and to_stack:is_empty() then
 				return 1
 			else
 				return 0
@@ -1361,6 +1605,7 @@ minetest.register_node("default:ladder", {
 	wield_image = "default_ladder.png",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
+	sunlight_propagates = true,
 	walkable = false,
 	climbable = true,
 	is_ground_content = false,
@@ -1383,6 +1628,7 @@ minetest.register_node("default:fence_wood", {
 	inventory_image = fence_texture,
 	wield_image = fence_texture,
 	paramtype = "light",
+	sunlight_propagates = true,
 	is_ground_content = false,
 	selection_box = {
 		type = "fixed",
@@ -1426,6 +1672,7 @@ minetest.register_node("default:rail", {
 	inventory_image = "default_rail.png",
 	wield_image = "default_rail.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
 	is_ground_content = false,
 	selection_box = {
@@ -1433,7 +1680,7 @@ minetest.register_node("default:rail", {
                 -- but how to specify the dimensions for curved and sideways rails?
                 fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
 	},
-	groups = {bendy=2,dig_immediate=2,attached_node=1},
+	groups = {bendy=2,dig_immediate=2,attached_node=1,connect_to_raillike=minetest.raillike_group("rail")},
 })
 
 
@@ -1446,6 +1693,19 @@ minetest.register_node("default:brick", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+
+minetest.register_node("default:meselamp", {
+	description = "Mese Lamp",
+	drawtype = "glasslike",
+	tiles = {"default_meselamp.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {cracky = 3, oddly_breakable_by_hand = 3},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = default.LIGHT_MAX,
+})
+
 --
 -- Misc
 --
@@ -1453,6 +1713,7 @@ minetest.register_node("default:brick", {
 minetest.register_node("default:cloud", {
 	description = "Cloud",
 	tiles = {"default_cloud.png"},
+	is_ground_content = false,
 	sounds = default.node_sound_defaults(),
 	groups = {not_in_creative_inventory=1},
 })

mods/default/player.lua

@@ -15,7 +15,7 @@ function default.player_register_model(name, def)
 end
 
 -- Default player appearance
-default.player_register_model("character.x", {
+default.player_register_model("character.b3d", {
 	animation_speed = 30,
 	textures = {"character.png", },
 	animations = {
@@ -93,7 +93,7 @@ end
 -- Update appearance when the player joins
 minetest.register_on_joinplayer(function(player)
 	default.player_attached[player:get_player_name()] = false
-	default.player_set_model(player, "character.x")
+	default.player_set_model(player, "character.b3d")
 	player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30)
 	
 	-- set GUI