Merge branch 'master' into newsounds

mods/default/README.txt

@@ -151,7 +151,6 @@ BlockMen (CC BY-SA 3.0):
   default_chest_top.png
   default_mineral_mese.png
   default_meselamp.png
-  bubble.png
   gui_formbg.png
   gui_furnace_arrow_bg.png
   gui_furnace_arrow_fg.png
@@ -196,9 +195,6 @@ Gambit (CC BY-SA 3.0):
 asl97 (CC BY-SA 3.0):
   default_ice.png
 
-KevDoy (CC BY-SA 3.0):
-  heart.png
-
 Pithydon (CC BY-SA 3.0)
   default_coral_brown.png
   default_coral_orange.png
@@ -253,6 +249,11 @@ Topywo (CC BY-SA 3.0)
 
 Extex101 (CC BY-SA 3.0)
   default_large_cactus_seedling.png
+  default_dry_shrub.png -- Derived from the original texture by celeron55
+
+An0n3m0us (CC BY-SA 3.0):
+  heart.png -- Derived from a texture by KevDoy (CC BY-SA 3.0)
+  bubble.png -- Derived from a texture by BlockMen (CC BY-SA 3.0)
 
 
 Sounds
@@ -357,6 +358,10 @@ Angel_Perez_Grandi (CC BY 3.0):
 https://freesound.org/people/Angel_Perez_Grandi/sounds/49190/
   default_ice_dug.ogg
 
+iankath (CC0 1.0)
+https://freesound.org/people/iankath/sounds/173991/
+  default_furnace_active.ogg
+
 
 Models
 ------

mods/default/chests.lua

@@ -44,9 +44,10 @@ function default.chest.chest_lid_close(pn)
 	end
 
 	local node = minetest.get_node(pos)
