Tnt: Avoid divide-by-zero errors in calc_velocity()

Fix the glitch when players use the '-' character in their username
on a server, causing creative inventory to not pass page 2

README.txt

@@ -1,22 +1,23 @@
-The main game for the Minetest game engine [minetest_game]
-==========================================================
+Minetest Game [minetest_game]
+=============================
+The main subgame for the Minetest engine
+========================================
 
-To use this game with Minetest, insert this repository as
+To use this subgame with the Minetest engine, insert this repository as
 	/games/minetest_game
-in the Minetest Engine.
 
-The Minetest Engine can be found in:
+The Minetest engine can be found in:
 	https://github.com/minetest/minetest/
 
 Compatibility
 --------------
-The minetest_game github master HEAD is generally compatible with the github
-master HEAD of minetest.
+The Minetest Game github master HEAD is generally compatible with the github
+master HEAD of the Minetest engine.
 
-Additionally, when the minetest engine is tagged to be a certain version (eg.
-0.4.10), minetest_game is tagged with the version too.
+Additionally, when the Minetest engine is tagged to be a certain version (eg.
+0.4.10), Minetest Game is tagged with the version too.
 
-When stable releases are made, minetest_game is packaged and made available in
+When stable releases are made, Minetest Game is packaged and made available in
 	http://minetest.net/download
 and in case the repository has grown too much, it may be reset. In that sense,
 this is not a "real" git repository. (Package maintainers please note!)
@@ -49,4 +50,4 @@ Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 http://creativecommons.org/licenses/by-sa/3.0/
 
 License of menu/header.png
-Copyright (C) 2013 BlockMen CC BY-3.0
+Copyright (C) 2015 paramat CC BY-SA 3.0

game.conf

@@ -1 +1 @@
-name = Minetest
+name = Minetest Game

game_api.txt

@@ -1,59 +1,60 @@
-minetest_game API
-======================
+Minetest Game API
+=================
 GitHub Repo: https://github.com/minetest/minetest_game
 
 Introduction
 ------------
-The minetest_game gamemode offers multiple new possibilities in addition to Minetest's built-in API, allowing you to
-add new plants to farming mod, buckets for new liquids, new stairs and custom panes.
+
+The Minetest Game subgame offers multiple new possibilities in addition to the Minetest engine's built-in API,
+allowing you to add new plants to farming mod, buckets for new liquids, new stairs and custom panes.
 For information on the Minetest API, visit https://github.com/minetest/minetest/blob/master/doc/lua_api.txt
 Please note:
