Merge remote-tracking branch 'upstream/master' into dev

mods/default/README.txt

@@ -178,7 +178,7 @@ Gambit (CC BY-SA 3.0):
   default_iron_lump.png
   default_gold_lump.png
   default_clay_lump.png
-  default_coal.png
+  default_coal_lump.png
   default_grass_*.png
   default_paper.png
   default_diamond_block.png

mods/default/craftitems.lua

@@ -3,6 +3,46 @@
 -- support for MT game translation.
 local S = default.get_translator
 
+local esc = minetest.formspec_escape
+local formspec_size = "size[8,8]"
+
+local function formspec_core(tab)
+	if tab == nil then tab = 1 else tab = tostring(tab) end
+	return "tabheader[0,0;book_header;" ..
+		esc(S("Write")) .. "," ..
+		esc(S("Read")) .. ";" ..
+		tab  ..  ";false;false]"
+end
+
+local function formspec_write(title, text)
+	return "field[0.5,1;7.5,0;title;" .. esc(S("Title:")) .. ";" ..
+			esc(title) .. "]" ..
+		"textarea[0.5,1.5;7.5,7;text;" .. esc(S("Contents:")) .. ";" ..
+			esc(text) .. "]" ..
+		"button_exit[2.5,7.5;3,1;save;" .. esc(S("Save")) .. "]"
+end
+
+local function formspec_read(owner, title, string, text, page, page_max)
+	return "label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" ..
+		"tablecolumns[color;text]" ..
+		"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
+		"table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" ..
+		"textarea[0.5,1.5;7.5,7;;" ..
+			esc(string ~= "" and string or text) .. ";]" ..
+		"button[2.4,7.6;0.8,0.8;book_prev;<]" ..
+		"label[3.2,7.7;" .. esc(S("Page @1 of @2", page, page_max)) .. "]" ..
+		"button[4.9,7.6;0.8,0.8;book_next;>]"
+end
+
+local function formspec_string(lpp, page, lines, string)
+	for i = ((lpp * page) - lpp) + 1, lpp * page do
+		if not lines[i] then break end
+		string = string .. lines[i] .. "\n"
+	end
+	return string
+end
+
+local tab_number
 local lpp = 14 -- Lines per book's page
 local function book_on_use(itemstack, user)
 	local player_name = user:get_player_name()
@@ -19,8 +59,8 @@ local function book_on_use(itemstack, user)
 	local data = meta:to_table().fields
 
 	if data.owner then
-		title = data.title
-		text = data.text
+		title = data.title or ""
+		text = data.text or ""
 		owner = data.owner
 
 		for str in (text .. "\n"):gmatch("([^\n]*)[\n]") do
@@ -30,37 +70,26 @@ local function book_on_use(itemstack, user)
 		if data.page then
 			page = data.page
 			page_max = data.page_max
-
-			for i = ((lpp * page) - lpp) + 1, lpp * page do
-				if not lines[i] then break end
-				string = string .. lines[i] .. "\n"
-			end
+			string = formspec_string(lpp, page, lines, string)
 		end
 	end
 
 	local formspec
-	local esc = minetest.formspec_escape
-	if owner == player_name then
-		formspec = "size[8,8]" ..
-			"field[0.5,1;7.5,0;title;" .. esc(S("Title:")) .. ";" ..
-				esc(title) .. "]" ..
-			"textarea[0.5,1.5;7.5,7;text;" .. esc(S("Contents:")) .. ";" ..
-				esc(text) .. "]" ..
-			"button_exit[2.5,7.5;3,1;save;" .. esc(S("Save")) .. "]"
+	if title == "" and text == "" then
+		formspec = formspec_write(title, text)
+	elseif owner == player_name then
+		local tab = tab_number or 1
+		if tab == 2 then
+			formspec = formspec_core(tab) ..
+				formspec_read(owner, title, string, text, page, page_max)
+		else
+			formspec = formspec_core(tab) .. formspec_write(title, text)
+		end
 	else
