Merge branch 'dev'

5.5.1

game.conf

@@ -1,3 +1,3 @@
-title       = Minetest Game
-author      = Minetest
+title       = Notre Ami Le Cube 1.6
+author      = Minetest and Sys4
 description = A basic exploration, mining, crafting, and building, sandbox game with no NPCs, monsters, or animals. Minetest Game is usually used with mods added, and many mods are available for this game. Reliably maintained by Minetest Engine core developers.

game_api.txt

@@ -49,8 +49,6 @@ Beds API
  * `beds.read_spawns() `   Returns a table containing players respawn positions
  * `beds.kick_players()`  Forces all players to leave bed
  * `beds.skip_night()`   Sets world time to morning and saves respawn position of all players currently sleeping
- * `beds.day_interval`   Is a table with keys "start" and "finish". Allows you
-   to set the period of the day (timeofday format). Default: `{ start = 0.2, finish = 0.805 }`.
 
 ### Bed definition
 

minetest.conf

@@ -0,0 +1,76 @@
+# This file contains settings of Minetest Game that can be changed in
+# minetest.conf.
+# By default, all the settings are commented and not functional.
+# Uncomment settings by removing the preceding #.
+
+# Whether creative mode (fast digging of all blocks, unlimited resources) should
+# be enabled.
+creative_mode = false
+
+# Sets the behaviour of the inventory items when a player dies.
+#   bones: Store items in a bone node but drop items if inside protected area.
+#   drop: Drop items on the ground.
+#   keep: Player keeps items.
+bones_mode = bones
+
+# The time in seconds after which the bones of a dead player can be looted by
+# everyone.
+# 0 to disable.
+share_bones_time = 1200
+
+# How much earlier the bones of a dead player can be looted by
+# everyone if the player dies in a protected area they don't own.
+# 0 to disable. By default it is "share_bones_time" divide by four.
+share_bones_time_early = 300
+
+# Inform player of condition and location of new bones.
+bones_position_message = true
+
+# Whether fire should be enabled. If disabled, 'basic_flame' nodes will
+# disappear.
+# 'permanent_flame' nodes will remain with either setting.
+enable_fire = false
+
+# Enable flame sound.
+flame_sound = true
+
+# Whether lavacooling should be enabled.
+enable_lavacooling = true
+
+# Whether the stuff in initial_stuff should be given to new players.
+give_initial_stuff = true
+initial_stuff = default:axe_wood,default:torch 9,default:sapling 2,default:apple 5
+
+# Whether the TNT mod should be enabled.
+enable_tnt = true
+
+# The radius of a TNT explosion.
+tnt_radius = 3
+
+# Enable the stairs mod ABM that replaces the old 'upside down'
+# stair and slab nodes in old maps with the new param2 versions.
+enable_stairs_replace_abm = false
+
+# Whether to allow respawning in beds.
+# Default value is true.
+enable_bed_respawn = true
+
+# Whether players can skip night by sleeping.
+# Default value is true.
+enable_bed_night_skip = true
+
+# If enabled, fences and walls cannot be jumped over.
+enable_fence_tall = true
+
+# Whether the engine's spawn search, which does not check for a suitable
+# starting biome, is used.
+# Default value is false.
+engine_spawn = false
+
+# Whether river water source nodes create flowing sounds.
+# Helps rivers create more sound, especially on level sections.
+river_source_sounds = true
+
+# Enable cloud variation by the 'weather' mod.
+# Non-functional in V6 or Singlenode mapgens.
+enable_weather = false

mods/beds/functions.lua

@@ -186,7 +186,7 @@ function beds.on_rightclick(pos, player)
 	local ppos = player:get_pos()
 	local tod = minetest.get_timeofday()
 
-	if tod > beds.day_interval.start and tod < beds.day_interval.finish then
+	if tod > 0.2 and tod < 0.805 then
 		if beds.player[name] then
 			lay_down(player, nil, nil, false)
 		end

mods/beds/init.lua

@@ -16,11 +16,6 @@ beds.formspec = "size[8,11;true]" ..
 	"bgcolor[#080808BB;true]" ..
 	"button_exit[2,10;4,0.75;leave;" .. esc(S("Leave Bed")) .. "]"
 
-beds.day_interval = {
-	start = 0.2,
-	finish = 0.805,
-}
-
 local modpath = minetest.get_modpath("beds")
 
 -- Load files

mods/beds/locale/beds.id.tr

@@ -1,10 +1,10 @@
 # textdomain: beds
 Fancy Bed=Ranjang Mewah
 Simple Bed=Ranjang Sederhana
-This bed is already occupied!=Ranjang telah terisi!
-You have to stop moving before going to bed!=Anda harus diam untuk tidur!
+This bed is already occupied!=
+You have to stop moving before going to bed!=
 Good morning.=Selamat pagi.
 @1 of @2 players are in bed=@1 dari @2 pemain sedang tidur
 Force night skip=Paksa lewati malam
-You can only sleep at night.=Anda hanya bisa tidur pada waktu malam.
+You can only sleep at night.=Anda hanya dapat tidur pada waktu malam.
 Leave Bed=Tinggalkan Ranjang

mods/beds/locale/beds.zh_TW.tr

@@ -1,8 +1,8 @@
 # textdomain: beds
 Fancy Bed=花式床
 Simple Bed=簡易床
-This bed is already occupied!=這個床已經被占據了！
-You have to stop moving before going to bed!=你必須在上床前停止移動！
+This bed is already occupied!=
+You have to stop moving before going to bed!=
 Good morning.=早安！
 @1 of @2 players are in bed=@2位玩家中的@1位在床上
 Force night skip=強制跳過夜晚