-	minetest.after(0.2, minetest.swap_node, pos, { name = "default:" .. swap,
+	minetest.after(0.2, minetest.swap_node, pos, { name = swap,
 			param2 = node.param2 })
-	minetest.sound_play(sound, {gain = 0.3, pos = pos, max_hear_distance = 10})
+	minetest.sound_play(sound, {gain = 0.3, pos = pos,
+		max_hear_distance = 10}, true)
 end
 
 default.chest.open_chests = {}
@@ -75,7 +76,8 @@ minetest.register_on_leaveplayer(function(player)
 	end
 end)
 
-function default.chest.register_chest(name, d)
+function default.chest.register_chest(prefixed_name, d)
+	local name = prefixed_name:sub(1,1) == ':' and prefixed_name:sub(2,-1) or prefixed_name
 	local def = table.copy(d)
 	def.drawtype = "mesh"
 	def.visual = "mesh"
@@ -128,10 +130,10 @@ function default.chest.register_chest(name, d)
 			end
 
 			minetest.sound_play(def.sound_open, {gain = 0.3,
-					pos = pos, max_hear_distance = 10})
+					pos = pos, max_hear_distance = 10}, true)
 			if not default.chest.chest_lid_obstructed(pos) then
 				minetest.swap_node(pos,
-						{ name = "default:" .. name .. "_open",
+						{ name = name .. "_open",
 						param2 = node.param2 })
 			end
 			minetest.after(0.2, minetest.show_formspec,
@@ -199,10 +201,10 @@ function default.chest.register_chest(name, d)
 		end
 		def.on_rightclick = function(pos, node, clicker)
 			minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos,
-					max_hear_distance = 10})
+					max_hear_distance = 10}, true)
 			if not default.chest.chest_lid_obstructed(pos) then
 				minetest.swap_node(pos, {
-						name = "default:" .. name .. "_open",
+						name = name .. "_open",
 						param2 = node.param2 })
 			end
 			minetest.after(0.2, minetest.show_formspec,
@@ -214,7 +216,7 @@ function default.chest.register_chest(name, d)
 		def.on_blast = function(pos)
 			local drops = {}
 			default.get_inventory_drops(pos, "main", drops)
-			drops[#drops+1] = "default:" .. name
+			drops[#drops+1] = name
 			minetest.remove_node(pos)
 			return drops
 		end
@@ -247,7 +249,7 @@ function default.chest.register_chest(name, d)
 			def_opened.tiles[i].backface_culling = true
 		end
 	end
-	def_opened.drop = "default:" .. name
+	def_opened.drop = name
 	def_opened.groups.not_in_creative_inventory = 1
 	def_opened.selection_box = {
 		type = "fixed",
@@ -264,29 +266,31 @@ function default.chest.register_chest(name, d)
 	def_closed.tiles[5] = def.tiles[3] -- drawtype to make them match the mesh
 	def_closed.tiles[3] = def.tiles[3].."^[transformFX"
 
-	minetest.register_node("default:" .. name, def_closed)
-	minetest.register_node("default:" .. name .. "_open", def_opened)
+	minetest.register_node(prefixed_name, def_closed)
+	minetest.register_node(prefixed_name .. "_open", def_opened)
 
 	-- convert old chests to this new variant
-	minetest.register_lbm({
-		label = "update chests to opening chests",
-		name = "default:upgrade_" .. name .. "_v2",
-		nodenames = {"default:" .. name},
-		action = function(pos, node)
-			local meta = minetest.get_meta(pos)
-			meta:set_string("formspec", nil)
-			local inv = meta:get_inventory()
-			local list = inv:get_list("default:chest")
-			if list then
-				inv:set_size("main", 8*4)
-				inv:set_list("main", list)
-				inv:set_list("default:chest", nil)
+	if name == "default:chest" or name == "default:chest_locked" then
+		minetest.register_lbm({
+			label = "update chests to opening chests",
+			name = "default:upgrade_" .. name:sub(9,-1) .. "_v2",
+			nodenames = {name},
+			action = function(pos, node)
+				local meta = minetest.get_meta(pos)
+				meta:set_string("formspec", nil)
+				local inv = meta:get_inventory()
+				local list = inv:get_list("default:chest")
+				if list then
+					inv:set_size("main", 8*4)
+					inv:set_list("main", list)
+					inv:set_list("default:chest", nil)
+				end
 			end
-		end
-	})
+		})
+	end
 end
 
-default.chest.register_chest("chest", {
+default.chest.register_chest("default:chest", {
 	description = S("Chest"),
 	tiles = {
 		"default_chest_top.png",
@@ -302,7 +306,7 @@ default.chest.register_chest("chest", {
 	groups = {choppy = 2, oddly_breakable_by_hand = 2},
 })
 
-default.chest.register_chest("chest_locked", {
+default.chest.register_chest("default:chest_locked", {
 	description = S("Locked Chest"),
 	tiles = {
 		"default_chest_top.png",

mods/default/crafting.lua

@@ -300,15 +300,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "default:mese_post_light 3",
-	recipe = {
-		{"", "default:glass", ""},
-		{"default:mese_crystal", "default:mese_crystal", "default:mese_crystal"},
-		{"", "group:wood", ""},
-	}
-})
-
 minetest.register_craft({
 	output = "default:obsidian",
 	recipe = {

mods/default/functions.lua

@@ -155,7 +155,7 @@ default.cool_lava = function(pos, node)
 		minetest.set_node(pos, {name = "default:stone"})
 	end
 	minetest.sound_play("default_cool_lava",
-		{pos = pos, max_hear_distance = 16, gain = 0.25})
+		{pos = pos, max_hear_distance = 16, gain = 0.25}, true)
 end
 
 if minetest.settings:get_bool("enable_lavacooling") ~= false then
@@ -224,7 +224,12 @@ end
 function default.grow_papyrus(pos, node)
 	pos.y = pos.y - 1
 	local name = minetest.get_node(pos).name
-	if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
+	if name ~= "default:dirt" and
+			name ~= "default:dirt_with_grass" and
+			name ~= "default:dirt_with_dry_grass" and
+			name ~= "default:dirt_with_rainforest_litter" and
+			name ~= "default:dry_dirt" and
+			name ~= "default:dry_dirt_with_dry_grass" then
 		return
 	end
 	if not minetest.find_node_near(pos, 3, {"group:water"}) then
@@ -261,7 +266,17 @@ minetest.register_abm({
 minetest.register_abm({
 	label = "Grow papyrus",
 	nodenames = {"default:papyrus"},
-	neighbors = {"default:dirt", "default:dirt_with_grass"},
+	-- Grows on the dirt and surface dirt nodes of the biomes papyrus appears in,
+	-- including the old savanna nodes.
+	-- 'default:dirt_with_grass' is here only because it was allowed before.
+	neighbors = {
+		"default:dirt",
+		"default:dirt_with_grass",
+		"default:dirt_with_dry_grass",
+		"default:dirt_with_rainforest_litter",
+		"default:dry_dirt",
+		"default:dry_dirt_with_dry_grass",
+	},
 	interval = 14,
 	chance = 71,
 	action = function(...)
@@ -420,6 +435,51 @@ function default.register_fence_rail(name, def)
 	minetest.register_node(name, def)
 end
 
+--
+-- Mese post registration helper
+--
+
+function default.register_mesepost(name, def)
+	minetest.register_craft({
+		output = name .. " 4",
+		recipe = {
+			{'', 'default:glass', ''},
+			{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+			{'', def.material, ''},
+		}
+	})
+
+	local post_texture = def.texture .. "^default_mese_post_light_side.png^[makealpha:0,0,0"
+	local post_texture_dark = def.texture .. "^default_mese_post_light_side_dark.png^[makealpha:0,0,0"
+	-- Allow almost everything to be overridden
+	local default_fields = {
+		wield_image = post_texture,
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{-2 / 16, -8 / 16, -2 / 16, 2 / 16, 8 / 16, 2 / 16},
+			},
+		},
+		paramtype = "light",
+		tiles = {def.texture, def.texture, post_texture_dark, post_texture_dark, post_texture, post_texture},
+		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(),
+	}
+	for k, v in pairs(default_fields) do
+		if def[k] == nil then
+			def[k] = v
+		end
+	end
+
+	def.texture = nil
+	def.material = nil
+
+	minetest.register_node(name, def)
+end
 
 --
 -- Leafdecay
@@ -447,6 +507,9 @@ local function leafdecay_after_destruct(pos, oldnode, def)
 	end
 end
 
+local movement_gravity = tonumber(
+	minetest.settings:get("movement_gravity")) or 9.81
+
 local function leafdecay_on_timer(pos, def)
 	if minetest.find_node_near(pos, def.radius, def.trunks) then
 		return false
@@ -473,6 +536,21 @@ local function leafdecay_on_timer(pos, def)
 
 	minetest.remove_node(pos)
 	minetest.check_for_falling(pos)
+
+	-- spawn a few particles for the removed node
+	minetest.add_particlespawner({
+		amount = 8,
+		time = 0.001,
+		minpos = vector.subtract(pos, {x=0.5, y=0.5, z=0.5}),
+		maxpos = vector.add(pos, {x=0.5, y=0.5, z=0.5}),
+		minvel = vector.new(-0.5, -1, -0.5),
+		maxvel = vector.new(0.5, 0, 0.5),
+		minacc = vector.new(0, -movement_gravity, 0),
+		maxacc = vector.new(0, -movement_gravity, 0),
+		minsize = 0,
+		maxsize = 0,
+		node = node,
+	})
 end
 
 function default.register_leafdecay(def)
@@ -497,7 +575,7 @@ end
 
 
 --
--- Convert dirt to something that fits the environment
+-- Convert default:dirt to something that fits the environment
 --
 
 minetest.register_abm({
@@ -506,6 +584,7 @@ minetest.register_abm({
 	neighbors = {
 		"air",
 		"group:grass",
+		"group:dry_grass",
 		"default:snow",
 	},
 	interval = 6,
@@ -534,6 +613,8 @@ minetest.register_abm({
 			minetest.set_node(pos, {name = "default:dirt_with_snow"})
 		elseif minetest.get_item_group(name, "grass") ~= 0 then
 			minetest.set_node(pos, {name = "default:dirt_with_grass"})
+		elseif minetest.get_item_group(name, "dry_grass") ~= 0 then
+			minetest.set_node(pos, {name = "default:dirt_with_dry_grass"})
 		end
 	end
 })

mods/default/furnace.lua

@@ -113,6 +113,9 @@ local function furnace_node_timer(pos, elapsed)
 	local srclist, fuellist
 	local dst_full = false
 
+	local timer_elapsed = meta:get_int("timer_elapsed") or 0
+	meta:set_int("timer_elapsed", timer_elapsed + 1)
+
 	local cookable, cooked
 	local fuel
 
@@ -154,6 +157,9 @@ local function furnace_node_timer(pos, elapsed)
 					else
 						dst_full = true
 					end
+					-- Play cooling sound
+					minetest.sound_play("default_cool_lava",
+						{pos = pos, max_hear_distance = 16, gain = 0.1}, true)
 				else
 					-- Item could not be cooked: probably missing fuel
 					update = true
@@ -237,6 +243,12 @@ local function furnace_node_timer(pos, elapsed)
 		swap_node(pos, "default:furnace_active")
 		-- make sure timer restarts automatically
 		result = true
+
+		-- Play sound every 5 seconds while the furnace is active
+		if timer_elapsed == 0 or (timer_elapsed+1) % 5 == 0 then
+			minetest.sound_play("default_furnace_active",
+				{pos = pos, max_hear_distance = 16, gain = 0.5}, true)
+		end
 	else
 		if fuellist and not fuellist[1]:is_empty() then
 			fuel_state = S("@1%", 0)
@@ -245,6 +257,7 @@ local function furnace_node_timer(pos, elapsed)
 		swap_node(pos, "default:furnace")
 		-- stop timer on the inactive furnace
 		minetest.get_node_timer(pos):stop()
+		meta:set_int("timer_elapsed", 0)
 	end
 
 

mods/default/item_entity.lua

@@ -15,12 +15,12 @@ local item = {
 
 	burn_up = function(self)
 		-- disappear in a smoke puff
-		self.object:remove()
 		local p = self.object:get_pos()
+		self.object:remove()
 		minetest.sound_play("default_item_smoke", {
 			pos = p,
 			max_hear_distance = 8,
-		})
+		}, true)
 		minetest.add_particlespawner({
 			amount = 3,
 			time = 0.1,
@@ -39,16 +39,20 @@ local item = {
 		})
 	end,
 
-	on_step = function(self, dtime)
-		builtin_item.on_step(self, dtime)
+	on_step = function(self, dtime, ...)
+		builtin_item.on_step(self, dtime, ...)
 
 		if self.flammable then
-			-- flammable, check for igniters
+			-- flammable, check for igniters every 10 s
 			self.ignite_timer = (self.ignite_timer or 0) + dtime
 			if self.ignite_timer > 10 then
 				self.ignite_timer = 0
 
-				local node = minetest.get_node_or_nil(self.object:get_pos())
+				local pos = self.object:get_pos()
+				if pos == nil then
+					return -- object already deleted
+				end
+				local node = minetest.get_node_or_nil(pos)
 				if not node then
 					return
 				end

mods/default/license.txt

@@ -51,6 +51,7 @@ Copyright (C) 2010-2018:
   Mossmanikin
   random-geek
   Extex101
+  An0n3m0us
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.

mods/default/locale/default.de.tr

@@ -62,12 +62,12 @@ Obsidian Block=Obsidianblock
 Dirt=Erde
 Dirt with Grass=Erde mit Gras
 Dirt with Grass and Footsteps=Erde mit Gras und Fußstapfen
-Dirt with Dry Grass=Erde mit trockenem Gras
+Dirt with Savanna Grass=Erde mit Savannengras
 Dirt with Snow=Erde mit Schnee
 Dirt with Rainforest Litter=Erde mit Regenwaldboden
 Dirt with Coniferous Litter=Erde mit Nadelwaldboden
-Dry Dirt=Trockene Erde
-Dry Dirt with Dry Grass=Trockene Erde mit trockenem Gras
+Savanna Dirt=Savannenerde
+Savanna Dirt with Savanna Grass=Savannenerde mit Savannengras
 Permafrost=Permafrost
 Permafrost with Stones=Permafrost mit Steinen
 Permafrost with Moss=Permafrost mit Moos
@@ -124,7 +124,7 @@ Papyrus=Papyrus
 Dry Shrub=Trockener Busch
 Jungle Grass=Dschungelgras
 Grass=Gras
-Dry Grass=Trockenes Gras
+Savanna Grass=Savannengras
 Fern=Farn
 Marram Grass=Dünengras
 Bush Stem=Buschstamm

mods/default/locale/default.id.tr

@@ -0,0 +1,211 @@
+# textdomain: default
+Stone=Batu
+Cobblestone=Bongkahan Batu
+Stone Brick=Tembok Batu
+Stone Block=Balok Batu
+Mossy Cobblestone=Bongkahan Batu Berlumut
+Desert Stone=Batu Gurun
+Desert Cobblestone=Bongkahan Batu Gurun
+Desert Stone Brick=Tembok Batu Gurun
+Desert Stone Block=Balok Batu Gurun
+Sandstone=Batu Pasir
+Sandstone Brick=Tembok Batu Pasir
+Sandstone Block=Balok Batu Pasir
+Desert Sandstone=Batu Pasir Gurun
+Desert Sandstone Brick=Tembok Batu Pasir Gurun
+Desert Sandstone Block=Balok Batu Pasir Gurun
+Silver Sandstone=Batu Pasir Perak
+Silver Sandstone Brick=Tembok Batu Pasir Perak
+Silver Sandstone Block=Balok Batu Pasir Perak
+Obsidian=Obsidian
+Obsidian Brick=Tembok Obsidian
+Obsidian Block=Balok Obsidian
+Dirt=Tanah
+Dirt with Grass=Tanah Berumput
+Dirt with Grass and Footsteps=Tanah Berumput dan Tapak Kaki
+Dirt with Savanna Grass=Tanah Berumput Sabana
+Dirt with Snow=Tanah Bersalju
+Dirt with Rainforest Litter=Tanah Berserasah Hutan Hujan
+Dirt with Coniferous Litter=Tanah Berserasah Hutan Konifer
+Savanna Dirt=Tanah Sabana
+Savanna Dirt with Savanna Grass=Tanah Sabana Berumput Sabana
+Permafrost=Ibun Abadi
+Permafrost with Stones=Ibun Abadi Berbatu
+Permafrost with Moss=Ibun Abadi Berlumut
+Sand=Pasir
+Desert Sand=Pasir Gurun
+Silver Sand=Pasir Perak
+Gravel=Kerikil
+Clay=Semen
+Snow=Salju
+Snow Block=Balok Salju
+Ice=Es
+Cave Ice=Es Gua
+Apple Tree=Pohon Apel
+Apple Wood Planks=Papan Kayu Pohon Apel
+Apple Tree Sapling=Bibit Apel
+Apple Tree Leaves=Daun Pohon Apel
+Apple=Apel
+Apple Marker=Penanda Apel
+Jungle Tree=Pohon Hutan Rimba
+Jungle Wood Planks=Papan Kayu Pohon Rimba
+Jungle Tree Leaves=Daun Pohon Rimba
+Jungle Tree Sapling=Bibit Pohon Rimba
+Emergent Jungle Tree Sapling=Bibit Bertumbuh Pohon Rimba
+Pine Tree=Pohon Pinus
+Pine Wood Planks=Papan Kayu Pinus
+Pine Needles=Daun Pinus
+Pine Tree Sapling=Bibit Pinus
+Acacia Tree=Pohon Akasia
+Acacia Wood Planks=Papan Kayu Akasia
+Acacia Tree Leaves=Daun Akasia
+Acacia Tree Sapling=Bibit Akasia
+Aspen Tree=Pohon Aspen
+Aspen Wood Planks=Papan Kayu Aspen
+Aspen Tree Leaves=Daun Aspen
+Aspen Tree Sapling=Bibit Aspen
+Coal Ore=Bijih Batu Bara
+Coal Block=Balok Batu Bara
+Iron Ore=Biji Besi
+Steel Block=Balok Baja
+Copper Ore=Bijih Tembaga
+Copper Block=Balok Tembaga
+Tin Ore=Bijih Timah
+Tin Block=Balok Timah
+Bronze Block=Balok Perunggu
+Mese Ore=Bijih Mese
+Mese Block=Balok Mese
+Gold Ore=Bijih Emas
+Gold Block=Balok Emas
+Diamond Ore=Bijih Berlian
+Diamond Block=Balok Berlian
+Cactus=Kaktus
+Large Cactus Seedling=Bibit Kaktus Besar
+Papyrus=Papirus
+Dry Shrub=Semak Kering
+Jungle Grass=Rumput Rimba
+Grass=Rumput
+Savanna Grass=Rumput Sabana
+Fern=Pakis
+Marram Grass=Rumput Pantai
+Bush Stem=Batang Semak
+Bush Leaves=Daun Semak
+Bush Sapling=Bibit Semak
+Blueberry Bush Leaves with Berries=Daun Bluberi Berbuah
+Blueberry Bush Leaves=Daun Bluberi
+Blueberry Bush Sapling=Bibit Bluberi
+Acacia Bush Stem=Batang Semak Akasia
+Acacia Bush Leaves=Daun Semak Akasia
+Acacia Bush Sapling=Bibit Semak Akasia
+Pine Bush Stem=Batang Semak Pinus
+Pine Bush Needles=Daun Semak Pinus
+Pine Bush Sapling=Bibit Semak Pinus
+Kelp=Kelp
+Green Coral=Koral Hijau
+Pink Coral=Koral Jambon
+Cyan Coral=Koral Sian
+Brown Coral=Koral Cokelat
+Orange Coral=Koral Oranye
+Coral Skeleton=Kerangka Koral
+Water Source=Mata Air
+Flowing Water=Aliran Air
+River Water Source=Mata Air Sungai
+Flowing River Water=Aliran Air Sungai
+Lava Source=Sumber Lava
+Flowing Lava=Aliran Lava
+Empty Bookshelf=Rak Buku Kosong
+Bookshelf (@1 written, @2 empty books)=Rak Buku (@1 buku tertulis, @2 buku kosong)
+Bookshelf=Rak Buku
+Text too long=Teks terlalu panjang
+Wooden Sign=Penanda Kayu
+Steel Sign=Penanda Baja
+Wooden Ladder=Tangga Kayu
+Steel Ladder=Tangga Baja
+Apple Wood Fence=Pagar Kayu Apel
+Acacia Wood Fence=Pagar Akasia
+Jungle Wood Fence=Pagar Kayu Rimba
+Pine Wood Fence=Pagar Pinus
+Aspen Wood Fence=Pagar Aspen
+Apple Wood Fence Rail=Rel Pagar Kayu Apel
+Acacia Wood Fence Rail=Rel Pagar Akasia
+Jungle Wood Fence Rail=Rel Pagar Kayu Rimba
+Pine Wood Fence Rail=Rel Pagar Pinus
+Aspen Wood Fence Rail=Rel Pagar Aspen
+Glass=Kaca
+Obsidian Glass=Kaca Obsidian
+Brick Block=Balok Bata
+Mese Lamp=Lampu Mese
+Mese Post Light=Lampu Taman Mese
+Cloud=Awan
+@1 will intersect protection on growth.=@1 akan memotong perlindungan ketika tumbuh.
+Torch=Obor
+Wooden Pickaxe=Beliung Kayu
+Stone Pickaxe=Beliung Batu
+Bronze Pickaxe=Beliung Perunggu
+Steel Pickaxe=Beliung Baja
+Mese Pickaxe=Beliung Mese
+Diamond Pickaxe=Beliung Berlian
+Wooden Shovel=Sekop Kayu
+Stone Shovel=Sekop Batu
+Bronze Shovel=Sekop Perunggu
+Steel Shovel=Sekop Baja
+Mese Shovel=Sekop Mese
+Diamond Shovel=Sekop Berlian
+Wooden Axe=Kapak Kayu
+Stone Axe=Kapak Batu
+Bronze Axe=Kapak Perunggu
+Steel Axe=Kapak Baja
+Mese Axe=Kapak Mese
+Diamond Axe=Kapak Berlian
+Wooden Sword=Pedang Kayu
+Stone Sword=Pedang Batu
+Bronze Sword=Pedang Perunggu
+Steel Sword=Pedang Baja
+Mese Sword=Pedang Mese
+Diamond Sword=Pedang Berlian
+Key=Kunci
+Furnace is empty=Tungku kosong
+100% (output full)=100% (keluaran penuh)
+@1%=@1%
+Not cookable=Tidak bisa dimasak
+Empty=Kosong
+Furnace active=Tungku nyala
+Furnace inactive=Tungku mati
+(Item: @1; Fuel: @2)=(Barang: @1; Bahan Bakar: @2)
+Furnace=Tungku
+Title:=Judul:
+Contents:=Isi:
+Save=Simpan
+by @1=oleh @1
+Page @1 of @2=Halaman @1 dari @2
+"@1"="@1"
+"@1" by @2="@1" oleh @2
+Skeleton Key=Kunci Induk
+Key to @1's @2=Kunci @2 milik @1
+Blueberries=Bluberi
+Book=Buku
+Book with Text=Buku Tertulis
+Bronze Ingot=Perunggu Batangan
+Clay Brick=Bata
+Clay Lump=Bongkahan Semen
+Coal Lump=Bongkahan Batu Bara
+Copper Ingot=Tembaga Batangan
+Copper Lump=Bongkahan Tembaga
+Diamond=Berlian
+Flint=Batu Api
+Gold Ingot=Emas Batangan
+Gold Lump=Bongkahan Emas
+Iron Lump=Bongkahan Besi
+Mese Crystal=Kristal Mese
+Mese Crystal Fragment=Pecahan Kristal Mese
+Obsidian Shard=Pecahan Obsidian
+Paper=Kertas
+Steel Ingot=Baja Batangan
+Stick=Tongkat
+Tin Ingot=Timah Batangan
+Tin Lump=Bongkahan Timah
+Locked Chest=Peti Terkunci
+Locked Chest (owned by @1)=Peti Terkunci (milik @1)
+You do not own this chest.=Anda bukan pemilik peti ini.
+a locked chest=suatu peti terkunci
+Chest=Peti

mods/default/locale/default.zh_CN.tr

@@ -1,8 +1,8 @@
 # textdomain: default
-Locked Chest=锁着的箱子
-Locked Chest (owned by @1)=锁着的箱子（由@1拥有）
-You do not own this chest.=您不拥有该箱子。
-a locked chest=一个锁着的箱子
+Locked Chest=已上锁的箱子
+Locked Chest (owned by @1)=已上锁的箱子（属于@1所有）
+You do not own this chest.=这个箱子不属于你所有。
+a locked chest=一个已上锁的箱子
 Chest=箱子
 Stick=棒
 Paper=纸
@@ -11,20 +11,20 @@ Book=书
 Book with Text=带文字的书
 Skeleton Key=万能钥匙
 Key to @1's @2=@1的@2的钥匙
-Coal Lump=煤矿
-Iron Lump=铁矿
-Copper Lump=铜矿
-Tin Lump=锡矿
-Mese Crystal=黄石水晶
-Gold Lump=金矿
+Coal Lump=煤块
+Iron Lump=铁块
+Copper Lump=铜块
+Tin Lump=锡块
+Mese Crystal=黄石晶体
+Gold Lump=金块
 Diamond=钻石
-Clay Lump=粘土矿
+Clay Lump=粘土块
 Steel Ingot=铁锭
 Copper Ingot=铜锭
 Tin Ingot=锡锭
 Bronze Ingot=青铜锭
 Gold Ingot=金锭
-Mese Crystal Fragment=黄石水晶碎片
+Mese Crystal Fragment=黄石晶体碎片
 Clay Brick=粘土砖
 Obsidian Shard=黑曜石碎片
 Flint=燧石
@@ -34,50 +34,50 @@ Furnace is empty=熔炉是空的
 @1%=@1%
 Empty=空
 Not cookable=不可烹饪
-Furnace active=熔炉活跃
-Furnace inactive=熔炉非活跃
+Furnace active=熔炉正在运转
+Furnace inactive=熔炉未使用
 (Item: @1; Fuel: @2)=（项目：@1;燃料：@2）
 Furnace=熔炉
 Stone=石
 Cobblestone=鹅卵石
 Stone Brick=石砖
-Stone Block=石块
-Mossy Cobblestone=生苔的鹅卵石
+Stone Block=石方块
+Mossy Cobblestone=苔藓覆盖的鹅卵石
 Desert Stone=沙漠石
 Desert Cobblestone=沙漠鹅卵石
 Desert Stone Brick=沙漠鹅卵石砖
-Desert Stone Block=沙漠鹅卵石块
+Desert Stone Block=沙漠鹅卵石方块
 Sandstone=砂岩
 Sandstone Brick=砂岩砖
-Sandstone Block=砂岩块
+Sandstone Block=砂岩方块
 Desert Sandstone=沙漠砂岩
 Desert Sandstone Brick=沙漠砂岩砖
-Desert Sandstone Block=沙漠砂岩块
+Desert Sandstone Block=沙漠砂岩方块
 Silver Sandstone=银砂岩
 Silver Sandstone Brick=银砂岩砖
-Silver Sandstone Block=银砂岩块
+Silver Sandstone Block=银砂岩方块
 Obsidian=黑曜石
 Obsidian Brick=黑曜石砖
-Obsidian Block=黑曜石块
+Obsidian Block=黑曜石方块
 Dirt=土
 Dirt with Grass=带草的土
 Dirt with Grass and Footsteps=带草的土及脚印
-Dirt with Dry Grass=土和干草
-Dirt with Snow=土和雪
+Dirt with Dry Grass=带干草的土
+Dirt with Snow=带雪的土
 Dirt with Rainforest Litter=雨林腐土
 Dirt with Coniferous Litter=针叶林腐土
 Dry Dirt=干土
 Dry Dirt with Dry Grass=干土和干草
 Permafrost=多年冻土
-Permafrost with Stones=多年冻土和石头
+Permafrost with Stones=带石头的多年冻土
 Permafrost with Moss=生苔的多年冻土
 Sand=沙
 Desert Sand=沙漠沙
 Silver Sand=银沙
-Gravel=砾石
+Gravel=沙砾
 Clay=粘土
 Snow=雪
-Snow Block=雪块
+Snow Block=雪方块
 Ice=冰
 Cave Ice=洞穴冰
 Apple Tree=苹果树
@@ -103,26 +103,26 @@ Aspen Tree=白杨树
 Aspen Wood Planks=白杨树木板
 Aspen Tree Leaves=白杨树叶
 Aspen Tree Sapling=白杨树树苗
-Coal Ore=煤矿石
-Coal Block=煤块
+Coal Ore=煤炭矿石
+Coal Block=煤炭方块
 Iron Ore=铁矿石
-Steel Block=钢块
+Steel Block=钢方块
 Copper Ore=铜矿石
-Copper Block=铜块
+Copper Block=铜方块
 Tin Ore=锡矿石
-Tin Block=锡块
-Bronze Block=青铜块
+Tin Block=锡方块
+Bronze Block=青铜方块
 Mese Ore=黄石矿石
-Mese Block=黄石块
+Mese Block=黄石方块
 Gold Ore=金矿石
-Gold Block=金块
+Gold Block=金方块
 Diamond Ore=钻石矿石
-Diamond Block=钻石块
+Diamond Block=钻石方块
 Cactus=仙人掌
 Large Cactus Seedling=大仙人掌苗
 Papyrus=莎草纸
 Dry Shrub=干灌木
-Jungle Grass=莦
+Jungle Grass=丛林草
 Grass=草
 Dry Grass=干草
 Fern=蕨
@@ -148,20 +148,20 @@ Orange Coral=橙珊瑚
 Coral Skeleton=珊瑚骨架
 Water Source=水方块
 Flowing Water=流动的水
-River Water Source=河流水方块
-Flowing River Water=流动的河流水
-Lava Source=融岩方块
-Flowing Lava=流动的融岩
+River Water Source=河水方块
+Flowing River Water=流动的河水
+Lava Source=岩浆方块
+Flowing Lava=流动的岩浆
 Empty Bookshelf=空书架
 Bookshelf (@1 written, @2 empty books)=书架（@1本有字的书，@2本空书）
 Bookshelf=书架
 Text too long=文字太长
 Wooden Sign=木牌
 Steel Sign=铁牌
-Wooden Ladder=木阶梯
-Steel Ladder=铁阶梯
-Apple Wood Fence=苹果木围栏
-Acacia Wood Fence=相思木围栏
+Wooden Ladder=木梯子
+Steel Ladder=铁梯子
+Apple Wood Fence=苹果木栅栏
+Acacia Wood Fence=相思木栅栏
 Jungle Wood Fence=丛林木栅栏
 Pine Wood Fence=松木栅栏
 Aspen Wood Fence=白杨木栅栏
@@ -172,7 +172,7 @@ Pine Wood Fence Rail=松木栏杆
 Aspen Wood Fence Rail=白杨木栏杆
 Glass=玻璃
 Obsidian Glass=黑曜石玻璃
-Brick Block=砖块
+Brick Block=砖方块
 Mese Lamp=黄石灯
 Mese Post Light=黄石柱灯
 Cloud=云

mods/default/locale/default.zh_TW.tr

@@ -0,0 +1,211 @@
+# textdomain: default
+Locked Chest=已上鎖的箱子
+Locked Chest (owned by @1)=已上鎖的箱子（屬於@1所有）
+You do not own this chest.=這個箱子不屬於你所有。
+a locked chest=一個已上鎖的箱子
+Chest=箱子
+Stick=棒
+Paper=紙
+"@1" by @2="@1" by @2
+Book=書
+Book with Text=帶文字的書
+Skeleton Key=萬能鑰匙
+Key to @1's @2=@1的@2的鑰匙
+Coal Lump=煤塊
+Iron Lump=鐵塊
+Copper Lump=銅塊
+Tin Lump=錫塊
+Mese Crystal=黃石晶體
+Gold Lump=金塊
+Diamond=鑽石
+Clay Lump=粘土塊
+Steel Ingot=鐵錠
+Copper Ingot=銅錠
+Tin Ingot=錫錠
+Bronze Ingot=青銅錠
+Gold Ingot=金錠
+Mese Crystal Fragment=黃石晶體碎片
+Clay Brick=粘土磚
+Obsidian Shard=黑曜石碎片
+Flint=燧石
+Blueberries=藍莓
+Furnace is empty=熔爐是空的
+100% (output full)=100％（輸出已滿）
+@1%=@1%
+Empty=空
+Not cookable=不可烹飪
+Furnace active=熔爐正在運轉
+Furnace inactive=熔爐未使用
+(Item: @1; Fuel: @2)=（項目：@1;燃料：@2）
+Furnace=熔爐
+Stone=石
+Cobblestone=鵝卵石
+Stone Brick=石磚
+Stone Block=石方塊
+Mossy Cobblestone=苔蘚覆蓋的鵝卵石
+Desert Stone=沙漠石
+Desert Cobblestone=沙漠鵝卵石
+Desert Stone Brick=沙漠鵝卵石磚
+Desert Stone Block=沙漠鵝卵石方塊
+Sandstone=砂岩
+Sandstone Brick=砂岩磚
+Sandstone Block=砂岩方塊
+Desert Sandstone=沙漠砂岩
+Desert Sandstone Brick=沙漠砂岩磚
+Desert Sandstone Block=沙漠砂岩方塊
+Silver Sandstone=銀砂岩
+Silver Sandstone Brick=銀砂岩磚
+Silver Sandstone Block=銀砂岩方塊
+Obsidian=黑曜石
+Obsidian Brick=黑曜石磚
+Obsidian Block=黑曜石方塊
+Dirt=土
+Dirt with Grass=帶草的土
+Dirt with Grass and Footsteps=帶草的土及腳印
+Dirt with Dry Grass=帶乾草的土
+Dirt with Snow=帶雪的土
+Dirt with Rainforest Litter=雨林腐土
+Dirt with Coniferous Litter=針葉林腐土
+Dry Dirt=乾土
+Dry Dirt with Dry Grass=乾土和乾草
+Permafrost=多年凍土
+Permafrost with Stones=帶石頭的多年凍土
+Permafrost with Moss=生苔的多年凍土
+Sand=沙
+Desert Sand=沙漠沙
+Silver Sand=銀沙
+Gravel=沙礫
+Clay=粘土
+Snow=雪
+Snow Block=雪方塊
+Ice=冰
+Cave Ice=洞穴冰
+Apple Tree=蘋果樹
+Apple Wood Planks=蘋果樹木板
+Apple Tree Sapling=蘋果樹苗
+Apple Tree Leaves=蘋果樹葉
+Apple=蘋果
+Apple Marker=蘋果標記
+Jungle Tree=叢林樹
+Jungle Wood Planks=叢林樹木板
+Jungle Tree Leaves=叢林樹葉
+Jungle Tree Sapling=叢林樹苗
+Emergent Jungle Tree Sapling=應急叢林樹苗
+Pine Tree=松樹
+Pine Wood Planks=松樹木板
+Pine Needles=松針
+Pine Tree Sapling=松樹樹苗
+Acacia Tree=相思樹
+Acacia Wood Planks=相思樹木板
+Acacia Tree Leaves=相思樹葉
+Acacia Tree Sapling=相思樹樹苗
+Aspen Tree=白楊樹
+Aspen Wood Planks=白楊樹木板
+Aspen Tree Leaves=白楊樹葉
+Aspen Tree Sapling=白楊樹樹苗
+Coal Ore=煤炭礦石
+Coal Block=煤炭方塊
+Iron Ore=鐵礦石
+Steel Block=鋼方塊
+Copper Ore=銅礦石
+Copper Block=銅方塊
+Tin Ore=錫礦石
+Tin Block=錫方塊
+Bronze Block=青銅方塊
+Mese Ore=黃石礦石
+Mese Block=黃石方塊
+Gold Ore=金礦石
+Gold Block=金方塊
+Diamond Ore=鑽石礦石
+Diamond Block=鑽石方塊
+Cactus=仙人掌
+Large Cactus Seedling=大仙人掌苗
+Papyrus=莎草紙
+Dry Shrub=幹灌木
+Jungle Grass=叢林草
+Grass=草
+Dry Grass=乾草
+Fern=蕨
+Marram Grass=濱草
+Bush Stem=灌木
+Bush Leaves=灌木葉
+Bush Sapling=灌木苗
+Blueberry Bush Leaves with Berries=藍莓灌木葉與漿果
+Blueberry Bush Leaves=藍莓灌木葉
+Blueberry Bush Sapling=藍莓灌木苗
+Acacia Bush Stem=相思灌木
+Acacia Bush Leaves=相思灌木葉
+Acacia Bush Sapling=相思灌木苗
+Pine Bush Stem=松樹灌木
+Pine Bush Needles=松樹灌木針
+Pine Bush Sapling=松樹灌木苗
+Kelp=海帶
+Green Coral=綠珊瑚
+Pink Coral=淡紅珊瑚
+Cyan Coral=青珊瑚
+Brown Coral=棕珊瑚
+Orange Coral=橙珊瑚
+Coral Skeleton=珊瑚骨架
+Water Source=水方塊
+Flowing Water=流動的水
+River Water Source=河水方塊
+Flowing River Water=流動的河水
+Lava Source=岩漿方塊
+Flowing Lava=流動的岩漿
+Empty Bookshelf=空書架
+Bookshelf (@1 written, @2 empty books)=書架（@1本有字的書，@2本空書）
+Bookshelf=書架
+Text too long=文字太長
+Wooden Sign=木牌
+Steel Sign=鐵牌
+Wooden Ladder=木梯子
+Steel Ladder=鐵梯子
+Apple Wood Fence=蘋果木柵欄
+Acacia Wood Fence=相思木柵欄
+Jungle Wood Fence=叢林木柵欄
+Pine Wood Fence=松木柵欄
+Aspen Wood Fence=白楊木柵欄
+Apple Wood Fence Rail=蘋果木欄杆
+Acacia Wood Fence Rail=相思木欄杆
+Jungle Wood Fence Rail=叢林木欄杆
+Pine Wood Fence Rail=松木欄杆
+Aspen Wood Fence Rail=白楊木欄杆
+Glass=玻璃
+Obsidian Glass=黑曜石玻璃
+Brick Block=磚方塊
+Mese Lamp=黃石燈
+Mese Post Light=黃石柱燈
+Cloud=雲
+Wooden Pickaxe=木鎬
+Stone Pickaxe=石鎬
+Bronze Pickaxe=青銅鎬
+Steel Pickaxe=鐵鎬
+Mese Pickaxe=黃石鎬
+Diamond Pickaxe=鑽石鎬
+Wooden Shovel=木鏟
+Stone Shovel=石鏟
+Bronze Shovel=青銅鏟
+Steel Shovel=鐵鏟
+Mese Shovel=黃石鏟
+Diamond Shovel=鑽石鏟
+Wooden Axe=木斧
+Stone Axe=石斧
+Bronze Axe=青銅斧
+Steel Axe=鐵斧
+Mese Axe=黃石斧
+Diamond Axe=鑽石斧
+Wooden Sword=木劍
+Stone Sword=石劍
+Bronze Sword=青銅劍
+Steel Sword=鐵劍
+Mese Sword=黃石劍
+Diamond Sword=鑽石劍
+Key=鑰匙
+Torch=火把
+@1 will intersect protection on growth.=@1將與增長的保護相交。
+Title:=標題：
+Contents:=內容：
+Save=保存
+by @1=由@1
+Page @1 of @2=第@1頁，共@2頁。
+"@1"="@1"

mods/default/locale/template.txt

@@ -1,43 +1,4 @@
 # textdomain: default
-Locked Chest=
-Locked Chest (owned by @1)=
-You do not own this chest.=
-a locked chest=
-Chest=
-Stick=
-Paper=
-"@1" by @2=
-Book=
-Book with Text=
-Skeleton Key=
-Key to @1's @2=
-Coal Lump=
-Iron Lump=
-Copper Lump=
-Tin Lump=
-Mese Crystal=
-Gold Lump=
-Diamond=
-Clay Lump=
-Steel Ingot=
-Copper Ingot=
-Tin Ingot=
-Bronze Ingot=
-Gold Ingot=
-Mese Crystal Fragment=
-Clay Brick=
-Obsidian Shard=
-Flint=
-Blueberries=
-Furnace is empty=
-100% (output full)=
-@1%=
-Empty=
-Not cookable=
-Furnace active=
-Furnace inactive=
-(Item: @1; Fuel: @2)=
-Furnace=
 Stone=
 Cobblestone=
 Stone Brick=
@@ -62,12 +23,12 @@ Obsidian Block=
 Dirt=
 Dirt with Grass=
 Dirt with Grass and Footsteps=
-Dirt with Dry Grass=
+Dirt with Savanna Grass=
 Dirt with Snow=
 Dirt with Rainforest Litter=
 Dirt with Coniferous Litter=
-Dry Dirt=
-Dry Dirt with Dry Grass=
+Savanna Dirt=
+Savanna Dirt with Savanna Grass=
 Permafrost=
 Permafrost with Stones=
 Permafrost with Moss=
@@ -124,7 +85,7 @@ Papyrus=
 Dry Shrub=
 Jungle Grass=
 Grass=
-Dry Grass=
+Savanna Grass=
 Fern=
 Marram Grass=
 Bush Stem=
@@ -176,6 +137,8 @@ Brick Block=
 Mese Lamp=
 Mese Post Light=
 Cloud=
+@1 will intersect protection on growth.=
+Torch=
 Wooden Pickaxe=
 Stone Pickaxe=
 Bronze Pickaxe=
@@ -201,11 +164,48 @@ Steel Sword=
 Mese Sword=
 Diamond Sword=
 Key=
-Torch=
-@1 will intersect protection on growth.=
+Furnace is empty=
+100% (output full)=
+@1%=
+Not cookable=
+Empty=
+Furnace active=
+Furnace inactive=
+(Item: @1; Fuel: @2)=
+Furnace=
 Title:=
 Contents:=
 Save=
 by @1=
 Page @1 of @2=
 "@1"=
+"@1" by @2=
+Skeleton Key=
+Key to @1's @2=
+Blueberries=
+Book=
+Book with Text=
+Bronze Ingot=
+Clay Brick=
+Clay Lump=
+Coal Lump=
+Copper Ingot=
+Copper Lump=
+Diamond=
+Flint=
+Gold Ingot=
+Gold Lump=
+Iron Lump=
+Mese Crystal=
+Mese Crystal Fragment=
+Obsidian Shard=
+Paper=
+Steel Ingot=
+Stick=
+Tin Ingot=
+Tin Lump=
+Locked Chest=
+Locked Chest (owned by @1)=
+You do not own this chest.=
+a locked chest=
+Chest=

mods/default/mapgen.lua

@@ -2143,8 +2143,10 @@ function default.register_decorations()
 
 	-- Papyrus
 
+	-- Dirt version for rainforest swamp
+
 	minetest.register_decoration({
-		name = "default:papyrus",
+		name = "default:papyrus_on_dirt",
 		deco_type = "schematic",
 		place_on = {"default:dirt"},
 		sidelen = 16,
@@ -2156,10 +2158,32 @@ function default.register_decorations()
 			octaves = 3,
 			persist = 0.7
 		},
-		biomes = {"savanna_shore", "rainforest_swamp"},
+		biomes = {"rainforest_swamp"},
 		y_max = 0,
 		y_min = 0,
-		schematic = minetest.get_modpath("default") .. "/schematics/papyrus.mts",
+		schematic = minetest.get_modpath("default") .. "/schematics/papyrus_on_dirt.mts",
+	})
+
+	-- Dry dirt version for savanna shore
+
+	minetest.register_decoration({
+		name = "default:papyrus_on_dry_dirt",
+		deco_type = "schematic",
+		place_on = {"default:dry_dirt"},
+		sidelen = 16,
+		noise_params = {
+			offset = -0.3,
+			scale = 0.7,
+			spread = {x = 200, y = 200, z = 200},
+			seed = 354,
+			octaves = 3,
+			persist = 0.7
+		},
+		biomes = {"savanna_shore"},
+		y_max = 0,
+		y_min = 0,
+		schematic = minetest.get_modpath("default") ..
+			"/schematics/papyrus_on_dry_dirt.mts",
 	})
 
 	-- Bush

mods/default/nodes.lua

@@ -221,6 +221,10 @@ default:brick
 
 default:meselamp
 default:mese_post_light
+default:mese_post_light_acacia_wood
+default:mese_post_light_junglewood
+default:mese_post_light_pine_wood
+default:mese_post_light_aspen_wood
 
 Misc
 ----
@@ -458,12 +462,12 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 })
 
 minetest.register_node("default:dirt_with_dry_grass", {
-	description = S("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},
+	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},
@@ -513,14 +517,14 @@ minetest.register_node("default:dirt_with_coniferous_litter", {
 })
 
 minetest.register_node("default:dry_dirt", {
-	description = S("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("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}},
@@ -621,7 +625,7 @@ minetest.register_node("default:snow", {
 	collision_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, -7 / 16, 0.5},
+			{-0.5, -0.5, -0.5, 0.5, -6 / 16, 0.5},
 		},
 	},
 	groups = {crumbly = 3, falling_node = 1, snowy = 1},
@@ -1497,7 +1501,7 @@ end
 
 
 minetest.register_node("default:dry_grass_1", {
-	description = S("Dry Grass"),
+	description = S("Savanna Grass"),
 	drawtype = "plantlike",
 	waving = 1,
 	tiles = {"default_dry_grass_1.png"},
@@ -1526,7 +1530,7 @@ minetest.register_node("default:dry_grass_1", {
 
 for i = 2, 5 do
 	minetest.register_node("default:dry_grass_" .. i, {
-		description = S("Dry Grass"),
+		description = S("Savanna Grass"),
 		drawtype = "plantlike",
 		waving = 1,
 		tiles = {"default_dry_grass_" .. i .. ".png"},
@@ -2234,7 +2238,7 @@ minetest.register_node("default:water_flowing", {
 				type = "vertical_frames",
 				aspect_w = 16,
 				aspect_h = 16,
-				length = 0.8,
+				length = 0.5,
 			},
 		},
 		{
@@ -2244,7 +2248,7 @@ minetest.register_node("default:water_flowing", {
 				type = "vertical_frames",
 				aspect_w = 16,
 				aspect_h = 16,
-				length = 0.8,
+				length = 0.5,
 			},
 		},
 	},
@@ -2330,7 +2334,7 @@ minetest.register_node("default:river_water_flowing", {
 				type = "vertical_frames",
 				aspect_w = 16,
 				aspect_h = 16,
-				length = 0.8,
+				length = 0.5,
 			},
 		},
 		{
@@ -2340,7 +2344,7 @@ minetest.register_node("default:river_water_flowing", {
 				type = "vertical_frames",
 				aspect_w = 16,
 				aspect_h = 16,
-				length = 0.8,
+				length = 0.5,
 			},
 		},
 	},
@@ -2579,12 +2583,10 @@ 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)
@@ -2598,8 +2600,8 @@ local function register_sign(material, desc, def)
 				minetest.chat_send_player(player_name, S("Text too long"))
 				return
 			end
-			minetest.log("action", (player_name or "") .. " wrote \"" ..
-				text .. "\" to sign at " .. minetest.pos_to_string(pos))
+			minetest.log("action", player_name .. " wrote \"" .. text ..
+				"\" to the sign at " .. minetest.pos_to_string(pos))
 			local meta = minetest.get_meta(pos)
 			meta:set_string("text", text)
 
@@ -2816,7 +2818,10 @@ minetest.register_node("default:brick", {
 	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(),
@@ -2835,25 +2840,34 @@ 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(),
+default.register_mesepost("default:mese_post_light", {
+	description = S("Apple Wood Mese Post Light"),
+	texture = "default_fence_wood.png",
+	material = "default:wood",
+})
+
+default.register_mesepost("default:mese_post_light_acacia", {
+	description = S("Acacia Wood Mese Post Light"),
+	texture = "default_fence_acacia_wood.png",
+	material = "default:acacia_wood",
+})
+
+default.register_mesepost("default:mese_post_light_junglewood", {
+	description = S("Jungle Wood Mese Post Light"),
+	texture = "default_fence_junglewood.png",
+	material = "default:junglewood",
+})
+
+default.register_mesepost("default:mese_post_light_pine_wood", {
+	description = S("Pine Wood Mese Post Light"),
+	texture = "default_fence_pine_wood.png",
+	material = "default:pine_wood",
+})
+
+default.register_mesepost("default:mese_post_light_aspen_wood", {
+	description = S("Aspen Wood Mese Post Light"),
+	texture = "default_fence_aspen_wood.png",
+	material = "default:aspen_wood",
 })
 
 --

mods/default/torch.lua

@@ -11,7 +11,8 @@ local function on_flood(pos, oldnode, newnode)
 			nodedef.groups.igniter and nodedef.groups.igniter > 0) then
 		minetest.sound_play(
 			"default_cool_lava",
-			{pos = pos, max_hear_distance = 16, gain = 0.1}
+			{pos = pos, max_hear_distance = 16, gain = 0.1},
+			true
 		)
 	end
 	-- Remove the torch node
@@ -70,6 +71,7 @@ minetest.register_node("default:torch", {
 	end,
 	floodable = true,
 	on_flood = on_flood,
+	on_rotate = false
 })
 
 minetest.register_node("default:torch_wall", {
@@ -93,6 +95,7 @@ minetest.register_node("default:torch_wall", {
 	sounds = default.node_sound_wood_defaults(),
 	floodable = true,
 	on_flood = on_flood,
+	on_rotate = false
 })
 
 minetest.register_node("default:torch_ceiling", {
@@ -116,6 +119,7 @@ minetest.register_node("default:torch_ceiling", {
 	sounds = default.node_sound_wood_defaults(),
 	floodable = true,
 	on_flood = on_flood,
+	on_rotate = false
 })
 
 minetest.register_lbm({

mods/default/trees.lua

@@ -16,9 +16,7 @@ function default.can_grow(pos)
 	if not node_under then
 		return false
 	end
-	local name_under = node_under.name
-	local is_soil = minetest.get_item_group(name_under, "soil")
-	if is_soil == 0 then
+	if minetest.get_item_group(node_under.name, "soil") == 0 then
 		return false
 	end
 	local light_level = minetest.get_node_light(pos)