-		formspec = "size[8,8]" ..
-			"label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" ..
-			"tablecolumns[color;text]" ..
-			"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
-			"table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" ..
-			"textarea[0.5,1.5;7.5,7;;" ..
-				minetest.formspec_escape(string ~= "" and string or text) .. ";]" ..
-			"button[2.4,7.6;0.8,0.8;book_prev;<]" ..
-			"label[3.2,7.7;" .. esc(S("Page @1 of @2", page, page_max)) .. "]" ..
-			"button[4.9,7.6;0.8,0.8;book_next;>]"
+		formspec = formspec_read(owner, title, string, text, page, page_max)
 	end
 
-	minetest.show_formspec(player_name, "default:book", formspec)
+	minetest.show_formspec(player_name, "default:book", formspec_size .. formspec)
 	return itemstack
 end
 
@@ -69,12 +98,37 @@ local max_title_size = 80
 local short_title_size = 35
 minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if formname ~= "default:book" then return end
+	local player_name = player:get_player_name()
 	local inv = player:get_inventory()
 	local stack = player:get_wielded_item()
+	local data = stack:get_meta():to_table().fields
 
-	if fields.save and fields.title and fields.text
-			and fields.title ~= "" and fields.text ~= "" then
-		local new_stack, data
+	local title = data.title or ""
+	local text = data.text or ""
+
+	if fields.book_header ~= nil and data.owner == player_name then
+		local contents
+		local tab = tonumber(fields.book_header)
+		if tab == 1 then
+			contents = formspec_core(tab) ..
+				formspec_write(title, text)
+		elseif tab == 2 then
+			local lines, string = {}, ""
+			for str in (text .. "\n"):gmatch("([^\n]*)[\n]") do
+				lines[#lines+1] = str
+			end
+			string = formspec_string(lpp, data.page, lines, string)
+			contents = formspec_read(player_name, title, string,
+				text, data.page, data.page_max)
+		end
+		tab_number = tab
+		local formspec = formspec_size .. formspec_core(tab) .. contents
+		minetest.show_formspec(player_name, "default:book", formspec)
+		return
+	end
+
+	if fields.save and fields.title and fields.text then
+		local new_stack
 		if stack:get_name() ~= "default:book_written" then
 			local count = stack:get_count()
 			if count == 1 then
@@ -83,11 +137,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 				stack:set_count(count - 1)
 				new_stack = ItemStack("default:book_written")
 			end
-		else
-			data = stack:get_meta():to_table().fields
 		end
 
-		if data and data.owner and data.owner ~= player:get_player_name() then
+		if data.owner ~= player_name and title ~= "" and text ~= "" then
 			return
 		end
 
@@ -117,8 +169,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		end
 
 	elseif fields.book_next or fields.book_prev then
-		local data = stack:get_meta():to_table().fields
-		if not data or not data.page then
+		if not data.page then
 			return
 		end
 

mods/default/furnace.lua

@@ -177,8 +177,15 @@ local function furnace_node_timer(pos, elapsed)
 					fuel_totaltime = 0
 					src_time = 0
 				else
-					-- Take fuel from fuel list
-					inv:set_stack("fuel", 1, afterfuel.items[1])
+					-- prevent blocking of fuel inventory (for automatization mods)
+					local is_fuel = minetest.get_craft_result({method = "fuel", width = 1, items = {afterfuel.items[1]:to_string()}})
+					if is_fuel.time == 0 then
+						table.insert(fuel.replacements, afterfuel.items[1])
+						inv:set_stack("fuel", 1, "")
+					else
+						-- Take fuel from fuel list
+						inv:set_stack("fuel", 1, afterfuel.items[1])
+					end
 					-- Put replacements in dst list or drop them on the furnace.
 					local replacements = fuel.replacements
 					if replacements[1] then

mods/default/init.lua

@@ -12,6 +12,20 @@ default = {}
 default.LIGHT_MAX = 14
 default.get_translator = S
 
+-- Check for engine features required by MTG
+-- This provides clear error behaviour when MTG is newer than the installed engine
+-- and avoids obscure, hard to debug runtime errors.
+-- This section should be updated before release and older checks can be dropped
+-- when newer ones are introduced.
+if not minetest.is_creative_enabled or not minetest.has_feature({
+		direct_velocity_on_players = true,
+		use_texture_alpha_string_modes = true,
+	}) then
+	error("\nThis version of Minetest Game is incompatible with your engine version "..
+		"(which is too old). You should download a version of Minetest Game that "..
+		"matches the installed engine version.\n")
+end
+
 -- GUI related stuff
 minetest.register_on_joinplayer(function(player)
 	-- Set formspec prepend

mods/default/locale/default.de.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=Abgeschlossene Truhe (Eigentum von @1)
 You do not own this chest.=Ihnen gehört diese Truhe nicht.
 a locked chest=eine abgeschlossene Truhe
 Chest=Truhe
+Write=Schreiben
+Read=Lesen
 Title:=Titel:
 Contents:=Inhalt:
 Save=Speichern

mods/default/locale/default.eo.tr

@@ -0,0 +1,222 @@
+# textdomain: default
+Locked Chest=Ŝlosita Kesto
+Locked Chest (owned by @1)=Ŝlosita Kesto (de @1)
+You do not own this chest.=Vi ne posedas ĉi tiu keston.
+a locked chest=ŝlosita kesto
+Chest=Kesto
+Write=
+Read=
+Title:=Titolo
+Contents:=Entenaĵo
+Save=Konservu
+by @1=per @1
+Page @1 of @2=Paĝo @1 el @2
+"@1" by @2="@1" per @2
+Skeleton Key=Skeleta Ŝlosilo
+Key to @1's @2=Ŝlosilo por la @2 de @1
+Blueberries=Mirteloj
+Book=Libro
+Book with Text=Libro kun Teksto
+Bronze Ingot=Bronza Ingoto
+Clay Brick=Argila Briko
+Clay Lump=Argila Bulo
+Coal Lump=Karba Bulo
+Copper Ingot=Kupra Ingoto
+Copper Lump=Kupra Bulo
+Diamond=Diamanto
+Flint=Siliko
+Gold Ingot=Ora Ingoto
+Gold Lump=Ora Bulo
+Iron Lump=Fera Bulo
+Mese Crystal=Mesea Kristalo
+Mese Crystal Fragment=Mesea Kristala Ero
+Obsidian Shard=Obsidiana Peceto 
+Paper=Papero
+Steel Ingot=Ŝtala Ingoto
+Stick=Bastono
+Tin Ingot=Stana Ingoto
+Tin Lump=Stana Bulo
+Furnace is empty=Forno estas malplena
+100% (output full)=100% (eligo estas plena)
+@1%=@1%
+Not cookable=Ne povas kuiri
+Empty=Malplena
+Furnace active=Forno laboras
+Furnace inactive=Forno ne laboras
+(Item: @1; Fuel: @2)=(Objekto: @1; Brulaĵo: @2)
+Furnace=Forno
+Stone=Ŝtono
+Cobblestone=Pavimŝtono
+Stone Brick=Ŝtona Briko
+Stone Block=Ŝtona Ŝtipo
+Mossy Cobblestone=Muska Pavimŝtono
+Desert Stone=Dezerta Ŝtono
+Desert Cobblestone=Dezerta Pavimŝtono
+Desert Stone Brick=Dezerta Ŝtona Briko
+Desert Stone Block=Dezerta Ŝtona Ŝtipo
+Sandstone=Sablaŝtono
+Sandstone Brick=Sablaŝtono Briko
+Sandstone Block=Sablaŝtono Ŝtipo
+Desert Sandstone=Dezerta Sablaŝtono
+Desert Sandstone Brick=Dezerta Sablaŝtono Briko
+Desert Sandstone Block=Dezerta Sablaŝtono Ŝtipo
+Silver Sandstone=Arĝenta Sablaŝtono
+Silver Sandstone Brick=Arĝenta Sablaŝtono Briko
+Silver Sandstone Block=Arĝenta Sablaŝtono Ŝtipo
+Obsidian=Obsidiano
+Obsidian Brick=Obsidiana Briko
+Obsidian Block=Obsidiana Ŝtipo
+Dirt=Tero
+Dirt with Grass=Tero kun Herbo
+Dirt with Grass and Footsteps=Tero kun Herbo kaj Piedpaŝoj
+Dirt with Savanna Grass=Tero kun Savana Herbo
+Dirt with Snow=Tero kun Neĝo
+Dirt with Rainforest Litter=Tero kun Pluvarbara Folioj
+Dirt with Coniferous Litter=Tero kun Konifera Folioj
+Savanna Dirt=Savana Tero
+Savanna Dirt with Savanna Grass=Savana Tero kun Savana Herbo
+Permafrost=Ĉiamfrosto
+Permafrost with Stones=Ĉiamfrosto kun Ŝtonoj
+Permafrost with Moss=Ĉiamfrosto kun Musko
+Sand=Sablo
+Desert Sand=Dezerta Sablo
+Silver Sand=Arĝenta Sablo
+Gravel=Gruzo
+Clay=Argilo
+Snow=Neĝo
+Snow Block=Neĝa Ŝtipo
+Ice=Glacio
+Cave Ice=Kaverna Glacio
+Apple Tree=Poma Arbo
+Apple Wood Planks=Poma Ligna Tabuloj
+Apple Tree Sapling=Poma Arba Arbido
+Apple Tree Leaves=Poma Arba Folioj
+Apple=Pomo
+Apple Marker=Poma Marko
+Jungle Tree=Ĝangala Arbo
+Jungle Wood Planks=Ĝangala Ligna Tabuloj
+Jungle Tree Leaves=Ĝangala Arba Folioj
+Jungle Tree Sapling=Ĝangala Arba Arbido
+Emergent Jungle Tree Sapling=Nova Ĝangala Arba Arbido
+Pine Tree=Pina Arbo
+Pine Wood Planks=Pina Ligna Tabuloj
+Pine Needles=Pinpingloj
+Pine Tree Sapling=Pina Arba Arbido
+Acacia Tree=Akacia Arbo
+Acacia Wood Planks=Akacia Ligna Tabuloj
+Acacia Tree Leaves=Akacia Arba Folioj
+Acacia Tree Sapling=Akacia Arba Arbido
+Aspen Tree=Tremola Arba
+Aspen Wood Planks=Tremola Ligna Tabuloj
+Aspen Tree Leaves=Tremola Arbo Folioj
+Aspen Tree Sapling=Tremola Arba Arbido
+Coal Ore=Karba Minaĵo
+Coal Block=Karba Ŝtipo
+Iron Ore=Fera Minaĵo
+Steel Block=Ŝtala Ŝtipo
+Copper Ore=Kupra Minaĵo
+Copper Block=Kupra Ŝtipo
+Tin Ore=Stana Minaĵo
+Tin Block=Stana Ŝtipo
+Bronze Block=Bronza Ŝtipo
+Mese Ore=Mesea Minaĵo
+Mese Block=Mesea Ŝtipo
+Gold Ore=Ora Minaĵo
+Gold Block=Ora Ŝtipo
+Diamond Ore=Diamanta Minaĵo
+Diamond Block=Diamanta Ŝtipo
+Cactus=Kakto
+Large Cactus Seedling=Granda Kakta Kreskaĵo
+Papyrus=Papiruso
+Dry Shrub=Seka Arbetaĵo
+Jungle Grass=Ĝangala Herbo
+Grass=Herbo
+Savanna Grass=Savana Herbo
+Fern=Filiko
+Marram Grass=Amofilo
+Bush Stem=Arbateĵa Tubo
+Bush Leaves=Arbateĵa Folioj
+Bush Sapling=Arbateĵa Arbido
+Blueberry Bush Leaves with Berries=Mirtela Arbateĵa Folioj kaj Beroj
+Blueberry Bush Leaves=Mirtela Arbateĵa Folioj
+Blueberry Bush Sapling=Mirtela Arbateĵa Arbido
+Acacia Bush Stem=Akacia Arbateĵa Tubo
+Acacia Bush Leaves=Akacia Arbateĵa Folioj
+Acacia Bush Sapling=Akacia Arbateĵa Arbido
+Pine Bush Stem=Pina Arbateĵa Tubo
+Pine Bush Needles=Pina Arbateĵa Pingloj
+Pine Bush Sapling=Pina Arbateĵa Arbido
+Kelp=Fuko
+Green Coral=Verda Koralo
+Pink Coral=Rozkolora Koralo
+Cyan Coral=Bluverda Koralo
+Brown Coral=Bruna Koralo
+Orange Coral=Oranĝa Koralo
+Coral Skeleton=Korala Framo
+Water Source=Akva Fonto
+Flowing Water=Flua Akvo
+River Water Source=Rivera Akva Fonto
+Flowing River Water=Flua Rivera Akvo
+Lava Source=Lafa Fonto
+Flowing Lava=Flua Lafa
+Empty Bookshelf=Malplena Librobreto
+Bookshelf (@1 written, @2 empty books)=Librobreto (@1 skriba, @2 malplena libroj)
+Bookshelf=Librobreto
+Text too long=Teksto estas ekscesa longo
+"@1"="@1"
+Wooden Sign=Ligna Signo
+Steel Sign=Ŝtala Signo
+Wooden Ladder=Ligna Ŝtupetaro
+Steel Ladder=Ŝtala Ŝtupetaro
+Apple Wood Fence=Poma Ligna Barilo
+Acacia Wood Fence=Akacia Ligna Barilo
+Jungle Wood Fence=Ĝangala Ligna Barilo
+Pine Wood Fence=Pina Ligna Barilo
+Aspen Wood Fence=Tremola Ligna Barilo
+Apple Wood Fence Rail=Poma Ligna Barila Relo
+Acacia Wood Fence Rail=Akacia Ligna Barila Relo
+Jungle Wood Fence Rail=Ĝangala Ligna Barila Relo
+Pine Wood Fence Rail=Pina Ligna Barila Relo
+Aspen Wood Fence Rail=Tremola Ligna Barila Relo
+Glass=Vitro
+Obsidian Glass=Obsidiana Vitro
+Brick Block=Brika Ŝtipo
+Mese Lamp=Mesea Lampo
+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=Nubo
+Wooden Pickaxe=Ligna Pioĉo
+Stone Pickaxe=Ŝtona Pioĉo
+Bronze Pickaxe=Bronza Pioĉo
+Steel Pickaxe=Ŝtala Pioĉo
+Mese Pickaxe=Mesea Pioĉo
+Diamond Pickaxe=Diamanta Pioĉo
+Wooden Shovel=Ligna Fosilo
+Stone Shovel=Ŝtona Fosilo
+Bronze Shovel=Bronza Fosilo
+Steel Shovel=Ŝtala Fosilo
+Mese Shovel=Mesea Fosilo
+Diamond Shovel=Diamanta Fosilo
+Wooden Axe=Ligna Hakilo
+Stone Axe=Ŝtona Hakilo
+Bronze Axe=Bronza Hakilo
+Steel Axe=Ŝtala Hakilo
+Mese Axe=Mesea Hakilo
+Diamond Axe=Diamanta Hakilo
+Wooden Sword=Ligna Glavo
+Stone Sword=Ŝtona Glavo
+Bronze Sword=Bronza Glavo
+Steel Sword=Ŝtala Glavo
+Mese Sword=Mesea Glavo
+Diamond Sword=Diamanta Glavo
+Key=Ŝlosilo
+Torch=Torĉo
+@1 will intersect protection on growth.=@1 sekcos protekto ĉe vegeto.
+
+
+##### not used anymore #####
+
+Mese Post Light=Mesea Fosta Lampo

mods/default/locale/default.es.tr

@@ -1,10 +1,11 @@
 # textdomain: default
-
 Locked Chest=Cofre cerrado
 Locked Chest (owned by @1)=Cofre cerrado (propiedad de @1)
 You do not own this chest.=Este cofre no te pertenece.
 a locked chest=un cofre cerrado
 Chest=Cofre
+Write=
+Read=
 Title:=Título:
 Contents:=Contenidos:
 Save=Guardar

mods/default/locale/default.fr.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=Coffre verrouillé (possédé par @1)
 You do not own this chest.=Ce coffre ne vous appartient pas.
 a locked chest=un coffre verrouillé
 Chest=Coffre
+Write=
+Read=
 Title:=Titre :
 Contents:=Contenu :
 Save=Sauvegarder

mods/default/locale/default.id.tr

@@ -4,6 +4,8 @@ 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=
+Read=
 Title:=Judul:
 Contents:=Isi:
 Save=Simpan

mods/default/locale/default.it.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=Baule chiuso a chiave (di proprietà di @1)
 You do not own this chest.=Questo baule non ti appartiene.
 a locked chest=un baule chiuso a chiave
 Chest=Baule
+Write=
+Read=
 Title:=
 Contents:=
 Save=

mods/default/locale/default.ja.tr

@@ -0,0 +1,217 @@
+# textdomain: default
+Locked Chest=鍵のかかったチェスト
+Locked Chest (owned by @1)=鍵のかかったチェスト(@1所有)
+You do not own this chest.=あなたはこのチェストの所有者ではありません。
+a locked chest=ロックされたチェスト
+Chest=チェスト
+Write=
+Read=
+Title:=題名
+Contents:=内容
+Save=保存
+by @1=@1著
+Page @1 of @2=@1 / @2 ページ
+"@1" by @2=@2著「@1」 
+Skeleton Key=スケルトンの鍵
+Key to @1's @2=@1の@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=スズの塊
+Furnace is empty=かまどは空です
+100% (output full)=100%(フル出力)
+@1%=@1%
+Not cookable=調理できません
+Empty=空
+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 Savanna Grass=サバンナの草のついた土
+Dirt with Snow=雪のついた土
+Dirt with Rainforest Litter=熱帯雨林のよごれた土
+Dirt with Coniferous Litter=針葉樹のよごれた土
+Savanna Dirt=サバンナの土
+Savanna Dirt with Savanna 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=草
+Savanna 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=テキストが長すぎます
+"@1"=「@1」
+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=メセの塊
+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=木のシャベル
+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は成長するとき保護と交差します。

mods/default/locale/default.jbo.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=.i ti selstela gairvau po la'o zo'i.@1.zo'i
 You do not own this chest.=.i do na ponse lo ti gairvau
 a locked chest=lo selstela gairvau
 Chest=lo gairvau
+Write=
+Read=
 Title:=cmene
 Contents:=se cukta
 Save=rejgau

mods/default/locale/default.ms.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=Peti Berkunci (milik @1)
 You do not own this chest.=Ini bukan peti milik anda.
 a locked chest=peti berkunci
 Chest=Peti
+Write=
+Read=
 Title:=Tajuk:
 Contents:=Kandungan:
 Save=Simpan

mods/default/locale/default.pt_BR.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=Baú Trancado (pertence a @1)
 You do not own this chest.=Você não é dono deste baú.
 a locked chest=um baú trancado
 Chest=Baú
+Write=
+Read=
 Title:=Título:
 Contents:=Conteúdo:
 Save=Salvar

mods/default/locale/default.ru.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=Заблокированный Сундук (влад
 You do not own this chest.=Вы не владелец этого сундука.
 a locked chest=заблокированный сундук
 Chest=Сундук
+Write=
+Read=
 Title:=Заголовок:
 Contents:=Содержимое:
 Save=Сохранить
@@ -67,12 +69,12 @@ Obsidian Block=Обсидиановый Блок
 Dirt=Земля
 Dirt with Grass=Земля с Травой
 Dirt with Grass and Footsteps=Земля с Травой и Следами
-Dirt with Savanna Grass=
+Dirt with Savanna Grass=Земля с Саванной Травой
 Dirt with Snow=Земля Со Снегом
 Dirt with Rainforest Litter=Земля с Тропической Подстилкой
 Dirt with Coniferous Litter=Земля с Сосновой Подстилкой
-Savanna Dirt=
-Savanna Dirt with Savanna Grass=
+Savanna Dirt=Саванная Земля
+Savanna Dirt with Savanna Grass=Саванная Земля с Травой
 Permafrost=Замороженная Почва
 Permafrost with Stones=Замороженная Почва с Камнями
 Permafrost with Moss=Замороженная Почва с Мхом
@@ -129,7 +131,7 @@ Papyrus=Папирус
 Dry Shrub=Сухой Куст
 Jungle Grass=Тропическая Трава
 Grass=Трава
-Savanna Grass=
+Savanna Grass=Саванная Трава
 Fern=Папоротник
 Marram Grass=Песколюб
 Bush Stem=Стебли Куста
@@ -180,11 +182,11 @@ 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=
+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=Каменная Кирка

mods/default/locale/default.se.tr

@@ -1,10 +1,11 @@
 # textdomain: default
-## textdomain: default
 Locked Chest=Låst kista
 Locked Chest (owned by @1)=Låst kista (Ägd av @1)
 You do not own this chest.=Du äger inte denna kistan.
 a locked chest=en låst kista
 Chest=Kista
+Write=
+Read=
 Title:=Titel:
 Contents:=Innehåll:
 Save=Spara

mods/default/locale/default.sk.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=Uzamknutá truhlica (Vlastník - @1)
 You do not own this chest.=Túto truhlicu nevlastníš.
 a locked chest=zamknutá truhlica
 Chest=Truhlica
+Write=
+Read=
 Title:=Názov:
 Contents:=Obsah:
 Save=Uložiť

mods/default/locale/default.zh_CN.tr

@@ -1,9 +1,11 @@
 # textdomain: default
 Locked Chest=已上锁的箱子
-Locked Chest (owned by @1)=已上锁的箱子（属于@1所有）
+Locked Chest (owned by @1)=已上锁的箱子（属于@1）
 You do not own this chest.=这个箱子不属于你所有。
 a locked chest=一个已上锁的箱子
 Chest=箱子
+Write=
+Read=
 Title:=标题：
 Contents:=内容：
 Save=保存
@@ -66,13 +68,13 @@ Obsidian Brick=黑曜石砖
 Obsidian Block=黑曜石方块
 Dirt=土方块
 Dirt with Grass=草方块
-Dirt with Grass and Footsteps=草方块及脚印
+Dirt with Grass and Footsteps=带有脚印的草方块
 Dirt with Savanna Grass=草原草方块
 Dirt with Snow=雪土方块
-Dirt with Rainforest Litter=雨林腐土
-Dirt with Coniferous Litter=针叶林腐土
+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=生苔的多年冻土
@@ -95,7 +97,7 @@ Jungle Tree=丛林树
 Jungle Wood Planks=丛林树木板
 Jungle Tree Leaves=丛林树叶
 Jungle Tree Sapling=丛林树苗
-Emergent Jungle Tree Sapling=应急丛林树苗
+Emergent Jungle Tree Sapling=露生层丛林树苗
 Pine Tree=松树
 Pine Wood Planks=松树木板
 Pine Needles=松针
@@ -129,13 +131,13 @@ Papyrus=莎草纸
 Dry Shrub=干灌木
 Jungle Grass=丛林草
 Grass=草
-Savanna Grass=
+Savanna Grass=草原草
 Fern=蕨
 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=相思灌木
@@ -212,7 +214,7 @@ Mese Sword=黄石剑
 Diamond Sword=钻石剑
 Key=钥匙
 Torch=火把
-@1 will intersect protection on growth.=@1将与增长的保护相交。
+@1 will intersect protection on growth.=@1生长时将与保护区域相交。
 
 
 ##### not used anymore #####

mods/default/locale/default.zh_TW.tr

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=已上鎖的箱子（屬於@1所有）
 You do not own this chest.=這個箱子不屬於你所有。
 a locked chest=一個已上鎖的箱子
 Chest=箱子
+Write=
+Read=
 Title:=標題：
 Contents:=內容：
 Save=保存

mods/default/locale/template.txt

@@ -4,6 +4,8 @@ Locked Chest (owned by @1)=
 You do not own this chest.=
 a locked chest=
 Chest=
+Write=
+Read=
 Title:=
 Contents:=
 Save=

mods/default/models/torch_ceiling.obj

@@ -1,7 +1,5 @@
 # Blender v2.77 (sub 0) OBJ File: 'torch_ceiling.blend'
 # www.blender.org
-mtllib torch_ceiling.mtl
-o Cube_Cube.001
 v -0.062469 -0.047331 0.068152
 v -0.062469 -0.559515 -0.164388
 v -0.062469 0.004344 -0.045667
@@ -45,14 +43,11 @@ vn -0.0000 -0.4134 0.9105
 vn -1.0000 0.0000 0.0000
 vn 0.7071 0.0000 -0.7071
 vn 0.7071 0.0000 0.7071
-usemtl Material.001
-s off
 f 3/1/1 1/2/1 5/3/1 7/4/1
 f 8/5/1 4/6/1 2/7/1 6/8/1
 f 3/9/2 4/6/2 8/5/2 7/10/2
 f 1/11/3 3/9/3 4/6/3 2/12/3
 f 5/13/2 1/11/2 2/12/2 6/14/2
 f 7/10/3 8/5/3 6/14/3 5/13/3
-usemtl Material.002
 f 9/15/4 10/16/4 12/17/4 11/18/4
 f 13/19/5 14/20/5 16/21/5 15/22/5

mods/default/models/torch_floor.obj

@@ -1,7 +1,5 @@
 # Blender v2.76 (sub 11) OBJ File: 'torch_floor.blend'
 # www.blender.org
-mtllib torch_floor.mtl
-o Cube_Cube.001
 v 0.062500 0.062500 -0.062500
 v 0.062500 -0.500000 -0.062500
 v 0.062500 0.062500 0.062500
@@ -35,16 +33,11 @@ vn 0.000000 0.000000 -1.000000
 vn 1.000000 0.000000 0.000000
 vn -0.707100 0.000000 -0.707100
 vn -0.707100 -0.000000 0.707100
-g Cube_Cube.001_Cube_Cube.001_Material.001
-usemtl Material.001
-s off
 f 3/1/1 1/2/1 5/3/1 7/4/1
 f 8/5/1 4/6/1 2/7/1 6/8/1
 f 3/2/2 4/6/2 8/5/2 7/3/2
 f 1/3/3 3/2/3 4/6/3 2/5/3
 f 5/2/2 1/3/2 2/5/2 6/6/2
 f 7/3/3 8/5/3 6/6/3 5/2/3
-g Cube_Cube.001_Cube_Cube.001_Material.002
-usemtl Material.002
 f 9/9/4 10/10/4 12/11/4 11/12/4
 f 13/12/5 14/9/5 16/10/5 15/11/5

mods/default/models/torch_wall.obj

@@ -1,7 +1,5 @@
 # Blender v2.76 (sub 11) OBJ File: 'torch_wall.blend'
 # www.blender.org
-mtllib torch_wall.mtl
-o Cube_Cube.001
 v 0.062469 -0.195248 0.023570
 v 0.062469 -0.476498 -0.463570
 v 0.062469 -0.303502 0.086070
@@ -47,9 +45,6 @@ vn -0.707100 0.612400 -0.353600
 vn -0.707100 -0.612400 0.353600
 vn -0.707100 0.707100 -0.000000
 vn -0.707100 -0.707100 -0.000000
-g Cube_Cube.001_Cube_Cube.001_Material.001
-usemtl Material.001
-s off
 f 3/1/1 1/2/1 5/3/1 7/4/1
 f 8/5/1 4/6/1 2/7/1 6/8/1
 f 3/2/2 4/6/2 8/5/2 7/3/2
@@ -58,7 +53,5 @@ f 5/2/2 1/3/2 2/5/2 6/6/2
 f 7/3/3 8/5/3 6/6/3 5/2/3
 f 17/9/4 18/10/4 20/11/4 19/12/4
 f 21/9/5 22/10/5 24/11/5 23/12/5
-g Cube_Cube.001_Cube_Cube.001_Material.002
-usemtl Material.002
 f 9/12/6 10/13/6 12/14/6 11/9/6
 f 13/9/7 14/12/7 16/13/7 15/14/7