mods/binoculars/locale/binoculars.id.tr

@@ -1,3 +1,3 @@
 # textdomain: binoculars
 Binoculars=Teropong
-Use with 'Zoom' key=Pakai dengan tombol 'Zum'
+Use with 'Zoom' key=Pakai dengan tombol 'Zoom'

mods/boats/locale/boats.ru.tr

@@ -1,4 +1,4 @@
 # textdomain: boats
-Boat cruise mode on=Автоход лодки включен
-Boat cruise mode off=Автоход лодки выключен
+Boat cruise mode on=Режим путешествия на лодке включен
+Boat cruise mode off=Режим путешествия на лодке выключен
 Boat=Лодка

mods/bones/locale/bones.sv.tr

@@ -1,8 +1,8 @@
 # textdomain: bones
 Bones=Ben
 @1's old bones=@1s Gamla ben
-@1 died at @2.=@1 dog på @2.
-@1 died at @2, and dropped their inventory.=@1 dog på @2, och tappade deras saker.
+@1 died at @2.=@1 dog på @a.
+@1 died at @2, and dropped their inventory.=@1 dog på @a, och tappade deras saker.
 @1 died at @2, and bones were placed.=@1 dog på @2, och deras ben var placerade.
 @1's fresh bones=@1s färska ben
 @1's bones=@1s ben

mods/bucket/locale/bucket.ja.tr

@@ -1,5 +1,5 @@
 # textdomain: bucket
 Empty Bucket=空のバケツ
 Water Bucket=水入りバケツ
-River Water Bucket=河川水入りバケツ
+River Water Bucket=川の水入りバケツ
 Lava Bucket=溶岩入りバケツ

mods/creative/init.lua

@@ -46,7 +46,6 @@ end
 dofile(minetest.get_modpath("creative") .. "/inventory.lua")
 
 if minetest.is_creative_enabled("") then
-	minetest.register_on_mods_loaded(function()
 	-- Dig time is modified according to difference (leveldiff) between tool
 	-- 'maxlevel' and node 'level'. Digtime is divided by the larger of
 	-- leveldiff and 1.
@@ -75,7 +74,6 @@ if minetest.is_creative_enabled("") then
 			damage_groups = {fleshy = 10},
 		}
 	})
-	end)
 end
 
 -- Unlimited node placement

mods/creative/inventory.lua

@@ -150,10 +150,9 @@ function creative.register_tab(name, title, items)
 			creative.update_creative_inventory(player_name, items)
 			local inv = player_inventory[player_name]
 			local pagenum = math.floor(inv.start_i / (4*8) + 1)
-			local pagemax = math.max(math.ceil(inv.size / (4*8)), 1)
+			local pagemax = math.ceil(inv.size / (4*8))
 			local esc = minetest.formspec_escape
 			return sfinv.make_formspec(player, context,
-				(inv.size == 0 and ("label[3,2;"..esc(S("No items to show.")).."]") or "") ..
 				"label[5.8,4.15;" .. minetest.colorize("#FFFF00", tostring(pagenum)) .. " / " .. tostring(pagemax) .. "]" ..
 				[[
 					image[4.08,4.2;0.8,0.8;creative_trash_icon.png]
@@ -161,7 +160,7 @@ function creative.register_tab(name, title, items)
 					list[detached:trash;main;4.02,4.1;1,1;]
 					listring[]
 					image_button[5,4.05;0.8,0.8;creative_prev_icon.png;creative_prev;]
-					image_button[7.25,4.05;0.8,0.8;creative_next_icon.png;creative_next;]
+					image_button[7.2,4.05;0.8,0.8;creative_next_icon.png;creative_next;]
 					image_button[2.63,4.05;0.8,0.8;creative_search_icon.png;creative_search;]
 					image_button[3.25,4.05;0.8,0.8;creative_clear_icon.png;creative_clear;]
 				]] ..
@@ -192,13 +191,10 @@ function creative.register_tab(name, title, items)
 				inv.start_i = 0
 				inv.filter = ""
 				sfinv.set_player_inventory_formspec(player, context)
-			elseif (fields.creative_search or
-					fields.key_enter_field == "creative_filter")
-					and fields.creative_filter then
+			elseif fields.creative_search or
+					fields.key_enter_field == "creative_filter" then
 				inv.start_i = 0
-				inv.filter = fields.creative_filter:sub(1, 128) -- truncate to a sane length
-						:gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n)
-						:lower() -- search is case insensitive
+				inv.filter = fields.creative_filter:lower()
 				sfinv.set_player_inventory_formspec(player, context)
 			elseif not fields.quit then
 				local start_i = inv.start_i or 0

mods/creative/mod.conf

@@ -1,3 +1,4 @@
 name = creative
 description = Minetest Game mod: creative
 depends = sfinv
+optional_depends = default

mods/default/chests.lua

@@ -53,22 +53,19 @@ end
 default.chest.open_chests = {}
 
 minetest.register_on_player_receive_fields(function(player, formname, fields)
+	if formname ~= "default:chest" then
+		return
+	end
+	if not player or not fields.quit then
+		return
+	end
 	local pn = player:get_player_name()
 
-	if formname ~= "default:chest" then
-		if default.chest.open_chests[pn] then
-			default.chest.chest_lid_close(pn)
-		end
-
-		return
-	end
-
-	if not (fields.quit and default.chest.open_chests[pn]) then
+	if not default.chest.open_chests[pn] then
 		return
 	end
 
 	default.chest.chest_lid_close(pn)
-
 	return true
 end)
 
