Add node particles when leafdecay removes a node (#2686)
[oweals/minetest_game.git] / mods / default / nodes.lua
index a81f4ed79b9872c3cbec68ea2a04070586a2469f..aa7d482feb8d116342573a32f78b13838a26b4e0 100644 (file)
@@ -1,5 +1,7 @@
 -- mods/default/nodes.lua
 
+-- support for MT game translation.
+local S = default.get_translator
 
 --[[ Node name convention:
 
@@ -30,6 +32,12 @@ default:desert_stone_block
 default:sandstone
 default:sandstonebrick
 default:sandstone_block
+default:desert_sandstone
+default:desert_sandstone_brick
+default:desert_sandstone_block
+default:silver_sandstone
+default:silver_sandstone_brick
+default:silver_sandstone_block
 
 default:obsidian
 default:obsidianbrick
@@ -44,6 +52,14 @@ default:dirt_with_grass
 default:dirt_with_grass_footsteps
 default:dirt_with_dry_grass
 default:dirt_with_snow
+default:dirt_with_rainforest_litter
+default:dirt_with_coniferous_litter
+default:dry_dirt
+default:dry_dirt_with_dry_grass
+
+default:permafrost
+default:permafrost_with_stones
+default:permafrost_with_moss
 
 default:sand
 default:desert_sand
@@ -55,8 +71,8 @@ default:clay
 
 default:snow
 default:snowblock
-
 default:ice
+default:cave_ice
 
 Trees
 -----
@@ -72,6 +88,7 @@ default:jungletree
 default:junglewood
 default:jungleleaves
 default:junglesapling
+default:emergent_jungle_sapling
 
 default:pine_tree
 default:pine_wood
@@ -100,6 +117,10 @@ default:steelblock
 
 default:stone_with_copper
 default:copperblock
+
+default:stone_with_tin
+default:tinblock
+
 default:bronzeblock
 
 default:stone_with_gold
@@ -115,6 +136,8 @@ Plantlife
 ---------
 
 default:cactus
+default:large_cactus_seedling
+
 default:papyrus
 default:dry_shrub
 default:junglegrass
@@ -131,10 +154,28 @@ default:dry_grass_3
 default:dry_grass_4
 default:dry_grass_5
 
+default:fern_1
+default:fern_2
+default:fern_3
+
+default:marram_grass_1
+default:marram_grass_2
+default:marram_grass_3
+
 default:bush_stem
 default:bush_leaves
+default:bush_sapling
 default:acacia_bush_stem
 default:acacia_bush_leaves
+default:acacia_bush_sapling
+default:pine_bush_stem
+default:pine_bush_needles
+default:pine_bush_sapling
+default:blueberry_bush_leaves_with_berries
+default:blueberry_bush_leaves
+default:blueberry_bush_sapling
+
+default:sand_with_kelp
 
 Corals
 ------
@@ -159,9 +200,6 @@ default:lava_flowing
 Tools / "Advanced" crafting / Non-"natural"
 -------------------------------------------
 
-default:chest
-default:chest_locked
-
 default:bookshelf
 
 default:sign_wall_wood
@@ -182,6 +220,7 @@ default:obsidian_glass
 default:brick
 
 default:meselamp
+default:mese_post_light
 
 Misc
 ----
@@ -190,21 +229,31 @@ default:cloud
 
 --]]
 
+-- Required wrapper to allow customization of default.after_place_leaves
+local function after_place_leaves(...)
+       return default.after_place_leaves(...)
+end
+
+-- Required wrapper to allow customization of default.grow_sapling
+local function grow_sapling(...)
+       return default.grow_sapling(...)
+end
+
 --
 -- Stone
 --
 
 minetest.register_node("default:stone", {
-       description = "Stone",
+       description = S("Stone"),
        tiles = {"default_stone.png"},
        groups = {cracky = 3, stone = 1},
-       drop = 'default:cobble',
+       drop = "default:cobble",
        legacy_mineral = true,
        sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:cobble", {
-       description = "Cobblestone",
+       description = S("Cobblestone"),
        tiles = {"default_cobble.png"},
        is_ground_content = false,
        groups = {cracky = 3, stone = 2},
@@ -212,7 +261,7 @@ minetest.register_node("default:cobble", {
 })
 
 minetest.register_node("default:stonebrick", {
-       description = "Stone Brick",
+       description = S("Stone Brick"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_stone_brick.png"},
@@ -222,7 +271,7 @@ minetest.register_node("default:stonebrick", {
 })
 
 minetest.register_node("default:stone_block", {
-       description = "Stone Block",
+       description = S("Stone Block"),
        tiles = {"default_stone_block.png"},
        is_ground_content = false,
        groups = {cracky = 2, stone = 1},
@@ -230,7 +279,7 @@ minetest.register_node("default:stone_block", {
 })
 
 minetest.register_node("default:mossycobble", {
-       description = "Mossy Cobblestone",
+       description = S("Mossy Cobblestone"),
        tiles = {"default_mossycobble.png"},
        is_ground_content = false,
        groups = {cracky = 3, stone = 1},
@@ -239,16 +288,16 @@ minetest.register_node("default:mossycobble", {
 
 
 minetest.register_node("default:desert_stone", {
-       description = "Desert Stone",
+       description = S("Desert Stone"),
        tiles = {"default_desert_stone.png"},
        groups = {cracky = 3, stone = 1},
-       drop = 'default:desert_cobble',
+       drop = "default:desert_cobble",
        legacy_mineral = true,
        sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:desert_cobble", {
-       description = "Desert Cobblestone",
+       description = S("Desert Cobblestone"),
        tiles = {"default_desert_cobble.png"},
        is_ground_content = false,
        groups = {cracky = 3, stone = 2},
@@ -256,7 +305,7 @@ minetest.register_node("default:desert_cobble", {
 })
 
 minetest.register_node("default:desert_stonebrick", {
-       description = "Desert Stone Brick",
+       description = S("Desert Stone Brick"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_desert_stone_brick.png"},
@@ -266,23 +315,22 @@ minetest.register_node("default:desert_stonebrick", {
 })
 
 minetest.register_node("default:desert_stone_block", {
-       description = "Desert Stone Block",
+       description = S("Desert Stone Block"),
        tiles = {"default_desert_stone_block.png"},
        is_ground_content = false,
        groups = {cracky = 2, stone = 1},
        sounds = default.node_sound_stone_defaults(),
 })
 
-
 minetest.register_node("default:sandstone", {
-       description = "Sandstone",
+       description = S("Sandstone"),
        tiles = {"default_sandstone.png"},
        groups = {crumbly = 1, cracky = 3},
        sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:sandstonebrick", {
-       description = "Sandstone Brick",
+       description = S("Sandstone Brick"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_sandstone_brick.png"},
@@ -292,23 +340,72 @@ minetest.register_node("default:sandstonebrick", {
 })
 
 minetest.register_node("default:sandstone_block", {
-       description = "Sandstone Block",
+       description = S("Sandstone Block"),
        tiles = {"default_sandstone_block.png"},
        is_ground_content = false,
        groups = {cracky = 2},
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:desert_sandstone", {
+       description = S("Desert Sandstone"),
+       tiles = {"default_desert_sandstone.png"},
+       groups = {crumbly = 1, cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_brick", {
+       description = S("Desert Sandstone Brick"),
+       paramtype2 = "facedir",
+       place_param2 = 0,
+       tiles = {"default_desert_sandstone_brick.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_block", {
+       description = S("Desert Sandstone Block"),
+       tiles = {"default_desert_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone", {
+       description = S("Silver Sandstone"),
+       tiles = {"default_silver_sandstone.png"},
+       groups = {crumbly = 1, cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_brick", {
+       description = S("Silver Sandstone Brick"),
+       paramtype2 = "facedir",
+       place_param2 = 0,
+       tiles = {"default_silver_sandstone_brick.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_block", {
+       description = S("Silver Sandstone Block"),
+       tiles = {"default_silver_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
 
 minetest.register_node("default:obsidian", {
-       description = "Obsidian",
+       description = S("Obsidian"),
        tiles = {"default_obsidian.png"},
        sounds = default.node_sound_stone_defaults(),
        groups = {cracky = 1, level = 2},
 })
 
 minetest.register_node("default:obsidianbrick", {
-       description = "Obsidian Brick",
+       description = S("Obsidian Brick"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_obsidian_brick.png"},
@@ -318,7 +415,7 @@ minetest.register_node("default:obsidianbrick", {
 })
 
 minetest.register_node("default:obsidian_block", {
-       description = "Obsidian Block",
+       description = S("Obsidian Block"),
        tiles = {"default_obsidian_block.png"},
        is_ground_content = false,
        sounds = default.node_sound_stone_defaults(),
@@ -330,77 +427,153 @@ minetest.register_node("default:obsidian_block", {
 --
 
 minetest.register_node("default:dirt", {
-       description = "Dirt",
+       description = S("Dirt"),
        tiles = {"default_dirt.png"},
        groups = {crumbly = 3, soil = 1},
        sounds = default.node_sound_dirt_defaults(),
 })
 
 minetest.register_node("default:dirt_with_grass", {
-       description = "Dirt with Grass",
+       description = S("Dirt with Grass"),
        tiles = {"default_grass.png", "default_dirt.png",
                {name = "default_dirt.png^default_grass_side.png",
                        tileable_vertical = false}},
        groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
-       drop = 'default:dirt',
+       drop = "default:dirt",
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_grass_footstep", gain = 0.25},
        }),
 })
 
 minetest.register_node("default:dirt_with_grass_footsteps", {
-       description = "Dirt with Grass and Footsteps",
+       description = S("Dirt with Grass and Footsteps"),
        tiles = {"default_grass.png^default_footprint.png", "default_dirt.png",
                {name = "default_dirt.png^default_grass_side.png",
                        tileable_vertical = false}},
        groups = {crumbly = 3, soil = 1, not_in_creative_inventory = 1},
-       drop = 'default:dirt',
+       drop = "default:dirt",
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_grass_footstep", gain = 0.25},
        }),
 })
 
 minetest.register_node("default:dirt_with_dry_grass", {
-       description = "Dirt with Dry Grass",
+       description = S("Dirt with Savanna Grass"),
        tiles = {"default_dry_grass.png",
                "default_dirt.png",
                {name = "default_dirt.png^default_dry_grass_side.png",
                        tileable_vertical = false}},
-       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
-       drop = 'default:dirt',
+       groups = {crumbly = 3, soil = 1},
+       drop = "default:dirt",
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_grass_footstep", gain = 0.4},
        }),
 })
 
 minetest.register_node("default:dirt_with_snow", {
-       description = "Dirt with Snow",
+       description = S("Dirt with Snow"),
        tiles = {"default_snow.png", "default_dirt.png",
                {name = "default_dirt.png^default_snow_side.png",
                        tileable_vertical = false}},
+       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1, snowy = 1},
+       drop = "default:dirt",
+       sounds = default.node_sound_dirt_defaults({
+               footstep = {name = "default_snow_footstep", gain = 0.2},
+       }),
+})
+
+minetest.register_node("default:dirt_with_rainforest_litter", {
+       description = S("Dirt with Rainforest Litter"),
+       tiles = {
+               "default_rainforest_litter.png",
+               "default_dirt.png",
+               {name = "default_dirt.png^default_rainforest_litter_side.png",
+                       tileable_vertical = false}
+       },
+       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
+       drop = "default:dirt",
+       sounds = default.node_sound_dirt_defaults({
+               footstep = {name = "default_grass_footstep", gain = 0.4},
+       }),
+})
+
+minetest.register_node("default:dirt_with_coniferous_litter", {
+       description = S("Dirt with Coniferous Litter"),
+       tiles = {
+               "default_coniferous_litter.png",
+               "default_dirt.png",
+               {name = "default_dirt.png^default_coniferous_litter_side.png",
+                       tileable_vertical = false}
+       },
        groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
-       drop = 'default:dirt',
+       drop = "default:dirt",
+       sounds = default.node_sound_dirt_defaults({
+               footstep = {name = "default_grass_footstep", gain = 0.4},
+       }),
+})
+
+minetest.register_node("default:dry_dirt", {
+       description = S("Savanna Dirt"),
+       tiles = {"default_dry_dirt.png"},
+       groups = {crumbly = 3, soil = 1},
+       sounds = default.node_sound_dirt_defaults(),
+})
+
+minetest.register_node("default:dry_dirt_with_dry_grass", {
+       description = S("Savanna Dirt with Savanna Grass"),
+       tiles = {"default_dry_grass.png", "default_dry_dirt.png",
+               {name = "default_dry_dirt.png^default_dry_grass_side.png",
+                       tileable_vertical = false}},
+       groups = {crumbly = 3, soil = 1},
+       drop = "default:dry_dirt",
+       sounds = default.node_sound_dirt_defaults({
+               footstep = {name = "default_grass_footstep", gain = 0.4},
+       }),
+})
+
+minetest.register_node("default:permafrost", {
+       description = S("Permafrost"),
+       tiles = {"default_permafrost.png"},
+       groups = {cracky = 3},
+       sounds = default.node_sound_dirt_defaults(),
+})
+
+minetest.register_node("default:permafrost_with_stones", {
+       description = S("Permafrost with Stones"),
+       tiles = {"default_permafrost.png^default_stones.png",
+               "default_permafrost.png",
+               "default_permafrost.png^default_stones_side.png"},
+       groups = {cracky = 3},
+       sounds = default.node_sound_gravel_defaults(),
+})
+
+minetest.register_node("default:permafrost_with_moss", {
+       description = S("Permafrost with Moss"),
+       tiles = {"default_moss.png", "default_permafrost.png",
+               {name = "default_permafrost.png^default_moss_side.png",
+                       tileable_vertical = false}},
+       groups = {cracky = 3},
        sounds = default.node_sound_dirt_defaults({
-               footstep = {name = "default_snow_footstep", gain = 0.15},
+               footstep = {name = "default_grass_footstep", gain = 0.25},
        }),
 })
 
 minetest.register_node("default:sand", {
-       description = "Sand",
+       description = S("Sand"),
        tiles = {"default_sand.png"},
        groups = {crumbly = 3, falling_node = 1, sand = 1},
        sounds = default.node_sound_sand_defaults(),
 })
 
 minetest.register_node("default:desert_sand", {
-       description = "Desert Sand",
+       description = S("Desert Sand"),
        tiles = {"default_desert_sand.png"},
        groups = {crumbly = 3, falling_node = 1, sand = 1},
        sounds = default.node_sound_sand_defaults(),
 })
 
 minetest.register_node("default:silver_sand", {
-       description = "Silver Sand",
+       description = S("Silver Sand"),
        tiles = {"default_silver_sand.png"},
        groups = {crumbly = 3, falling_node = 1, sand = 1},
        sounds = default.node_sound_sand_defaults(),
@@ -408,30 +581,30 @@ minetest.register_node("default:silver_sand", {
 
 
 minetest.register_node("default:gravel", {
-       description = "Gravel",
+       description = S("Gravel"),
        tiles = {"default_gravel.png"},
        groups = {crumbly = 2, falling_node = 1},
        sounds = default.node_sound_gravel_defaults(),
        drop = {
                max_items = 1,
                items = {
-                       {items = {'default:flint'}, rarity = 16},
-                       {items = {'default:gravel'}}
+                       {items = {"default:flint"}, rarity = 16},
+                       {items = {"default:gravel"}}
                }
        }
 })
 
 minetest.register_node("default:clay", {
-       description = "Clay",
+       description = S("Clay"),
        tiles = {"default_clay.png"},
        groups = {crumbly = 3},
-       drop = 'default:clay_lump 4',
+       drop = "default:clay_lump 4",
        sounds = default.node_sound_dirt_defaults(),
 })
 
 
 minetest.register_node("default:snow", {
-       description = "Snow",
+       description = S("Snow"),
        tiles = {"default_snow.png"},
        inventory_image = "default_snowball.png",
        wield_image = "default_snowball.png",
@@ -445,12 +618,14 @@ minetest.register_node("default:snow", {
                        {-0.5, -0.5, -0.5, 0.5, -0.25, 0.5},
                },
        },
-       groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1},
-       sounds = default.node_sound_dirt_defaults({
-               footstep = {name = "default_snow_footstep", gain = 0.15},
-               dug = {name = "default_snow_footstep", gain = 0.2},
-               dig = {name = "default_snow_footstep", gain = 0.2}
-       }),
+       collision_box = {
+               type = "fixed",
+               fixed = {
+                       {-0.5, -0.5, -0.5, 0.5, -6 / 16, 0.5},
+               },
+       },
+       groups = {crumbly = 3, falling_node = 1, snowy = 1},
+       sounds = default.node_sound_snow_defaults(),
 
        on_construct = function(pos)
                pos.y = pos.y - 1
@@ -461,14 +636,10 @@ minetest.register_node("default:snow", {
 })
 
 minetest.register_node("default:snowblock", {
-       description = "Snow Block",
+       description = S("Snow Block"),
        tiles = {"default_snow.png"},
-       groups = {crumbly = 3, puts_out_fire = 1, cools_lava = 1},
-       sounds = default.node_sound_dirt_defaults({
-               footstep = {name = "default_snow_footstep", gain = 0.15},
-               dug = {name = "default_snow_footstep", gain = 0.2},
-               dig = {name = "default_snow_footstep", gain = 0.2}
-       }),
+       groups = {crumbly = 3, cools_lava = 1, snowy = 1},
+       sounds = default.node_sound_snow_defaults(),
 
        on_construct = function(pos)
                pos.y = pos.y - 1
@@ -478,12 +649,24 @@ minetest.register_node("default:snowblock", {
        end,
 })
 
+-- 'is ground content = false' to avoid tunnels in sea ice or ice rivers
 minetest.register_node("default:ice", {
-       description = "Ice",
+       description = S("Ice"),
        tiles = {"default_ice.png"},
        is_ground_content = false,
        paramtype = "light",
-       groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1},
+       groups = {cracky = 3, cools_lava = 1, slippery = 3},
+       sounds = default.node_sound_glass_defaults(),
+})
+
+-- Mapgen-placed ice with 'is ground content = true' to contain tunnels
+minetest.register_node("default:cave_ice", {
+       description = S("Cave Ice"),
+       tiles = {"default_ice.png"},
+       paramtype = "light",
+       groups = {cracky = 3, cools_lava = 1, slippery = 3,
+               not_in_creative_inventory = 1},
+       drop = "default:ice",
        sounds = default.node_sound_glass_defaults(),
 })
 
@@ -492,7 +675,7 @@ minetest.register_node("default:ice", {
 --
 
 minetest.register_node("default:tree", {
-       description = "Tree",
+       description = S("Apple Tree"),
        tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
        paramtype2 = "facedir",
        is_ground_content = false,
@@ -503,7 +686,7 @@ minetest.register_node("default:tree", {
 })
 
 minetest.register_node("default:wood", {
-       description = "Wooden Planks",
+       description = S("Apple Wood Planks"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_wood.png"},
@@ -513,16 +696,15 @@ minetest.register_node("default:wood", {
 })
 
 minetest.register_node("default:sapling", {
-       description = "Sapling",
+       description = S("Apple Tree Sapling"),
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_sapling.png"},
        inventory_image = "default_sapling.png",
        wield_image = "default_sapling.png",
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
-       on_timer = default.grow_sapling,
+       on_timer = grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -532,7 +714,7 @@ minetest.register_node("default:sapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -540,8 +722,8 @@ minetest.register_node("default:sapling", {
                        "default:sapling",
                        -- minp, maxp to be checked, relative to sapling pos
                        -- minp_relative.y = 1 because sapling pos has been checked
-                       {x = -2, y = 1, z = -2},
-                       {x = 2, y = 6, z = 2},
+                       {x = -3, y = 1, z = -3},
+                       {x = 3, y = 6, z = 3},
                        -- maximum interval of interior volume check
                        4)
 
@@ -550,7 +732,7 @@ minetest.register_node("default:sapling", {
 })
 
 minetest.register_node("default:leaves", {
-       description = "Leaves",
+       description = S("Apple Tree Leaves"),
        drawtype = "allfaces_optional",
        waving = 1,
        tiles = {"default_leaves.png"},
@@ -563,25 +745,24 @@ minetest.register_node("default:leaves", {
                items = {
                        {
                                -- player will get sapling with 1/20 chance
-                               items = {'default:sapling'},
+                               items = {"default:sapling"},
                                rarity = 20,
                        },
                        {
                                -- player will get leaves only if he get no saplings,
                                -- this is because max_items is 1
-                               items = {'default:leaves'},
+                               items = {"default:leaves"},
                        }
                }
        },
        sounds = default.node_sound_leaves_defaults(),
 
-       after_place_node = default.after_place_leaves,
+       after_place_node = after_place_leaves,
 })
 
 minetest.register_node("default:apple", {
-       description = "Apple",
+       description = S("Apple"),
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_apple.png"},
        inventory_image = "default_apple.png",
        paramtype = "light",
@@ -593,20 +774,47 @@ minetest.register_node("default:apple", {
                fixed = {-3 / 16, -7 / 16, -3 / 16, 3 / 16, 4 / 16, 3 / 16}
        },
        groups = {fleshy = 3, dig_immediate = 3, flammable = 2,
-               leafdecay = 3, leafdecay_drop = 1},
+               leafdecay = 3, leafdecay_drop = 1, food_apple = 1},
        on_use = minetest.item_eat(2),
        sounds = default.node_sound_leaves_defaults(),
 
        after_place_node = function(pos, placer, itemstack)
-               if placer:is_player() then
-                       minetest.set_node(pos, {name = "default:apple", param2 = 1})
+               minetest.set_node(pos, {name = "default:apple", param2 = 1})
+       end,
+
+       after_dig_node = function(pos, oldnode, oldmetadata, digger)
+               if oldnode.param2 == 0 then
+                       minetest.set_node(pos, {name = "default:apple_mark"})
+                       minetest.get_node_timer(pos):start(math.random(300, 1500))
                end
        end,
 })
 
+minetest.register_node("default:apple_mark", {
+       description = S("Apple Marker"),
+       drawtype = "airlike",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       pointable = false,
+       diggable = false,
+       buildable_to = true,
+       drop = "",
+       groups = {not_in_creative_inventory = 1},
+       on_timer = function(pos, elapsed)
+               if not minetest.find_node_near(pos, 1, "default:leaves") then
+                       minetest.remove_node(pos)
+               elseif minetest.get_node_light(pos) < 11 then
+                       minetest.get_node_timer(pos):start(200)
+               else
+                       minetest.set_node(pos, {name = "default:apple"})
+               end
+       end
+})
+
 
 minetest.register_node("default:jungletree", {
-       description = "Jungle Tree",
+       description = S("Jungle Tree"),
        tiles = {"default_jungletree_top.png", "default_jungletree_top.png",
                "default_jungletree.png"},
        paramtype2 = "facedir",
@@ -618,7 +826,7 @@ minetest.register_node("default:jungletree", {
 })
 
 minetest.register_node("default:junglewood", {
-       description = "Junglewood Planks",
+       description = S("Jungle Wood Planks"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_junglewood.png"},
@@ -628,7 +836,7 @@ minetest.register_node("default:junglewood", {
 })
 
 minetest.register_node("default:jungleleaves", {
-       description = "Jungle Leaves",
+       description = S("Jungle Tree Leaves"),
        drawtype = "allfaces_optional",
        waving = 1,
        tiles = {"default_jungleleaves.png"},
@@ -639,26 +847,25 @@ minetest.register_node("default:jungleleaves", {
        drop = {
                max_items = 1,
                items = {
-                       {items = {'default:junglesapling'}, rarity = 20},
-                       {items = {'default:jungleleaves'}}
+                       {items = {"default:junglesapling"}, rarity = 20},
+                       {items = {"default:jungleleaves"}}
                }
        },
        sounds = default.node_sound_leaves_defaults(),
 
-       after_place_node = default.after_place_leaves,
+       after_place_node = after_place_leaves,
 })
 
 minetest.register_node("default:junglesapling", {
-       description = "Jungle Sapling",
+       description = S("Jungle Tree Sapling"),
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_junglesapling.png"},
        inventory_image = "default_junglesapling.png",
        wield_image = "default_junglesapling.png",
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
-       on_timer = default.grow_sapling,
+       on_timer = grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -668,7 +875,7 @@ minetest.register_node("default:junglesapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -685,9 +892,44 @@ minetest.register_node("default:junglesapling", {
        end,
 })
 
+minetest.register_node("default:emergent_jungle_sapling", {
+       description = S("Emergent Jungle Tree Sapling"),
+       drawtype = "plantlike",
+       tiles = {"default_emergent_jungle_sapling.png"},
+       inventory_image = "default_emergent_jungle_sapling.png",
+       wield_image = "default_emergent_jungle_sapling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       on_timer = grow_sapling,
+       selection_box = {
+               type = "fixed",
+               fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
+       },
+       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+               attached_node = 1, sapling = 1},
+       sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:emergent_jungle_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       {x = -3, y = -5, z = -3},
+                       {x = 3, y = 31, z = 3},
+                       -- maximum interval of interior volume check
+                       4)
+
+               return itemstack
+       end,
+})
+
 
 minetest.register_node("default:pine_tree", {
-       description = "Pine Tree",
+       description = S("Pine Tree"),
        tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png",
                "default_pine_tree.png"},
        paramtype2 = "facedir",
@@ -699,7 +941,7 @@ minetest.register_node("default:pine_tree", {
 })
 
 minetest.register_node("default:pine_wood", {
-       description = "Pine Wood Planks",
+       description = S("Pine Wood Planks"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_pine_wood.png"},
@@ -709,7 +951,7 @@ minetest.register_node("default:pine_wood", {
 })
 
 minetest.register_node("default:pine_needles",{
-       description = "Pine Needles",
+       description = S("Pine Needles"),
        drawtype = "allfaces_optional",
        tiles = {"default_pine_needles.png"},
        waving = 1,
@@ -725,20 +967,19 @@ minetest.register_node("default:pine_needles",{
        },
        sounds = default.node_sound_leaves_defaults(),
 
-       after_place_node = default.after_place_leaves,
+       after_place_node = after_place_leaves,
 })
 
 minetest.register_node("default:pine_sapling", {
-       description = "Pine Sapling",
+       description = S("Pine Tree Sapling"),
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_pine_sapling.png"},
        inventory_image = "default_pine_sapling.png",
        wield_image = "default_pine_sapling.png",
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
-       on_timer = default.grow_sapling,
+       on_timer = grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -748,7 +989,7 @@ minetest.register_node("default:pine_sapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -757,7 +998,7 @@ minetest.register_node("default:pine_sapling", {
                        -- minp, maxp to be checked, relative to sapling pos
                        -- minp_relative.y = 1 because sapling pos has been checked
                        {x = -2, y = 1, z = -2},
-                       {x = 2, y = 12, z = 2},
+                       {x = 2, y = 14, z = 2},
                        -- maximum interval of interior volume check
                        4)
 
@@ -767,7 +1008,7 @@ minetest.register_node("default:pine_sapling", {
 
 
 minetest.register_node("default:acacia_tree", {
-       description = "Acacia Tree",
+       description = S("Acacia Tree"),
        tiles = {"default_acacia_tree_top.png", "default_acacia_tree_top.png",
                "default_acacia_tree.png"},
        paramtype2 = "facedir",
@@ -779,7 +1020,7 @@ minetest.register_node("default:acacia_tree", {
 })
 
 minetest.register_node("default:acacia_wood", {
-       description = "Acacia Wood Planks",
+       description = S("Acacia Wood Planks"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_acacia_wood.png"},
@@ -789,7 +1030,7 @@ minetest.register_node("default:acacia_wood", {
 })
 
 minetest.register_node("default:acacia_leaves", {
-       description = "Acacia Leaves",
+       description = S("Acacia Tree Leaves"),
        drawtype = "allfaces_optional",
        tiles = {"default_acacia_leaves.png"},
        special_tiles = {"default_acacia_leaves_simple.png"},
@@ -806,20 +1047,19 @@ minetest.register_node("default:acacia_leaves", {
        },
        sounds = default.node_sound_leaves_defaults(),
 
-       after_place_node = default.after_place_leaves,
+       after_place_node = after_place_leaves,
 })
 
 minetest.register_node("default:acacia_sapling", {
-       description = "Acacia Tree Sapling",
+       description = S("Acacia Tree Sapling"),
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_acacia_sapling.png"},
        inventory_image = "default_acacia_sapling.png",
        wield_image = "default_acacia_sapling.png",
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
-       on_timer = default.grow_sapling,
+       on_timer = grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -829,7 +1069,7 @@ minetest.register_node("default:acacia_sapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -838,7 +1078,7 @@ minetest.register_node("default:acacia_sapling", {
                        -- minp, maxp to be checked, relative to sapling pos
                        -- minp_relative.y = 1 because sapling pos has been checked
                        {x = -4, y = 1, z = -4},
-                       {x = 4, y = 6, z = 4},
+                       {x = 4, y = 7, z = 4},
                        -- maximum interval of interior volume check
                        4)
 
@@ -847,7 +1087,7 @@ minetest.register_node("default:acacia_sapling", {
 })
 
 minetest.register_node("default:aspen_tree", {
-       description = "Aspen Tree",
+       description = S("Aspen Tree"),
        tiles = {"default_aspen_tree_top.png", "default_aspen_tree_top.png",
                "default_aspen_tree.png"},
        paramtype2 = "facedir",
@@ -859,7 +1099,7 @@ minetest.register_node("default:aspen_tree", {
 })
 
 minetest.register_node("default:aspen_wood", {
-       description = "Aspen Wood Planks",
+       description = S("Aspen Wood Planks"),
        paramtype2 = "facedir",
        place_param2 = 0,
        tiles = {"default_aspen_wood.png"},
@@ -869,7 +1109,7 @@ minetest.register_node("default:aspen_wood", {
 })
 
 minetest.register_node("default:aspen_leaves", {
-       description = "Aspen Leaves",
+       description = S("Aspen Tree Leaves"),
        drawtype = "allfaces_optional",
        tiles = {"default_aspen_leaves.png"},
        waving = 1,
@@ -885,20 +1125,19 @@ minetest.register_node("default:aspen_leaves", {
        },
        sounds = default.node_sound_leaves_defaults(),
 
-       after_place_node = default.after_place_leaves,
+       after_place_node = after_place_leaves,
 })
 
 minetest.register_node("default:aspen_sapling", {
-       description = "Aspen Tree Sapling",
+       description = S("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,
-       on_timer = default.grow_sapling,
+       on_timer = grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-3 / 16, -0.5, -3 / 16, 3 / 16, 0.5, 3 / 16}
@@ -908,7 +1147,7 @@ minetest.register_node("default:aspen_sapling", {
        sounds = default.node_sound_leaves_defaults(),
 
        on_construct = function(pos)
-               minetest.get_node_timer(pos):start(math.random(2400,4800))
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
        end,
 
        on_place = function(itemstack, placer, pointed_thing)
@@ -930,15 +1169,15 @@ minetest.register_node("default:aspen_sapling", {
 --
 
 minetest.register_node("default:stone_with_coal", {
-       description = "Coal Ore",
+       description = S("Coal Ore"),
        tiles = {"default_stone.png^default_mineral_coal.png"},
        groups = {cracky = 3},
-       drop = 'default:coal_lump',
+       drop = "default:coal_lump",
        sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:coalblock", {
-       description = "Coal Block",
+       description = S("Coal Block"),
        tiles = {"default_coal_block.png"},
        is_ground_content = false,
        groups = {cracky = 3},
@@ -947,15 +1186,15 @@ minetest.register_node("default:coalblock", {
 
 
 minetest.register_node("default:stone_with_iron", {
-       description = "Iron Ore",
+       description = S("Iron Ore"),
        tiles = {"default_stone.png^default_mineral_iron.png"},
        groups = {cracky = 2},
-       drop = 'default:iron_lump',
+       drop = "default:iron_lump",
        sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:steelblock", {
-       description = "Steel Block",
+       description = S("Steel Block"),
        tiles = {"default_steel_block.png"},
        is_ground_content = false,
        groups = {cracky = 1, level = 2},
@@ -964,23 +1203,41 @@ minetest.register_node("default:steelblock", {
 
 
 minetest.register_node("default:stone_with_copper", {
-       description = "Copper Ore",
+       description = S("Copper Ore"),
        tiles = {"default_stone.png^default_mineral_copper.png"},
        groups = {cracky = 2},
-       drop = 'default:copper_lump',
+       drop = "default:copper_lump",
        sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:copperblock", {
-       description = "Copper Block",
+       description = S("Copper Block"),
        tiles = {"default_copper_block.png"},
        is_ground_content = false,
        groups = {cracky = 1, level = 2},
        sounds = default.node_sound_metal_defaults(),
 })
 
+
+minetest.register_node("default:stone_with_tin", {
+       description = S("Tin Ore"),
+       tiles = {"default_stone.png^default_mineral_tin.png"},
+       groups = {cracky = 2},
+       drop = "default:tin_lump",
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:tinblock", {
+       description = S("Tin Block"),
+       tiles = {"default_tin_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 1, level = 2},
+       sounds = default.node_sound_metal_defaults(),
+})
+
+
 minetest.register_node("default:bronzeblock", {
-       description = "Bronze Block",
+       description = S("Bronze Block"),
        tiles = {"default_bronze_block.png"},
        is_ground_content = false,
        groups = {cracky = 1, level = 2},
@@ -989,7 +1246,7 @@ minetest.register_node("default:bronzeblock", {
 
 
 minetest.register_node("default:stone_with_mese", {
-       description = "Mese Ore",
+       description = S("Mese Ore"),
        tiles = {"default_stone.png^default_mineral_mese.png"},
        groups = {cracky = 1},
        drop = "default:mese_crystal",
@@ -997,7 +1254,7 @@ minetest.register_node("default:stone_with_mese", {
 })
 
 minetest.register_node("default:mese", {
-       description = "Mese Block",
+       description = S("Mese Block"),
        tiles = {"default_mese_block.png"},
        paramtype = "light",
        groups = {cracky = 1, level = 2},
@@ -1007,7 +1264,7 @@ minetest.register_node("default:mese", {
 
 
 minetest.register_node("default:stone_with_gold", {
-       description = "Gold Ore",
+       description = S("Gold Ore"),
        tiles = {"default_stone.png^default_mineral_gold.png"},
        groups = {cracky = 2},
        drop = "default:gold_lump",
@@ -1015,7 +1272,7 @@ minetest.register_node("default:stone_with_gold", {
 })
 
 minetest.register_node("default:goldblock", {
-       description = "Gold Block",
+       description = S("Gold Block"),
        tiles = {"default_gold_block.png"},
        is_ground_content = false,
        groups = {cracky = 1},
@@ -1024,7 +1281,7 @@ minetest.register_node("default:goldblock", {
 
 
 minetest.register_node("default:stone_with_diamond", {
-       description = "Diamond Ore",
+       description = S("Diamond Ore"),
        tiles = {"default_stone.png^default_mineral_diamond.png"},
        groups = {cracky = 1},
        drop = "default:diamond",
@@ -1032,7 +1289,7 @@ minetest.register_node("default:stone_with_diamond", {
 })
 
 minetest.register_node("default:diamondblock", {
-       description = "Diamond Block",
+       description = S("Diamond Block"),
        tiles = {"default_diamond_block.png"},
        is_ground_content = false,
        groups = {cracky = 1, level = 3},
@@ -1044,17 +1301,88 @@ minetest.register_node("default:diamondblock", {
 --
 
 minetest.register_node("default:cactus", {
-       description = "Cactus",
+       description = S("Cactus"),
        tiles = {"default_cactus_top.png", "default_cactus_top.png",
                "default_cactus_side.png"},
        paramtype2 = "facedir",
-       groups = {snappy = 1, choppy = 3},
+       groups = {choppy = 3},
        sounds = default.node_sound_wood_defaults(),
        on_place = minetest.rotate_node,
 })
 
+minetest.register_node("default:large_cactus_seedling", {
+       description = S("Large Cactus Seedling"),
+       drawtype = "plantlike",
+       tiles = {"default_large_cactus_seedling.png"},
+       inventory_image = "default_large_cactus_seedling.png",
+       wield_image = "default_large_cactus_seedling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       selection_box = {
+               type = "fixed",
+               fixed = {
+                       -5 / 16, -0.5, -5 / 16,
+                       5 / 16, 0.5, 5 / 16
+               }
+       },
+       groups = {choppy = 3, dig_immediate = 3, attached_node = 1},
+       sounds = default.node_sound_wood_defaults(),
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:large_cactus_seedling",
+                       {x = -2, y = -1, z = -2},
+                       {x = 2, y = 5, z = 2},
+                       4)
+
+               return itemstack
+       end,
+
+       on_construct = function(pos)
+               -- Normal cactus farming adds 1 cactus node by ABM,
+               -- interval 12s, chance 83.
+               -- Consider starting with 5 cactus nodes. We make sure that growing a
+               -- large cactus is not a faster way to produce new cactus nodes.
+               -- Confirmed by experiment, when farming 5 cacti, on average 1 new
+               -- cactus node is added on average every
+               -- 83 / 5 = 16.6 intervals = 16.6 * 12 = 199.2s.
+               -- Large cactus contains on average 14 cactus nodes.
+               -- 14 * 199.2 = 2788.8s.
+               -- Set random range to average to 2789s.
+               minetest.get_node_timer(pos):start(math.random(1859, 3719))
+       end,
+
+       on_timer = function(pos)
+               local node_under = minetest.get_node_or_nil(
+                       {x = pos.x, y = pos.y - 1, z = pos.z})
+               if not node_under then
+                       -- Node under not yet loaded, try later
+                       minetest.get_node_timer(pos):start(300)
+                       return
+               end
+
+               if minetest.get_item_group(node_under.name, "sand") == 0 then
+                       -- Seedling dies
+                       minetest.remove_node(pos)
+                       return
+               end
+
+               local light_level = minetest.get_node_light(pos)
+               if not light_level or light_level < 13 then
+                       -- Too dark for growth, try later in case it's night
+                       minetest.get_node_timer(pos):start(300)
+                       return
+               end
+
+               minetest.log("action", "A large cactus seedling grows into a large" ..
+                       "cactus at ".. minetest.pos_to_string(pos))
+               default.grow_large_cactus(pos)
+       end,
+})
+
 minetest.register_node("default:papyrus", {
-       description = "Papyrus",
+       description = S("Papyrus"),
        drawtype = "plantlike",
        tiles = {"default_papyrus.png"},
        inventory_image = "default_papyrus.png",
@@ -1075,14 +1403,15 @@ minetest.register_node("default:papyrus", {
 })
 
 minetest.register_node("default:dry_shrub", {
-       description = "Dry Shrub",
+       description = S("Dry Shrub"),
        drawtype = "plantlike",
        waving = 1,
-       visual_scale = 1.0,
        tiles = {"default_dry_shrub.png"},
        inventory_image = "default_dry_shrub.png",
        wield_image = "default_dry_shrub.png",
        paramtype = "light",
+       paramtype2 = "meshoptions",
+       place_param2 = 4,
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
@@ -1090,15 +1419,15 @@ minetest.register_node("default:dry_shrub", {
        sounds = default.node_sound_leaves_defaults(),
        selection_box = {
                type = "fixed",
-               fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 4 / 16, 5 / 16},
+               fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 4 / 16, 6 / 16},
        },
 })
 
 minetest.register_node("default:junglegrass", {
-       description = "Jungle Grass",
+       description = S("Jungle Grass"),
        drawtype = "plantlike",
        waving = 1,
-       visual_scale = 1.3,
+       visual_scale = 1.69,
        tiles = {"default_junglegrass.png"},
        inventory_image = "default_junglegrass.png",
        wield_image = "default_junglegrass.png",
@@ -1106,17 +1435,17 @@ minetest.register_node("default:junglegrass", {
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
-       groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1},
+       groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1},
        sounds = default.node_sound_leaves_defaults(),
        selection_box = {
                type = "fixed",
-               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 1.19, 7 / 16},
+               fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16},
        },
 })
 
 
 minetest.register_node("default:grass_1", {
-       description = "Grass",
+       description = S("Grass"),
        drawtype = "plantlike",
        waving = 1,
        tiles = {"default_grass_1.png"},
@@ -1145,7 +1474,7 @@ minetest.register_node("default:grass_1", {
 
 for i = 2, 5 do
        minetest.register_node("default:grass_" .. i, {
-               description = "Grass",
+               description = S("Grass"),
                drawtype = "plantlike",
                waving = 1,
                tiles = {"default_grass_" .. i .. ".png"},
@@ -1168,7 +1497,7 @@ end
 
 
 minetest.register_node("default:dry_grass_1", {
-       description = "Dry Grass",
+       description = S("Savanna Grass"),
        drawtype = "plantlike",
        waving = 1,
        tiles = {"default_dry_grass_1.png"},
@@ -1197,7 +1526,7 @@ minetest.register_node("default:dry_grass_1", {
 
 for i = 2, 5 do
        minetest.register_node("default:dry_grass_" .. i, {
-               description = "Dry Grass",
+               description = S("Savanna Grass"),
                drawtype = "plantlike",
                waving = 1,
                tiles = {"default_dry_grass_" .. i .. ".png"},
@@ -1219,10 +1548,113 @@ for i = 2, 5 do
 end
 
 
+minetest.register_node("default:fern_1", {
+       description = S("Fern"),
+       drawtype = "plantlike",
+       waving = 1,
+       tiles = {"default_fern_1.png"},
+       inventory_image = "default_fern_1.png",
+       wield_image = "default_fern_1.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       buildable_to = true,
+       groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1},
+       sounds = default.node_sound_leaves_defaults(),
+       selection_box = {
+               type = "fixed",
+               fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -0.25, 6 / 16},
+       },
+
+       on_place = function(itemstack, placer, pointed_thing)
+               -- place a random fern node
+               local stack = ItemStack("default:fern_" .. math.random(1, 3))
+               local ret = minetest.item_place(stack, placer, pointed_thing)
+               return ItemStack("default:fern_1 " ..
+                       itemstack:get_count() - (1 - ret:get_count()))
+       end,
+})
+
+for i = 2, 3 do
+       minetest.register_node("default:fern_" .. i, {
+               description = S("Fern"),
+               drawtype = "plantlike",
+               waving = 1,
+               visual_scale = 2,
+               tiles = {"default_fern_" .. i .. ".png"},
+               inventory_image = "default_fern_" .. i .. ".png",
+               wield_image = "default_fern_" .. i .. ".png",
+               paramtype = "light",
+               sunlight_propagates = true,
+               walkable = false,
+               buildable_to = true,
+               groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1,
+                       not_in_creative_inventory=1},
+               drop = "default:fern_1",
+               sounds = default.node_sound_leaves_defaults(),
+               selection_box = {
+                       type = "fixed",
+                       fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -0.25, 6 / 16},
+               },
+       })
+end
+
+
+minetest.register_node("default:marram_grass_1", {
+       description = S("Marram Grass"),
+       drawtype = "plantlike",
+       waving = 1,
+       tiles = {"default_marram_grass_1.png"},
+       inventory_image = "default_marram_grass_1.png",
+       wield_image = "default_marram_grass_1.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       buildable_to = true,
+       groups = {snappy = 3, flammable = 3, attached_node = 1},
+       sounds = default.node_sound_leaves_defaults(),
+       selection_box = {
+               type = "fixed",
+               fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -0.25, 6 / 16},
+       },
+
+       on_place = function(itemstack, placer, pointed_thing)
+               -- place a random marram grass node
+               local stack = ItemStack("default:marram_grass_" .. math.random(1, 3))
+               local ret = minetest.item_place(stack, placer, pointed_thing)
+               return ItemStack("default:marram_grass_1 " ..
+                       itemstack:get_count() - (1 - ret:get_count()))
+       end,
+})
+
+for i = 2, 3 do
+       minetest.register_node("default:marram_grass_" .. i, {
+               description = S("Marram Grass"),
+               drawtype = "plantlike",
+               waving = 1,
+               tiles = {"default_marram_grass_" .. i .. ".png"},
+               inventory_image = "default_marram_grass_" .. i .. ".png",
+               wield_image = "default_marram_grass_" .. i .. ".png",
+               paramtype = "light",
+               sunlight_propagates = true,
+               walkable = false,
+               buildable_to = true,
+               groups = {snappy = 3, flammable = 3, attached_node = 1,
+                       not_in_creative_inventory=1},
+               drop = "default:marram_grass_1",
+               sounds = default.node_sound_leaves_defaults(),
+               selection_box = {
+                       type = "fixed",
+                       fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -0.25, 6 / 16},
+               },
+       })
+end
+
+
 minetest.register_node("default:bush_stem", {
-       description = "Bush Stem",
+       description = S("Bush Stem"),
        drawtype = "plantlike",
-       visual_scale = 1.18,
+       visual_scale = 1.41,
        tiles = {"default_bush_stem.png"},
        inventory_image = "default_bush_stem.png",
        wield_image = "default_bush_stem.png",
@@ -1232,24 +1664,147 @@ minetest.register_node("default:bush_stem", {
        sounds = default.node_sound_wood_defaults(),
        selection_box = {
                type = "fixed",
-               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.54, 7 / 16},
+               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.5, 7 / 16},
        },
 })
 
 minetest.register_node("default:bush_leaves", {
-       description = "Bush Leaves",
+       description = S("Bush Leaves"),
        drawtype = "allfaces_optional",
        waving = 1,
        tiles = {"default_leaves_simple.png"},
        paramtype = "light",
        groups = {snappy = 3, flammable = 2, leaves = 1},
-       sounds = default.node_sound_leaves_defaults(),
+       drop = {
+               max_items = 1,
+               items = {
+                       {items = {"default:bush_sapling"}, rarity = 5},
+                       {items = {"default:bush_leaves"}}
+               }
+       },
+       sounds = default.node_sound_leaves_defaults(),
+
+       after_place_node = after_place_leaves,
+})
+
+minetest.register_node("default:bush_sapling", {
+       description = S("Bush Sapling"),
+       drawtype = "plantlike",
+       tiles = {"default_bush_sapling.png"},
+       inventory_image = "default_bush_sapling.png",
+       wield_image = "default_bush_sapling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       on_timer = grow_sapling,
+       selection_box = {
+               type = "fixed",
+               fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 2 / 16, 4 / 16}
+       },
+       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+               attached_node = 1, sapling = 1},
+       sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:bush_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       {x = -1, y = 0, z = -1},
+                       {x = 1, y = 1, z = 1},
+                       -- maximum interval of interior volume check
+                       2)
+
+               return itemstack
+       end,
+})
+
+minetest.register_node("default:blueberry_bush_leaves_with_berries", {
+       description = S("Blueberry Bush Leaves with Berries"),
+       drawtype = "allfaces_optional",
+       waving = 1,
+       tiles = {"default_blueberry_bush_leaves.png^default_blueberry_overlay.png"},
+       paramtype = "light",
+       groups = {snappy = 3, flammable = 2, leaves = 1, dig_immediate = 3},
+       drop = "default:blueberries",
+       sounds = default.node_sound_leaves_defaults(),
+       node_dig_prediction = "default:blueberry_bush_leaves",
+
+       after_dig_node = function(pos, oldnode, oldmetadata, digger)
+               minetest.set_node(pos, {name = "default:blueberry_bush_leaves"})
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
+       end,
+})
+
+minetest.register_node("default:blueberry_bush_leaves", {
+       description = S("Blueberry Bush Leaves"),
+       drawtype = "allfaces_optional",
+       waving = 1,
+       tiles = {"default_blueberry_bush_leaves.png"},
+       paramtype = "light",
+       groups = {snappy = 3, flammable = 2, leaves = 1},
+       drop = {
+               max_items = 1,
+               items = {
+                       {items = {"default:blueberry_bush_sapling"}, rarity = 5},
+                       {items = {"default:blueberry_bush_leaves"}}
+               }
+       },
+       sounds = default.node_sound_leaves_defaults(),
+
+       on_timer = function(pos, elapsed)
+               if minetest.get_node_light(pos) < 11 then
+                       minetest.get_node_timer(pos):start(200)
+               else
+                       minetest.set_node(pos, {name = "default:blueberry_bush_leaves_with_berries"})
+               end
+       end,
+
+       after_place_node = after_place_leaves,
+})
+
+minetest.register_node("default:blueberry_bush_sapling", {
+       description = S("Blueberry Bush Sapling"),
+       drawtype = "plantlike",
+       tiles = {"default_blueberry_bush_sapling.png"},
+       inventory_image = "default_blueberry_bush_sapling.png",
+       wield_image = "default_blueberry_bush_sapling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       on_timer = grow_sapling,
+       selection_box = {
+               type = "fixed",
+               fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 2 / 16, 4 / 16}
+       },
+       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+               attached_node = 1, sapling = 1},
+       sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:blueberry_bush_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       {x = -1, y = 0, z = -1},
+                       {x = 1, y = 1, z = 1},
+                       -- maximum interval of interior volume check
+                       2)
+
+               return itemstack
+       end,
 })
 
 minetest.register_node("default:acacia_bush_stem", {
-       description = "Acacia Bush Stem",
+       description = S("Acacia Bush Stem"),
        drawtype = "plantlike",
-       visual_scale = 1.18,
+       visual_scale = 1.41,
        tiles = {"default_acacia_bush_stem.png"},
        inventory_image = "default_acacia_bush_stem.png",
        wield_image = "default_acacia_bush_stem.png",
@@ -1259,18 +1814,204 @@ minetest.register_node("default:acacia_bush_stem", {
        sounds = default.node_sound_wood_defaults(),
        selection_box = {
                type = "fixed",
-               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.54, 7 / 16},
+               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.5, 7 / 16},
        },
 })
 
 minetest.register_node("default:acacia_bush_leaves", {
-       description = "Acacia Bush Leaves",
+       description = S("Acacia Bush Leaves"),
        drawtype = "allfaces_optional",
        waving = 1,
        tiles = {"default_acacia_leaves_simple.png"},
        paramtype = "light",
        groups = {snappy = 3, flammable = 2, leaves = 1},
+       drop = {
+               max_items = 1,
+               items = {
+                       {items = {"default:acacia_bush_sapling"}, rarity = 5},
+                       {items = {"default:acacia_bush_leaves"}}
+               }
+       },
        sounds = default.node_sound_leaves_defaults(),
+
+       after_place_node = after_place_leaves,
+})
+
+minetest.register_node("default:acacia_bush_sapling", {
+       description = S("Acacia Bush Sapling"),
+       drawtype = "plantlike",
+       tiles = {"default_acacia_bush_sapling.png"},
+       inventory_image = "default_acacia_bush_sapling.png",
+       wield_image = "default_acacia_bush_sapling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       on_timer = grow_sapling,
+       selection_box = {
+               type = "fixed",
+               fixed = {-3 / 16, -0.5, -3 / 16, 3 / 16, 2 / 16, 3 / 16}
+       },
+       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+               attached_node = 1, sapling = 1},
+       sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:acacia_bush_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       {x = -1, y = 0, z = -1},
+                       {x = 1, y = 1, z = 1},
+                       -- maximum interval of interior volume check
+                       2)
+
+               return itemstack
+       end,
+})
+
+minetest.register_node("default:pine_bush_stem", {
+       description = S("Pine Bush Stem"),
+       drawtype = "plantlike",
+       visual_scale = 1.41,
+       tiles = {"default_pine_bush_stem.png"},
+       inventory_image = "default_pine_bush_stem.png",
+       wield_image = "default_pine_bush_stem.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       groups = {choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
+       sounds = default.node_sound_wood_defaults(),
+       selection_box = {
+               type = "fixed",
+               fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.5, 7 / 16},
+       },
+})
+
+minetest.register_node("default:pine_bush_needles", {
+       description = S("Pine Bush Needles"),
+       drawtype = "allfaces_optional",
+       waving = 1,
+       tiles = {"default_pine_needles.png"},
+       paramtype = "light",
+       groups = {snappy = 3, flammable = 2, leaves = 1},
+       drop = {
+               max_items = 1,
+               items = {
+                       {items = {"default:pine_bush_sapling"}, rarity = 5},
+                       {items = {"default:pine_bush_needles"}}
+               }
+       },
+       sounds = default.node_sound_leaves_defaults(),
+
+       after_place_node = after_place_leaves,
+})
+
+minetest.register_node("default:pine_bush_sapling", {
+       description = S("Pine Bush Sapling"),
+       drawtype = "plantlike",
+       tiles = {"default_pine_bush_sapling.png"},
+       inventory_image = "default_pine_bush_sapling.png",
+       wield_image = "default_pine_bush_sapling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       on_timer = grow_sapling,
+       selection_box = {
+               type = "fixed",
+               fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 2 / 16, 4 / 16}
+       },
+       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+               attached_node = 1, sapling = 1},
+       sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(300, 1500))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:pine_bush_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       {x = -1, y = 0, z = -1},
+                       {x = 1, y = 1, z = 1},
+                       -- maximum interval of interior volume check
+                       2)
+
+               return itemstack
+       end,
+})
+
+minetest.register_node("default:sand_with_kelp", {
+       description = S("Kelp"),
+       drawtype = "plantlike_rooted",
+       waving = 1,
+       tiles = {"default_sand.png"},
+       special_tiles = {{name = "default_kelp.png", tileable_vertical = true}},
+       inventory_image = "default_kelp.png",
+       paramtype = "light",
+       paramtype2 = "leveled",
+       groups = {snappy = 3},
+       selection_box = {
+               type = "fixed",
+               fixed = {
+                               {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+                               {-2/16, 0.5, -2/16, 2/16, 3.5, 2/16},
+               },
+       },
+       node_dig_prediction = "default:sand",
+       node_placement_prediction = "",
+       sounds = default.node_sound_sand_defaults({
+               dig = {name = "default_dig_snappy", gain = 0.2},
+               dug = {name = "default_grass_footstep", gain = 0.25},
+       }),
+
+       on_place = function(itemstack, placer, pointed_thing)
+               -- Call on_rightclick if the pointed node defines it
+               if pointed_thing.type == "node" and placer and
+                               not placer:get_player_control().sneak then
+                       local node_ptu = minetest.get_node(pointed_thing.under)
+                       local def_ptu = minetest.registered_nodes[node_ptu.name]
+                       if def_ptu and def_ptu.on_rightclick then
+                               return def_ptu.on_rightclick(pointed_thing.under, node_ptu, placer,
+                                       itemstack, pointed_thing)
+                       end
+               end
+
+               local pos = pointed_thing.under
+               if minetest.get_node(pos).name ~= "default:sand" then
+                       return itemstack
+               end
+
+               local height = math.random(4, 6)
+               local pos_top = {x = pos.x, y = pos.y + height, z = pos.z}
+               local node_top = minetest.get_node(pos_top)
+               local def_top = minetest.registered_nodes[node_top.name]
+               local player_name = placer:get_player_name()
+
+               if def_top and def_top.liquidtype == "source" and
+                               minetest.get_item_group(node_top.name, "water") > 0 then
+                       if not minetest.is_protected(pos, player_name) and
+                                       not minetest.is_protected(pos_top, player_name) then
+                               minetest.set_node(pos, {name = "default:sand_with_kelp",
+                                       param2 = height * 16})
+                               if not (creative and creative.is_enabled_for
+                                               and creative.is_enabled_for(player_name)) then
+                                       itemstack:take_item()
+                               end
+                       else
+                               minetest.chat_send_player(player_name, "Node is protected")
+                               minetest.record_protection_violation(pos, player_name)
+                       end
+               end
+
+               return itemstack
+       end,
+
+       after_destruct  = function(pos, oldnode)
+               minetest.set_node(pos, {name = "default:sand"})
+       end
 })
 
 
@@ -1278,8 +2019,138 @@ minetest.register_node("default:acacia_bush_leaves", {
 -- Corals
 --
 
+local function coral_on_place(itemstack, placer, pointed_thing)
+       if pointed_thing.type ~= "node" or not placer then
+               return itemstack
+       end
+
+       local player_name = placer:get_player_name()
+       local pos_under = pointed_thing.under
+       local pos_above = pointed_thing.above
+       local node_under = minetest.get_node(pos_under)
+       local def_under = minetest.registered_nodes[node_under.name]
+
+       if def_under and def_under.on_rightclick and not placer:get_player_control().sneak then
+               return def_under.on_rightclick(pos_under, node_under,
+                               placer, itemstack, pointed_thing) or itemstack
+       end
+
+       if node_under.name ~= "default:coral_skeleton" or
+                       minetest.get_node(pos_above).name ~= "default:water_source" then
+               return itemstack
+       end
+
+       if minetest.is_protected(pos_under, player_name) or
+                       minetest.is_protected(pos_above, player_name) then
+               minetest.log("action", player_name
+                       .. " tried to place " .. itemstack:get_name()
+                       .. " at protected position "
+                       .. minetest.pos_to_string(pos_under))
+               minetest.record_protection_violation(pos_under, player_name)
+               return itemstack
+       end
+
+       node_under.name = itemstack:get_name()
+       minetest.set_node(pos_under, node_under)
+       if not (creative and creative.is_enabled_for(player_name)) then
+               itemstack:take_item()
+       end
+
+       return itemstack
+end
+
+minetest.register_node("default:coral_green", {
+       description = S("Green Coral"),
+       drawtype = "plantlike_rooted",
+       waving = 1,
+       paramtype = "light",
+       tiles = {"default_coral_skeleton.png"},
+       special_tiles = {{name = "default_coral_green.png", tileable_vertical = true}},
+       inventory_image = "default_coral_green.png",
+       groups = {snappy = 3},
+       selection_box = {
+               type = "fixed",
+               fixed = {
+                               {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+                               {-4/16, 0.5, -4/16, 4/16, 1.5, 4/16},
+               },
+       },
+       node_dig_prediction = "default:coral_skeleton",
+       node_placement_prediction = "",
+       sounds = default.node_sound_stone_defaults({
+               dig = {name = "default_dig_snappy", gain = 0.2},
+               dug = {name = "default_grass_footstep", gain = 0.25},
+       }),
+
+       on_place = coral_on_place,
+
+       after_destruct  = function(pos, oldnode)
+               minetest.set_node(pos, {name = "default:coral_skeleton"})
+       end,
+})
+
+minetest.register_node("default:coral_pink", {
+       description = S("Pink Coral"),
+       drawtype = "plantlike_rooted",
+       waving = 1,
+       paramtype = "light",
+       tiles = {"default_coral_skeleton.png"},
+       special_tiles = {{name = "default_coral_pink.png", tileable_vertical = true}},
+       inventory_image = "default_coral_pink.png",
+       groups = {snappy = 3},
+       selection_box = {
+               type = "fixed",
+               fixed = {
+                               {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+                               {-4/16, 0.5, -4/16, 4/16, 1.5, 4/16},
+               },
+       },
+       node_dig_prediction = "default:coral_skeleton",
+       node_placement_prediction = "",
+       sounds = default.node_sound_stone_defaults({
+               dig = {name = "default_dig_snappy", gain = 0.2},
+               dug = {name = "default_grass_footstep", gain = 0.25},
+       }),
+
+       on_place = coral_on_place,
+
+       after_destruct  = function(pos, oldnode)
+               minetest.set_node(pos, {name = "default:coral_skeleton"})
+       end,
+})
+
+minetest.register_node("default:coral_cyan", {
+       description = S("Cyan Coral"),
+       drawtype = "plantlike_rooted",
+       waving = 1,
+       paramtype = "light",
+       tiles = {"default_coral_skeleton.png"},
+       special_tiles = {{name = "default_coral_cyan.png", tileable_vertical = true}},
+       inventory_image = "default_coral_cyan.png",
+       groups = {snappy = 3},
+       selection_box = {
+               type = "fixed",
+               fixed = {
+                               {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+                               {-4/16, 0.5, -4/16, 4/16, 1.5, 4/16},
+               },
+       },
+       node_dig_prediction = "default:coral_skeleton",
+       node_placement_prediction = "",
+       sounds = default.node_sound_stone_defaults({
+               dig = {name = "default_dig_snappy", gain = 0.2},
+               dug = {name = "default_grass_footstep", gain = 0.25},
+       }),
+
+       on_place = coral_on_place,
+
+       after_destruct  = function(pos, oldnode)
+               minetest.set_node(pos, {name = "default:coral_skeleton"})
+       end,
+})
+
 minetest.register_node("default:coral_brown", {
-       description = "Brown Coral",
+       description = S("Brown Coral"),
        tiles = {"default_coral_brown.png"},
        groups = {cracky = 3},
        drop = "default:coral_skeleton",
@@ -1287,7 +2158,7 @@ minetest.register_node("default:coral_brown", {
 })
 
 minetest.register_node("default:coral_orange", {
-       description = "Orange Coral",
+       description = S("Orange Coral"),
        tiles = {"default_coral_orange.png"},
        groups = {cracky = 3},
        drop = "default:coral_skeleton",
@@ -1295,7 +2166,7 @@ minetest.register_node("default:coral_orange", {
 })
 
 minetest.register_node("default:coral_skeleton", {
-       description = "Coral Skeleton",
+       description = S("Coral Skeleton"),
        tiles = {"default_coral_skeleton.png"},
        groups = {cracky = 3},
        sounds = default.node_sound_stone_defaults(),
@@ -1307,11 +2178,13 @@ minetest.register_node("default:coral_skeleton", {
 --
 
 minetest.register_node("default:water_source", {
-       description = "Water Source",
+       description = S("Water Source"),
        drawtype = "liquid",
+       waving = 3,
        tiles = {
                {
                        name = "default_water_source_animated.png",
+                       backface_culling = false,
                        animation = {
                                type = "vertical_frames",
                                aspect_w = 16,
@@ -1319,21 +2192,18 @@ minetest.register_node("default:water_source", {
                                length = 2.0,
                        },
                },
-       },
-       special_tiles = {
-               -- New-style water source material (mostly unused)
                {
                        name = "default_water_source_animated.png",
+                       backface_culling = true,
                        animation = {
                                type = "vertical_frames",
                                aspect_w = 16,
                                aspect_h = 16,
                                length = 2.0,
                        },
-                       backface_culling = false,
                },
        },
-       alpha = 160,
+       alpha = 191,
        paramtype = "light",
        walkable = false,
        pointable = false,
@@ -1347,13 +2217,14 @@ minetest.register_node("default:water_source", {
        liquid_alternative_source = "default:water_source",
        liquid_viscosity = 1,
        post_effect_color = {a = 103, r = 30, g = 60, b = 90},
-       groups = {water = 3, liquid = 3, puts_out_fire = 1, cools_lava = 1},
+       groups = {water = 3, liquid = 3, cools_lava = 1},
        sounds = default.node_sound_water_defaults(),
 })
 
 minetest.register_node("default:water_flowing", {
-       description = "Flowing Water",
+       description = S("Flowing Water"),
        drawtype = "flowingliquid",
+       waving = 3,
        tiles = {"default_water.png"},
        special_tiles = {
                {
@@ -1363,7 +2234,7 @@ minetest.register_node("default:water_flowing", {
                                type = "vertical_frames",
                                aspect_w = 16,
                                aspect_h = 16,
-                               length = 0.8,
+                               length = 0.5,
                        },
                },
                {
@@ -1373,11 +2244,11 @@ minetest.register_node("default:water_flowing", {
                                type = "vertical_frames",
                                aspect_w = 16,
                                aspect_h = 16,
-                               length = 0.8,
+                               length = 0.5,
                        },
                },
        },
-       alpha = 160,
+       alpha = 191,
        paramtype = "light",
        paramtype2 = "flowingliquid",
        walkable = false,
@@ -1392,18 +2263,19 @@ minetest.register_node("default:water_flowing", {
        liquid_alternative_source = "default:water_source",
        liquid_viscosity = 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, cools_lava = 1},
+       groups = {water = 3, liquid = 3, not_in_creative_inventory = 1,
+               cools_lava = 1},
        sounds = default.node_sound_water_defaults(),
 })
 
 
 minetest.register_node("default:river_water_source", {
-       description = "River Water Source",
+       description = S("River Water Source"),
        drawtype = "liquid",
        tiles = {
                {
                        name = "default_river_water_source_animated.png",
+                       backface_culling = false,
                        animation = {
                                type = "vertical_frames",
                                aspect_w = 16,
@@ -1411,17 +2283,15 @@ minetest.register_node("default:river_water_source", {
                                length = 2.0,
                        },
                },
-       },
-       special_tiles = {
                {
                        name = "default_river_water_source_animated.png",
+                       backface_culling = true,
                        animation = {
                                type = "vertical_frames",
                                aspect_w = 16,
                                aspect_h = 16,
                                length = 2.0,
                        },
-                       backface_culling = false,
                },
        },
        alpha = 160,
@@ -1437,15 +2307,19 @@ minetest.register_node("default:river_water_source", {
        liquid_alternative_flowing = "default:river_water_flowing",
        liquid_alternative_source = "default:river_water_source",
        liquid_viscosity = 1,
+       -- Not renewable to avoid horizontal spread of water sources in sloping
+       -- rivers that can cause water to overflow riverbanks and cause floods.
+       -- River water source is instead made renewable by the 'force renew'
+       -- option used in the 'bucket' mod by the river water bucket.
        liquid_renewable = false,
        liquid_range = 2,
        post_effect_color = {a = 103, r = 30, g = 76, b = 90},
-       groups = {water = 3, liquid = 3, puts_out_fire = 1, cools_lava = 1},
+       groups = {water = 3, liquid = 3, cools_lava = 1},
        sounds = default.node_sound_water_defaults(),
 })
 
 minetest.register_node("default:river_water_flowing", {
-       description = "Flowing River Water",
+       description = S("Flowing River Water"),
        drawtype = "flowingliquid",
        tiles = {"default_river_water.png"},
        special_tiles = {
@@ -1456,7 +2330,7 @@ minetest.register_node("default:river_water_flowing", {
                                type = "vertical_frames",
                                aspect_w = 16,
                                aspect_h = 16,
-                               length = 0.8,
+                               length = 0.5,
                        },
                },
                {
@@ -1466,7 +2340,7 @@ minetest.register_node("default:river_water_flowing", {
                                type = "vertical_frames",
                                aspect_w = 16,
                                aspect_h = 16,
-                               length = 0.8,
+                               length = 0.5,
                        },
                },
        },
@@ -1487,18 +2361,19 @@ minetest.register_node("default:river_water_flowing", {
        liquid_renewable = false,
        liquid_range = 2,
        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, cools_lava = 1},
+       groups = {water = 3, liquid = 3, not_in_creative_inventory = 1,
+               cools_lava = 1},
        sounds = default.node_sound_water_defaults(),
 })
 
 
 minetest.register_node("default:lava_source", {
-       description = "Lava Source",
+       description = S("Lava Source"),
        drawtype = "liquid",
        tiles = {
                {
                        name = "default_lava_source_animated.png",
+                       backface_culling = false,
                        animation = {
                                type = "vertical_frames",
                                aspect_w = 16,
@@ -1506,18 +2381,15 @@ minetest.register_node("default:lava_source", {
                                length = 3.0,
                        },
                },
-       },
-       special_tiles = {
-               -- New-style lava source material (mostly unused)
                {
                        name = "default_lava_source_animated.png",
+                       backface_culling = true,
                        animation = {
                                type = "vertical_frames",
                                aspect_w = 16,
                                aspect_h = 16,
                                length = 3.0,
                        },
-                       backface_culling = false,
                },
        },
        paramtype = "light",
@@ -1540,7 +2412,7 @@ minetest.register_node("default:lava_source", {
 })
 
 minetest.register_node("default:lava_flowing", {
-       description = "Flowing Lava",
+       description = S("Flowing Lava"),
        drawtype = "flowingliquid",
        tiles = {"default_lava.png"},
        special_tiles = {
@@ -1590,221 +2462,8 @@ minetest.register_node("default:lava_flowing", {
 -- Tools / "Advanced" crafting / Non-"natural"
 --
 
-local chest_formspec =
-       "size[8,9]" ..
-       default.gui_bg ..
-       default.gui_bg_img ..
-       default.gui_slots ..
-       "list[current_name;main;0,0.3;8,4;]" ..
-       "list[current_player;main;0,4.85;8,1;]" ..
-       "list[current_player;main;0,6.08;8,3;8]" ..
-       "listring[current_name;main]" ..
-       "listring[current_player;main]" ..
-       default.get_hotbar_bg(0,4.85)
-
-local function get_locked_chest_formspec(pos)
-       local spos = pos.x .. "," .. pos.y .. "," .. pos.z
-       local formspec =
-               "size[8,9]" ..
-               default.gui_bg ..
-               default.gui_bg_img ..
-               default.gui_slots ..
-               "list[nodemeta:" .. spos .. ";main;0,0.3;8,4;]" ..
-               "list[current_player;main;0,4.85;8,1;]" ..
-               "list[current_player;main;0,6.08;8,3;8]" ..
-               "listring[nodemeta:" .. spos .. ";main]" ..
-               "listring[current_player;main]" ..
-               default.get_hotbar_bg(0,4.85)
- return formspec
-end
-
-local function has_locked_chest_privilege(meta, player)
-       if player then
-               if minetest.check_player_privs(player, "protection_bypass") then
-                       return true
-               end
-       else
-               return false
-       end
-
-       -- is player wielding the right key?
-       local item = player:get_wielded_item()
-       if item:get_name() == "default:key" then
-               local key_meta = minetest.parse_json(item:get_metadata())
-               local secret = meta:get_string("key_lock_secret")
-               if secret ~= key_meta.secret then
-                       return false
-               end
-
-               return true
-       end
-
-       if player:get_player_name() ~= meta:get_string("owner") then
-               return false
-       end
-
-       return true
-end
-
-minetest.register_node("default:chest", {
-       description = "Chest",
-       tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
-               "default_chest_side.png", "default_chest_side.png", "default_chest_front.png"},
-       paramtype2 = "facedir",
-       groups = {choppy = 2, oddly_breakable_by_hand = 2},
-       legacy_facedir_simple = true,
-       is_ground_content = false,
-       sounds = default.node_sound_wood_defaults(),
-
-       on_construct = function(pos)
-               local meta = minetest.get_meta(pos)
-               meta:set_string("formspec", chest_formspec)
-               local inv = meta:get_inventory()
-               inv:set_size("main", 8*4)
-       end,
-       can_dig = function(pos,player)
-               local meta = minetest.get_meta(pos);
-               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)
-               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 " .. 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 " .. 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",
-               "default_chest_side.png", "default_chest_side.png", "default_chest_lock.png"},
-       paramtype2 = "facedir",
-       groups = {choppy = 2, oddly_breakable_by_hand = 2},
-       legacy_facedir_simple = true,
-       is_ground_content = false,
-       sounds = default.node_sound_wood_defaults(),
-
-       after_place_node = function(pos, placer)
-               local meta = minetest.get_meta(pos)
-               meta:set_string("owner", placer:get_player_name() or "")
-               meta:set_string("infotext", "Locked Chest (owned by " ..
-                               meta:get_string("owner") .. ")")
-       end,
-       on_construct = function(pos)
-               local meta = minetest.get_meta(pos)
-               meta:set_string("owner", "")
-               local inv = meta:get_inventory()
-               inv:set_size("main", 8 * 4)
-       end,
-       can_dig = function(pos,player)
-               local meta = minetest.get_meta(pos);
-               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)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
-                       return 0
-               end
-               return count
-       end,
-    allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
-                       return 0
-               end
-               return stack:get_count()
-       end,
-    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
-                       return 0
-               end
-               return stack:get_count()
-       end,
-    on_metadata_inventory_put = function(pos, listname, index, stack, player)
-               minetest.log("action", player:get_player_name() ..
-                       " 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 " .. stack:get_name()  ..
-                       " from locked chest at " .. minetest.pos_to_string(pos))
-       end,
-       on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-               local meta = minetest.get_meta(pos)
-               if has_locked_chest_privilege(meta, clicker) then
-                       minetest.show_formspec(
-                               clicker:get_player_name(),
-                               "default:chest_locked",
-                               get_locked_chest_formspec(pos)
-                       )
-               end
-               return itemstack
-       end,
-       on_blast = function() end,
-       on_key_use = function(pos, player)
-               local secret = minetest.get_meta(pos):get_string("key_lock_secret")
-               local itemstack = player:get_wielded_item()
-               local key_meta = minetest.parse_json(itemstack:get_metadata())
-
-               if secret ~= key_meta.secret then
-                       return
-               end
-
-               minetest.show_formspec(
-                       player:get_player_name(),
-                       "default:chest_locked",
-                       get_locked_chest_formspec(pos)
-               )
-       end,
-       on_skeleton_key_use = function(pos, player, newsecret)
-               local meta = minetest.get_meta(pos)
-               local owner = meta:get_string("owner")
-               local name = player:get_player_name()
-
-               -- verify placer is owner of lockable chest
-               if owner ~= name then
-                       minetest.record_protection_violation(pos, name)
-                       minetest.chat_send_player(name, "You do not own this chest.")
-                       return nil
-               end
-
-               local secret = meta:get_string("key_lock_secret")
-               if secret == "" then
-                       secret = newsecret
-                       meta:set_string("key_lock_secret", secret)
-               end
-
-               return secret, "a locked chest", owner
-       end,
-})
-
-
 local bookshelf_formspec =
        "size[8,7;]" ..
-       default.gui_bg ..
-       default.gui_bg_img ..
-       default.gui_slots ..
        "list[context;books;0,0.3;8,2;]" ..
        "list[current_player;main;0,2.85;8,1;]" ..
        "list[current_player;main;0,4.08;8,3;8]" ..
@@ -1812,27 +2471,44 @@ local bookshelf_formspec =
        "listring[current_player;main]" ..
        default.get_hotbar_bg(0,2.85)
 
-local function get_bookshelf_formspec(inv)
+local function update_bookshelf(pos)
+       local meta = minetest.get_meta(pos)
+       local inv = meta:get_inventory()
+       local invlist = inv:get_list("books")
+
        local formspec = bookshelf_formspec
-       local invlist = inv and inv:get_list("books")
        -- Inventory slots overlay
        local bx, by = 0, 0.3
+       local n_written, n_empty = 0, 0
        for i = 1, 16 do
                if i == 9 then
                        bx = 0
                        by = by + 1
                end
-               if not invlist or invlist[i]:is_empty() then
+               local stack = invlist[i]
+               if stack:is_empty() then
                        formspec = formspec ..
                                "image[" .. bx .. "," .. by .. ";1,1;default_bookshelf_slot.png]"
+               else
+                       local metatable = stack:get_meta():to_table() or {}
+                       if metatable.fields and metatable.fields.text then
+                               n_written = n_written + stack:get_count()
+                       else
+                               n_empty = n_empty + stack:get_count()
+                       end
                end
                bx = bx + 1
        end
-       return formspec
+       meta:set_string("formspec", formspec)
+       if n_written + n_empty == 0 then
+               meta:set_string("infotext", S("Empty Bookshelf"))
+       else
+               meta:set_string("infotext", S("Bookshelf (@1 written, @2 empty books)", n_written, n_empty))
+       end
 end
 
 minetest.register_node("default:bookshelf", {
-       description = "Bookshelf",
+       description = S("Bookshelf"),
        tiles = {"default_wood.png", "default_wood.png", "default_wood.png",
                "default_wood.png", "default_bookshelf.png", "default_bookshelf.png"},
        paramtype2 = "facedir",
@@ -1842,9 +2518,9 @@ minetest.register_node("default:bookshelf", {
 
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("formspec", get_bookshelf_formspec(nil))
                local inv = meta:get_inventory()
                inv:set_size("books", 8 * 2)
+               update_bookshelf(pos)
        end,
        can_dig = function(pos,player)
                local inv = minetest.get_meta(pos):get_inventory()
@@ -1859,20 +2535,17 @@ minetest.register_node("default:bookshelf", {
        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))
-               local meta = minetest.get_meta(pos)
-               meta:set_string("formspec", get_bookshelf_formspec(meta:get_inventory()))
+               update_bookshelf(pos)
        end,
        on_metadata_inventory_put = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
-                       " moves stuff to bookshelf at " .. minetest.pos_to_string(pos))
-               local meta = minetest.get_meta(pos)
-               meta:set_string("formspec", get_bookshelf_formspec(meta:get_inventory()))
+                       " puts stuff to bookshelf at " .. minetest.pos_to_string(pos))
+               update_bookshelf(pos)
        end,
        on_metadata_inventory_take = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
                        " takes stuff from bookshelf at " .. minetest.pos_to_string(pos))
-               local meta = minetest.get_meta(pos)
-               meta:set_string("formspec", get_bookshelf_formspec(meta:get_inventory()))
+               update_bookshelf(pos)
        end,
        on_blast = function(pos)
                local drops = {}
@@ -1885,7 +2558,7 @@ minetest.register_node("default:bookshelf", {
 
 local function register_sign(material, desc, def)
        minetest.register_node("default:sign_wall_" .. material, {
-               description = desc .. " Sign",
+               description = desc,
                drawtype = "nodebox",
                tiles = {"default_sign_wall_" .. material .. ".png"},
                inventory_image = "default_sign_" .. material .. ".png",
@@ -1906,39 +2579,49 @@ local function register_sign(material, desc, def)
                sounds = def.sounds,
 
                on_construct = function(pos)
-                       --local n = minetest.get_node(pos)
                        local meta = minetest.get_meta(pos)
                        meta:set_string("formspec", "field[text;;${text}]")
                end,
                on_receive_fields = function(pos, formname, fields, sender)
-                       --print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields))
                        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 text = fields.text
+                       if not text then
+                               return
+                       end
+                       if string.len(text) > 512 then
+                               minetest.chat_send_player(player_name, S("Text too long"))
+                               return
+                       end
+                       minetest.log("action", player_name .. " wrote \"" .. text ..
+                               "\" to the sign at " .. minetest.pos_to_string(pos))
                        local meta = minetest.get_meta(pos)
-                       if not fields.text then return end
-                       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 .. '"')
+                       meta:set_string("text", text)
+
+                       if #text > 0 then
+                               meta:set_string("infotext", S('"@1"', text))
+                       else
+                               meta:set_string("infotext", '')
+                       end
                end,
        })
 end
 
-register_sign("wood", "Wooden", {
+register_sign("wood", S("Wooden Sign"), {
        sounds = default.node_sound_wood_defaults(),
        groups = {choppy = 2, attached_node = 1, flammable = 2, oddly_breakable_by_hand = 3}
 })
 
-register_sign("steel", "Steel", {
+register_sign("steel", S("Steel Sign"), {
        sounds = default.node_sound_metal_defaults(),
        groups = {cracky = 2, attached_node = 1}
 })
 
 minetest.register_node("default:ladder_wood", {
-       description = "Wooden Ladder",
+       description = S("Wooden Ladder"),
        drawtype = "signlike",
        tiles = {"default_ladder_wood.png"},
        inventory_image = "default_ladder_wood.png",
@@ -1961,7 +2644,7 @@ minetest.register_node("default:ladder_wood", {
 })
 
 minetest.register_node("default:ladder_steel", {
-       description = "Steel Ladder",
+       description = S("Steel Ladder"),
        drawtype = "signlike",
        tiles = {"default_ladder_steel.png"},
        inventory_image = "default_ladder_steel.png",
@@ -1983,60 +2666,131 @@ minetest.register_node("default:ladder_steel", {
 })
 
 default.register_fence("default:fence_wood", {
-       description = "Wooden Fence",
+       description = S("Apple Wood Fence"),
        texture = "default_fence_wood.png",
-       inventory_image = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
-       wield_image = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       inventory_image = "default_fence_overlay.png^default_wood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_wood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
        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",
+       description = S("Acacia Wood Fence"),
        texture = "default_fence_acacia_wood.png",
-       inventory_image = "default_fence_overlay.png^default_acacia_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
-       wield_image = "default_fence_overlay.png^default_acacia_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       inventory_image = "default_fence_overlay.png^default_acacia_wood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_acacia_wood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
        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",
+       description = S("Jungle Wood Fence"),
        texture = "default_fence_junglewood.png",
-       inventory_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
-       wield_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       inventory_image = "default_fence_overlay.png^default_junglewood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_junglewood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
        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",
+       description = S("Pine Wood Fence"),
        texture = "default_fence_pine_wood.png",
-       inventory_image = "default_fence_overlay.png^default_pine_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
-       wield_image = "default_fence_overlay.png^default_pine_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       inventory_image = "default_fence_overlay.png^default_pine_wood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_pine_wood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
        material = "default:pine_wood",
        groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
        sounds = default.node_sound_wood_defaults()
 })
 
 default.register_fence("default:fence_aspen_wood", {
-       description = "Aspen Fence",
+       description = S("Aspen Wood Fence"),
        texture = "default_fence_aspen_wood.png",
-       inventory_image = "default_fence_overlay.png^default_aspen_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
-       wield_image = "default_fence_overlay.png^default_aspen_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       inventory_image = "default_fence_overlay.png^default_aspen_wood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_aspen_wood.png^" ..
+                               "default_fence_overlay.png^[makealpha:255,126,126",
        material = "default:aspen_wood",
        groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
        sounds = default.node_sound_wood_defaults()
 })
 
+default.register_fence_rail("default:fence_rail_wood", {
+       description = S("Apple Wood Fence Rail"),
+       texture = "default_fence_rail_wood.png",
+       inventory_image = "default_fence_rail_overlay.png^default_wood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_rail_overlay.png^default_wood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       material = "default:wood",
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence_rail("default:fence_rail_acacia_wood", {
+       description = S("Acacia Wood Fence Rail"),
+       texture = "default_fence_rail_acacia_wood.png",
+       inventory_image = "default_fence_rail_overlay.png^default_acacia_wood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_rail_overlay.png^default_acacia_wood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       material = "default:acacia_wood",
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence_rail("default:fence_rail_junglewood", {
+       description = S("Jungle Wood Fence Rail"),
+       texture = "default_fence_rail_junglewood.png",
+       inventory_image = "default_fence_rail_overlay.png^default_junglewood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_rail_overlay.png^default_junglewood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       material = "default:junglewood",
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence_rail("default:fence_rail_pine_wood", {
+       description = S("Pine Wood Fence Rail"),
+       texture = "default_fence_rail_pine_wood.png",
+       inventory_image = "default_fence_rail_overlay.png^default_pine_wood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_rail_overlay.png^default_pine_wood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       material = "default:pine_wood",
+       groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
+       sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence_rail("default:fence_rail_aspen_wood", {
+       description = S("Aspen Wood Fence Rail"),
+       texture = "default_fence_rail_aspen_wood.png",
+       inventory_image = "default_fence_rail_overlay.png^default_aspen_wood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_rail_overlay.png^default_aspen_wood.png^" ..
+                               "default_fence_rail_overlay.png^[makealpha:255,126,126",
+       material = "default:aspen_wood",
+       groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults()
+})
+
 minetest.register_node("default:glass", {
-       description = "Glass",
+       description = S("Glass"),
        drawtype = "glasslike_framed_optional",
        tiles = {"default_glass.png", "default_glass_detail.png"},
        paramtype = "light",
+       paramtype2 = "glasslikeliquidlevel",
        sunlight_propagates = true,
        is_ground_content = false,
        groups = {cracky = 3, oddly_breakable_by_hand = 3},
@@ -2044,10 +2798,11 @@ minetest.register_node("default:glass", {
 })
 
 minetest.register_node("default:obsidian_glass", {
-       description = "Obsidian Glass",
+       description = S("Obsidian Glass"),
        drawtype = "glasslike_framed_optional",
        tiles = {"default_obsidian_glass.png", "default_obsidian_glass_detail.png"},
        paramtype = "light",
+       paramtype2 = "glasslikeliquidlevel",
        is_ground_content = false,
        sunlight_propagates = true,
        sounds = default.node_sound_glass_defaults(),
@@ -2056,10 +2811,13 @@ minetest.register_node("default:obsidian_glass", {
 
 
 minetest.register_node("default:brick", {
-       description = "Brick Block",
+       description = S("Brick Block"),
        paramtype2 = "facedir",
        place_param2 = 0,
-       tiles = {"default_brick.png"},
+       tiles = {
+               "default_brick.png^[transformFX",
+               "default_brick.png",
+       },
        is_ground_content = false,
        groups = {cracky = 3},
        sounds = default.node_sound_stone_defaults(),
@@ -2067,7 +2825,7 @@ minetest.register_node("default:brick", {
 
 
 minetest.register_node("default:meselamp", {
-       description = "Mese Lamp",
+       description = S("Mese Lamp"),
        drawtype = "glasslike",
        tiles = {"default_meselamp.png"},
        paramtype = "light",
@@ -2078,14 +2836,101 @@ minetest.register_node("default:meselamp", {
        light_source = default.LIGHT_MAX,
 })
 
+minetest.register_node("default:mese_post_light", {
+       description = S("Mese Post Light"),
+       tiles = {"default_mese_post_light_top.png", "default_mese_post_light_top.png",
+               "default_mese_post_light_side_dark.png", "default_mese_post_light_side_dark.png",
+               "default_mese_post_light_side.png", "default_mese_post_light_side.png"},
+       wield_image = "default_mese_post_light_side.png",
+       drawtype = "nodebox",
+       node_box = {
+               type = "fixed",
+               fixed = {
+                       {-2 / 16, -8 / 16, -2 / 16, 2 / 16, 8 / 16, 2 / 16},
+               },
+       },
+       paramtype = "light",
+       light_source = default.LIGHT_MAX,
+       sunlight_propagates = true,
+       is_ground_content = false,
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults(),
+})
+
 --
 -- Misc
 --
 
 minetest.register_node("default:cloud", {
-       description = "Cloud",
+       description = S("Cloud"),
        tiles = {"default_cloud.png"},
        is_ground_content = false,
        sounds = default.node_sound_defaults(),
        groups = {not_in_creative_inventory = 1},
 })
+
+--
+-- register trees for leafdecay
+--
+
+if minetest.get_mapgen_setting("mg_name") == "v6" then
+       default.register_leafdecay({
+               trunks = {"default:tree"},
+               leaves = {"default:apple", "default:leaves"},
+               radius = 2,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:jungletree"},
+               leaves = {"default:jungleleaves"},
+               radius = 3,
+       })
+else
+       default.register_leafdecay({
+               trunks = {"default:tree"},
+               leaves = {"default:apple", "default:leaves"},
+               radius = 3,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:jungletree"},
+               leaves = {"default:jungleleaves"},
+               radius = 2,
+       })
+end
+
+default.register_leafdecay({
+       trunks = {"default:pine_tree"},
+       leaves = {"default:pine_needles"},
+       radius = 3,
+})
+
+default.register_leafdecay({
+       trunks = {"default:acacia_tree"},
+       leaves = {"default:acacia_leaves"},
+       radius = 2,
+})
+
+default.register_leafdecay({
+       trunks = {"default:aspen_tree"},
+       leaves = {"default:aspen_leaves"},
+       radius = 3,
+})
+
+default.register_leafdecay({
+       trunks = {"default:bush_stem"},
+       leaves = {"default:bush_leaves"},
+       radius = 1,
+})
+
+default.register_leafdecay({
+       trunks = {"default:acacia_bush_stem"},
+       leaves = {"default:acacia_bush_leaves"},
+       radius = 1,
+})
+
+default.register_leafdecay({
+       trunks = {"default:pine_bush_stem"},
+       leaves = {"default:pine_bush_needles"},
+       radius = 1,
+})