-	[XYZ] refers to a section the Minetest API
-	[#ABC] refers to a section in this document
-	^ Explanation for line above
+
+ * [XYZ] refers to a section the Minetest API
+ * [#ABC] refers to a section in this document
 
 Bucket API
 ----------
+
 The bucket API allows registering new types of buckets for non-default liquids.
 
+
 	bucket.register_liquid(
-		"default:lava_source",		-- Source node name
-		"default:lava_flowing",		-- Flowing node name
-		"bucket:bucket_lava",		-- Name to be used for bucket
-		"bucket_lava.png",			-- Bucket texture (for wielditem and inventory_image)
-		"Lava Bucket"				-- Bucket description
+		"default:lava_source",   -- name of the source node
+		"default:lava_flowing",  -- name of the flowing node
+		"bucket:bucket_lava",    -- name of the new bucket item (or nil if liquid is not takeable)
+		"bucket_lava.png",       -- texture of the new bucket item (ignored if itemname == nil)
+		"Lava Bucket",           -- text description of the bucket item
+		{lava_bucket = 1}        -- groups of the bucket item, OPTIONAL
 	)
 
 Beds API
 --------
+
 	beds.register_bed(
 		"beds:bed",    -- Bed name
-		def: See [#Bed definition]	-- Bed definition
+		def            -- See [#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
+ * `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
 
-#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
-	    }
+			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
+			bottom = 'regular nodebox',     -- bottom part of bed (see [Node boxes])
+			top = 'regular nodebox',        -- top part of bed (see [Node boxes])
 		},
-	selectionbox = regular nodebox, see [Node boxes],	-- for both nodeboxes
+		selectionbox = 'regular nodebox',  -- for both nodeboxes (see [Node boxes])
 		recipe = {                                         -- Craft recipe
 			{"group:wool", "group:wool", "group:wool"},
 			{"group:wood", "group:wood", "group:wood"}
@@ -62,65 +63,123 @@ Beds API
 
 Doors API
 ---------
+
 The doors mod allows modders to register custom doors and trapdoors.
 
-doors.register_door(name, def)
-^ name: "Door name"
-^ def: See [#Door definition]
- -> Registers new door
+`doors.register_door(name, def)`
 
-doors.register_trapdoor(name, def)
-^ name: "Trapdoor name"
-^ def: See [#Trapdoor definition]
- -> Registers new trapdoor
+ * Registers new door
+ * `name` Name for door
+ * `def`  See [#Door definition]
+
+`doors.register_trapdoor(name, def)`
+
+ * Registers new trapdoor
+ * `name` Name for trapdoor
+ * `def`  See [#Trapdoor definition]
+
+`doors.register_fencegate(name, def)`
+
+ * Registers new fence gate
+ * `name` Name for fence gate
+ * `def`  See [#Fence gate definition]
+
+`doors.get(pos)`
+
+ * `pos` A position as a table, e.g `{x = 1, y = 1, z = 1}`
+ * Returns an ObjectRef to a door, or nil if the position does not contain a door
+
+    ### Methods
+
+        :open(player)   -- Open the door object, returns if door was opened
+        :close(player)  -- Close the door object, returns if door was closed
+        :toggle(player) -- Toggle the door state, returns if state was toggled
+        :state()        -- returns the door state, true = open, false = closed
+
+    the "player" parameter can be omitted in all methods. If passed then
+    the usual permission checks will be performed to make sure the player
+    has the permissions needed to open this door. If omitted then no
+    permission checks are performed.
+
+### Door definition
 
-#Door definition
-----------------
-{
 	description = "Door description",
 	inventory_image = "mod_door_inv.png",
-	groups = {group = 1},
-	tiles_bottom: [Tile definition],
-	^ the tiles of the bottom part of the door {front, side}
-	tiles_top: [Tile definition],
-	^ the tiles of the bottom part of the door {front, side}
-	node_box_bottom = regular nodebox, see [Node boxes], OPTIONAL,
-	node_box_top = regular nodebox, see [Node boxes], OPTIONAL,
-	selection_box_bottom = regular nodebox, see [Node boxes], OPTIONAL,
-	selection_box_top = regular nodebox, see [Node boxes], OPTIONAL,
-	sound_open_door = sound play for open door, OPTIONAL,
-	sound_close_door = sound play for close door, OPTIONAL,
-	only_placer_can_open = true/false,
-	^ If true, only placer can open the door (locked for others)
-}
+	groups = {choppy = 2},
+	tiles = {"mod_door.png"}, -- UV map.
+	recipe = craftrecipe,
+	sounds = default.node_sound_wood_defaults(), -- optional
+	sound_open = sound play for open door, -- optional
+	sound_close = sound play for close door, -- optional
+	protected = false, -- If true, only placer can open the door (locked for others)
 
-#Trapdoor definition
-----------------
-{
-	tile_front = "doors_trapdoor.png",
-	^ the texture for the front and back of the trapdoor
-	tile_side: "doors_trapdoor_side.png",
-	^ the tiles of the four side parts of the trapdoor
-	sound_open = sound to play when opening the trapdoor, OPTIONAL,
-	sound_close = sound to play when closing the trapdoor, OPTIONAL,
-	-> You can add any other node definition properties for minetest.register_node,
-	   such as wield_image, inventory_image, sounds, groups, description, ...
-	   Only node_box, selection_box, tiles, drop, drawtype, paramtype, paramtype2, on_rightclick
-	   will be overwritten by the trapdoor registration function
-}
+### Trapdoor definition
+
+	description = "Trapdoor description",
+	inventory_image = "mod_trapdoor_inv.png",
+	groups = {choppy = 2},
+	tile_front = "doors_trapdoor.png", -- the texture for the front and back of the trapdoor
+	tile_side = "doors_trapdoor_side.png", -- the tiles of the four side parts of the trapdoor
+	sounds = default.node_sound_wood_defaults(), -- optional
+	sound_open = sound play for open door, -- optional
+	sound_close = sound play for close door, -- optional
+	protected = false, -- If true, only placer can open the door (locked for others)
+
+### Fence gate definition
+
+	description = "Wooden Fence Gate",
+	texture = "default_wood.png",
+	material = "default:wood",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults(), -- optional
+
+Fence API
+---------
+
+Allows creation of new fences with "fencelike" drawtype.
+
+`default.register_fence(name, item definition)`
+
+ Registers a new fence. Custom fields texture and material are required, as
+ are name and description. The rest is optional. You can pass most normal
+ nodedef fields here except drawtype. The fence group will always be added
+ for this node.
+
+### fence definition
+
+	name = "default:fence_wood",
+	description = "Wooden Fence",
+	texture = "default_wood.png",
+	material = "default:wood",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults(),
+
+Walls API
+---------
+
+The walls API allows easy addition of stone auto-connecting wall nodes.
+
+walls.register(name, desc, texture, mat, sounds)
+^ name = "walls:stone_wall". Node name.
+^ desc = "A Stone wall"
+^ texture = "default_stone.png"
+^ mat = "default:stone". Used to auto-generate crafting recipe.
+^ sounds = sounds: see [#Default sounds]
 
 Farming API
 -----------
+
 The farming API allows you to easily register plants and hoes.
 
-farming.register_hoe(name, hoe definition)
- -> Register a new hoe, see [#hoe definition]
+`farming.register_hoe(name, hoe definition)`
+ * Register a new hoe, see [#hoe definition]
+
+`farming.register_plant(name, Plant definition)`
+ * Register a new growing plant, see [#Plant definition]
+
+### Hoe Definition
 
-farming.register_plant(name, Plant definition)
- -> Register a new growing plant, see [#Plant definition]
 
-#Hoe Definition
----------------
 	{
 		description = "",                      -- Description for tooltip
 		inventory_image = "unknown_item.png",  -- Image to be used as wield- and inventory image
@@ -133,90 +192,208 @@ farming.register_plant(name, Plant definition)
 		}
 	}
 
-#Plant definition
------------------
+### 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 each 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
 	}
 
+Fire API
+--------
+
+New node def property:
+
+`on_burn(pos)`
+
+ * Called when fire attempts to remove a burning node.
+ * `pos` Position of the burning node.
+
+Give Initial Stuff API
+----------------------
+
+`give_initial_stuff.give(player)`
+
+^ Give initial stuff to "player"
+
+`give_initial_stuff.add(stack)`
+
+^ Add item to the initial stuff
+^ Stack can be an ItemStack or a item name eg: "default:dirt 99"
+^ Can be called after the game has loaded
+
+`give_initial_stuff.clear()`
+
+^ Removes all items from the initial stuff
+^ Can be called after the game has loaded
+
+`give_initial_stuff.get_list()`
+
+^ returns list of item stacks
+
+`give_initial_stuff.set_list(list)`
+
+^ List of initial items with numeric indices.
+
+`give_initial_stuff.add_from_csv(str)`
+
+^ str is a comma separated list of initial stuff
+^ Adds items to the list of items to be given
+
+
+TNT API
+----------
+
+`tnt.register_tnt(definition)`
+
+^ Register a new type of tnt.
+
+ * `name` The name of the node. If no prefix is given `tnt` is used.
+ * `description` A description for your TNT.
+ * `radius` The radius within which the TNT can destroy nodes. The default is 3.
+ * `damage_radius` The radius within which the TNT can damage players and mobs. By default it is twice the `radius`.
+ * `disable_drops` Disable drops. By default it is set to false.
+ * `ignore_protection` Don't check `minetest.is_protected` before removing a node.
+ * `ignore_on_blast` Don't call `on_blast` even if a node has one.
+ * `tiles` Textures for node
+  * `side`  Side tiles. By default the name of the tnt with a suffix of `_side.png`.
+  * `top`  Top tile. By default the name of the tnt with a suffix of `_top.png`.
+  * `bottom` Bottom tile. By default the name of the tnt with a suffix of `_bottom.png`.
+  * `burning` Top tile when lit. By default the name of the tnt with a suffix of `_top_burning_animated.png".
+
+`tnt.boom(position, definition)`
+
+^ Create an explosion.
+
+* `position` The center of explosion.
+* `definition` The TNT definion as passed to `tnt.register`
+
+`tnt.burn(position)`
+
+^ Ignite TNT at position
+
+
+To make dropping items from node inventories easier, you can use the
+following helper function from 'default':
+
+default.get_inventory_drops(pos, inventory, drops)
+
+^ Return drops from node inventory "inventory" in drops.
+
+* `pos` - the node position
+* `inventory` - the name of the inventory (string)
+* `drops` - an initialized list
+
+The function returns no values. The drops are returned in the `drops`
+parameter, and drops is not reinitialized so you can call it several
+times in a row to add more inventory items to it.
+
+
+`on_blast` callbacks:
+
+Both nodedefs and entitydefs can provide an `on_blast()` callback
+
+`nodedef.on_blast(pos, intensity)`
+^ Allow drop and node removal overriding
+* `pos` - node position
+* `intensity` - TNT explosion measure. larger or equal to 1.0
+^ Should return a list of drops (e.g. {"default:stone"})
+^ Should perform node removal itself. If callback exists in the nodedef
+^ then the TNT code will not destroy this node.
+
+`entitydef.on_blast(luaobj, damage)`
+^ Allow TNT effects on entities to be overridden
+* `luaobj` - LuaEntityRef of the entity
+* `damage` - suggested HP damage value
+^ Should return a list of (bool do_damage, bool do_knockback, table drops)
+* `do_damage` - if true then TNT mod wil damage the entity
+* `do_knockback` - if true then TNT mod will knock the entity away
+* `drops` - a list of drops, e.g. {"wool:red"}
+
+
 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
+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
+ * 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
-delivered with minetest_game, to keep them compatible with other mods.
+delivered with Minetest Game, to keep them compatible with other mods.
 
-stairs.register_stair(subname, recipeitem, groups, images, description, sounds)
- -> Registers a stair.
- -> subname: Basically the material name (e.g. cobble) used for the stair name. Nodename pattern: "stairs:stair_subname"
- -> recipeitem: Item used in the craft recipe, e.g. "default:cobble"
- -> groups: see [Known damage and digging time defining groups]
- -> images: see [Tile definition]
- -> description: used for the description field in the stair's definition
- -> sounds: see [#Default sounds]
+`stairs.register_stair(subname, recipeitem, groups, images, description, sounds)`
 
-stairs.register_slab(subname, recipeitem, groups, images, description, sounds)
- -> Registers a slabs
- -> subname: Basically the material name (e.g. cobble) used for the stair name. Nodename pattern: "stairs:stair_subname"
- -> recipeitem: Item used in the craft recipe, e.g. "default:cobble"
- -> groups: see [Known damage and digging time defining groups]
- -> images: see [Tile definition]
- -> description: used for the description field in the stair's definition
- -> sounds: see [#Default sounds]
+ * Registers a stair.
+ * `subname`: Basically the material name (e.g. cobble) used for the stair name. Nodename pattern: "stairs:stair_subname"
+ * `recipeitem`: Item used in the craft recipe, e.g. "default:cobble"
+ * `groups`: see [Known damage and digging time defining groups]
+ * `images`: see [Tile definition]
+ * `description`: used for the description field in the stair's definition
+ * `sounds`: see [#Default sounds]
 
-stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds)
- -> A wrapper for stairs.register_stair and stairs.register_slab
- -> Uses almost the same arguments as stairs.register_stair
- -> desc_stair: Description for stair node
- -> desc_slab: Description for slab node
+`stairs.register_slab(subname, recipeitem, groups, images, description, sounds)`
+
+ * Registers a slabs
+ * `subname`: Basically the material name (e.g. cobble) used for the stair name. Nodename pattern: "stairs:stair_subname"
+ * `recipeitem`: Item used in the craft recipe, e.g. "default:cobble"
+ * `groups`: see [Known damage and digging time defining groups]
+ * `images`: see [Tile definition]
+ * `description`: used for the description field in the stair's definition
+ * `sounds`: see [#Default sounds]
+
+`stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds)`
+
+ * A wrapper for stairs.register_stair and stairs.register_slab
+ * Uses almost the same arguments as stairs.register_stair
+ * `desc_stair`: Description for stair node
+ * `desc_slab`: Description for slab node
 
 Xpanes API
 ----------
+
 Creates panes that automatically connect to each other
 
-xpanes.register_pane(subname, def)
- -> subname: used for nodename. Result: "xpanes:subname" and "xpanes:subname_{2..15}"
- -> def: See [#Pane definition]
+`xpanes.register_pane(subname, def)`
+
+ * `subname`: used for nodename. Result: "xpanes:subname" and "xpanes:subname_{2..15}"
+ * `def`: See [#Pane definition]
+
+### Pane definition
 
-#Pane definition
-----------------
 	{
-	textures = {"texture_Bottom_top", "texture_left_right", "texture_front_back"},
-	^ More tiles aren't supported
-	groups = {group = rating},
-	^ Uses the known node groups, see [Known damage and digging time defining groups]
-	sounds = SoundSpec,
-	^ See [#Default sounds]
-	recipe = {{"","","","","","","","",""}},
-	^ Recipe field only
+		textures = {"texture_Bottom_top", "texture_left_right", "texture_front_back"}, -- More tiles aren't supported
+		groups = {group = rating}, -- Uses the known node groups, see [Known damage and digging time defining groups]
+		sounds = SoundSpec,        -- See [#Default sounds]
+		recipe = {{"","","","","","","","",""}}, -- 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"
@@ -229,156 +406,188 @@ of your node.
 
 Default sounds
 --------------
+
 Sounds inside the default table can be used within the sounds field of node definitions.
 
-default.node_sound_defaults()
-default.node_sound_stone_defaults()
-default.node_sound_dirt_defaults()
-default.node_sound_sand_defaults()
-default.node_sound_wood_defaults()
-default.node_sound_leaves_defaults()
-default.node_sound_glass_defaults()
+ * `default.node_sound_defaults()`
+ * `default.node_sound_stone_defaults()`
+ * `default.node_sound_dirt_defaults()`
+ * `default.node_sound_sand_defaults()`
+ * `default.node_sound_wood_defaults()`
+ * `default.node_sound_leaves_defaults()`
+ * `default.node_sound_glass_defaults()`
 
 Default constants
 -----------------
-default.LIGHT_MAX
-^ The maximum light level (see [Node definition] light_source)
+
+`default.LIGHT_MAX`  The maximum light level (see [Node definition] light_source)
 
 Player API
 ----------
+
 The player API can register player models and update the player's appearence
 
-default.player_register_model(name, def)
-^ Register a new model to be used by players.
- -> name: model filename such as "character.x", "foo.b3d", etc.
- -> def: See [#Model definition]
+`default.player_register_model(name, def)`
 
-default.registered_player_models[name]
-^ Get a model's definition
- -> see [#Model definition]
+ * Register a new model to be used by players.
+ * name: model filename such as "character.x", "foo.b3d", etc.
+ * def: See [#Model definition]
 
-default.player_set_model(player, model_name)
-^ Change a player's model
- -> player: PlayerRef
- -> model_name: model registered with player_register_model()
+`default.registered_player_models[name]`
 
-default.player_set_animation(player, anim_name [, speed])
-^ Applies an animation to a player
- -> anim_name: name of the animation.
- -> speed: frames per second. If nil, default from the model is used
+ * Get a model's definition
+ * see [#Model definition]
 
-default.player_set_textures(player, textures)
-^ Sets player textures
- -> player: PlayerRef
- -> textures: array of textures
- ^ If <textures> is nil, the default textures from the model def are used
+`default.player_set_model(player, model_name)`
+
+ * Change a player's model
+ * `player`: PlayerRef
+ * `model_name`: model registered with player_register_model()
+
+`default.player_set_animation(player, anim_name [, speed])`
+
+ * Applies an animation to a player
+ * anim_name: name of the animation.
+ * speed: frames per second. If nil, default from the model is used
+
+`default.player_set_textures(player, textures)`
+
+ * Sets player textures
+ * `player`: PlayerRef
+ * `textures`: array of textures, If `textures` is nil, the default textures from the model def are used
 
 default.player_get_animation(player)
-^ Returns a table containing fields "model", "textures" and "animation".
-^ Any of the fields of the returned table may be nil.
- -> player: PlayerRef
 
-Model Definition
-----------------
+ * Returns a table containing fields `model`, `textures` and `animation`.
+ * Any of the fields of the returned table may be nil.
+ * player: PlayerRef
+
+### Model Definition
+
 	{
 		animation_speed = 30,            -- Default animation speed, in FPS.
 		textures = {"character.png", },  -- Default array of textures.
-	visual_size = {x=1, y=1,}, -- Used to scale the model.
+		visual_size = {x = 1, y = 1},    -- Used to scale the model.
 		animations = {
-		-- <anim_name> = { x=<start_frame>, y=<end_frame>, },
-		foo = { x= 0, y=19, },
-		bar = { x=20, y=39, },
+			-- <anim_name> = {x = <start_frame>, y = <end_frame>},
+			foo = {x = 0, y = 19},
+			bar = {x = 20, y = 39},
 		-- ...
 		},
 	}
 
 Leafdecay
 ---------
-To enable leaf decay for a node, add it to the "leafdecay" group.
 
-The rating of the group determines how far from a node in the group "tree"
+To enable leaf decay for a node, add it to the `leafdecay` group.
+
+The rating of the group determines how far from a node in the group `tree`
 the node can be without decaying.
 
-If param2 of the node is ~= 0, the node will always be preserved. Thus, if
-the player places a node of that kind, you will want to set param2=1 or so.
+If `param2` of the node is ~= 0, the node will always be preserved. Thus, if
+the player places a node of that kind, you will want to set `param2 = 1` or so.
 
-The function default.after_place_leaves can be set as after_place_node of a node
+The function `default.after_place_leaves` can be set as `after_place_node of a node`
 to set param2 to 1 if the player places the node (should not be used for nodes
 that use param2 otherwise (e.g. facedir)).
 
-If the node is in the leafdecay_drop group then it will always be dropped as an
+If the node is in the `leafdecay_drop` group then it will always be dropped as an
 item.
 
 Dyes
 ----
+
 To make recipes that will work with any dye ever made by anybody, define
 them based on groups. You can select any group of groups, based on your need for
 amount of colors.
 
-#Color groups
--------------
-Base color groups:
-- basecolor_white
-- basecolor_grey
-- basecolor_black
-- basecolor_red
-- basecolor_yellow
-- basecolor_green
-- basecolor_cyan
-- basecolor_blue
-- basecolor_magenta
+### Color groups
 
-Extended color groups (* = equal to a base color):
-* excolor_white
-- excolor_lightgrey
-* excolor_grey
-- excolor_darkgrey
-* excolor_black
-* excolor_red
-- excolor_orange
-* excolor_yellow
-- excolor_lime
-* excolor_green
-- excolor_aqua
-* excolor_cyan
-- excolor_sky_blue
-* excolor_blue
-- excolor_violet
-* excolor_magenta
-- excolor_red_violet
+Base color groups:
+
+ * `basecolor_white`
+ * `basecolor_grey`
+ * `basecolor_black`
+ * `basecolor_red`
+ * `basecolor_yellow`
+ * `basecolor_green`
+ * `basecolor_cyan`
+ * `basecolor_blue`
+ * `basecolor_magenta`
+
+Extended color groups ( * means also base color )
+
+ * `excolor_white` *
+ * `excolor_lightgrey`
+ * `excolor_grey` *
+ * `excolor_darkgrey`
+ * `excolor_black` *
+ * `excolor_red` *
+ * `excolor_orange`
+ * `excolor_yellow` *
+ * `excolor_lime`
+ * `excolor_green` *
+ * `excolor_aqua`
+ * `excolor_cyan` *
+ * `excolor_sky_blue`
+ * `excolor_blue` *
+ * `excolor_violet`
+ * `excolor_magenta` *
+ * `excolor_red_violet`
 
 The whole unifieddyes palette as groups:
-- unicolor_<excolor>
+
+ * `unicolor_<excolor>`
+
 For the following, no white/grey/black is allowed:
-- unicolor_medium_<excolor>
-- unicolor_dark_<excolor>
-- unicolor_light_<excolor>
-- unicolor_<excolor>_s50
-- unicolor_medium_<excolor>_s50
-- unicolor_dark_<excolor>_s50
+
+ * `unicolor_medium_<excolor>`
+ * `unicolor_dark_<excolor>`
+ * `unicolor_light_<excolor>`
+ * `unicolor_<excolor>_s50`
+ * `unicolor_medium_<excolor>_s50`
+ * `unicolor_dark_<excolor>_s50`
 
 Example of one shapeless recipe using a color group:
+
 	minetest.register_craft({
 		type = "shapeless",
 		output = '<mod>:item_yellow',
 		recipe = {'<mod>:item_no_color', 'group:basecolor_yellow'},
 	})
 
-#Color lists
-------------
-dye.basecolors
-^ Array containing the names of available base colors
+### Color lists
 
-dye.excolors
-^ Array containing the names of the available extended colors
+ * `dye.basecolors` are an array containing the names of available base colors
+
+ * `dye.excolors` are an array containing the names of the available extended colors
 
 Trees
 -----
-default.grow_tree(pos, is_apple_tree)
-^ Grows a tree or apple tree at pos
 
-default.grow_jungle_tree(pos)
-^ Grows a jungletree at pos
+ * `default.grow_tree(pos, is_apple_tree)`
+  * Grows a mgv6 tree or apple tree at pos
 
-default.grow_pine_tree(pos)
-^ Grows a pinetree at pos
+ * `default.grow_jungle_tree(pos)`
+  * Grows a mgv6 jungletree at pos
+
+ * `default.grow_pine_tree(pos)`
+  * Grows a mgv6 pinetree at pos
+
+ * `default.grow_new_apple_tree(pos)`
+  * Grows a new design apple tree at pos
+
+ * `default.grow_new_jungle_tree(pos)`
+  * Grows a new design jungle tree at pos
+
+ * `default.grow_new_pine_tree(pos)`
+  * Grows a new design pine tree at pos
+
+ * `default.grow_new_acacia_tree(pos)`
+  * Grows a new design acacia tree at pos
+
+ * `default.grow_new_aspen_tree(pos)`
+  * Grows a new design aspen tree at pos
+
+ * `default.grow_new_snowy_pine_tree(pos)`
+  * Grows a new design snowy pine tree at pos

minetest.conf.example

@@ -1,6 +1,4 @@
-# This file contains settings of minetest_game that can be changed in
-# minetest.conf
-#
+# This file contains settings of Minetest Game that can be changed in minetest.conf
 # By default, all the settings are commented and not functional.
 # Uncomment settings by removing the preceding #.
 
@@ -11,11 +9,18 @@
 # 0 to disable
 #share_bones_time = 1200
 
-# Whether fire should be disabled (all fire nodes will instantly disappear)
+# How much earlier the bones of a dead player can be looted by
+# everyone if the player dies in a protected area they don't own.
+# 0 to disable. By default it is "share_bones_time" divide by four.
+#share_bones_time_early = 300
+
+# Whether standard fire should be disabled ('basic flame' nodes will disappear)
+# 'permanent flame' nodes will remain with either setting
 #disable_fire = false
 
-# Whether steel tools, torches and cobblestone should be given to new players
+# Whether the stuff in initial_stuff should be given to new players
 #give_initial_stuff = false
+#initial_stuff = default:pick_steel,default:axe_steel,default:shovel_steel,default:torch 99,default:cobble 99
 
 # Whether the TNT mod should be enabled
 #enable_tnt = <true in singleplayer, false in multiplayer>
@@ -26,3 +31,11 @@
 # 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
+
+# Whether you allow respawning in beds
+# Default value is true
+#enable_bed_respawn = true
+
+# Whether players can skip night by sleeping
+# Default value is true
+#enable_bed_night_skip = true

mods/beds/Changelog.txt

@@ -1,18 +0,0 @@
-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

@@ -1,5 +1,5 @@
-Minetest mod "Beds"
-===================
+Minetest Game mod: beds
+=======================
 by BlockMen (c) 2014-2015
 
 Version: 1.1.1
@@ -14,7 +14,8 @@ 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
-
+You can also disable the night skip feature by setting "enable_bed_night_skip = false" in minetest.conf or by using
+the /set command ingame.
 
 
 License of source code, textures: WTFPL

mods/beds/api.lua

@@ -1,3 +1,27 @@
+
+local reverse = true
+
+local function destruct_bed(pos, n)
+	local node = minetest.get_node(pos)
+	local other
+
+	if n == 2 then
+		local dir = minetest.facedir_to_dir(node.param2)
+		other = vector.subtract(pos, dir)
+	elseif n == 1 then
+		local dir = minetest.facedir_to_dir(node.param2)
+		other = vector.add(pos, dir)
+	end
+
+	if reverse then
+		reverse = not reverse
+		minetest.remove_node(other)
+		nodeupdate(other)
+	else
+		reverse = not reverse
+	end
+end
+
 function beds.register_bed(name, def)
 	minetest.register_node(name .. "_bottom", {
 		description = def.description,
@@ -18,38 +42,59 @@ function beds.register_bed(name, def)
 		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
+
+		on_place = function(itemstack, placer, pointed_thing)
+			local under = pointed_thing.under
+			local pos
+			if minetest.registered_items[minetest.get_node(under).name].buildable_to then
+				pos = under
+			else
+				pos = pointed_thing.above
 			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 minetest.is_protected(pos, placer:get_player_name()) and
+					not minetest.check_player_privs(placer, "protection_bypass") then
+				minetest.record_protection_violation(pos, placer:get_player_name())
+				return itemstack
+			end
+
+			local def = minetest.registered_nodes[minetest.get_node(pos).name]
 			if not def or not def.buildable_to then
-				minetest.remove_node(pos)
-				return true
+				return itemstack
 			end
-			minetest.set_node(p, {name = n.name:gsub("%_bottom", "_top"), param2 = n.param2})
-			return false
+
+			local dir = minetest.dir_to_facedir(placer:get_look_dir())
+			local botpos = vector.add(pos, minetest.facedir_to_dir(dir))
+
+			if minetest.is_protected(botpos, placer:get_player_name()) and
+					not minetest.check_player_privs(placer, "protection_bypass") then
+				minetest.record_protection_violation(botpos, placer:get_player_name())
+				return itemstack
+			end
+
+			local botdef = minetest.registered_nodes[minetest.get_node(botpos).name]
+			if not botdef or not botdef.buildable_to then
+				return itemstack
+			end
+
+			minetest.set_node(pos, {name = name .. "_bottom", param2 = dir})
+			minetest.set_node(botpos, {name = name .. "_top", param2 = dir})
+
+			if not minetest.setting_getbool("creative_mode") then
+				itemstack:take_item()
+			end
+			return itemstack
 		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
+			destruct_bed(pos, 1)
 		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)
@@ -76,9 +121,10 @@ function beds.register_bed(name, def)
 				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})
+			-- do not remove_node here - it will trigger destroy_bed()
+			minetest.set_node(p, {name = "air"})
+			minetest.set_node(pos, node)
+			minetest.set_node(newp, {name = name .. "_top", param2 = new_param2})
 			return true
 		end,
 	})
@@ -89,21 +135,21 @@ function beds.register_bed(name, def)
 		paramtype = "light",
 		paramtype2 = "facedir",
 		is_ground_content = false,
+		pointable = false,
 		groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
 		sounds = default.node_sound_wood_defaults(),
+		drop = name .. "_bottom",
 		node_box = {
 			type = "fixed",
 			fixed = def.nodebox.top,
 		},
-		selection_box = {
-			type = "fixed",
-			fixed = {0, 0, 0, 0, 0, 0},
-		},
+		on_destruct = function(pos)
+			destruct_bed(pos, 2)
+		end,
 	})
 
 	minetest.register_alias(name, name .. "_bottom")
 
-	-- register recipe
 	minetest.register_craft({
 		output = name,
 		recipe = def.recipe

mods/beds/beds.lua

@@ -1,4 +1,5 @@
--- fancy shaped bed
+-- Fancy shaped bed
+
 beds.register_bed("beds:fancy_bed", {
 	description = "Fancy Bed",
 	inventory_image = "beds_bed_fancy.png",
@@ -48,7 +49,8 @@ beds.register_bed("beds:fancy_bed", {
 	},
 })
 
--- simple shaped bed
+-- Simple shaped bed
+
 beds.register_bed("beds:bed", {
 	description = "Simple Bed",
 	inventory_image = "beds_bed.png",
@@ -80,9 +82,9 @@ beds.register_bed("beds:bed", {
 		{"wool:red", "wool:red", "wool:white"},
 		{"group:wood", "group:wood", "group:wood"}
 	},
-
 })
 
--- aliases for PA's beds mod
+-- Aliases for PilzAdam'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/functions.lua

@@ -1,3 +1,4 @@
+local pi = math.pi
 local player_in_bed = 0
 local is_sp = minetest.is_singleplayer()
 local enable_respawn = minetest.setting_getbool("enable_bed_respawn")
@@ -5,22 +6,29 @@ if enable_respawn == nil then
 	enable_respawn = true
 end
 
-
--- helper functions
+-- Helper functions
 
 local function get_look_yaw(pos)
 	local n = minetest.get_node(pos)
 	if n.param2 == 1 then
-		return 7.9, n.param2
+		return pi / 2, n.param2
 	elseif n.param2 == 3 then
-		return 4.75, n.param2
+		return -pi / 2, n.param2
 	elseif n.param2 == 0 then
-		return 3.15, n.param2
+		return pi, n.param2
 	else
-		return 6.28, n.param2
+		return 0, n.param2
 	end
 end
 
+local function is_night_skip_enabled()
+	local enable_night_skip = minetest.setting_getbool("enable_bed_night_skip")
+	if enable_night_skip == nil then
+		enable_night_skip = true
+	end
+	return enable_night_skip
+end
+
 local function check_in_beds(players)
 	local in_bed = beds.player
 	if not players then
@@ -96,14 +104,12 @@ local function update_formspecs(finished)
 	local is_majority = (ges / 2) < player_in_bed
 
 	if finished then
-		form_n = beds.formspec ..
-			"label[2.7,11; Good morning.]"
+		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]"
+		form_n = beds.formspec .. "label[2.2,11;" .. tostring(player_in_bed) ..
+			" of " .. tostring(ges) .. " players are in bed]"
+		if is_majority and is_night_skip_enabled() then
+			form_n = form_n .. "button_exit[2,8;4,0.75;force;Force night skip]"
 		end
 	end
 
@@ -113,7 +119,7 @@ local function update_formspecs(finished)
 end
 
 
--- public functions
+-- Public functions
 
 function beds.kick_players()
 	for name, _ in pairs(beds.player) do
@@ -154,17 +160,19 @@ function beds.on_rightclick(pos, player)
 	-- 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)
+				update_formspecs(is_night_skip_enabled())
 			end
+			if is_night_skip_enabled() then
+				beds.skip_night()
 				beds.kick_players()
+			end
 		end)
 	end
 end
 
 
--- callbacks
+-- Callbacks
 
 minetest.register_on_joinplayer(function(player)
 	beds.read_spawns()
@@ -189,9 +197,11 @@ minetest.register_on_leaveplayer(function(player)
 	beds.player[name] = nil
 	if check_in_beds() then
 		minetest.after(2, function()
+			update_formspecs(is_night_skip_enabled())
+			if is_night_skip_enabled() then
 				beds.skip_night()
-			update_formspecs(true)
 				beds.kick_players()
+			end
 		end)
 	end
 end)
@@ -206,8 +216,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	end
 
 	if fields.force then
+		update_formspecs(is_night_skip_enabled())
+		if is_night_skip_enabled() then
 			beds.skip_night()
-		update_formspecs(true)
 			beds.kick_players()
 		end
+	end
 end)

mods/beds/init.lua

@@ -9,7 +9,8 @@ beds.formspec = "size[8,15;true]"..
 
 local modpath = minetest.get_modpath("beds")
 
--- load files
+-- Load files
+
 dofile(modpath .. "/functions.lua")
 dofile(modpath .. "/api.lua")
 dofile(modpath .. "/beds.lua")

mods/beds/spawns.lua

@@ -41,10 +41,12 @@ function beds.save_spawns()
 	if not beds.spawn then
 		return
 	end
+	local data = {}
 	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")
+	for k, v in pairs(beds.spawn) do
+		table.insert(data, string.format("%.1f %.1f %.1f %s\n", v.x, v.y, v.z, k))
 	end
+	output:write(table.concat(data))
 	io.close(output)
 end
 
@@ -52,7 +54,10 @@ function beds.set_spawns()
 	for name,_ in pairs(beds.player) do
 		local player = minetest.get_player_by_name(name)
 		local p = player:getpos()
+		-- but don't change spawn location if borrowing a bed
+		if not minetest.is_protected(p, name) then
 			beds.spawn[name] = p
 		end
+	end
 	beds.save_spawns()
 end

mods/boats/README.txt

@@ -1,6 +1,6 @@
-Minetest 0.4 mod: boats
-=======================
-by PilzAdam, slightly modified for NeXt
+Minetest Game mod: boats
+========================
+by PilzAdam
 
 License of source code:
 -----------------------

mods/boats/init.lua

@@ -36,7 +36,7 @@ local boat = {
 	physical = true,
 	collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5},
 	visual = "mesh",
-	mesh = "boat.obj",
+	mesh = "boats_boat.obj",
 	textures = {"default_wood.png"},
 
 	driver = nil,
@@ -62,6 +62,14 @@ function boat.on_rightclick(self, clicker)
 			clicker:setpos(pos)
 		end)
 	elseif not self.driver then
+		local attach = clicker:get_attach()
+		if attach and attach:get_luaentity() then
+			local luaentity = attach:get_luaentity()
+			if luaentity.driver then
+				luaentity.driver = nil
+			end
+			clicker:set_detach()
+		end
 		self.driver = clicker
 		clicker:set_attach(self.object, "",
 			{x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
@@ -88,8 +96,7 @@ function boat.get_staticdata(self)
 end
 
 
-function boat.on_punch(self, puncher, time_from_last_punch,
-		tool_capabilities, direction)
+function boat.on_punch(self, puncher)
 	if not puncher or not puncher:is_player() or self.removed then
 		return
 	end
@@ -105,7 +112,12 @@ function boat.on_punch(self, puncher, time_from_last_punch,
 			self.object:remove()
 		end)
 		if not minetest.setting_getbool("creative_mode") then
-			puncher:get_inventory():add_item("main", "boats:boat")
+			local inv = puncher:get_inventory()
+			if inv:room_for_item("main", "boats:boat") then
+				inv:add_item("main", "boats:boat")
+			else
+				minetest.add_item(self.object:getpos(), "boats:boat")
+			end
 		end
 	end
 end
@@ -147,8 +159,8 @@ function boat.on_step(self, dtime)
 		self.v = 0
 		return
 	end
-	if math.abs(self.v) > 4.5 then
-		self.v = 4.5 * get_sign(self.v)
+	if math.abs(self.v) > 5 then
+		self.v = 5 * get_sign(self.v)
 	end
 
 	local p = self.object:getpos()
@@ -170,8 +182,8 @@ function boat.on_step(self, dtime)
 		p.y = p.y + 1
 		if is_water(p) then
 			local y = self.object:getvelocity().y
-			if y >= 4.5 then
-				y = 4.5
+			if y >= 5 then
+				y = 5
 			elseif y < 0 then
 				new_acce = {x = 0, y = 20, z = 0}
 			else
@@ -203,8 +215,8 @@ minetest.register_entity("boats:boat", boat)
 
 minetest.register_craftitem("boats:boat", {
 	description = "Boat",
-	inventory_image = "boat_inventory.png",
-	wield_image = "boat_wield.png",
+	inventory_image = "boats_inventory.png",
+	wield_image = "boats_wield.png",
 	wield_scale = {x = 2, y = 2, z = 1},
 	liquids_pointable = true,
 

mods/boats/models/boats_boat.obj

@@ -0,0 +1,358 @@
+# Blender v2.76 (sub 11) OBJ File: 'boat.blend'
+# www.blender.org
+mtllib boat.mtl
+o boats_boat
+v -6.786140 -3.033999 -9.415440
+v -6.786140 -1.967150 -9.415440
+v -6.786140 -1.967150 8.793510
+v -6.786140 -3.033999 8.793510
+v 5.732520 -1.967150 -9.415440
+v 5.732520 -3.033999 -9.415440
+v 5.732520 -3.033999 8.793510
+v 5.732520 -1.967150 8.793510
+v -2.233900 -3.033999 -9.415440
+v -2.233900 -1.967150 -9.415440
+v -2.233900 -1.967150 8.793510
+v -2.233900 -3.033999 8.793510
+v 2.318340 -3.033999 -9.415440
+v 2.318340 -1.967150 -9.415440
+v 2.318340 -1.967150 8.793510
+v 2.318340 -3.033999 8.793510
+v -3.371960 -3.033999 8.793510
+v -3.371960 -1.967150 8.793510
+v -3.371960 -1.967150 -9.415440
+v -3.371960 -3.033999 -9.415440
+v 2.318340 0.276645 8.793510
+v 1.180280 -1.967150 8.793510
+v 5.732520 0.276645 8.793510
+v 5.732520 1.039180 8.793510
+v 6.870580 0.276645 8.793510
+v 6.870580 -1.967150 8.793510
+v 2.318340 1.039180 8.793510
+v 1.180280 0.276645 8.793510
+v 1.180280 1.039180 8.793510
+v 1.180280 -3.033999 8.793510
+v -2.233900 0.276645 8.793510
+v -3.371960 0.276645 8.793510
+v -2.233900 1.039180 8.793510
+v -3.371960 1.039180 8.793510
+v -6.786140 0.276645 8.793510
+v -7.786200 0.276645 8.793510
+v -7.786200 -1.967150 8.793510
+v -6.786140 1.039180 8.793510
+v 1.180280 -1.967150 -9.415440
+v 1.180280 -3.033999 -9.415440
+v 2.318340 0.276645 -9.415440
+v 1.180280 0.276645 -9.415440
+v 2.318340 1.039180 -9.415440
+v 5.732520 0.276645 -9.415440
+v 6.870580 -1.967150 -9.415440
+v 5.732520 1.039180 -9.415440
+v 6.870580 0.276645 -9.415440
+v 0.042220 1.039180 -9.415440
+v 1.180280 1.039180 -9.415440
+v 0.042220 -1.967150 -9.415440
+v -1.095840 -1.967150 -9.415440
+v -2.233900 0.276645 -9.415440
+v -3.371960 0.276645 -9.415440
+v -2.233900 1.039180 -9.415440
+v -1.095840 1.039180 -9.415440
+v -3.371960 1.039180 -9.415440
+v -6.786140 0.276645 -9.415440
+v -6.786140 1.039180 -9.415440
+v -7.786200 -1.967150 -9.415440
+v -7.786200 0.276645 -9.415440
+v -1.095840 0.156645 -12.044100
+v -1.095840 -4.601110 -9.415440
+v -1.095840 1.039181 -10.802900
+v -1.095840 2.868579 -10.802900
+v -1.095840 2.868580 -7.883420
+v -1.095840 3.746069 -12.034100
+v -1.095840 3.746070 -7.883420
+v -1.095840 0.156645 -14.294900
+v -1.095840 -4.601110 -14.284900
+v 0.042220 -4.601110 -14.284900
+v 0.042220 -4.601110 -9.415440
+v 0.042220 1.039181 -10.802900
+v 0.042220 0.156645 -12.044100
+v 0.042220 2.868579 -10.802900
+v 0.042220 0.156645 -14.294900
+v 0.042220 3.746069 -12.034100
+v 0.042220 3.746070 -7.883420
+v 0.042220 2.868580 -7.883420
+v -1.096322 -3.033999 -9.415440
+v 0.044046 -3.035397 -9.415440
+vt 1.000000 0.187500
+vt -1.000000 0.312500
+vt 1.000000 0.312500
+vt 0.687500 1.000000
+vt 0.500000 0.875000
+vt 0.500000 0.625000
+vt -1.000000 0.062500
+vt 1.000000 0.062500
+vt 1.000000 -0.000000
+vt -1.000000 0.125000
+vt 1.000000 0.125000
+vt 0.437500 0.125000
+vt 0.312500 0.500000
+vt 0.312500 0.125000
+vt 1.000000 0.625000
+vt -1.000000 0.500000
+vt 1.000000 0.500000
+vt 0.187500 0.687500
+vt -0.187500 0.687500
+vt -0.187500 0.312500
+vt 1.000000 0.812500
+vt -1.000000 0.937500
+vt -1.000000 0.812500
+vt 0.812500 0.687500
+vt 1.187500 0.687500
+vt 0.812500 0.312500
+vt 1.000000 0.562500
+vt 0.312500 0.437500
+vt 1.000000 0.437500
+vt 1.000000 0.750000
+vt -1.000000 0.875000
+vt -1.000000 0.750000
+vt -1.000000 1.000000
+vt 1.000000 1.000000
+vt 0.437500 0.625000
+vt 0.562500 0.437500
+vt 0.562500 0.625000
+vt -1.000000 0.437500
+vt -1.000000 0.000000
+vt 0.500000 0.062500
+vt 0.375000 0.750000
+vt 0.500000 0.750000
+vt -1.000000 0.250000
+vt -1.000000 0.687500
+vt 1.000000 0.687500
+vt 0.625000 0.375000
+vt 1.000000 0.375000
+vt 1.000000 0.250000
+vt 1.000000 0.937500
+vt 0.437500 0.812500
+vt 0.312500 0.312500
+vt 0.312500 0.812500
+vt 0.437500 0.312500
+vt 0.437500 0.437500
+vt 0.687500 0.812500
+vt 0.000000 0.687500
+vt 0.000000 0.812500
+vt -1.000000 0.562500
+vt 0.875000 0.812500
+vt 0.875000 0.687500
+vt 0.250000 0.312500
+vt 0.562500 0.187500
+vt 0.250000 0.187500
+vt -1.000000 0.187500
+vt 0.312500 0.625000
+vt 0.312500 0.187500
+vt 0.312500 -0.187500
+vt 1.000000 -0.187500
+vt 0.687500 0.500000
+vt -0.000000 1.000000
+vt 0.000000 0.875000
+vt 0.437500 0.500000
+vt -1.000000 0.625000
+vt 0.812500 0.187500
+vt 1.187500 0.187500
+vt 1.187500 0.312500
+vt 1.312500 0.312500
+vt 1.312500 0.687500
+vt 0.687500 0.187500
+vt 0.687500 0.312500
+vt 1.187500 0.812500
+vt 0.812500 0.812500
+vt 0.187500 0.312500
+vt 0.312500 0.687500
+vt 0.687500 0.687500
+vt -0.187500 0.187500
+vt 0.187500 0.187500
+vt -0.312500 0.687500
+vt -0.312500 0.312500
+vt 0.187500 0.812500
+vt -0.187500 0.812500
+vt 0.437500 0.687500
+vt 0.437500 0.187500
+vt 0.562500 0.812500
+vt 0.562500 0.687500
+vt 0.312500 0.562500
+vt 1.000000 0.875000
+vt 0.375000 0.062500
+vt -1.000000 0.375000
+vt 0.625000 0.500000
+vt 0.875000 0.562500
+vt 0.937500 0.812500
+vt 0.937500 0.687500
+vt 0.875000 0.937500
+vt 0.562500 0.312500
+vn -1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 -0.002100 -1.000000
+vn 0.001200 -1.000000 0.000000
+vn 0.000000 0.002800 -1.000000
+vn -0.001200 -1.000000 0.000200
+g boats_boat_boats_boat_None
+usemtl None
+s off
+f 41/1/1 27/2/1 43/3/1
+f 76/4/2 74/5/2 72/6/2
+f 8/7/2 6/1/2 5/8/2
+f 15/9/1 13/10/1 16/11/1
+f 51/12/3 71/13/3 50/14/3
+f 56/15/2 32/16/2 53/17/2
+f 15/18/3 8/19/3 23/20/3
+f 22/21/2 40/22/2 39/23/2
+f 19/24/4 2/25/4 53/26/4
+f 70/27/5 62/28/5 69/29/5
+f 11/30/5 19/31/5 10/32/5
+f 4/15/5 20/33/5 17/34/5
+f 72/35/3 64/36/3 63/37/3
+f 13/8/5 7/38/5 16/7/5
+f 23/39/6 47/11/6 44/9/6
+f 68/40/7 70/41/7 69/42/7
+f 80/43/8 40/10/8 30/11/8
+f 3/15/1 1/32/1 4/30/1
+f 20/44/2 18/27/2 17/45/2
+f 74/17/5 65/46/5 64/47/5
+f 31/43/1 54/47/1 52/48/1
+f 22/47/5 14/43/5 15/48/5
+f 46/1/2 23/7/2 44/8/2
+f 57/21/1 38/22/1 58/49/1
+f 61/50/9 76/51/9 73/52/9
+f 37/45/5 2/23/5 3/21/5
+f 78/28/3 67/53/3 65/54/3
+f 64/5/1 66/4/1 63/6/1
+f 76/55/6 67/56/6 77/57/6
+f 47/17/2 26/10/2 45/11/2
+f 5/16/5 26/47/5 8/17/5
+f 33/58/6 48/59/6 55/60/6
+f 29/38/2 42/3/2 49/29/2
+f 32/44/6 52/21/6 53/45/6
+f 58/15/6 34/33/6 56/34/6
+f 27/7/6 46/29/6 43/8/6
+f 73/61/6 68/62/6 61/63/6
+f 21/58/6 42/29/6 28/38/6
+f 11/29/1 9/58/1 12/27/1
+f 59/45/1 36/2/1 60/3/1
+f 60/9/6 35/10/6 57/11/6
+f 41/1/1 21/64/1 27/2/1
+f 72/6/2 48/65/2 50/66/2
+f 50/66/2 71/67/2 70/68/2
+f 70/68/2 75/17/2 73/69/2
+f 76/4/2 77/70/2 74/5/2
+f 77/70/2 78/71/2 74/5/2
+f 50/66/2 70/68/2 73/69/2
+f 73/69/2 76/4/2 72/6/2
+f 72/6/2 50/66/2 73/69/2
+f 8/7/2 7/64/2 6/1/2
+f 15/9/1 14/39/1 13/10/1
+f 51/12/3 62/72/3 71/13/3
+f 56/15/2 34/73/2 32/16/2
+f 32/26/3 34/74/3 38/75/3
+f 35/76/3 36/77/3 37/78/3
+f 32/26/3 38/75/3 35/76/3
+f 29/66/3 33/79/3 31/80/3
+f 32/26/3 35/76/3 3/25/3
+f 28/51/3 29/66/3 31/80/3
+f 31/80/3 32/26/3 18/24/3
+f 3/25/3 4/81/3 17/82/3
+f 35/76/3 37/78/3 3/25/3
+f 21/83/3 28/51/3 22/84/3
+f 3/25/3 17/82/3 18/24/3
+f 11/85/3 12/55/3 30/52/3
+f 32/26/3 3/25/3 18/24/3
+f 11/85/3 30/52/3 22/84/3
+f 31/80/3 18/24/3 11/85/3
+f 24/86/3 27/87/3 21/83/3
+f 28/51/3 31/80/3 11/85/3
+f 11/85/3 22/84/3 28/51/3
+f 24/86/3 21/83/3 23/20/3
+f 26/88/3 25/89/3 23/20/3
+f 23/20/3 21/83/3 15/18/3
+f 15/18/3 16/90/3 7/91/3
+f 21/83/3 22/84/3 15/18/3
+f 8/19/3 26/88/3 23/20/3
+f 15/18/3 7/91/3 8/19/3
+f 22/21/2 30/49/2 40/22/2
+f 47/89/4 45/88/4 5/19/4
+f 5/19/4 6/91/4 13/90/4
+f 5/19/4 13/90/4 14/18/4
+f 44/20/4 47/89/4 5/19/4
+f 43/87/4 46/86/4 44/20/4
+f 41/83/4 43/87/4 44/20/4
+f 44/20/4 5/19/4 14/18/4
+f 39/84/4 40/52/4 80/50/4
+f 44/20/4 14/18/4 41/83/4
+f 42/51/4 41/83/4 39/84/4
+f 39/84/4 80/50/4 50/92/4
+f 41/83/4 14/18/4 39/84/4
+f 48/93/4 49/66/4 42/51/4
+f 50/92/4 48/93/4 42/51/4
+f 80/50/4 79/94/4 50/92/4
+f 50/92/4 42/51/4 39/84/4
+f 54/79/4 55/62/4 52/80/4
+f 50/92/4 79/94/4 51/95/4
+f 52/80/4 55/62/4 51/95/4
+f 51/95/4 79/94/4 10/85/4
+f 79/94/4 9/55/4 10/85/4
+f 53/26/4 52/80/4 10/85/4
+f 58/75/4 56/74/4 53/26/4
+f 59/78/4 60/77/4 57/76/4
+f 57/76/4 58/75/4 53/26/4
+f 52/80/4 51/95/4 10/85/4
+f 19/24/4 20/82/4 1/81/4
+f 53/26/4 10/85/4 19/24/4
+f 59/78/4 57/76/4 2/25/4
+f 19/24/4 1/81/4 2/25/4
+f 2/25/4 57/76/4 53/26/4
+f 70/27/5 71/96/5 62/28/5
+f 11/30/5 18/97/5 19/31/5
+f 4/15/5 1/73/5 20/33/5
+f 72/35/3 74/54/3 64/36/3
+f 13/8/5 6/29/5 7/38/5
+f 23/39/6 25/10/6 47/11/6
+f 68/40/7 75/98/7 70/41/7
+f 30/11/5 12/17/5 79/99/5
+f 79/99/10 80/43/10 30/11/10
+f 12/17/5 9/16/5 79/99/5
+f 3/15/1 2/73/1 1/32/1
+f 20/44/2 19/58/2 18/27/2
+f 74/17/5 78/100/5 65/46/5
+f 31/43/1 33/99/1 54/47/1
+f 22/47/5 39/99/5 14/43/5
+f 46/1/2 24/64/2 23/7/2
+f 57/21/1 35/23/1 38/22/1
+f 61/50/9 66/53/9 76/51/9
+f 37/45/5 59/44/5 2/23/5
+f 78/28/3 77/51/3 67/53/3
+f 62/67/1 51/66/1 69/68/1
+f 51/66/1 55/65/1 63/6/1
+f 68/17/1 69/68/1 61/69/1
+f 61/69/1 69/68/1 51/66/1
+f 61/69/1 51/66/1 63/6/1
+f 65/71/1 67/70/1 64/5/1
+f 61/69/1 63/6/1 66/4/1
+f 64/5/1 67/70/1 66/4/1
+f 76/55/6 66/85/6 67/56/6
+f 47/17/2 25/16/2 26/10/2
+f 5/16/5 45/99/5 26/47/5
+f 55/60/6 54/101/6 33/58/6
+f 33/58/6 29/22/6 48/59/6
+f 48/59/6 72/102/6 63/103/6
+f 29/22/6 49/104/6 48/59/6
+f 48/59/6 63/103/6 55/60/6
+f 29/38/2 28/2/2 42/3/2
+f 32/44/6 31/23/6 52/21/6
+f 58/15/6 38/73/6 34/33/6
+f 27/7/6 24/38/6 46/29/6
+f 73/61/6 75/105/6 68/62/6
+f 21/58/6 41/27/6 42/29/6
+f 11/29/1 10/38/1 9/58/1
+f 59/45/1 37/44/1 36/2/1
+f 60/9/6 36/39/6 35/10/6

mods/bones/README.txt

@@ -1,5 +1,5 @@
-Minetest 0.4 mod: bones
-=======================
+Minetest Game mod: bones
+========================
 
 License of source code:
 -----------------------

mods/bones/init.lua

@@ -5,7 +5,7 @@ bones = {}
 
 local function is_owner(pos, name)
 	local owner = minetest.get_meta(pos):get_string("owner")
-	if owner == "" or owner == name then
+	if owner == "" or owner == name or minetest.check_player_privs(name, "protection_bypass") then
 		return true
 	end
 	return false
@@ -19,10 +19,12 @@ bones.bones_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 share_bones_time = tonumber(minetest.setting_get("share_bones_time") or 1200)
-local share_bones_time_early = tonumber(minetest.setting_get("share_bones_time_early") or (share_bones_time/4))
+local share_bones_time = tonumber(minetest.setting_get("share_bones_time")) or 1200
+local share_bones_time_early = tonumber(minetest.setting_get("share_bones_time_early")) or share_bones_time / 4
 
 minetest.register_node("bones:bones", {
 	description = "Bones",
@@ -43,7 +45,11 @@ minetest.register_node("bones:bones", {
 	
 	can_dig = function(pos, player)
 		local inv = minetest.get_meta(pos):get_inventory()
-		return is_owner(pos, player:get_player_name()) and inv:is_empty("main")
+		local name = ""
+		if player then
+			name = player:get_player_name()
+		end
+		return is_owner(pos, name) and inv:is_empty("main")
 	end,
 	
 	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
@@ -76,6 +82,10 @@ minetest.register_node("bones:bones", {
 			return
 		end
 		
+		if(minetest.get_meta(pos):get_string("infotext") == "") then
+			return
+		end
+		
 		local inv = minetest.get_meta(pos):get_inventory()
 		local player_inv = player:get_inventory()
 		local has_space = true
@@ -93,6 +103,11 @@ minetest.register_node("bones:bones", {
 		
 		-- remove bones if player emptied them
 		if has_space then
+			if player_inv:room_for_item("main", {name = "bones:bones"}) then
+				player_inv:add_item("main", {name = "bones:bones"})
+			else
+				minetest.add_item(pos,"bones:bones")
+			end
 			minetest.remove_node(pos)
 		end
 	end,
@@ -108,6 +123,8 @@ minetest.register_node("bones:bones", {
 			return true
 		end
 	end,
+	on_blast = function(pos)
+	end,
 })
 
 local function may_replace(pos, player)

mods/bucket/README.txt

@@ -1,4 +1,4 @@
-Minetest 0.4 mod: bucket
+Minetest Game mod: bucket
 =========================
 
 License of source code:

mods/creative/README.txt

@@ -1,5 +1,5 @@
-Minetest 0.4 mod: creative
-==========================
+Minetest Game mod: creative
+===========================
 
 Implements creative mode.
 
@@ -13,6 +13,7 @@ are added to the creative inventory.
 License of source code and media files:
 ---------------------------------------
 Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com>
+Copyright (C) 2016 Jean-Patrick G. (kilbith) <jeanpatrick.guerrero@gmail.com>
 
 This program is free software. It comes without any warranty, to
 the extent permitted by applicable law. You can redistribute it

mods/creative/init.lua

@@ -1,13 +1,21 @@
 -- minetest/creative/init.lua
 
-creative_inventory = {}
-creative_inventory.creative_inventory_size = 0
+creative = {}
+local player_inventory = {}
+local creative_mode = minetest.setting_getbool("creative_mode")
 
 -- Create detached creative inventory after loading all mods
-minetest.after(0, function()
-	local inv = minetest.create_detached_inventory("creative", {
+creative.init_creative_inventory = function(player)
+	local player_name = player:get_player_name()
+	player_inventory[player_name] = {}
+	player_inventory[player_name].size = 0
+	player_inventory[player_name].filter = ""
+	player_inventory[player_name].start_i = 1
+	player_inventory[player_name].tab_id = 2
+
+	minetest.create_detached_inventory("creative_" .. player_name, {
 		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-			if minetest.setting_getbool("creative_mode") then
+			if creative_mode and not to_list == "main" then
 				return count
 			else
 				return 0
@@ -17,7 +25,7 @@ minetest.after(0, function()
 			return 0
 		end,
 		allow_take = function(inv, listname, index, stack, player)
-			if minetest.setting_getbool("creative_mode") then
+			if creative_mode then
 				return -1
 			else
 				return 0
@@ -28,114 +36,191 @@ minetest.after(0, function()
 		on_put = function(inv, listname, index, stack, player)
 		end,
 		on_take = function(inv, listname, index, stack, player)
-			--print(player:get_player_name().." takes item from creative inventory; listname="..dump(listname)..", index="..dump(index)..", stack="..dump(stack))
+			local player_name, stack_name = player:get_player_name(), stack:get_name()
+			--print(player_name .. " takes item from creative inventory; listname = " .. listname .. ", index = " .. index .. ", stack = " .. dump(stack:to_table()))
 			if stack then
-				minetest.log("action", player:get_player_name().." takes "..dump(stack:get_name()).." from creative inventory")
-				--print("stack:get_name()="..dump(stack:get_name())..", stack:get_count()="..dump(stack:get_count()))
+				minetest.log("action", player_name .. " takes " .. stack_name .. " from creative inventory")
+				--print("Stack name: " .. stack_name .. ", Stack count: " .. stack:get_count())
 			end
 		end,
 	})
+
+	creative.update_creative_inventory(player_name)
+	--print("creative inventory size: " .. player_inventory[player_name].size)
+end
+
+local function tab_category(tab_id)
+	local id_category = {
+		nil, -- Reserved for crafting tab.
+		minetest.registered_items,
+		minetest.registered_nodes,
+		minetest.registered_tools,
+		minetest.registered_craftitems
+	}
+
+	-- If index out of range, show default ("All") page.
+	return id_category[tab_id] or id_category[2]
+end
+
+function creative.update_creative_inventory(player_name)
 	local creative_list = {}
-	for name,def in pairs(minetest.registered_items) do
-		if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0)
-				and def.description and def.description ~= "" then
-			table.insert(creative_list, name)
+	local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name})
+	local inv = player_inventory[player_name]
+
+	for name, def in pairs(tab_category(inv.tab_id)) do
+		if not (def.groups.not_in_creative_inventory == 1) and
+				def.description and def.description ~= "" and
+				(def.name:find(inv.filter, 1, true) or
+					def.description:lower():find(inv.filter, 1, true)) then
+			creative_list[#creative_list+1] = name
 		end
 	end
+
 	table.sort(creative_list)
-	inv:set_size("main", #creative_list)
-	for _,itemstring in ipairs(creative_list) do
-		inv:add_item("main", ItemStack(itemstring))
+	player_inv:set_size("main", #creative_list)
+	player_inv:set_list("main", creative_list)
+	inv.size = #creative_list
 end
-	creative_inventory.creative_inventory_size = #creative_list
-	--print("creative inventory size: "..dump(creative_inventory.creative_inventory_size))
-end)
 
 -- Create the trash field
 local trash = minetest.create_detached_inventory("creative_trash", {
 	-- Allow the stack to be placed and remove it in on_put()
 	-- This allows the creative inventory to restore the stack
 	allow_put = function(inv, listname, index, stack, player)
-		if minetest.setting_getbool("creative_mode") then
+		if creative_mode then
 			return stack:get_count()
 		else
 			return 0
 		end
 	end,
-	on_put = function(inv, listname, index, stack, player)
-		inv:set_stack(listname, index, "")
+	on_put = function(inv, listname)
+		inv:set_list(listname, {})
 	end,
 })
 trash:set_size("main", 1)
 
+creative.formspec_add = ""
 
-creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
-	pagenum = math.floor(pagenum)
-	local pagemax = math.floor((creative_inventory.creative_inventory_size-1) / (6*4) + 1)
-	player:set_inventory_formspec(
-			"size[13,7.5]"..
-			--"image[6,0.6;1,2;player.png]"..
-			default.gui_bg..
-			default.gui_bg_img..
-			default.gui_slots..
-			"list[current_player;main;5,3.5;8,1;]"..
-			"list[current_player;main;5,4.75;8,3;8]"..
-			"list[current_player;craft;8,0;3,3;]"..
-			"list[current_player;craftpreview;12,1;1,1;]"..
-			"image[11,1;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
-			"list[detached:creative;main;0.3,0.5;4,6;"..tostring(start_i).."]"..
-			"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)
+creative.set_creative_formspec = function(player, start_i)
+	local player_name = player:get_player_name()
+	local inv = player_inventory[player_name]
+	local pagenum = math.floor(start_i / (3*8) + 1)
+	local pagemax = math.ceil(inv.size / (3*8))
+
+	player:set_inventory_formspec([[
+		size[8,8.6]
+		image[4.06,3.4;0.8,0.8;creative_trash_icon.png]
+		list[current_player;main;0,4.7;8,1;]
+		list[current_player;main;0,5.85;8,3;8]
+		list[detached:creative_trash;main;4,3.3;1,1;]
+		listring[]
+		tablecolumns[color;text;color;text]
+		tableoptions[background=#00000000;highlight=#00000000;border=false]
+		button[5.4,3.2;0.8,0.9;creative_prev;<]
+		button[7.25,3.2;0.8,0.9;creative_next;>]
+		button[2.1,3.4;0.8,0.5;creative_search;?]
+		button[2.75,3.4;0.8,0.5;creative_clear;X]
+		tooltip[creative_search;Search]
+		tooltip[creative_clear;Reset]
+		listring[current_player;main]
+		]] ..
+		"field[0.3,3.5;2.2,1;creative_filter;;" .. inv.filter .. "]" ..
+		"listring[detached:creative_" .. player_name .. ";main]" ..
+		"tabheader[0,0;creative_tabs;Crafting,All,Nodes,Tools,Items;" .. tostring(inv.tab_id) .. ";true;false]" ..
+		"list[detached:creative_" .. player_name .. ";main;0,0;8,3;" .. tostring(start_i) .. "]" ..
+		"table[6.05,3.35;1.15,0.5;pagenum;#FFFF00," .. tostring(pagenum) .. ",#FFFFFF,/ " .. tostring(pagemax) .. "]" ..
+		default.get_hotbar_bg(0,4.7) ..
+		default.gui_bg .. default.gui_bg_img .. default.gui_slots
+		.. creative.formspec_add
 	)
 end
+
+creative.set_crafting_formspec = function(player)
+	player:set_inventory_formspec([[
+		size[8,8.6]
+		list[current_player;craft;2,0.75;3,3;]
+		list[current_player;craftpreview;6,1.75;1,1;]
+		list[current_player;main;0,4.7;8,1;]
+		list[current_player;main;0,5.85;8,3;8]
+		list[detached:creative_trash;main;0,2.75;1,1;]
+		image[0.06,2.85;0.8,0.8;creative_trash_icon.png]
+		image[5,1.75;1,1;gui_furnace_arrow_bg.png^[transformR270]
+		tabheader[0,0;creative_tabs;Crafting,All,Nodes,Tools,Items;1;true;false]
+		listring[current_player;main]
+		listring[current_player;craft]
+		]] ..
+		default.get_hotbar_bg(0,4.7) ..
+		default.gui_bg .. default.gui_bg_img .. default.gui_slots
+	)
+end
+
 minetest.register_on_joinplayer(function(player)
 	-- If in creative mode, modify player's inventory forms
-	if not minetest.setting_getbool("creative_mode") then
+	if not creative_mode then
 		return
 	end
-	creative_inventory.set_creative_formspec(player, 0, 1)
+	creative.init_creative_inventory(player)
+	creative.set_creative_formspec(player, 0)
 end)
+
 minetest.register_on_player_receive_fields(function(player, formname, fields)
-	if not minetest.setting_getbool("creative_mode") then
+	if formname ~= "" or not creative_mode then
 		return
 	end
-	-- Figure out current page from formspec
-	local current_page = 0
+
+	local player_name = player:get_player_name()
+	local inv = player_inventory[player_name]
+
+	if fields.quit then
+		if inv.tab_id == 1 then
+			creative.set_crafting_formspec(player)
+		end
+	elseif fields.creative_tabs then
+		local tab = tonumber(fields.creative_tabs)
+		inv.tab_id = tab
+
+		if tab == 1 then
+			creative.set_crafting_formspec(player)
+		else
+			creative.update_creative_inventory(player_name)
+			creative.set_creative_formspec(player, 0)
+		end
+	elseif fields.creative_clear then
+		inv.filter = ""
+		creative.update_creative_inventory(player_name)
+		creative.set_creative_formspec(player, 0)
+	elseif fields.creative_search then
+		inv.filter = fields.creative_filter:lower()
+		creative.update_creative_inventory(player_name)
+		creative.set_creative_formspec(player, 0)
+	else
 		local formspec = player:get_inventory_formspec()
-	local start_i = string.match(formspec, "list%[detached:creative;main;[%d.]+,[%d.]+;[%d.]+,[%d.]+;(%d+)%]")
-	start_i = tonumber(start_i) or 0
+		local start_i = player_inventory[player_name].start_i or 0
 
 		if fields.creative_prev then
-		start_i = start_i - 4*6
-	end
-	if fields.creative_next then
-		start_i = start_i + 4*6
-	end
-
+			start_i = start_i - 3*8
 			if start_i < 0 then
-		start_i = start_i + 4*6
+				start_i = inv.size - (inv.size % (3*8))
+				if inv.size == start_i then
+					start_i = math.max(0, inv.size - (3*8))
 				end
-	if start_i >= creative_inventory.creative_inventory_size then
-		start_i = start_i - 4*6
 			end
-		
-	if start_i < 0 or start_i >= creative_inventory.creative_inventory_size then
+		elseif fields.creative_next then
+			start_i = start_i + 3*8
+			if start_i >= inv.size then
 				start_i = 0
 			end
+		end
 
-	creative_inventory.set_creative_formspec(player, start_i, start_i / (6*4) + 1)
+		player_inventory[player_name].start_i = start_i
+		creative.set_creative_formspec(player, start_i)
+	end
 end)
 
-if minetest.setting_getbool("creative_mode") then
+if creative_mode then
 	local digtime = 0.5
+	local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 3}
+
 	minetest.register_item(":", {
 		type = "none",
 		wield_image = "wieldhand.png",
@@ -145,11 +230,11 @@ if minetest.setting_getbool("creative_mode") then
 			full_punch_interval = 0.5,
 			max_drop_level = 3,
 			groupcaps = {
-				crumbly = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-				cracky = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-				snappy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-				choppy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
-				oddly_breakable_by_hand = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3},
+				crumbly = caps,
+				cracky  = caps,
+				snappy  = caps,
+				choppy  = caps,
+				oddly_breakable_by_hand = caps,
 			},
 			damage_groups = {fleshy = 10},
 		}
@@ -173,5 +258,4 @@ if minetest.setting_getbool("creative_mode") then
 			end
 		end
 	end
-	
 end

mods/default/README.txt

@@ -1,4 +1,4 @@
-Minetest 0.4 mod: default
+Minetest Game mod: default
 ==========================
 
 License of source code:
@@ -27,7 +27,6 @@ Cisoun's WTFPL texture pack:
   default_lava.png
   default_leaves.png
   default_sapling.png
-  default_sign_wall.png
   default_stone.png
   default_tree.png
   default_tree_top.png
@@ -59,7 +58,6 @@ VanessaE (WTFPL):
   default_desert_sand.png
   default_desert_stone.png
   default_sand.png
-  default_jungletree_top.png
 
 Calinou (CC BY-SA):
   default_brick.png
@@ -89,7 +87,6 @@ InfinityProject (WTFPL):
 
 Splizard (CC BY-SA 3.0):
   default_snow.png
-  default_snow_side.png
   default_pine_sapling.png
 
 Zeg9 (CC BY-SA 3.0):
@@ -100,28 +97,30 @@ Zeg9 (CC BY-SA 3.0):
   default_gold_block.png
 
 paramat (CC BY-SA 3.0):
-  wieldhand.png, derived from character.png by Jordach (CC BY-SA 3.0)
+  wieldhand.png -- Copied 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_junglewood.png
+  default_jungletree_top.png
+  default_sandstone_brick.png
+  default_obsidian_brick.png
+  default_stone_brick.png
+  default_desert_stone_brick.png
+  default_river_water.png
+  default_river_water_source_animated.png
+  default_river_water_flowing_animated.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)
+  default_grass.png
+  default_grass_side.png
+  default_snow_side.png
 
 brunob.santos (CC BY-SA 4.0):
   default_desert_cobble.png
@@ -145,9 +144,19 @@ BlockMen (CC BY-SA 3.0):
   default_mineral_mese.png
   default_meselamp.png
   bubble.png
-  heart.png
   gui_*.png
 
+sofar (CC BY-SA 3.0):
+  default_book_written.png, based on default_book.png
+  default_aspen_sapling
+  default_aspen_leaves
+  default_aspen_tree
+  default_aspen_tree_top, derived from default_pine_tree_top (by paramat)
+  default_aspen_wood, derived from default_pine_wood (by paramat)
+
+sofar (WTFPL):
+  default_gravel.png -- Derived from Gambit's PixelBOX texture pack light gravel
+
 Neuromancer (CC BY-SA 2.0):
   default_cobble.png, based on texture by Brane praefect
   default_mossycobble.png, based on texture by Brane praefect
@@ -166,10 +175,16 @@ Gambit (WTFPL):
   default_grass_*.png
   default_paper.png
   default_diamond_block.png
+  default_ladder_steel.png
+  default_sign_wall_wood.png
+  default_flint.png
 
 asl97 (WTFPL):
   default_ice.png
 
+KevDoy (CC BY-SA 3.0)
+  heart.png
+
 Glass breaking sounds (CC BY 3.0):
   1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
   2: http://www.freesound.org/people/Tomlija/sounds/97669/

mods/default/aliases.lua

@@ -23,7 +23,7 @@ minetest.register_alias("bookshelf", "default:bookshelf")
 minetest.register_alias("glass", "default:glass")
 minetest.register_alias("wooden_fence", "default:fence_wood")
 minetest.register_alias("rail", "default:rail")
-minetest.register_alias("ladder", "default:ladder")
+minetest.register_alias("ladder", "default:ladder_wood")
 minetest.register_alias("wood", "default:wood")
 minetest.register_alias("mese", "default:mese")
 minetest.register_alias("cloud", "default:cloud")
@@ -32,7 +32,7 @@ minetest.register_alias("water_source", "default:water_source")
 minetest.register_alias("lava_flowing", "default:lava_flowing")
 minetest.register_alias("lava_source", "default:lava_source")
 minetest.register_alias("torch", "default:torch")
-minetest.register_alias("sign_wall", "default:sign_wall")
+minetest.register_alias("sign_wall", "default:sign_wall_wood")
 minetest.register_alias("furnace", "default:furnace")
 minetest.register_alias("chest", "default:chest")
 minetest.register_alias("locked_chest", "default:chest_locked")
@@ -74,3 +74,7 @@ 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")
+
+minetest.register_alias("default:ladder", "default:ladder_wood")
+minetest.register_alias("default:sign_wall", "default:sign_wall_wood")
+

mods/default/crafting.lua

@@ -28,6 +28,13 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:aspen_wood 4',
+	recipe = {
+		{'default:aspen_tree'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:stick 4',
 	recipe = {
@@ -36,15 +43,16 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:fence_wood 2',
+	output = 'default:sign_wall_steel 3',
 	recipe = {
-		{'group:stick', 'group:stick', 'group:stick'},
-		{'group:stick', 'group:stick', 'group:stick'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = 'default:sign_wall',
+	output = 'default:sign_wall_wood 3',
 	recipe = {
 		{'group:wood', 'group:wood', 'group:wood'},
 		{'group:wood', 'group:wood', 'group:wood'},
@@ -499,6 +507,13 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:clay_lump 4',
+	recipe = {
+		{'default:clay'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:brick',
 	recipe = {
@@ -540,7 +555,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:ladder',
+	output = 'default:ladder_wood 3',
 	recipe = {
 		{'group:stick', '', 'group:stick'},
 		{'group:stick', 'group:stick', 'group:stick'},
@@ -548,6 +563,15 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:ladder_steel 15',
+	recipe = {
+		{'default:steel_ingot', '', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', '', 'default:steel_ingot'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:mese',
 	recipe = {
@@ -749,7 +773,31 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:ladder",
+	recipe = "default:fence_acacia_wood",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_junglewood",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_pine_wood",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_aspen_wood",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:ladder_wood",
 	burntime = 5,
 })
 
@@ -773,7 +821,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:sign_wall",
+	recipe = "default:sign_wall_wood",
 	burntime = 10,
 })
 

mods/default/craftitems.lua

@@ -11,16 +11,36 @@ minetest.register_craftitem("default:paper", {
 	inventory_image = "default_paper.png",
 })
 
-local function book_on_use(itemstack, user, pointed_thing)
+local lpp = 14 -- Lines per book's page
+local function book_on_use(itemstack, user)
 	local player_name = user:get_player_name()
 	local data = minetest.deserialize(itemstack:get_metadata())
-	local title, text, owner = "", "", player_name
+	local formspec, title, text, owner = "", "", "", player_name
+	local page, page_max, lines, string = 1, 1, {}, ""
+
 	if data then
-		title, text, owner = data.title, data.text, data.owner
+		title = data.title
+		text = data.text
+		owner = data.owner
+
+		for str in (text .. "\n"):gmatch("([^\n]*)[\n]") do
+			lines[#lines+1] = str
 		end
-	local formspec
+
+		if data.page then
+			page = data.page
+			page_max = data.page_max
+
+			for i = ((lpp * page) - lpp) + 1, lpp * page do
+				if not lines[i] then break end
+				string = string .. lines[i] .. "\n"
+			end
+		end
+	end
+
 	if owner == player_name then
 		formspec = "size[8,8]" .. default.gui_bg ..
+			default.gui_bg_img ..
 			"field[0.5,1;7.5,0;title;Title:;" ..
 				minetest.formspec_escape(title) .. "]" ..
 			"textarea[0.5,1.5;7.5,7;text;Contents:;" ..
@@ -28,20 +48,27 @@ local function book_on_use(itemstack, user, pointed_thing)
 			"button_exit[2.5,7.5;3,1;save;Save]"
 	else
 		formspec = "size[8,8]" .. default.gui_bg ..
+			default.gui_bg_img ..
 			"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)
+			"tablecolumns[color;text]" ..
+			"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
+			"table[0.4,0;7,0.5;title;#FFFF00," .. minetest.formspec_escape(title) .. "]" ..
+			"textarea[0.5,1.5;7.5,7;;" ..
+				minetest.formspec_escape(string ~= "" and string or text) .. ";]" ..
+			"button[2.4,7.6;0.8,0.8;book_prev;<]" ..
+			"label[3.2,7.7;Page " .. page .. " of " .. page_max .. "]" ..
+			"button[4.9,7.6;0.8,0.8;book_next;>]"
 	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
+	minetest.show_formspec(player_name, "default:book", formspec)
 end
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	if formname ~= "default:book" then return end
 	local inv = player:get_inventory()
 	local stack = player:get_wielded_item()
+
+	if fields.save and fields.title ~= "" and fields.text ~= "" then
 		local new_stack, data
 		if stack:get_name() ~= "default:book_written" then
 			local count = stack:get_count()
@@ -54,11 +81,16 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
 		else
 			data = minetest.deserialize(stack:get_metadata())
 		end
+
 		if not data then data = {} end
 		data.title = fields.title
 		data.text = fields.text
+		data.text_len = #data.text
+		data.page = 1
+		data.page_max = math.ceil((#data.text:gsub("[^\n]", "") + 1) / lpp)
 		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
@@ -69,6 +101,28 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
 		else
 			stack:set_metadata(data_str)
 		end
+
+	elseif fields.book_next or fields.book_prev then
+		local data = minetest.deserialize(stack:get_metadata())
+		if not data.page then return end
+
+		if fields.book_next then
+			data.page = data.page + 1
+			if data.page > data.page_max then
+				data.page = 1
+			end
+		else
+			data.page = data.page - 1
+			if data.page == 0 then
+				data.page = data.page_max
+			end
+		end
+
+		local data_str = minetest.serialize(data)
+		stack:set_metadata(data_str)
+		book_on_use(stack, player)
+	end
+
 	player:set_wielded_item(stack)
 end)
 
@@ -81,12 +135,42 @@ minetest.register_craftitem("default:book", {
 
 minetest.register_craftitem("default:book_written", {
 	description = "Book With Text",
-	inventory_image = "default_book.png",
+	inventory_image = "default_book_written.png",
 	groups = {book = 1, not_in_creative_inventory = 1},
 	stack_max = 1,
 	on_use = book_on_use,
 })
 
+minetest.register_craft({
+	type = "shapeless",
+	output = "default:book_written",
+	recipe = {"default:book", "default:book_written"}
+})
+
+minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
+	if itemstack:get_name() ~= "default:book_written" then
+		return
+	end
+
+	local copy = ItemStack("default:book_written")
+	local original
+	local index
+	for i = 1, player:get_inventory():get_size("craft") do
+		if old_craft_grid[i]:get_name() == "default:book_written" then
+			original = old_craft_grid[i]
+			index = i
+		end
+	end
+	if not original then
+		return
+	end
+	local copymeta = original:get_metadata()
+	-- copy of the book held by player's mouse cursor
+	itemstack:set_metadata(copymeta)
+	-- put the book with metadata back in the craft grid
+	craft_inv:set_stack("craft", index, original)
+end)
+
 minetest.register_craftitem("default:coal_lump", {
 	description = "Coal Lump",
 	inventory_image = "default_coal_lump.png",
@@ -157,3 +241,9 @@ minetest.register_craftitem("default:obsidian_shard", {
 	description = "Obsidian Shard",
 	inventory_image = "default_obsidian_shard.png",
 })
+
+minetest.register_craftitem("default:flint", {
+	description = "Flint",
+	inventory_image = "default_flint.png"
+})
+

mods/default/functions.lua

@@ -40,9 +40,21 @@ end
 function default.node_sound_sand_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name = "default_sand_footstep", gain = 0.2}
+			{name = "default_sand_footstep", gain = 0.12}
 	table.dug = table.dug or
-			{name = "default_sand_footstep", gain = 0.4}
+			{name = "default_sand_footstep", gain = 0.24}
+	table.place = table.place or
+			{name = "default_place_node", gain = 1.0}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_gravel_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name = "default_gravel_footstep", gain = 0.5}
+	table.dug = table.dug or
+			{name = "default_gravel_footstep", gain = 1.0}
 	table.place = table.place or
 			{name = "default_place_node", gain = 1.0}
 	default.node_sound_defaults(table)
@@ -88,38 +100,42 @@ end
 -- Lavacooling
 --
 
-default.cool_lava_source = function(pos)
+default.cool_lava = function(pos, node)
+	if node.name == "default:lava_source" then
 		minetest.set_node(pos, {name = "default:obsidian"})
-	minetest.sound_play("default_cool_lava",
-		{pos = pos, max_hear_distance = 16, gain = 0.25})
-end
-
-default.cool_lava_flowing = function(pos)
+	else -- Lava flowing
 		minetest.set_node(pos, {name = "default:stone"})
+	end
 	minetest.sound_play("default_cool_lava",
 		{pos = pos, max_hear_distance = 16, gain = 0.25})
 end
 
 minetest.register_abm({
-	nodenames = {"default:lava_flowing"},
+	nodenames = {"default:lava_source", "default:lava_flowing"},
 	neighbors = {"group:water"},
 	interval = 1,
-	chance = 2,
+	chance = 1,
+	catch_up = false,
 	action = function(...)
-		default.cool_lava_flowing(...)
+		default.cool_lava(...)
 	end,
 })
 
-minetest.register_abm({
-	nodenames = {"default:lava_source"},
-	neighbors = {"group:water"},
-	interval = 1,
-	chance = 2,
-	action = function(...)
-		default.cool_lava_source(...)
-	end,
-})
 
+--
+-- optimized helper to put all items in an inventory into a drops list
+--
+function default.get_inventory_drops(pos, inventory, drops)
+	local inv = minetest.get_meta(pos):get_inventory()
+	local n = #drops
+	for i = 1, inv:get_size(inventory) do
+		local stack = inv:get_stack(inventory, i)
+		if stack:get_count() > 0 then
+			drops[n+1] = stack:to_table()
+			n = n + 1
+		end
+	end
+end
 
 --
 -- Papyrus and cactus growing
@@ -175,8 +191,8 @@ end
 minetest.register_abm({
 	nodenames = {"default:cactus"},
 	neighbors = {"group:sand"},
-	interval = 50,
-	chance = 20,
+	interval = 12,
+	chance = 83,
 	action = function(...)
 		default.grow_cactus(...)
 	end
@@ -185,8 +201,8 @@ minetest.register_abm({
 minetest.register_abm({
 	nodenames = {"default:papyrus"},
 	neighbors = {"default:dirt", "default:dirt_with_grass"},
-	interval = 50,
-	chance = 20,
+	interval = 14,
+	chance = 71,
 	action = function(...)
 		default.grow_papyrus(...)
 	end
@@ -207,6 +223,62 @@ function default.dig_up(pos, node, digger)
 end
 
 
+--
+-- Fence registration helper
+--
+function default.register_fence(name, def)
+	minetest.register_craft({
+		output = name .. " 4",
+		recipe = {
+			{ def.material, 'group:stick', def.material },
+			{ def.material, 'group:stick', def.material },
+		}
+	})
+
+	local fence_texture = "default_fence_overlay.png^" .. def.texture ..
+			"^default_fence_overlay.png^[makealpha:255,126,126"
+	-- Allow almost everything to be overridden
+	local default_fields = {
+		paramtype = "light",
+		drawtype = "nodebox",
+		node_box = {
+			type = "connected",
+			fixed = {{-1/8, -1/2, -1/8, 1/8, 1/2, 1/8}},
+			-- connect_top =
+			-- connect_bottom =
+			connect_front = {{-1/16,3/16,-1/2,1/16,5/16,-1/8},
+				{-1/16,-5/16,-1/2,1/16,-3/16,-1/8}},
+			connect_left = {{-1/2,3/16,-1/16,-1/8,5/16,1/16},
+				{-1/2,-5/16,-1/16,-1/8,-3/16,1/16}},
+			connect_back = {{-1/16,3/16,1/8,1/16,5/16,1/2},
+				{-1/16,-5/16,1/8,1/16,-3/16,1/2}},
+			connect_right = {{1/8,3/16,-1/16,1/2,5/16,1/16},
+				{1/8,-5/16,-1/16,1/2,-3/16,1/16}},
+		},
+		connects_to = {"group:fence", "group:wood", "group:tree"},
+		inventory_image = fence_texture,
+		wield_image = fence_texture,
+		tiles = {def.texture},
+		sunlight_propagates = true,
+		is_ground_content = false,
+		groups = {},
+	}
+	for k, v in pairs(default_fields) do
+		if not def[k] then
+			def[k] = v
+		end
+	end
+
+	-- Always add to the fence group, even if no group provided
+	def.groups.fence = 1
+
+	def.texture = nil
+	def.material = nil
+
+	minetest.register_node(name, def)
+end
+
+
 --
 -- Leafdecay
 --
@@ -223,10 +295,12 @@ minetest.register_globalstep(function(dtime)
 end)
 
 default.after_place_leaves = function(pos, placer, itemstack, pointed_thing)
+	if placer and not placer:get_player_control().sneak then
 		local node = minetest.get_node(pos)
 		node.param2 = 1
 		minetest.set_node(pos, node)
 	end
+end
 
 minetest.register_abm({
 	nodenames = {"group:leafdecay"},
@@ -306,33 +380,74 @@ minetest.register_abm({
 
 
 --
--- Grass growing
+-- Convert dirt to something that fits the environment
 --
 
 minetest.register_abm({
 	nodenames = {"default:dirt"},
-	interval = 2,
-	chance = 200,
+	neighbors = {
+		"default:dirt_with_grass",
+		"default:dirt_with_dry_grass",
+		"default:dirt_with_snow",
+		"group:grass",
+		"group:dry_grass",
+		"default:snow",
+	},
+	interval = 6,
+	chance = 67,
+	catch_up = false,
 	action = function(pos, node)
+		-- Most likely case, half the time it's too dark for this.
 		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") and
-				nodedef.liquidtype == "none" and
-				(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
-				minetest.set_node(pos, {name = "default:dirt_with_grass"})
+		if (minetest.get_node_light(above) or 0) < 13 then
+			return
 		end
+
+		-- Look for likely neighbors.
+		local p2 = minetest.find_node_near(pos, 1, {"default:dirt_with_grass",
+				"default:dirt_with_dry_grass", "default:dirt_with_snow"})
+		if p2 then
+			-- But the node needs to be under air in this case.
+			local n2 = minetest.get_node(above)
+			if n2 and n2.name == "air" then
+				local n3 = minetest.get_node(p2)
+				minetest.set_node(pos, {name = n3.name})
+				return
+			end
+		end
+
+		-- Anything on top?
+		local n2 = minetest.get_node(above)
+		if not n2 then
+			return
+		end
+
+		local name = n2.name
+		-- Snow check is cheapest, so comes first.
+		if name == "default:snow" then
+			minetest.set_node(pos, {name = "default:dirt_with_snow"})
+		-- Most likely case first.
+		elseif minetest.get_item_group(name, "grass") ~= 0 then
+			minetest.set_node(pos, {name = "default:dirt_with_grass"})
+		elseif minetest.get_item_group(name, "dry_grass") ~= 0 then
+			minetest.set_node(pos, {name = "default:dirt_with_dry_grass"})
 		end
 	end
 })
 
+--
+-- Grass and dry grass removed in darkness
+--
+
 minetest.register_abm({
-	nodenames = {"default:dirt_with_grass", "default:dirt_with_dry_grass"},
-	interval = 2,
-	chance = 20,
+	nodenames = {
+		"default:dirt_with_grass",
+		"default:dirt_with_dry_grass",
+		"default:dirt_with_snow",
+	},
+	interval = 8,
+	chance = 50,
+	catch_up = false,
 	action = function(pos, node)
 		local above = {x = pos.x, y = pos.y + 1, z = pos.z}
 		local name = minetest.get_node(above).name
@@ -345,3 +460,18 @@ minetest.register_abm({
 	end
 })
 
+
+--
+-- Moss growth on cobble near water
+--
+
+minetest.register_abm({
+	nodenames = {"default:cobble"},
+	neighbors = {"group:water"},
+	interval = 16,
+	chance = 200,
+	catch_up = false,
+	action = function(pos, node)
+		minetest.set_node(pos, {name = "default:mossycobble"})
+	end
+})

mods/default/furnace.lua

@@ -90,66 +90,6 @@ local function allow_metadata_inventory_take(pos, listname, index, stack, player
 	return stack:get_count()
 end
 
---
--- Node definitions
---
-
-minetest.register_node("default:furnace", {
-	description = "Furnace",
-	tiles = {
-		"default_furnace_top.png", "default_furnace_bottom.png",
-		"default_furnace_side.png", "default_furnace_side.png",
-		"default_furnace_side.png", "default_furnace_front.png"
-	},
-	paramtype2 = "facedir",
-	groups = {cracky=2},
-	legacy_facedir_simple = true,
-	is_ground_content = false,
-	sounds = default.node_sound_stone_defaults(),
-	
-	can_dig = can_dig,
-	
-	allow_metadata_inventory_put = allow_metadata_inventory_put,
-	allow_metadata_inventory_move = allow_metadata_inventory_move,
-	allow_metadata_inventory_take = allow_metadata_inventory_take,
-})
-
-minetest.register_node("default:furnace_active", {
-	description = "Furnace",
-	tiles = {
-		"default_furnace_top.png", "default_furnace_bottom.png",
-		"default_furnace_side.png", "default_furnace_side.png",
-		"default_furnace_side.png",
-		{
-			image = "default_furnace_front_active.png",
-			backface_culling = false,
-			animation = {
-				type = "vertical_frames",
-				aspect_w = 16,
-				aspect_h = 16,
-				length = 1.5
-			},
-		}
-	},
-	paramtype2 = "facedir",
-	light_source = 8,
-	drop = "default:furnace",
-	groups = {cracky=2, not_in_creative_inventory=1},
-	legacy_facedir_simple = true,
-	is_ground_content = false,
-	sounds = default.node_sound_stone_defaults(),
-	
-	can_dig = can_dig,
-	
-	allow_metadata_inventory_put = allow_metadata_inventory_put,
-	allow_metadata_inventory_move = allow_metadata_inventory_move,
-	allow_metadata_inventory_take = allow_metadata_inventory_take,
-})
-
---
--- ABM
---
-
 local function swap_node(pos, name)
 	local node = minetest.get_node(pos)
 	if node.name == name then
@@ -159,11 +99,7 @@ local function swap_node(pos, name)
 	minetest.swap_node(pos, node)
 end
 
-minetest.register_abm({
-	nodenames = {"default:furnace", "default:furnace_active"},
-	interval = 1.0,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+local function furnace_node_timer(pos, elapsed)
 	--
 	-- Inizialize metadata
 	--
@@ -172,19 +108,7 @@ minetest.register_abm({
 	local src_time = meta:get_float("src_time") or 0
 	local fuel_totaltime = meta:get_float("fuel_totaltime") or 0
 
-		--
-		-- Inizialize inventory
-		--
 	local inv = meta:get_inventory()
-		for listname, size in pairs({
-				src = 1,
-				fuel = 1,
-				dst = 4,
-		}) do
-			if inv:get_size(listname) ~= size then
-				inv:set_size(listname, size)
-			end
-		end
 	local srclist = inv:get_list("src")
 	local fuellist = inv:get_list("fuel")
 	local dstlist = inv:get_list("dst")
@@ -235,7 +159,6 @@ minetest.register_abm({
 
 				fuel_totaltime = fuel.time
 				fuel_time = 0
-					
 			end
 		else
 			-- We don't need to get new fuel since there is no cookable item
@@ -264,17 +187,24 @@ minetest.register_abm({
 
 	local fuel_state = "Empty"
 	local active = "inactive "
+	local result = false
+
 	if fuel_time <= fuel_totaltime and fuel_totaltime ~= 0 then
 		active = "active "
 		local fuel_percent = math.floor(fuel_time / fuel_totaltime * 100)
 		fuel_state = fuel_percent .. "%"
 		formspec = active_formspec(fuel_percent, item_percent)
 		swap_node(pos, "default:furnace_active")
+		-- make sure timer restarts automatically
+		result = true
 	else
 		if not fuellist[1]:is_empty() then
 			fuel_state = "0%"
 		end
 		swap_node(pos, "default:furnace")
+		-- stop timer on the inactive furnace
+		local timer = minetest.get_node_timer(pos)
+		timer:stop()
 	end
 
 	local infotext = "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")"
@@ -287,5 +217,94 @@ minetest.register_abm({
 	meta:set_float("src_time", src_time)
 	meta:set_string("formspec", formspec)
 	meta:set_string("infotext", infotext)
+
+	return result
+end
+
+--
+-- Node definitions
+--
+
+minetest.register_node("default:furnace", {
+	description = "Furnace",
+	tiles = {
+		"default_furnace_top.png", "default_furnace_bottom.png",
+		"default_furnace_side.png", "default_furnace_side.png",
+		"default_furnace_side.png", "default_furnace_front.png"
+	},
+	paramtype2 = "facedir",
+	groups = {cracky=2},
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
+
+	can_dig = can_dig,
+
+	on_timer = furnace_node_timer,
+
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec", inactive_formspec)
+		local inv = meta:get_inventory()
+		inv:set_size('src', 1)
+		inv:set_size('fuel', 1)
+		inv:set_size('dst', 4)
 	end,
+
+	on_metadata_inventory_move = function(pos)
+		local timer = minetest.get_node_timer(pos)
+		timer:start(1.0)
+	end,
+	on_metadata_inventory_put = function(pos)
+		-- start timer function, it will sort out whether furnace can burn or not.
+		local timer = minetest.get_node_timer(pos)
+		timer:start(1.0)
+	end,
+	on_blast = function(pos)
+		local drops = {}
+		default.get_inventory_drops(pos, "src", drops)
+		default.get_inventory_drops(pos, "fuel", drops)
+		default.get_inventory_drops(pos, "dst", drops)
+		drops[#drops+1] = "default:furnace"
+		minetest.remove_node(pos)
+		return drops
+	end,
+
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_move = allow_metadata_inventory_move,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
 })
+
+minetest.register_node("default:furnace_active", {
+	description = "Furnace",
+	tiles = {
+		"default_furnace_top.png", "default_furnace_bottom.png",
+		"default_furnace_side.png", "default_furnace_side.png",
+		"default_furnace_side.png",
+		{
+			image = "default_furnace_front_active.png",
+			backface_culling = false,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 1.5
+			},
+		}
+	},
+	paramtype2 = "facedir",
+	light_source = 8,
+	drop = "default:furnace",
+	groups = {cracky=2, not_in_creative_inventory=1},
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
+	on_timer = furnace_node_timer,
+
+	can_dig = can_dig,
+
+	allow_metadata_inventory_put = allow_metadata_inventory_put,
+	allow_metadata_inventory_move = allow_metadata_inventory_move,
+	allow_metadata_inventory_take = allow_metadata_inventory_take,
+})
+

mods/default/nodes.lua

@@ -14,7 +14,7 @@ language (for example pinewood and pine wood) the underscore form should be used
 
 Stone
 -----
-(1. Material 2. Cobble variant 3. Brick variant [4. Modified forms])
+(1. Material 2. Cobble variant 3. Brick variant 4. Modified forms)
 
 default:stone
 default:cobble
@@ -33,7 +33,7 @@ default:obsidianbrick
 
 Soft / Non-Stone
 ----------------
-(1. Material [2. Modified forms])
+(1. Material 2. Modified forms)
 
 default:dirt
 default:dirt_with_grass
@@ -55,7 +55,7 @@ default:ice
 
 Trees
 -----
-(1. Trunk 2. Fabricated trunk 3. Leaves 4. Sapling [5. Fruits])
+(1. Trunk 2. Fabricated trunk 3. Leaves 4. Sapling 5. Fruits)
 
 default:tree
 default:wood
@@ -78,9 +78,14 @@ default:acacia_wood
 default:acacia_leaves
 default:acacia_sapling
 
+default:aspen_tree
+default:aspen_wood
+default:aspen_leaves
+default:aspen_sapling
+
 Ores
 ----
-(1. In stone 2. Block)
+(1. In stone 2. Blocks)
 
 default:stone_with_coal
 default:coalblock
@@ -103,6 +108,7 @@ default:diamondblock
 
 Plantlife (non-cubic)
 ---------------------
+
 default:cactus
 default:papyrus
 default:dry_shrub
@@ -135,6 +141,7 @@ default:lava_flowing
 
 Tools / "Advanced" crafting / Non-"natural"
 -------------------------------------------
+
 default:torch
 
 default:chest
@@ -142,9 +149,17 @@ default:chest_locked
 
 default:bookshelf
 
-default:sign_wall
-default:ladder
+default:sign_wall_wood
+default:sign_wall_steel
+
+default:ladder_wood
+default:ladder_steel
+
 default:fence_wood
+default:fence_acacia_wood
+default:fence_junglewood
+default:fence_pine_wood
+default:fence_aspen_wood
 
 default:glass
 default:obsidian_glass
@@ -157,6 +172,7 @@ default:meselamp
 
 Misc
 ----
+
 default:cloud
 default:nyancat
 default:nyancat_rainbow
@@ -201,7 +217,6 @@ minetest.register_node("default:mossycobble", {
 })
 
 
-
 minetest.register_node("default:desert_stone", {
 	description = "Desert Stone",
 	tiles = {"default_desert_stone.png"},
@@ -228,11 +243,10 @@ minetest.register_node("default:desert_stonebrick", {
 })
 
 
-
 minetest.register_node("default:sandstone", {
 	description = "Sandstone",
 	tiles = {"default_sandstone.png"},
-	groups = {crumbly=2,cracky=3},
+	groups = {crumbly = 1, cracky = 3},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -245,7 +259,6 @@ minetest.register_node("default:sandstonebrick", {
 })
 
 
-
 minetest.register_node("default:obsidian", {
 	description = "Obsidian",
 	tiles = {"default_obsidian.png"},
@@ -317,11 +330,10 @@ minetest.register_node("default:dirt_with_snow", {
 	groups = {crumbly = 3, soil = 1},
 	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_snow_footstep", gain=0.25},
+		footstep = {name = "default_snow_footstep", gain = 0.15},
 	}),
 })
 
-
 minetest.register_node("default:sand", {
 	description = "Sand",
 	tiles = {"default_sand.png"},
@@ -337,19 +349,20 @@ minetest.register_node("default:desert_sand", {
 })
 
 
-
 minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tiles = {"default_gravel.png"},
 	groups = {crumbly = 2, falling_node = 1},
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_gravel_footstep", gain=0.5},
-		dug = {name="default_gravel_footstep", gain=1.0},
-	}),
+	sounds = default.node_sound_gravel_defaults(),
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {'default:flint'}, rarity = 16},
+			{items = {'default:gravel'}}
+		}
+	}
 })
 
-
-
 minetest.register_node("default:clay", {
 	description = "Clay",
 	tiles = {"default_clay.png"},
@@ -359,7 +372,6 @@ minetest.register_node("default:clay", {
 })
 
 
-
 minetest.register_node("default:snow", {
 	description = "Snow",
 	tiles = {"default_snow.png"},
@@ -367,6 +379,7 @@ minetest.register_node("default:snow", {
 	wield_image = "default_snowball.png",
 	paramtype = "light",
 	buildable_to = true,
+	floodable = true,
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -374,10 +387,11 @@ minetest.register_node("default:snow", {
 			{-0.5, -0.5, -0.5, 0.5, -0.25, 0.5},
 		},
 	},
-	groups = {crumbly = 3, falling_node = 1},
+	groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1},
 	sounds = default.node_sound_dirt_defaults({
-		footstep = {name = "default_snow_footstep", gain = 0.25},
-		dug = {name = "default_snow_footstep", gain = 0.75},
+		footstep = {name = "default_snow_footstep", gain = 0.15},
+		dug = {name = "default_snow_footstep", gain = 0.2},
+		dig = {name = "default_snow_footstep", gain = 0.2}
 	}),
 
 	on_construct = function(pos)
@@ -388,25 +402,23 @@ minetest.register_node("default:snow", {
 	end,
 })
 
-
 minetest.register_node("default:snowblock", {
 	description = "Snow Block",
 	tiles = {"default_snow.png"},
-	groups = {crumbly=3},
+	groups = {crumbly = 3, puts_out_fire = 1},
 	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_snow_footstep", gain=0.25},
-		dug = {name="default_snow_footstep", gain=0.75},
+		footstep = {name = "default_snow_footstep", gain = 0.15},
+		dug = {name = "default_snow_footstep", gain = 0.2},
+		dig = {name = "default_snow_footstep", gain = 0.2}
 	}),
 })
 
-
-
 minetest.register_node("default:ice", {
 	description = "Ice",
 	tiles = {"default_ice.png"},
 	is_ground_content = false,
 	paramtype = "light",
-	groups = {cracky=3},
+	groups = {cracky = 3, puts_out_fire = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
@@ -447,7 +459,8 @@ minetest.register_node("default:sapling", {
 		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(),
 })
 
@@ -495,7 +508,8 @@ minetest.register_node("default:apple", {
 		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},
+	groups = {fleshy = 3, dig_immediate = 3, flammable = 2,
+		leafdecay = 3, leafdecay_drop = 1},
 	on_use = minetest.item_eat(2),
 	sounds = default.node_sound_leaves_defaults(),
 
@@ -507,10 +521,10 @@ minetest.register_node("default:apple", {
 })
 
 
-
 minetest.register_node("default:jungletree", {
 	description = "Jungle Tree",
-	tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
+	tiles = {"default_jungletree_top.png", "default_jungletree_top.png",
+		"default_jungletree.png"},
 	paramtype2 = "facedir",
 	is_ground_content = false,
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
@@ -540,16 +554,8 @@ minetest.register_node("default:jungleleaves", {
 	drop = {
 		max_items = 1,
 		items = {
-			{
-				-- player will get sapling with 1/20 chance
-				items = {'default:junglesapling'},
-				rarity = 20,
-			},
-			{
-				-- player will get leaves only if he get no saplings,
-				-- this is because max_items is 1
-				items = {'default:jungleleaves'},
-			}
+			{items = {'default:junglesapling'}, rarity = 20},
+			{items = {'default:jungleleaves'}}
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
@@ -571,12 +577,12 @@ minetest.register_node("default:junglesapling", {
 		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:pine_tree", {
 	description = "Pine Tree",
 	tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png",
@@ -637,6 +643,7 @@ minetest.register_node("default:pine_sapling", {
 	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",
@@ -662,6 +669,7 @@ minetest.register_node("default:acacia_leaves", {
 	drawtype = "allfaces_optional",
 	visual_scale = 1.3,
 	tiles = {"default_acacia_leaves.png"},
+	waving = 1,
 	paramtype = "light",
 	is_ground_content = false,
 	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
@@ -696,6 +704,65 @@ minetest.register_node("default:acacia_sapling", {
 	sounds = default.node_sound_leaves_defaults(),
 })
 
+minetest.register_node("default:aspen_tree", {
+	description = "Aspen Tree",
+	tiles = {"default_aspen_tree_top.png", "default_aspen_tree_top.png",
+		"default_aspen_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:aspen_wood", {
+	description = "Aspen Wood Planks",
+	tiles = {"default_aspen_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:aspen_leaves", {
+	description = "Aspen Leaves",
+	drawtype = "allfaces_optional",
+	visual_scale = 1.3,
+	tiles = {"default_aspen_leaves.png"},
+	waving = 1,
+	paramtype = "light",
+	is_ground_content = false,
+	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {"default:aspen_sapling"}, rarity = 20},
+			{items = {"default:aspen_leaves"}}
+		}
+	},
+	sounds = default.node_sound_leaves_defaults(),
+
+	after_place_node = default.after_place_leaves,
+})
+
+minetest.register_node("default:aspen_sapling", {
+	description = "Aspen Tree Sapling",
+	drawtype = "plantlike",
+	visual_scale = 1.0,
+	tiles = {"default_aspen_sapling.png"},
+	inventory_image = "default_aspen_sapling.png",
+	wield_image = "default_aspen_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(),
+})
 --
 -- Ores
 --
@@ -717,7 +784,6 @@ minetest.register_node("default:coalblock", {
 })
 
 
-
 minetest.register_node("default:stone_with_iron", {
 	description = "Iron Ore",
 	tiles = {"default_stone.png^default_mineral_iron.png"},
@@ -735,7 +801,6 @@ minetest.register_node("default:steelblock", {
 })
 
 
-
 minetest.register_node("default:stone_with_copper", {
 	description = "Copper Ore",
 	tiles = {"default_stone.png^default_mineral_copper.png"},
@@ -761,15 +826,12 @@ minetest.register_node("default:bronzeblock", {
 })
 
 
-
 minetest.register_node("default:stone_with_mese", {
 	description = "Mese Ore",
 	tiles = {"default_stone.png^default_mineral_mese.png"},
-	paramtype = "light",
 	groups = {cracky = 1},
 	drop = "default:mese_crystal",
 	sounds = default.node_sound_stone_defaults(),
-	light_source = 1,
 })
 
 minetest.register_node("default:mese", {
@@ -782,8 +844,6 @@ minetest.register_node("default:mese", {
 })
 
 
-
-
 minetest.register_node("default:stone_with_gold", {
 	description = "Gold Ore",
 	tiles = {"default_stone.png^default_mineral_gold.png"},
@@ -801,7 +861,6 @@ minetest.register_node("default:goldblock", {
 })
 
 
-
 minetest.register_node("default:stone_with_diamond", {
 	description = "Diamond Ore",
 	tiles = {"default_stone.png^default_mineral_diamond.png"},
@@ -824,15 +883,12 @@ minetest.register_node("default:diamondblock", {
 
 minetest.register_node("default:cactus", {
 	description = "Cactus",
-	tiles = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
+	tiles = {"default_cactus_top.png", "default_cactus_top.png",
+		"default_cactus_side.png"},
 	paramtype2 = "facedir",
-	groups = {snappy=1,choppy=3,flammable=2},
+	groups = {snappy = 1, choppy = 3},
 	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node,
-
-	after_dig_node = function(pos, node, metadata, digger)
-		default.dig_up(pos, node, digger)
-	end,
 })
 
 minetest.register_node("default:papyrus", {
@@ -888,7 +944,7 @@ minetest.register_node("default:junglegrass", {
 	sunlight_propagates = true,
 	walkable = false,
 	buildable_to = true,
-	groups = {snappy=3,flammable=2,flora=1,attached_node=1},
+	groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1},
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -896,6 +952,7 @@ minetest.register_node("default:junglegrass", {
 	},
 })
 
+
 minetest.register_node("default:grass_1", {
 	description = "Grass",
 	drawtype = "plantlike",
@@ -908,7 +965,7 @@ minetest.register_node("default:grass_1", {
 	sunlight_propagates = true,
 	walkable = false,
 	buildable_to = true,
-	groups = {snappy=3,flammable=3,flora=1,attached_node=1},
+	groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1},
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -919,7 +976,8 @@ minetest.register_node("default:grass_1", {
 		-- place a random grass node
 		local stack = ItemStack("default:grass_" .. math.random(1,5))
 		local ret = minetest.item_place(stack, placer, pointed_thing)
-		return ItemStack("default:grass_1 "..itemstack:get_count()-(1-ret:get_count()))
+		return ItemStack("default:grass_1 " ..
+			itemstack:get_count() - (1 - ret:get_count()))
 	end,
 })
 
@@ -936,7 +994,8 @@ for i=2,5 do
 		walkable = false,
 		buildable_to = true,
 		drop = "default:grass_1",
-		groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
+		groups = {snappy = 3, flora = 1, attached_node = 1,
+			not_in_creative_inventory = 1, grass = 1},
 		sounds = default.node_sound_leaves_defaults(),
 		selection_box = {
 			type = "fixed",
@@ -945,6 +1004,7 @@ for i=2,5 do
 	})
 end
 
+
 minetest.register_node("default:dry_grass_1", {
 	description = "Dry Grass",
 	drawtype = "plantlike",
@@ -956,7 +1016,8 @@ minetest.register_node("default:dry_grass_1", {
 	sunlight_propagates = true,
 	walkable = false,
 	buildable_to = true,
-	groups = {snappy=3,flammable=3,flora=1,attached_node=1},
+	groups = {snappy = 3, flammable = 3, flora = 1,
+		attached_node = 1, dry_grass = 1},
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -967,7 +1028,8 @@ minetest.register_node("default:dry_grass_1", {
 		-- 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()))
+		return ItemStack("default:dry_grass_1 " ..
+			itemstack:get_count() - (1 - ret:get_count()))
 	end,
 })
 
@@ -983,7 +1045,8 @@ for i=2,5 do
 		sunlight_propagates = true,
 		walkable = false,
 		buildable_to = true,
-		groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
+		groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1,
+			not_in_creative_inventory=1, dry_grass = 1},
 		drop = "default:dry_grass_1",
 		sounds = default.node_sound_leaves_defaults(),
 		selection_box = {
@@ -999,7 +1062,6 @@ end
 
 minetest.register_node("default:water_source", {
 	description = "Water Source",
-	inventory_image = minetest.inventorycube("default_water.png"),
 	drawtype = "liquid",
 	tiles = {
 		{
@@ -1038,13 +1100,12 @@ minetest.register_node("default:water_source", {
 	liquid_alternative_flowing = "default:water_flowing",
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = 1,
-	post_effect_color = {a=120, r=30, g=60, b=90},
+	post_effect_color = {a = 103, r = 30, g = 60, b = 90},
 	groups = {water = 3, liquid = 3, puts_out_fire = 1},
 })
 
 minetest.register_node("default:water_flowing", {
 	description = "Flowing Water",
-	inventory_image = minetest.inventorycube("default_water.png"),
 	drawtype = "flowingliquid",
 	tiles = {"default_water.png"},
 	special_tiles = {
@@ -1083,14 +1144,14 @@ minetest.register_node("default:water_flowing", {
 	liquid_alternative_flowing = "default:water_flowing",
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = 1,
-	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},
+	post_effect_color = {a = 103, 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 = {
 		{
@@ -1130,13 +1191,12 @@ minetest.register_node("default:river_water_source", {
 	liquid_viscosity = 1,
 	liquid_renewable = false,
 	liquid_range = 2,
-	post_effect_color = {a=120, r=30, g=76, b=90},
+	post_effect_color = {a = 103, 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 = {
@@ -1177,15 +1237,14 @@ minetest.register_node("default:river_water_flowing", {
 	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},
+	post_effect_color = {a = 103, r = 30, g = 76, b = 90},
+	groups = {water = 3, liquid = 3, puts_out_fire = 1,
+		not_in_creative_inventory = 1},
 })
 
 
-
 minetest.register_node("default:lava_source", {
 	description = "Lava Source",
-	inventory_image = minetest.inventorycube("default_lava.png"),
 	drawtype = "liquid",
 	tiles = {
 		{
@@ -1226,13 +1285,12 @@ minetest.register_node("default:lava_source", {
 	liquid_viscosity = 7,
 	liquid_renewable = false,
 	damage_per_second = 4 * 2,
-	post_effect_color = {a=192, r=255, g=64, b=0},
+	post_effect_color = {a = 191, r = 255, g = 64, b = 0},
 	groups = {lava = 3, liquid = 2, hot = 3, igniter = 1},
 })
 
 minetest.register_node("default:lava_flowing", {
 	description = "Flowing Lava",
-	inventory_image = minetest.inventorycube("default_lava.png"),
 	drawtype = "flowingliquid",
 	tiles = {"default_lava.png"},
 	special_tiles = {
@@ -1273,8 +1331,9 @@ minetest.register_node("default:lava_flowing", {
 	liquid_viscosity = 7,
 	liquid_renewable = false,
 	damage_per_second = 4 * 2,
-	post_effect_color = {a=192, r=255, g=64, b=0},
-	groups = {lava=3, liquid=2, hot=3, igniter=1, not_in_creative_inventory=1},
+	post_effect_color = {a = 191, r = 255, g = 64, b = 0},
+	groups = {lava = 3, liquid = 2, hot = 3, igniter = 1,
+		not_in_creative_inventory = 1},
 })
 
 --
@@ -1333,7 +1392,6 @@ minetest.register_node("default:torch", {
 })
 
 
-
 local chest_formspec =
 	"size[8,9]" ..
 	default.gui_bg ..
@@ -1363,7 +1421,14 @@ local function get_locked_chest_formspec(pos)
 end
 
 local function has_locked_chest_privilege(meta, player)
-	if player:get_player_name() ~= meta:get_string("owner") then
+	local name = ""
+	if player then
+		if minetest.check_player_privs(player, "protection_bypass") then
+			return true
+		end
+		name = player:get_player_name()
+	end
+	if name ~= meta:get_string("owner") then
 		return false
 	end
 	return true
@@ -1391,22 +1456,30 @@ minetest.register_node("default:chest", {
 		local inv = meta:get_inventory()
 		return inv:is_empty("main")
 	end,
-	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+	on_metadata_inventory_move = function(pos, from_list, from_index,
+			to_list, to_index, count, player)
 		minetest.log("action", player:get_player_name() ..
 			" moves stuff in chest at " .. minetest.pos_to_string(pos))
 	end,
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
 		minetest.log("action", player:get_player_name() ..
-				" moves stuff to chest at "..minetest.pos_to_string(pos))
+			" moves " .. stack:get_name() ..
+			" to chest at " .. minetest.pos_to_string(pos))
 	end,
     on_metadata_inventory_take = function(pos, listname, index, stack, player)
 		minetest.log("action", player:get_player_name() ..
-				" takes stuff from chest at "..minetest.pos_to_string(pos))
+			" takes " .. stack:get_name() ..
+			" from chest at " .. minetest.pos_to_string(pos))
+	end,
+	on_blast = function(pos)
+		local drops = {}
+		default.get_inventory_drops(pos, "main", drops)
+		drops[#drops+1] = "default:chest"
+		minetest.remove_node(pos)
+		return drops
 	end,
 })
 
-
-
 minetest.register_node("default:chest_locked", {
 	description = "Locked Chest",
 	tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
@@ -1435,7 +1508,8 @@ minetest.register_node("default:chest_locked", {
 		local inv = meta:get_inventory()
 		return inv:is_empty("main") and has_locked_chest_privilege(meta, player)
 	end,
-	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+	allow_metadata_inventory_move = function(pos, from_list, from_index,
+			to_list, to_index, count, player)
 		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			return 0
@@ -1458,11 +1532,13 @@ minetest.register_node("default:chest_locked", {
 	end,
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
 		minetest.log("action", player:get_player_name() ..
-				" moves stuff to locked chest at "..minetest.pos_to_string(pos))
+			" moves " .. stack:get_name() ..
+			" to locked chest at " .. minetest.pos_to_string(pos))
 	end,
     on_metadata_inventory_take = function(pos, listname, index, stack, player)
 		minetest.log("action", player:get_player_name() ..
-				" takes stuff from locked chest at "..minetest.pos_to_string(pos))
+			" takes " .. stack:get_name()  ..
+			" from locked chest at " .. minetest.pos_to_string(pos))
 	end,
 	on_rightclick = function(pos, node, clicker)
 		local meta = minetest.get_meta(pos)
@@ -1478,7 +1554,6 @@ minetest.register_node("default:chest_locked", {
 })
 
 
-
 local bookshelf_formspec =
 	"size[8,7;]" ..
 	default.gui_bg ..
@@ -1505,40 +1580,15 @@ minetest.register_node("default:bookshelf", {
 		inv:set_size("books", 8 * 2)
 	end,
 	can_dig = function(pos,player)
-		local meta = minetest.get_meta(pos);
-		local inv = meta:get_inventory()
+		local inv = minetest.get_meta(pos):get_inventory()
 		return inv:is_empty("books")
 	end,
-
-	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-		local to_stack = inv:get_stack(listname, index)
-		if listname == "books" then
-			if minetest.get_item_group(stack:get_name(), "book") ~= 0
-					and to_stack:is_empty() then
-				return 1
-			else
+	allow_metadata_inventory_put = function(pos, listname, index, stack)
+		if minetest.get_item_group(stack:get_name(), "book") ~= 0 then
+			return stack:get_count()
+		end
 		return 0
-			end
-		end
 	end,
-
-	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-		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 minetest.get_item_group(stack:get_name(), "book") ~= 0
-					and to_stack:is_empty() then
-				return 1
-			else
-				return 0
-			end
-		end
-	end,
-
 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 		minetest.log("action", player:get_player_name() ..
 			" moves stuff in bookshelf at " .. minetest.pos_to_string(pos))
@@ -1551,16 +1601,22 @@ minetest.register_node("default:bookshelf", {
 		minetest.log("action", player:get_player_name() ..
 			" takes stuff from bookshelf at " .. minetest.pos_to_string(pos))
 	end,
+	on_blast = function(pos)
+		local drops = {}
+		default.get_inventory_drops(pos, "books", drops)
+		drops[#drops+1] = "default:bookshelf"
+		minetest.remove_node(pos)
+		return drops
+	end,
 })
 
-
-
-minetest.register_node("default:sign_wall", {
-	description = "Sign",
+local function register_sign(material, desc, def)
+	minetest.register_node("default:sign_wall_" .. material, {
+		description = desc .. " Sign",
 		drawtype = "nodebox",
-	tiles = {"default_sign.png"},
-	inventory_image = "default_sign_wall.png",
-	wield_image = "default_sign_wall.png",
+		tiles = {"default_sign_wall_" .. material .. ".png"},
+		inventory_image = "default_sign_" .. material .. ".png",
+		wield_image = "default_sign_" .. material .. ".png",
 		paramtype = "light",
 		paramtype2 = "wallmounted",
 		sunlight_propagates = true,
@@ -1572,9 +1628,9 @@ minetest.register_node("default:sign_wall", {
 			wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125},
 			wall_side   = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375},
 		},
-	groups = {choppy=2,dig_immediate=2,attached_node=1},
+		groups = def.groups,
 		legacy_wallmounted = true,
-	sounds = default.node_sound_defaults(),
+		sounds = def.sounds,
 
 		on_construct = function(pos)
 			--local n = minetest.get_node(pos)
@@ -1584,25 +1640,37 @@ minetest.register_node("default:sign_wall", {
 		end,
 		on_receive_fields = function(pos, formname, fields, sender)
 			--print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields))
-		if minetest.is_protected(pos, sender:get_player_name()) then
-			minetest.record_protection_violation(pos, sender:get_player_name())
+			local player_name = sender:get_player_name()
+			if minetest.is_protected(pos, player_name) then
+				minetest.record_protection_violation(pos, player_name)
 				return
 			end
 			local meta = minetest.get_meta(pos)
 			if not fields.text then return end
-		minetest.log("action", (sender:get_player_name() or "").." wrote \""..fields.text..
-				"\" to sign at "..minetest.pos_to_string(pos))
+			minetest.log("action", (player_name or "") .. " wrote \"" ..
+				fields.text .. "\" to sign at " .. minetest.pos_to_string(pos))
 			meta:set_string("text", fields.text)
 			meta:set_string("infotext", '"' .. fields.text .. '"')
 		end,
 	})
+end
 
-minetest.register_node("default:ladder", {
-	description = "Ladder",
+register_sign("wood", "Wooden", {
+	sounds = default.node_sound_wood_defaults(),
+	groups = {choppy = 2, attached_node = 1, flammable = 2, oddly_breakable_by_hand = 3}
+})
+
+register_sign("steel", "Steel", {
+	sounds = default.node_sound_defaults(),
+	groups = {cracky = 2, attached_node = 1}
+})
+
+minetest.register_node("default:ladder_wood", {
+	description = "Wooden Ladder",
 	drawtype = "signlike",
-	tiles = {"default_ladder.png"},
-	inventory_image = "default_ladder.png",
-	wield_image = "default_ladder.png",
+	tiles = {"default_ladder_wood.png"},
+	inventory_image = "default_ladder_wood.png",
+	wield_image = "default_ladder_wood.png",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	sunlight_propagates = true,
@@ -1620,31 +1688,72 @@ minetest.register_node("default:ladder", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-local fence_texture = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126"
-minetest.register_node("default:fence_wood", {
-	description = "Wooden Fence",
-	drawtype = "fencelike",
-	tiles = {"default_wood.png"},
-	inventory_image = fence_texture,
-	wield_image = fence_texture,
+minetest.register_node("default:ladder_steel", {
+	description = "Steel Ladder",
+	drawtype = "signlike",
+	tiles = {"default_ladder_steel.png"},
+	inventory_image = "default_ladder_steel.png",
+	wield_image = "default_ladder_steel.png",
 	paramtype = "light",
+	paramtype2 = "wallmounted",
 	sunlight_propagates = true,
+	walkable = false,
+	climbable = true,
 	is_ground_content = false,
 	selection_box = {
-		type = "fixed",
-		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
+		type = "wallmounted",
+		--wall_top = = <default>
+		--wall_bottom = = <default>
+		--wall_side = = <default>
 	},
-	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=2},
-	sounds = default.node_sound_wood_defaults(),
+	groups = {cracky = 2},
+	sounds = default.node_sound_stone_defaults(),
 })
 
+default.register_fence("default:fence_wood", {
+	description = "Wooden Fence",
+	texture = "default_fence_wood.png",
+	material = "default:wood",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults()
+})
 
+default.register_fence("default:fence_acacia_wood", {
+	description = "Acacia Fence",
+	texture = "default_fence_acacia_wood.png",
+	material = "default:acacia_wood",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence("default:fence_junglewood", {
+	description = "Junglewood Fence",
+	texture = "default_fence_junglewood.png",
+	material = "default:junglewood",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence("default:fence_pine_wood", {
+	description = "Pine Fence",
+	texture = "default_fence_pine_wood.png",
+	material = "default:pine_wood",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence("default:fence_aspen_wood", {
+	description = "Aspen Fence",
+	texture = "default_fence_aspen_wood.png",
+	material = "default:aspen_wood",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+	sounds = default.node_sound_wood_defaults()
+})
 
 minetest.register_node("default:glass", {
 	description = "Glass",
 	drawtype = "glasslike_framed_optional",
 	tiles = {"default_glass.png", "default_glass_detail.png"},
-	inventory_image = minetest.inventorycube("default_glass.png"),
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = false,
@@ -1654,21 +1763,21 @@ minetest.register_node("default:glass", {
 
 minetest.register_node("default:obsidian_glass", {
 	description = "Obsidian Glass",
-	drawtype = "glasslike",
-	tiles = {"default_obsidian_glass.png"},
+	drawtype = "glasslike_framed_optional",
+	tiles = {"default_obsidian_glass.png", "default_obsidian_glass_detail.png"},
 	paramtype = "light",
 	is_ground_content = false,
 	sunlight_propagates = true,
 	sounds = default.node_sound_glass_defaults(),
-	groups = {cracky=3,oddly_breakable_by_hand=3},
+	groups = {cracky = 3},
 })
 
 
-
 minetest.register_node("default:rail", {
 	description = "Rail",
 	drawtype = "raillike",
-	tiles = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"},
+	tiles = {"default_rail.png", "default_rail_curved.png",
+		"default_rail_t_junction.png", "default_rail_crossing.png"},
 	inventory_image = "default_rail.png",
 	wield_image = "default_rail.png",
 	paramtype = "light",
@@ -1680,11 +1789,11 @@ 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,connect_to_raillike=minetest.raillike_group("rail")},
+	groups = {bendy = 2, dig_immediate = 2, attached_node = 1,
+		connect_to_raillike = minetest.raillike_group("rail")},
 })
 
 
-
 minetest.register_node("default:brick", {
 	description = "Brick Block",
 	tiles = {"default_brick.png"},