@@ -132,12 +129,6 @@ function default.chest.register_chest(prefixed_name, d)
 				return itemstack
 			end
 
-			local cn = clicker:get_player_name()
-
-			if default.chest.open_chests[cn] then
-				default.chest.chest_lid_close(cn)
-			end
-
 			minetest.sound_play(def.sound_open, {gain = 0.3,
 					pos = pos, max_hear_distance = 10}, true)
 			if not default.chest.chest_lid_obstructed(pos) then
@@ -145,9 +136,10 @@ function default.chest.register_chest(prefixed_name, d)
 						{ name = name .. "_open",
 						param2 = node.param2 })
 			end
-			minetest.after(0.2, minetest.show_formspec, cn,
+			minetest.after(0.2, minetest.show_formspec,
+					clicker:get_player_name(),
 					"default:chest", default.chest.get_chest_formspec(pos))
-			default.chest.open_chests[cn] = { pos = pos,
+			default.chest.open_chests[clicker:get_player_name()] = { pos = pos,
 					sound = def.sound_close, swap = name }
 		end
 		def.on_blast = function() end
@@ -208,12 +200,6 @@ function default.chest.register_chest(prefixed_name, d)
 			return inv:is_empty("main")
 		end
 		def.on_rightclick = function(pos, node, clicker)
-			local cn = clicker:get_player_name()
-
-			if default.chest.open_chests[cn] then
-				default.chest.chest_lid_close(cn)
-			end
-
 			minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos,
 					max_hear_distance = 10}, true)
 			if not default.chest.chest_lid_obstructed(pos) then
@@ -222,9 +208,9 @@ function default.chest.register_chest(prefixed_name, d)
 						param2 = node.param2 })
 			end
 			minetest.after(0.2, minetest.show_formspec,
-					cn,
+					clicker:get_player_name(),
 					"default:chest", default.chest.get_chest_formspec(pos))
-			default.chest.open_chests[cn] = { pos = pos,
+			default.chest.open_chests[clicker:get_player_name()] = { pos = pos,
 					sound = def.sound_close, swap = name }
 		end
 		def.on_blast = function(pos)
@@ -288,18 +274,6 @@ function default.chest.register_chest(prefixed_name, d)
 			end
 		})
 	end
-
-	-- close opened chests on load
-	minetest.register_lbm({
-		label = "close opened chests on load",
-		name = "default:close_" .. prefixed_name:gsub(":", "_") .. "_open",
-		nodenames = {prefixed_name .. "_open"},
-		run_at_every_load = true,
-		action = function(pos, node)
-			node.name = prefixed_name
-			minetest.swap_node(pos, node)
-		end
-	})
 end
 
 default.chest.register_chest("default:chest", {

mods/default/craftitems.lua

@@ -148,7 +148,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		return
 	end
 
-	if fields.quit then
+	if fields.close then
 		book_writers[player_name] = nil
 	end
 
@@ -179,7 +179,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		data.description = S("\"@1\" by @2", short_title, data.owner)
 		data.text = fields.text:sub(1, max_text_size)
 		data.text = data.text:gsub("\r\n", "\n"):gsub("\r", "\n")
-		data.text = data.text:gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n)
 		data.page = 1
 		data.page_max = math.ceil((#data.text:gsub("[^\n]", "") + 1) / lpp)
 

mods/default/locale/default.eo.tr

@@ -162,7 +162,6 @@ Empty Bookshelf=Malplena Librobreto
 Bookshelf (@1 written, @2 empty books)=Librobreto (@1 skriba(j), @2 malplena(j) libro(j))
 Bookshelf=Librobreto
 Text too long=Tro longa teksto
-"@1"=
 Wooden Sign=Ligna Signo
 Steel Sign=Ŝtala Signo
 Wooden Ladder=Ligna Ŝtupetaro
@@ -218,3 +217,4 @@ Torch=Torĉo
 ##### not used anymore #####
 
 Mese Post Light=Mesea Fosta Lampo
+

mods/default/locale/default.id.tr

@@ -4,16 +4,16 @@ Locked Chest (owned by @1)=Peti Terkunci (milik @1)
 You do not own this chest.=Anda bukan pemilik peti ini.
 a locked chest=peti terkunci
 Chest=Peti
-Write=Tulis
-Read=Baca
+Write=
+Read=
 Title:=Judul:
 Contents:=Isi:
 Save=Simpan
 by @1=oleh @1
 Page @1 of @2=Halaman @1 dari @2
-The book you were writing to mysteriously disappeared.=Buku yang Anda tulis menghilang secara misterius.
+The book you were writing to mysteriously disappeared.=
 "@1" by @2="@1" oleh @2
-Blueberries=Bluberi
+Blueberries=Blueberry
 Book=Buku
 Book with Text=Buku Tertulis
 Bronze Ingot=Perunggu Batangan
@@ -38,7 +38,7 @@ Tin Lump=Bongkahan Timah
 Furnace is empty=Tungku kosong
 100% (output full)=100% (keluaran penuh)
 @1%=@1%
-Not cookable=Tidak bisa dimasak
+Not cookable=Tidak dapat dimasak
 Empty=Kosong
 Furnace active=Tungku nyala
 Furnace inactive=Tungku mati
@@ -85,7 +85,7 @@ Clay=Tanah Liat
 Snow=Salju
 Snow Block=Balok Salju
 Ice=Es
-Cave Ice=Es Gua
+Cave Ice=Gua Es
 Apple Tree=Pohon Apel
 Apple Wood Planks=Papan Kayu Pohon Apel
 Apple Tree Sapling=Anak Pohon Apel
@@ -132,13 +132,13 @@ Jungle Grass=Rumput Rimba
 Grass=Rumput
 Savanna Grass=Rumput Sabana
 Fern=Pakis
-Marram Grass=Rumput Pantai
+Marram Grass=Rumput Maram
 Bush Stem=Batang Semak
 Bush Leaves=Daun Semak
 Bush Sapling=Anak Semak
-Blueberry Bush Leaves with Berries=Daun Semak Bluberi Berbuah
-Blueberry Bush Leaves=Daun Semak Bluberi
-Blueberry Bush Sapling=Anak Semak Bluberi
+Blueberry Bush Leaves with Berries=Daun Semak Blueberry Berbuah
+Blueberry Bush Leaves=Daun Semak Blueberry
+Blueberry Bush Sapling=Anak Semak Blueberry
 Acacia Bush Stem=Batang Semak Akasia
 Acacia Bush Leaves=Daun Semak Akasia
 Acacia Bush Sapling=Bibit Semak Akasia
@@ -147,7 +147,7 @@ Pine Bush Needles=Daun Semak Pinus
 Pine Bush Sapling=Bibit Semak Pinus
 Kelp=Kelp
 Green Coral=Koral Hijau
-Pink Coral=Koral Merah Muda
+Pink Coral=Koral Jambon
 Cyan Coral=Koral Sian
 Brown Coral=Koral Cokelat
 Orange Coral=Koral Oranye
@@ -181,18 +181,18 @@ Glass=Kaca
 Obsidian Glass=Kaca Obsidian
 Brick Block=Balok Bata
 Mese Lamp=Lampu Mese
-Apple Wood Mese Post Light=Lampu Taman Mese Kayu Apel
-Acacia Wood Mese Post Light=Lampu Taman Mese Kayu Akasia
-Jungle Wood Mese Post Light=Lampu Taman Mese Kayu Rimba
-Pine Wood Mese Post Light=Lampu Taman Mese Kayu Pinus
-Aspen Wood Mese Post Light=Lampu Taman Mese Kayu Aspen
+Apple Wood Mese Post Light=
+Acacia Wood Mese Post Light=
+Jungle Wood Mese Post Light=
+Pine Wood Mese Post Light=
+Aspen Wood Mese Post Light=
 Cloud=Awan
-Wooden Pickaxe=Belencong Kayu
-Stone Pickaxe=Belencong Batu
-Bronze Pickaxe=Belencong Perunggu
-Steel Pickaxe=Belencong Baja
-Mese Pickaxe=Belencong Mese
-Diamond Pickaxe=Belencong Berlian
+Wooden Pickaxe=Gancu Kayu
+Stone Pickaxe=Gancu Batu
+Bronze Pickaxe=Gancu Perunggu
+Steel Pickaxe=Gancu Baja
+Mese Pickaxe=Gancu Mese
+Diamond Pickaxe=Gancu Berlian
 Wooden Shovel=Sekop Kayu
 Stone Shovel=Sekop Batu
 Bronze Shovel=Sekop Perunggu

mods/default/locale/default.ja.tr

@@ -4,37 +4,37 @@ Locked Chest (owned by @1)=鍵のかかったチェスト(@1所有)
 You do not own this chest.=あなたはこのチェストの所有者ではありません。
 a locked chest=ロックされたチェスト
 Chest=チェスト
-Write=書き込む
-Read=読む
+Write=
+Read=
 Title:=題名
 Contents:=内容
 Save=保存
 by @1=@1著
 Page @1 of @2=@1 / @2 ページ
-The book you were writing to mysteriously disappeared.=あなたが書いていた本が、不思議なことに消えました。
+The book you were writing to mysteriously disappeared.=
 "@1" by @2=@2著「@1」 
 Blueberries=ブルーベリー
 Book=本
-Book with Text=記入済みの本
+Book with Text=テキストが書かれた本
 Bronze Ingot=青銅インゴット
 Clay Brick=粘土レンガ
-Clay Lump=粘土玉
+Clay Lump=粘土の塊
 Coal Lump=石炭
 Copper Ingot=銅インゴット
-Copper Lump=銅の粗鉱
+Copper Lump=銅の塊
 Diamond=ダイヤモンド
 Flint=火打ち石
 Gold Ingot=金インゴット
-Gold Lump=金の粗鉱
-Iron Lump=鉄の粗鉱
+Gold Lump=金の塊
+Iron Lump=鉄の塊
 Mese Crystal=メセクリスタル
 Mese Crystal Fragment=メセクリスタルの破片
-Obsidian Shard=黒曜石の欠片
+Obsidian Shard=黒曜石の破片
 Paper=紙
 Steel Ingot=鉄インゴット
 Stick=棒
 Tin Ingot=スズインゴット
-Tin Lump=スズの粗鉱
+Tin Lump=スズの塊
 Furnace is empty=かまどは空です
 100% (output full)=100%(フル出力)
 @1%=@1%
@@ -59,70 +59,70 @@ Sandstone Block=砂岩ブロック
 Desert Sandstone=砂漠の砂岩
 Desert Sandstone Brick=砂漠の砂岩レンガ
 Desert Sandstone Block=砂漠の砂岩ブロック
-Silver Sandstone=銀色の砂岩
-Silver Sandstone Brick=銀色の砂岩レンガ
-Silver 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 Savanna Grass=サバンナの草に覆われた土
-Dirt with Snow=雪に覆われた土
-Dirt with Rainforest Litter=熱帯雨林の落葉に覆われた土
-Dirt with Coniferous Litter=針葉樹の落葉に覆われた土
+Dirt with Grass=草のついた土
+Dirt with Grass and Footsteps=足あとと草のついた土
+Dirt with Savanna Grass=サバンナの草のついた土
+Dirt with Snow=雪のついた土
+Dirt with Rainforest Litter=熱帯雨林のよごれた土
+Dirt with Coniferous Litter=針葉樹のよごれた土
 Savanna Dirt=サバンナの土
-Savanna Dirt with Savanna Grass=サバンナの草に覆われたサバンナの土
+Savanna Dirt with Savanna Grass=サバンナの草のついたサバンナの土
 Permafrost=永久凍土
-Permafrost with Stones=石に覆われた永久凍土
-Permafrost with Moss=苔に覆われた永久凍土
+Permafrost with Stones=石のついた永久凍土
+Permafrost with Moss=苔のついた永久凍土
 Sand=砂
 Desert Sand=砂漠の砂
-Silver Sand=銀色の砂
+Silver Sand=銀の砂
 Gravel=砂利
 Clay=粘土
 Snow=雪
 Snow Block=雪ブロック
 Ice=氷
 Cave Ice=洞窟の氷
-Apple Tree=リンゴの原木
-Apple Wood Planks=リンゴの木の板材
-Apple Tree Sapling=リンゴの木の苗木
-Apple Tree Leaves=リンゴの木の葉
+Apple Tree=リンゴの木
+Apple Wood Planks=リンゴの板材
+Apple Tree Sapling=リンゴの苗木
+Apple Tree Leaves=リンゴの葉
 Apple=リンゴ
 Apple Marker=リンゴのマーカー
-Jungle Tree=ジャングルの原木
-Jungle Wood Planks=ジャングルの木の板材
+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=ポプラの木の苗木
+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=鉄鉱石
+Iron Ore=鉄の鉱石
 Steel Block=鉄ブロック
-Copper Ore=銅鉱石
+Copper Ore=銅の鉱石
 Copper Block=銅ブロック
-Tin Ore=スズ鉱石
+Tin Ore=スズの鉱石
 Tin Block=スズブロック
 Bronze Block=青銅ブロック
 Mese Ore=メセ鉱石
 Mese Block=メセブロック
-Gold Ore=金鉱石
+Gold Ore=金の鉱石
 Gold Block=金ブロック
-Diamond Ore=ダイヤモンド鉱石
+Diamond Ore=ダイヤモンドの鉱石
 Diamond Block=ダイヤモンドブロック
 Cactus=サボテン
 Large Cactus Seedling=大きなサボテンの苗
@@ -136,7 +136,7 @@ Marram Grass=マラムの草
 Bush Stem=低木の幹
 Bush Leaves=低木の葉
 Bush Sapling=低木の苗木
-Blueberry Bush Leaves with Berries=ブルーベリーの実った低木
+Blueberry Bush Leaves with Berries=ブルーベリーの低木と実
 Blueberry Bush Leaves=ブルーベリーの低木の葉
 Blueberry Bush Sapling=ブルーベリーの低木の苗木
 Acacia Bush Stem=アカシアの低木の幹
@@ -153,9 +153,9 @@ Brown Coral=茶色のサンゴ
 Orange Coral=橙色のサンゴ
 Coral Skeleton=サンゴのしがい
 Water Source=水源
-Flowing Water=流れる水
-River Water Source=河川水源
-Flowing River Water=流れる河川水
+Flowing Water=水流
+River Water Source=川の水源
+Flowing River Water=川の水流
 Lava Source=溶岩
 Flowing Lava=流れる溶岩
 Empty Bookshelf=空の本棚
@@ -163,49 +163,49 @@ Bookshelf (@1 written, @2 empty books)=本棚(記述済み @1 冊, 未記述 @2
 Bookshelf=本棚
 Text too long=テキストが長すぎます
 "@1"=「@1」
-Wooden Sign=木製の看板
+Wooden Sign=木の看板
 Steel Sign=鉄の看板
-Wooden Ladder=木製のはしご
+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=ポプラ材のフェンスレール
+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=黒曜石ガラス
+Obsidian Glass=黒曜石のガラス
 Brick Block=レンガブロック
-Mese Lamp=メセのランプ
-Apple Wood Mese Post Light=リンゴ材のメセ灯柱
-Acacia Wood Mese Post Light=アカシア材のメセ灯柱
-Jungle Wood Mese Post Light=ジャングル材のメセ灯柱
-Pine Wood Mese Post Light=マツ材のメセ灯柱
-Aspen Wood Mese Post Light=ポプラ材のメセ灯柱
+Mese Lamp=メセの塊
+Apple Wood Mese Post Light=リンゴのメセ灯柱
+Acacia Wood Mese Post Light=アカシアのメセ灯柱
+Jungle Wood Mese Post Light=ジャングルのメセ灯柱
+Pine Wood Mese Post Light=マツのメセ灯柱
+Aspen Wood Mese Post Light=ポプラのメセ灯柱
 Cloud=雲
-Wooden Pickaxe=木製のツルハシ
-Stone Pickaxe=石のツルハシ
-Bronze Pickaxe=青銅のツルハシ
-Steel Pickaxe=鉄のツルハシ
-Mese Pickaxe=メセのツルハシ
-Diamond Pickaxe=ダイヤモンドのツルハシ
-Wooden Shovel=木製のシャベル
+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=木製の斧
+Wooden Axe=木の斧
 Stone Axe=石の斧
 Bronze Axe=青銅の斧
 Steel Axe=鉄の斧
 Mese Axe=メセの斧
 Diamond Axe=ダイヤモンドの斧
-Wooden Sword=木製の剣
+Wooden Sword=木の剣
 Stone Sword=石の剣
 Bronze Sword=青銅の剣
 Steel Sword=鉄の剣

mods/default/locale/default.zh_CN.tr

@@ -4,14 +4,14 @@ Locked Chest (owned by @1)=已上锁的箱子（属于@1）
 You do not own this chest.=这个箱子不属于你所有。
 a locked chest=一个已上锁的箱子
 Chest=箱子
-Write=写
-Read=读
+Write=
+Read=
 Title:=标题：
 Contents:=内容：
 Save=保存
 by @1=由@1
 Page @1 of @2=第@1页，共@2页。
-The book you were writing to mysteriously disappeared.=你正在写的书不知为何消失了。
+The book you were writing to mysteriously disappeared.=
 "@1" by @2="@1" by @2
 Blueberries=蓝莓
 Book=书

mods/default/locale/default.zh_TW.tr

@@ -4,14 +4,14 @@ Locked Chest (owned by @1)=已上鎖的箱子（屬於@1所有）
 You do not own this chest.=這個箱子不屬於你所有。
 a locked chest=一個已上鎖的箱子
 Chest=箱子
-Write=寫
-Read=讀
+Write=
+Read=
 Title:=標題：
 Contents:=內容：
 Save=保存
 by @1=由@1
 Page @1 of @2=第@1頁，共@2頁。
-The book you were writing to mysteriously disappeared.=你正在寫的書神秘消失了。
+The book you were writing to mysteriously disappeared.=
 "@1" by @2="@1" by @2
 Blueberries=藍莓
 Book=書

mods/default/nodes.lua

@@ -2597,12 +2597,12 @@ local function register_sign(material, desc, def)
 			if not text then
 				return
 			end
-			if #text > 512 then
+			if string.len(text) > 512 then
 				minetest.chat_send_player(player_name, S("Text too long"))
 				return
 			end
-			text = text:gsub("[%z-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n)
-			default.log_player_action(sender, ("wrote %q to the sign at"):format(text), pos)
+			default.log_player_action(sender, "wrote \"" .. text ..
+				"\" to the sign at", pos)
 			local meta = minetest.get_meta(pos)
 			meta:set_string("text", text)
 

mods/doors/locale/doors.ja.tr

@@ -3,16 +3,16 @@ Hidden Door Segment=隠しドアの区切り
 Owned by @1=所有者 @1
 You do not own this locked door.=あなたはこのロックされたドアの所有者ではありません。
 a locked door=ロックされたドア
-Wooden Door=木製のドア
+Wooden Door=木のドア
 Steel Door=鉄のドア
 Glass Door=ガラスのドア
-Obsidian Glass Door=黒曜石ガラスのドア
+Obsidian Glass Door=黒曜石のガラスのドア
 You do not own this trapdoor.=あなたはこのトラップドアの所有者ではありません。
 a locked trapdoor=ロックされたトラップドア
-Wooden Trapdoor=木製のトラップドア
+Wooden Trapdoor=木のトラップドア
 Steel Trapdoor=鉄のトラップドア
-Apple Wood Fence Gate=リンゴ材のフェンスゲート
-Acacia Wood Fence Gate=アカシア材のフェンスゲート
-Jungle Wood Fence Gate=ジャングル材のフェンスゲート
-Pine Wood Fence Gate=マツ材のフェンスゲート
-Aspen Wood Fence Gate=ポプラ材のフェンスゲート
+Apple Wood Fence Gate=リンゴのフェンスゲート
+Acacia Wood Fence Gate=アカシアのフェンスゲート
+Jungle Wood Fence Gate=ジャングルのフェンスゲート
+Pine Wood Fence Gate=マツのフェンスゲート
+Aspen Wood Fence Gate=ポプラのフェンスゲート

mods/dye/locale/dye.id.tr

@@ -13,4 +13,4 @@ Brown Dye=Pewarna Cokelat
 Orange Dye=Pewarna Oranye
 Red Dye=Pewarna Merah
 Magenta Dye=Pewarna Magenta
-Pink Dye=Pewarna Merah Muda
+Pink Dye=Pewarna Merah Jambu

mods/farming/locale/farming.ja.tr

@@ -1,7 +1,7 @@
 # textdomain: farming
 Hoe=クワ
 Seed=種
-Wooden Hoe=木製のクワ
+Wooden Hoe=木のクワ
 Stone Hoe=石のクワ
 Steel Hoe=鉄のクワ
 Bronze Hoe=青銅のクワ
@@ -22,7 +22,7 @@ Desert Sand Soil=砂漠の砂の土壌
 Wet Desert Sand Soil=湿った砂漠の砂の土壌
 Straw=ワラ
 Straw Stair=ワラの階段
-Inner Straw Stair=ワラの凹階段
-Outer Straw Stair=ワラの凸階段
-Straw Slab=ワラの厚板
+Inner Straw Stair=へっこんだワラの階段
+Outer Straw Stair=でっぱったワラの階段
+Straw Slab=ワラのハーフブロック
 Wild Cotton=天然綿

mods/farming/locale/farming.zh_TW.tr

@@ -1,6 +1,6 @@
 # textdomain: farming
-Hoe=鋤頭
-Seed=種子
+Hoe=
+Seed=
 Wooden Hoe=木鋤頭
 Stone Hoe=石鋤頭
 Steel Hoe=鐵鋤頭
@@ -16,8 +16,8 @@ Cotton=棉
 String=線
 Soil=土
 Wet Soil=溼土
-Savanna Soil=草原土
-Wet Savanna Soil=溼草原土
+Savanna Soil=
+Wet Savanna Soil=
 Desert Sand Soil=沙漠沙土
 Wet Desert Sand Soil=溼沙漠沙土
 Straw=稻草
@@ -25,7 +25,7 @@ Straw Stair=稻草臺階
 Inner Straw Stair=稻草內樓梯
 Outer Straw Stair=稻草外樓梯
 Straw Slab=稻草板
-Wild Cotton=野生棉花
+Wild Cotton=
 
 
 ##### not used anymore #####

mods/mtg_craftguide/init.lua

@@ -345,11 +345,8 @@ local function on_receive_fields(player, fields)
 		data.items = init_items
 		return true
 
-	elseif (fields.key_enter_field == "filter" or fields.search)
-			and fields.filter then
-		local new = fields.filter:sub(1, 128) -- truncate to a sane length
-				:gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n)
-				:lower() -- search is case insensitive
+	elseif fields.key_enter_field == "filter" or fields.search then
+		local new = fields.filter:lower()
 		if data.filter == new then
 			return
 		end

mods/mtg_craftguide/locale/mtg_craftguide.id.tr

@@ -1,53 +0,0 @@
-# textdomain: mtg_craftguide
-Any coal=Batu bara apa pun
-Any sand=Pasir apa pun
-Any wool=Wol apa pun
-Any stick=Tongkat apa pun
-Any vessel=Bejana apa pun
-Any wood planks=Papan kayu apa pun
-Any kind of stone block=Blok batu apa pun
-Any red flower=Bunga merah apa pun
-Any blue flower=Bunga biru apa pun
-Any black flower=Bunga hitam apa pun
-Any green flower=Bunga hijau apa pun
-Any white flower=Bunga putih apa pun
-Any orange flower=Bunga oranye apa pun
-Any violet flower=Bunga ungu apa pun
-Any yellow flower=Bunga kuning apa pun
-Any red dye=Pewarna merah apa pun
-Any blue dye=Pewarna biru apa pun
-Any cyan dye=Pewarna sian apa pun
-Any grey dye=Pewarna abu apa pun
-Any pink dye=Pewarna merah jambu apa pun
-Any black dye=Pewarna hitam apa pun
-Any brown dye=Pewarna cokelat apa pun
-Any green dye=Pewarna hijau apa pun
-Any white dye=Pewarna putih apa pun
-Any orange dye=Pewarna oranye apa pun
-Any violet dye=Pewarna ungu apa pun
-Any yellow dye=Pewarna kuning apa pun
-Any magenta dye=Pewarna magenta apa pun
-Any dark grey dye=Pewarna abu tua apa pun
-Any dark green dye=Pewarna hijau tua apa pun
-# Label for group ingredients
-G=G
-Any item belonging to the group(s): @1=Barang apa pun yang termasuk grup: @1
-Unknown Item=Barang Tak Diketahui
-Fuel=Bahan Bakar
-Usage @1 of @2=Pemakaian @1 dari @2
-Recipe @1 of @2=Resep @1 dari @2
-Previous recipe=Resep sebelumnya
-Next recipe=Resep selanjutnya
-Recipe is too big to be displayed.=Resep terlalu besar untuk ditampilkan.
-Shapeless=Tak berbentuk
-Cooking time: @1=Waktu memasak: @1
-Search=Cari
-Reset=Atur ulang
-Previous page=Halaman sebelumnya
-Next page=Halaman selanjutnya
-No items to show.=Tiada barang untuk ditampilkan.
-No usages.=Tiada pemakaian.
-Click again to show recipes.=Klik lagi untuk menampilkan resep.
-No recipes.=Tiada resep.
-Click again to show usages.=Klik lagi untuk menampilkan pemakaian.
-Recipes=Resep

mods/mtg_craftguide/locale/mtg_craftguide.ru.tr

@@ -31,7 +31,7 @@ Any dark grey dye=Любая тёмно-серая краска
 Any dark green dye=Любая тёмно-зелёная краска
 # Label for group ingredients
 G=Г
-Any item belonging to the group(s): @1=Любой предмет из групп(ы): @1
+Any item belonging to the group(s): @1=Любой предмет принадлежащий группам: @1
 Unknown Item=Неизвестный предмет
 Fuel=Топливо
 Usage @1 of @2=Использование @1 из @2

mods/player_api/api.lua

@@ -67,11 +67,7 @@ function player_api.set_model(player, model_name)
 	if player_data.model == model_name then
 		return
 	end
-	-- Update data
 	player_data.model = model_name
-	-- Clear animation data as the model has changed
-	-- (required for setting the `stand` animation not to be a no-op)
-	player_data.animation, player_data.animation_speed = nil, nil
 
 	local model = models[model_name]
 	if model then

mods/screwdriver/init.lua

@@ -60,19 +60,6 @@ end
 
 screwdriver.rotate.colorfacedir = screwdriver.rotate.facedir
 
-screwdriver.rotate["4dir"] = function(pos, node, mode)
-	if mode ~= screwdriver.ROTATE_FACE then
-		-- Can only rotate 4dir nodes in face mode
-		return nil
-	end
-	local rotation = node.param2 % 4 -- get first 2 bits
-	local other = node.param2 - rotation
-	rotation = (rotation + 1) % 4
-	return rotation + other
-end
-
-screwdriver.rotate["color4dir"] = screwdriver.rotate["4dir"]
-
 local wallmounted_tbl = {
 	[screwdriver.ROTATE_FACE] = {[2] = 5, [3] = 4, [4] = 2, [5] = 3, [1] = 0, [0] = 1},
 	[screwdriver.ROTATE_AXIS] = {[2] = 5, [3] = 4, [4] = 2, [5] = 1, [1] = 0, [0] = 3}
@@ -126,10 +113,6 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses)
 	local new_param2
 	if fn then
 		new_param2 = fn(pos, node, mode)
-		if not new_param2 then
-			-- rotation refused
-			return itemstack
-		end
 	else
 		new_param2 = node.param2
 	end

mods/sethome/init.lua

@@ -52,9 +52,6 @@ end
 
 sethome.get = function(name)
 	local player = minetest.get_player_by_name(name)
-	if not player then
-		return false, S("This command can only be executed in-game!")
-	end
 	local player_meta = player:get_meta()
 	local pos = minetest.string_to_pos(player_meta:get_string("sethome:home"))
 	if pos then
@@ -89,10 +86,6 @@ minetest.register_chatcommand("home", {
 	description = S("Teleport you to your home point"),
 	privs = {home = true},
 	func = function(name)
-		local player = minetest.get_player_by_name(name)
-		if not player then
-			return false, S("This command can only be executed in-game!")
-		end
 		if sethome.go(name) then
 			return true, S("Teleported to home!")
 		end

mods/sethome/locale/sethome.de.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=Dieser Befehl kann nur im Spiel ausgeführt werden!
 Can use /sethome and /home=Kann /sethome und /home benutzen
 Teleport you to your home point=Teleportieren Sie sich zu Ihrem Zuhause-Punkt
 Teleported to home!=Nach Hause teleportiert!

mods/sethome/locale/sethome.eo.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Povas uzi /sethome kaj /home
 Teleport you to your home point=Teletransporti vin al via hejmo
 Teleported to home!=Teletransportita al hejmo!

mods/sethome/locale/sethome.es.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Puedes usar /sethome y /home
 Teleport you to your home point=Teletranspórtate a tu hogar
 Teleported to home!=¡Teletransportado a tu hogar!

mods/sethome/locale/sethome.fr.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Peut utiliser /sethome et /home
 Teleport you to your home point=Vous téléporter à votre domicile
 Teleported to home!=Téléporté à votre domicile !

mods/sethome/locale/sethome.id.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Boleh pakai /sethome dan /home
 Teleport you to your home point=Teleportasi ke rumah Anda
 Teleported to home!=Teleportasi ke rumah!

mods/sethome/locale/sethome.it.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Può usare /sethome e /home
 Teleport you to your home point=Ti teletrasporta al tuo punto di domicilio
 Teleported to home!=Teletrasportato a casa!

mods/sethome/locale/sethome.ja.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=/sethomeと/homeが使えます
 Teleport you to your home point=ホーム地点にテレポートします
 Teleported to home!=ホームにテレポート！

mods/sethome/locale/sethome.jbo.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=kakne lo nu pilno lo me zoi gy./sethome.gy. ku .e lo me zoi gy./home.gy.
 Teleport you to your home point=sukmu'u lo do zdani mokca
 Teleported to home!=puba'o sukmu'u lo zdani

mods/sethome/locale/sethome.ms.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Boleh guna /sethome dan /home
 Teleport you to your home point=Teleportasikan anda ke titik rumah anda
 Teleported to home!=Diteleportasikan ke rumah!

mods/sethome/locale/sethome.pl.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Może używać /sethome i /home
 Teleport you to your home point=Teleportuj się do swojego punktu domowego
 Teleported to home!=Teleportowano do punktu domowego

mods/sethome/locale/sethome.pt_BR.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Pode usar /sethome e /home
 Teleport you to your home point=Teletransportá-lo para seu ponto de origem
 Teleported to home!=Teletransportado para o ponto de origem!

mods/sethome/locale/sethome.ru.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=Эта команда может быть использована только в игре!
 Can use /sethome and /home=Возможность использовать /sethome и /home
 Teleport you to your home point=Вы телепортируетесь в свою домашнюю точку
 Teleported to home!=Вы телепортировались домой!

mods/sethome/locale/sethome.sk.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Môžeš použivať /sethome a /home
 Teleport you to your home point=Teleportuj sa domov
 Teleported to home!=Teleportovaný domov!

mods/sethome/locale/sethome.sv.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Kan använda /sethome och /home
 Teleport you to your home point=Teleportera dig till din hempunkt
 Teleported to home!=Teleporterad hem!

mods/sethome/locale/sethome.uk.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=Можливість використання /sethome та /home
 Teleport you to your home point=Ви телепортуєтесь у свою домашню точку
 Teleported to home!=Ви телепортувались додому!

mods/sethome/locale/sethome.zh_CN.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=该指令只能在游戏内使用！
 Can use /sethome and /home=可以使用/sethome和/home
 Teleport you to your home point=将您传送到家
 Teleported to home!=已传送到家！

mods/sethome/locale/sethome.zh_TW.tr

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=此指令僅能在游戲内使用！
 Can use /sethome and /home=可以使用/sethome和/home
 Teleport you to your home point=傳送您到您家的地點
 Teleported to home!=已傳送到家！

mods/sethome/locale/template.txt

@@ -1,5 +1,4 @@
 # textdomain: sethome
-This command can only be executed in-game!=
 Can use /sethome and /home=
 Teleport you to your home point=
 Teleported to home!=