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

2022-03-05 10:43:35 +01:00
parent bb2876eebf 240f9a6a85
commit 2d6d4adfd7
224 changed files with 3329 additions and 1238 deletions
--- a/mods/default/README.txt
+++ b/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
@@ -188,8 +188,6 @@ Gambit (CC BY-SA 3.0):
  default_snow.png
  default_snow_side.png
  default_snowball.png
-  default_key.png
-  default_key_skeleton.png
  default_book.png

 asl97 (CC BY-SA 3.0):
@@ -299,7 +297,6 @@ https://www.freesound.org/people/AGFX/packs/1253/
  default_water_footstep.1.ogg
  default_water_footstep.2.ogg
  default_water_footstep.3.ogg
-(default_water_footstep.4.ogg is silent)

 blukotek (CC0 1.0):
 https://www.freesound.org/people/blukotek/sounds/251660/
--- a/mods/default/craftitems.lua
+++ b/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

@@ -145,61 +196,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	player:set_wielded_item(stack)
 end)

-minetest.register_craftitem("default:skeleton_key", {
-	description = S("Skeleton Key"),
-	inventory_image = "default_key_skeleton.png",
-	on_use = function(itemstack, user, pointed_thing)
-		if pointed_thing.type ~= "node" then
-			return itemstack
-		end
-
-		local pos = pointed_thing.under
-		local node = minetest.get_node(pos)
-
-		if not node then
-			return itemstack
-		end
-
-		local node_reg = minetest.registered_nodes[node.name]
-		local on_skeleton_key_use = node_reg and node_reg.on_skeleton_key_use
-		if not on_skeleton_key_use then
-			return itemstack
-		end
-
-		-- make a new key secret in case the node callback needs it
-		local random = math.random
-		local newsecret = string.format(
-			"%04x%04x%04x%04x",
-			random(2^16) - 1, random(2^16) - 1,
-			random(2^16) - 1, random(2^16) - 1)
-
-		local secret, _, _ = on_skeleton_key_use(pos, user, newsecret)
-
-		if secret then
-			local inv = minetest.get_inventory({type="player", name=user:get_player_name()})
-
-			-- update original itemstack
-			itemstack:take_item()
-
-			-- finish and return the new key
-			local new_stack = ItemStack("default:key")
-			local meta = new_stack:get_meta()
-			meta:set_string("secret", secret)
-			meta:set_string("description", S("Key to @1's @2", user:get_player_name(),
-				minetest.registered_nodes[node.name].description))
-
-			if itemstack:get_count() == 0 then
-				itemstack = new_stack
-			else
-				if inv:add_item("main", new_stack):get_count() > 0 then
-					minetest.add_item(user:get_pos(), new_stack)
-				end -- else: added to inventory successfully
-			end
-
-			return itemstack
-		end
-	end
-})

 --
 -- Craftitem registry
@@ -428,13 +424,6 @@ minetest.register_craft({
 	}
 })

-minetest.register_craft({
-	output = "default:skeleton_key",
-	recipe = {
-		{"default:gold_ingot"},
-	}
-})
-
 minetest.register_craft({
 	output = "default:steel_ingot 9",
 	recipe = {
@@ -478,19 +467,6 @@ minetest.register_craft({
 	recipe = "default:gold_lump",
 })

-minetest.register_craft({
-	type = "cooking",
-	output = "default:gold_ingot",
-	recipe = "default:key",
-	cooktime = 5,
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "default:gold_ingot",
-	recipe = "default:skeleton_key",
-	cooktime = 5,
-})

 minetest.register_craft({
 	type = "cooking",
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -16,7 +16,7 @@ end
 function default.node_sound_stone_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name = "default_hard_footstep", gain = 0.3}
+			{name = "default_hard_footstep", gain = 0.2}
 	table.dug = table.dug or
 			{name = "default_hard_footstep", gain = 1.0}
 	default.node_sound_defaults(table)
@@ -26,7 +26,9 @@ end
 function default.node_sound_dirt_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name = "default_dirt_footstep", gain = 0.4}
+			{name = "default_dirt_footstep", gain = 0.25}
+	table.dig = table.dig or
+			{name = "default_dig_crumbly", gain = 0.4}
 	table.dug = table.dug or
 			{name = "default_dirt_footstep", gain = 1.0}
 	table.place = table.place or
@@ -50,7 +52,7 @@ end
 function default.node_sound_gravel_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name = "default_gravel_footstep", gain = 0.1}
+			{name = "default_gravel_footstep", gain = 0.25}
 	table.dig = table.dig or
 			{name = "default_gravel_dig", gain = 0.35}
 	table.dug = table.dug or
@@ -64,7 +66,9 @@ end
 function default.node_sound_wood_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name = "default_wood_footstep", gain = 0.3}
+			{name = "default_wood_footstep", gain = 0.15}
+	table.dig = table.dig or
+			{name = "default_dig_choppy", gain = 0.4}
 	table.dug = table.dug or
 			{name = "default_wood_footstep", gain = 1.0}
 	default.node_sound_defaults(table)
@@ -98,7 +102,7 @@ end
 function default.node_sound_ice_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name = "default_ice_footstep", gain = 0.3}
+			{name = "default_ice_footstep", gain = 0.15}
 	table.dig = table.dig or
 			{name = "default_ice_dig", gain = 0.5}
 	table.dug = table.dug or
@@ -110,7 +114,7 @@ end
 function default.node_sound_metal_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
-			{name = "default_metal_footstep", gain = 0.4}
+			{name = "default_metal_footstep", gain = 0.2}
 	table.dig = table.dig or
 			{name = "default_dig_metal", gain = 0.5}
 	table.dug = table.dug or
@@ -155,7 +159,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}, true)
+		{pos = pos, max_hear_distance = 16, gain = 0.2}, true)
 end

 if minetest.settings:get_bool("enable_lavacooling") ~= false then
--- a/mods/default/furnace.lua
+++ b/mods/default/furnace.lua
@@ -159,7 +159,7 @@ local function furnace_node_timer(pos, elapsed)
 					end
 					-- Play cooling sound
 					minetest.sound_play("default_cool_lava",
-						{pos = pos, max_hear_distance = 16, gain = 0.1}, true)
+						{pos = pos, max_hear_distance = 16, gain = 0.07}, true)
 				else
 					-- Item could not be cooked: probably missing fuel
 					update = true
@@ -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
@@ -245,9 +252,9 @@ local function furnace_node_timer(pos, elapsed)
 		result = true

 		-- Play sound every 5 seconds while the furnace is active
-		if timer_elapsed == 0 or (timer_elapsed+1) % 5 == 0 then
+		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)
+				{pos = pos, max_hear_distance = 16, gain = 0.25}, true)
 		end
 	else
 		if fuellist and not fuellist[1]:is_empty() then
--- a/mods/default/init.lua
+++ b/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
--- a/mods/default/item_entity.lua
+++ b/mods/default/item_entity.lua
@@ -19,6 +19,7 @@ local item = {
 		self.object:remove()
 		minetest.sound_play("default_item_smoke", {
 			pos = p,
+			gain = 1.0,
 			max_hear_distance = 8,
 		}, true)
 		minetest.add_particlespawner({
--- a/mods/default/locale/default.de.tr
+++ b/mods/default/locale/default.de.tr
@@ -4,14 +4,14 @@ 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
 by @1=von @1
 Page @1 of @2=Seite @1 von @2
 "@1" by @2=„@1“ von @2
-Skeleton Key=Skelettschlüssel
-Key to @1's @2=Schlüssel für @2 von @1
 Blueberries=Blaubeeren
 Book=Buch
 Book with Text=Buch mit Text
@@ -210,7 +210,6 @@ Bronze Sword=Bronzeschwert
 Steel Sword=Stahlschwert
 Mese Sword=Meseschwert
 Diamond Sword=Diamantschwert
-Key=Schlüssel
 Torch=Fackel
@1 will intersect protection on growth.=@1 wird bei Wachstum mit geschützter Zone überlappen.

--- a/mods/default/locale/default.eo.tr
+++ b/mods/default/locale/default.eo.tr
@@ -0,0 +1,219 @@
+# 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
+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
+Torch=Torĉo
+@1 will intersect protection on growth.=@1 sekcos protekto ĉe vegeto.
+
+
+##### not used anymore #####
+
+Mese Post Light=Mesea Fosta Lampo
--- a/mods/default/locale/default.es.tr
+++ b/mods/default/locale/default.es.tr
@@ -1,18 +1,17 @@
 # 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
 by @1=por @1
 Page @1 of @2=Página @1 de @2
 "@1" by @2="@1" por @2
-Skeleton Key=Llave esqueleto
-Key to @1's @2=Llave para @2 de @1
 Blueberries=Arándanos
 Book=Libro
 Book with Text=Libro escrito
@@ -211,7 +210,6 @@ Bronze Sword=Espada de bronce
 Steel Sword=Espada de acero
 Mese Sword=Espada de mese
 Diamond Sword=Espada de diamante
-Key=Llave
 Torch=Antorcha
@1 will intersect protection on growth.=@1 intersectará con protección cuando crezca.

--- a/mods/default/locale/default.fr.tr
+++ b/mods/default/locale/default.fr.tr
@@ -4,14 +4,14 @@ 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=Écrire
+Read=Lire
 Title:=Titre :
 Contents:=Contenu :
 Save=Sauvegarder
 by @1=de @1
 Page @1 of @2=Page @1 sur @2
 "@1" by @2=« @1 » de @2
-Skeleton Key=Squelette
-Key to @1's @2=Clé pour @2 de @1
 Blueberries=Myrtille
 Book=Livre
 Book with Text=Livre avec du texte
@@ -63,16 +63,16 @@ Silver Sandstone Brick=Brique de grès argenté
 Silver Sandstone Block=Bloc de grès argenté
 Obsidian=Obsidienne
 Obsidian Brick=Brique d'obsidienne
-Obsidian Block=Block d'obsidienne
+Obsidian Block=Bloc d'obsidienne
 Dirt=Terre
 Dirt with Grass=Terre avec de l'herbe
 Dirt with Grass and Footsteps=Terre avec de l'herbe et des traces de pas
-Dirt with Savanna Grass=
+Dirt with Savanna Grass=Terre avec de l'herbe de savane
 Dirt with Snow=Terre avec de la neige
 Dirt with Rainforest Litter=Terre avec sol de forêt humide
 Dirt with Coniferous Litter=Terre avec sol de forêt de conifère
-Savanna Dirt=
-Savanna Dirt with Savanna Grass=
+Savanna Dirt=Terre de la savane
+Savanna Dirt with Savanna Grass=Terre de la savane avec son herbe
 Permafrost=Pergélisol
 Permafrost with Stones=Pergélisol avec de la pierre
 Permafrost with Moss=Pergélisol avec de la mousse
@@ -129,7 +129,7 @@ Papyrus=Papyrus
 Dry Shrub=Arbuste sec
 Jungle Grass=Herbe de la jungle
 Grass=Herbe
-Savanna Grass=
+Savanna Grass=Herbe de la savane
 Fern=Fougère
 Marram Grass=Ammophile
 Bush Stem=Tige de buisson
@@ -152,11 +152,11 @@ Brown Coral=Corail marron
 Orange Coral=Corail orange
 Coral Skeleton=Squelette de corail 
 Water Source=Source d'eau
-Flowing Water=Ecoulement d'eau
+Flowing Water=Écoulement d'eau
 River Water Source=Source d'eau de rivière
-Flowing River Water=Ecoulement d'eau de rivière
+Flowing River Water=Écoulement d'eau de rivière
 Lava Source=Source de lave
-Flowing Lava=Ecoulement de lave
+Flowing Lava=Écoulement de lave
 Empty Bookshelf=Bibliothèque vide
 Bookshelf (@1 written, @2 empty books)=Bibliothèque (@1 écrits, @2 livres vides)
 Bookshelf=Bibliothèque
@@ -164,8 +164,8 @@ Text too long=Texte trop longue
 "@1"=« @1 »
 Wooden Sign=Panneau en bois
 Steel Sign=Panneau en acier
-Wooden Ladder=Echelle en bois
-Steel Ladder=Echelle en acier
+Wooden Ladder=Échelle en bois
+Steel Ladder=Échelle en acier
 Apple Wood Fence=Barrière de bois de pommier
 Acacia Wood Fence=Barrière de bois d'acacia
 Jungle Wood Fence=Barrière de bois de la jungle
@@ -180,11 +180,11 @@ Glass=Verre
 Obsidian Glass=Verre d'obsidienne
 Brick Block=Bloc de brique
 Mese Lamp=Lampe de Mese
-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=Réverbère de Mese en bois de pommier
+Acacia Wood Mese Post Light=Réverbère de Mese en bois d'acacia
+Jungle Wood Mese Post Light=Réverbère de Mese en bois de la jungle
+Pine Wood Mese Post Light=Réverbère de Mese en bois de pin
+Aspen Wood Mese Post Light=Réverbère de Mese en bois de tremble
 Cloud=Nuage
 Wooden Pickaxe=Pioche en bois
 Stone Pickaxe=Pioche en pierre
@@ -205,12 +205,11 @@ Steel Axe=Hache en acier
 Mese Axe=Hache en Mese
 Diamond Axe=Hache en diamant
 Wooden Sword=Epée en bois
-Stone Sword=Epée en pierre
-Bronze Sword=Epée en bronze
-Steel Sword=Epée en acier
-Mese Sword=Epée en Mese
-Diamond Sword=Epée en diamant
-Key=Clé
+Stone Sword=Épée en pierre
+Bronze Sword=Épée en bronze
+Steel Sword=Épée en acier
+Mese Sword=Épée en Mese
+Diamond Sword=Épée en diamant
 Torch=Torche
@1 will intersect protection on growth.=@1 chevauchera la zone protégée avec la croissance.

--- a/mods/default/locale/default.id.tr
+++ b/mods/default/locale/default.id.tr
@@ -4,14 +4,14 @@ 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
 by @1=oleh @1
 Page @1 of @2=Halaman @1 dari @2
 "@1" by @2="@1" oleh @2
-Skeleton Key=Kunci Induk
-Key to @1's @2=Kunci @2 milik @1
 Blueberries=Blueberry
 Book=Buku
 Book with Text=Buku Tertulis
@@ -210,7 +210,6 @@ Bronze Sword=Pedang Perunggu
 Steel Sword=Pedang Baja
 Mese Sword=Pedang Mese
 Diamond Sword=Pedang Berlian
-Key=Kunci
 Torch=Obor
@1 will intersect protection on growth.=@1 akan memotong perlindungan ketika tumbuh.

--- a/mods/default/locale/default.it.tr
+++ b/mods/default/locale/default.it.tr
@@ -4,14 +4,14 @@ 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=
 by @1=
 Page @1 of @2=
 "@1" by @2="@1" di @2
-Skeleton Key=Chiave dello Scheletro
-Key to @1's @2=Chiave per @2 di @1
 Blueberries=Mirtilli
 Book=Libro
 Book with Text=Libro con testo
@@ -210,7 +210,6 @@ Bronze Sword=Spada di bronzo
 Steel Sword=Spada d'acciaio
 Mese Sword=Spada di mese
 Diamond Sword=Spada di diamante
-Key=Chiave
 Torch=Torcia
@1 will intersect protection on growth.=@1 crescendo attraverserà la protezione.

--- a/mods/default/locale/default.ja.tr
+++ b/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は成長するとき保護と交差します。
--- a/mods/default/locale/default.jbo.tr
+++ b/mods/default/locale/default.jbo.tr
@@ -4,14 +4,14 @@ 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
 by @1=la'o zo'i.@1.zo'i te cukta
 Page @1 of @2=meirmoi fe li @1 li @2 le'i papri
 "@1" by @2=lo cukta be la'o gy.@1.gy. bei la'o zo'i.@2.zo'i
-Skeleton Key=lo greku ckiku
-Key to @1's @2=lo ckiku be @2 po la'o zo'i.@1.zo'i
 Blueberries=lo blajba
 Book=lo cukta
 Book with Text=lo cukta joi selci'a
@@ -210,6 +210,5 @@ Bronze Sword=lo ransu cladakyxa'i
 Steel Sword=lo gasta cladakyxa'i
 Mese Sword=lo za'e kunrmese cladakyxa'i
 Diamond Sword=lo tabjme cladakyxa'i
-Key=lo ckiku
 Torch=lo fagytergu'i
@1 will intersect protection on growth.=.i @1 cu ba kruca lo bandu ca lo nu banro
--- a/mods/default/locale/default.ms.tr
+++ b/mods/default/locale/default.ms.tr
@@ -4,14 +4,14 @@ 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
 by @1=oleh @1
 Page @1 of @2=Ms. @1 / @2
 "@1" by @2="@1" oleh @2
-Skeleton Key=Kunci Induk
-Key to @1's @2=Kunci @2 milik @1
 Blueberries=Beri Biru
 Book=Buku
 Book with Text=Buku Bertulisan
@@ -210,7 +210,6 @@ Bronze Sword=Pedang Gangsa
 Steel Sword=Pedang Keluli
 Mese Sword=Pedang Mese
 Diamond Sword=Pedang Intan
-Key=Kunci
 Torch=Obor
@1 will intersect protection on growth.=@1 akan masuk kawasan perlindungan lain apabila ia tumbuh.

--- a/mods/default/locale/default.pt_BR.tr
+++ b/mods/default/locale/default.pt_BR.tr
@@ -4,14 +4,14 @@ 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
 by @1=por @1
 Page @1 of @2=Página @1 de @2
 "@1" by @2="@1" por @2
-Skeleton Key=Chave de Mestra
-Key to @1's @2=Chave para @2 de @1
 Blueberries=Mirtilo
 Book=Livro
 Book with Text=Livro com Texto
@@ -210,6 +210,5 @@ Bronze Sword=Espada de Bronze
 Steel Sword=Espada de Aço
 Mese Sword=Espada de Mese
 Diamond Sword=Espada de Diamante
-Key=Chave
 Torch=Tocha
@1 will intersect protection on growth.=@1 cruzará a proteção no crescimento.
--- a/mods/default/locale/default.ru.tr
+++ b/mods/default/locale/default.ru.tr
@@ -4,14 +4,14 @@ Locked Chest (owned by @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="@1" @2
-Skeleton Key=Ключ Скелета
-Key to @1's @2=Ключ к @2 от @1
 Blueberries=Черника
 Book=Книга
 Book with Text=Книга с Текстом
@@ -67,12 +67,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 +129,7 @@ Papyrus=Папирус
 Dry Shrub=Сухой Куст
 Jungle Grass=Тропическая Трава
 Grass=Трава
-Savanna Grass=
+Savanna Grass=Саванная Трава
 Fern=Папоротник
 Marram Grass=Песколюб
 Bush Stem=Стебли Куста
@@ -180,11 +180,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=Каменная Кирка
@@ -210,7 +210,6 @@ Bronze Sword=Бронзовый Меч
 Steel Sword=Стальной Меч
 Mese Sword=Месе Меч
 Diamond Sword=Алмазный Меч
-Key=Ключ
 Torch=Факел
@1 will intersect protection on growth.=@1 пересечёт защиту по росту.

--- a/mods/default/locale/default.se.tr
+++ b/mods/default/locale/default.se.tr
@@ -1,225 +0,0 @@
-# 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
-Title:=Titel:
-Contents:=Innehåll:
-Save=Spara
-by @1=av @1
-Page @1 of @2=Sida @1 av @2
-"@1" by @2="@1" av @2
-Skeleton Key=Skelett Nyckel
-Key to @1's @2=Nyckel till @1s @2
-Blueberries=Blåbär
-Book=Bok
-Book with Text=Bok med text
-Bronze Ingot=Brons tacka
-Clay Brick=Tegelsten
-Clay Lump=Lerklump
-Coal Lump=Kol Klumo
-Copper Ingot=Koppar tacka
-Copper Lump=Koppar Klump
-Diamond=Diamant
-Flint=Flinta
-Gold Ingot=Guld tacka
-Gold Lump=Guld Klump
-Iron Lump=Järn Klump
-Mese Crystal=Mese Kristall
-Mese Crystal Fragment=Mese Kristall Fragment
-Obsidian Shard=Obsidian Skärva
-Paper=Papper
-Steel Ingot=Stål tacka
-Stick=Pinne
-Tin Ingot=Tenn tacka
-Tin Lump=Tenn Klump
-Furnace is empty=Ugnen är tom
-100% (output full)=100% (utgången full)
-@1%=@1%
-Not cookable=Inte kokbar
-Empty=Tom
-Furnace active=Ugn aktiv
-Furnace inactive=Ugn inaktiv
-(Item: @1; Fuel: @2)=(Sak: @1; Bränsle: @2)
-Furnace=Ugn
-Stone=Sten
-Cobblestone=Kullersten
-Stone Brick=Stentegel
-Stone Block=Sten block
-Mossy Cobblestone=Mossig kullersten
-Desert Stone=Öken sten
-Desert Cobblestone=Öken kullersten
-Desert Stone Brick=Öken stentegel
-Desert Stone Block=Öken sten block
-Sandstone=Sandsten
-Sandstone Brick=Sandstenstegel
-Sandstone Block=Sandsten block
-Desert Sandstone=Öken sandsten
-Desert Sandstone Brick=Öken Sandstenstegel
-Desert Sandstone Block=Öken sandsten block
-Silver Sandstone=Silver sandsten
-Silver Sandstone Brick=Silver Sandstenstegel
-Silver Sandstone Block=Silver sandsten block
-Obsidian=Obsidian
-Obsidian Brick=Obsidiantegel
-Obsidian Block=Obsidian block
-Dirt=Jord
-Dirt with Grass=Jord med gräs
-Dirt with Grass and Footsteps=Jord med gräs och fotsteg
-Dirt with Savanna Grass=
-Dirt with Snow=Jord med snö
-Dirt with Rainforest Litter=Jord med regnskogströ
-Dirt with Coniferous Litter=Jord med Barrträd
-Savanna Dirt=
-Savanna Dirt with Savanna Grass=
-Permafrost=Permafrost
-Permafrost with Stones=Permafrost med sten
-Permafrost with Moss=Permafrost med mossa
-Sand=Sand
-Desert Sand=Öken sand
-Silver Sand=Silver sand
-Gravel=Grus
-Clay=Lera
-Snow=Snö
-Snow Block=Snö block
-Ice=Is
-Cave Ice=Grott Is
-Apple Tree=Äpple Träd
-Apple Wood Planks=Äpple Plankor
-Apple Tree Sapling=Äpple Planta
-Apple Tree Leaves=Äpple Löv
-Apple=Äpple
-Apple Marker=Äpple Markör
-Jungle Tree=Djungel Träd
-Jungle Wood Planks=Djungel Plankor
-Jungle Tree Leaves=Djungel Löv
-Jungle Tree Sapling=Djungel Planta
-Emergent Jungle Tree Sapling=Nybliven Djungel Planta
-Pine Tree=Tall
-Pine Wood Planks= Tall Plankor
-Pine Needles=Granbarr
-Pine Tree Sapling=Tall Planta
-Acacia Tree=Akacia Träd
-Acacia Wood Planks=Akacia Plankor
-Acacia Tree Leaves=Akacia Löv
-Acacia Tree Sapling=Akacia Planta
-Aspen Tree=Asp
-Aspen Wood Planks=Asp Plankor
-Aspen Tree Leaves=Asp Löv
-Aspen Tree Sapling=Asp Planta
-Coal Ore=Kol Malm
-Coal Block=Kol Block
-Iron Ore=Järn Malm
-Steel Block=Stål Block
-Copper Ore=Koppar Malm
-Copper Block=Koppar Block
-Tin Ore=Tenn Malm
-Tin Block=Tenn Block
-Bronze Block=Brons Block
-Mese Ore=Mese Malm
-Mese Block=Mese Block
-Gold Ore=Guld Malm
-Gold Block=Guld Block
-Diamond Ore=Diamant Malm
-Diamond Block=Diamant Block
-Cactus=Kaktus
-Large Cactus Seedling=Stor kaktusplanta
-Papyrus=Papyrus
-Dry Shrub=Torr Buske
-Jungle Grass=Djungel Gräs
-Grass=Gräs
-Savanna Grass=
-Fern=Ormbunke
-Marram Grass=Marram Gräs
-Bush Stem=Busk Stam
-Bush Leaves=Busk Löv
-Bush Sapling=Busk Planta
-Blueberry Bush Leaves with Berries=Blåbärsbusks Löv med Bär
-Blueberry Bush Leaves=Blåbärsbusks Löv
-Blueberry Bush Sapling=Blåbärsbusks Plantga
-Acacia Bush Stem=Akacia Busks Stam
-Acacia Bush Leaves=Akacia Busks Löv
-Acacia Bush Sapling=Akacia Busks Planta
-Pine Bush Stem=Tall Busks Stam
-Pine Bush Needles=Tall Busks Granbarr
-Pine Bush Sapling=Tall Busks Planta
-Kelp=Brunalg
-Green Coral=Grön Korall
-Pink Coral=Rosa Korall
-Cyan Coral=Cyan Korall
-Brown Coral=Brun Korall
-Orange Coral=Orange Korall
-Coral Skeleton=Korall Skelett
-Water Source=Vattenkälla
-Flowing Water=Flödande Vatten
-River Water Source=Flodvattenkälla
-Flowing River Water=Flödande Flodvatten
-Lava Source=Lavakälla
-Flowing Lava=Flödande Lava
-Empty Bookshelf=Tom Bokhylla
-Bookshelf (@1 written, @2 empty books)=Bokhylla (@1 skriva, @2 tomma böcker)
-Bookshelf=Bokhylla
-Text too long=Text för lång
-"@1"="@1"
-Wooden Sign=Trä Skylt
-Steel Sign=Stål Skylt
-Wooden Ladder=Trä Stege
-Steel Ladder=Stål Stege
-Apple Wood Fence=Äpple Trä Staket
-Acacia Wood Fence=Akacia Trä Staket
-Jungle Wood Fence=Djungel Trä Staket
-Pine Wood Fence=Tall Trä Staket
-Aspen Wood Fence=Asp Trä Staket
-Apple Wood Fence Rail=Äpple Trä Staket Pinne
-Acacia Wood Fence Rail=Akacia Trä Staket Pinne
-Jungle Wood Fence Rail=Djungel Trä Staket Pinne
-Pine Wood Fence Rail=Tall Trä Staket Pinne
-Aspen Wood Fence Rail=Asp Trä Staket Pinne
-Glass=Glas
-Obsidian Glass=Obsidian Glas
-Brick Block=Tegelstens Block
-Mese Lamp=Mese Lampa
-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=Moln
-Wooden Pickaxe=Trä Hacka
-Stone Pickaxe=Sten Hacka
-Bronze Pickaxe=Brons Hacka
-Steel Pickaxe=Stål Hacka
-Mese Pickaxe=Mese Hacka
-Diamond Pickaxe=Diamant Hacka
-Wooden Shovel=Trä Spade
-Stone Shovel=Sten Spade
-Bronze Shovel=Brons Spade
-Steel Shovel=Stål Spade
-Mese Shovel=Mese Spade
-Diamond Shovel=Diamant Spade
-Wooden Axe=Trä Yxa
-Stone Axe=Sten Yxa
-Bronze Axe=Brons Yxa
-Steel Axe=Stål Yxa
-Mese Axe=Mese Yxa
-Diamond Axe=Diamant Yxa
-Wooden Sword=Trä Svärd
-Stone Sword=Sten Svärd
-Bronze Sword=Brons Svärd
-Steel Sword=Stål Svärd
-Mese Sword=Mese Svärd
-Diamond Sword=Diamant Svärd
-Key=Nyckel
-Torch=Fakla
-@1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt.
-
-
-##### not used anymore #####
-
-Dirt with Dry Grass=Jord med torrt gräs
-Dry Dirt=Torr jord
-Dry Dirt with Dry Grass=Torr jord med torrt gräs
-Dry Grass=Torrt Gräs
-Mese Post Light=Mese Postljus
--- a/mods/default/locale/default.sk.tr
+++ b/mods/default/locale/default.sk.tr
@@ -4,14 +4,14 @@ 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ť
 by @1=od @1
 Page @1 of @2=Strana @1 z @2
 "@1" by @2=„@1“ z @2
-Skeleton Key=Základný kľuč
-Key to @1's @2=Kľuč pre @2 hráča @1
 Blueberries=Čučoriedky
 Book=Kniha
 Book with Text=Kniha s textom
@@ -210,7 +210,6 @@ Bronze Sword=Bronzový meč
 Steel Sword=Oceľový meč
 Mese Sword=Mese meč
 Diamond Sword=Diamantový meč
-Key=Kľúč
 Torch=Fakľa
@1 will intersect protection on growth.=@1 prekročí pri raste chránenú zónu.

--- a/mods/default/locale/default.sv.tr
+++ b/mods/default/locale/default.sv.tr
@@ -0,0 +1,217 @@
+# 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 kista.
+a locked chest=en låst kista
+Chest=Kista
+Write=Skriva
+Read=Läs
+Title:=Titel:
+Contents:=Innehåll:
+Save=Spara
+by @1=av @1
+Page @1 of @2=Sida @1 av @2
+"@1" by @2="@1" av @2
+Skeleton Key=Skelettnyckel
+Key to @1's @2=Nyckel till @1s @2
+Blueberries=Blåbär
+Book=Bok
+Book with Text=Bok med text
+Bronze Ingot=Bronstacka
+Clay Brick=Tegelsten
+Clay Lump=Lerklump
+Coal Lump=Kolklump
+Copper Ingot=Koppartacka
+Copper Lump=Kopparklump
+Diamond=Diamant
+Flint=Flinta
+Gold Ingot=Guldtacka
+Gold Lump=Guldklump
+Iron Lump=Järnklump
+Mese Crystal=Mesekristall
+Mese Crystal Fragment=Mesekristallfragment
+Obsidian Shard=Obsidianskärva
+Paper=Papper
+Steel Ingot=Ståltacka
+Stick=Pinne
+Tin Ingot=Tenntacka
+Tin Lump=Tennklump
+Furnace is empty=Ugnen är tom
+100% (output full)=100% (utgången full)
+@1%=@1%
+Not cookable=Inte kokbar
+Empty=Tom
+Furnace active=Ugn aktiv
+Furnace inactive=Ugn inaktiv
+(Item: @1; Fuel: @2)=(Sak: @1; Bränsle: @2)
+Furnace=Ugn
+Stone=Sten
+Cobblestone=Kullersten
+Stone Brick=Stentegel
+Stone Block=Stenblock
+Mossy Cobblestone=Mossig kullersten
+Desert Stone=Ökensten
+Desert Cobblestone=Ökenkullersten
+Desert Stone Brick=Ökenstenstegel
+Desert Stone Block=Ökenstensblock
+Sandstone=Sandsten
+Sandstone Brick=Sandstenstegel
+Sandstone Block=Sandstensblock
+Desert Sandstone=Ökensandsten
+Desert Sandstone Brick=Ökensandstenstegel
+Desert Sandstone Block=Ökensandstensblock
+Silver Sandstone=Silversandsten
+Silver Sandstone Brick=Silversandstenstegel
+Silver Sandstone Block=Silversandstensblock
+Obsidian=Obsidian
+Obsidian Brick=Obsidiantegel
+Obsidian Block=Obsidianblock
+Dirt=Jord
+Dirt with Grass=Jord med gräs
+Dirt with Grass and Footsteps=Jord med gräs och fotsteg
+Dirt with Savanna Grass=Jord med savanngräs
+Dirt with Snow=Jord med snö
+Dirt with Rainforest Litter=Jord med regnskogströ
+Dirt with Coniferous Litter=Jord med barrträd
+Savanna Dirt=Savannjord
+Savanna Dirt with Savanna Grass=Savannjord med savanngräs
+Permafrost=Permafrost
+Permafrost with Stones=Permafrost med sten
+Permafrost with Moss=Permafrost med mossa
+Sand=Sand
+Desert Sand=Ökensand
+Silver Sand=Silversand
+Gravel=Grus
+Clay=Lera
+Snow=Snö
+Snow Block=Snöblock
+Ice=Is
+Cave Ice=Grottis
+Apple Tree=Äppleträd
+Apple Wood Planks=Äppleträdplankor
+Apple Tree Sapling=Äppleplanta
+Apple Tree Leaves=Äpplelöv
+Apple=Äpple
+Apple Marker=Äpplemarkör
+Jungle Tree=Djungelträd
+Jungle Wood Planks=Djungelplankor
+Jungle Tree Leaves=Djungellöv
+Jungle Tree Sapling=Djungelplanta
+Emergent Jungle Tree Sapling=Nybliven djungelplanta
+Pine Tree=Tall
+Pine Wood Planks=Tallplankor
+Pine Needles=Granbarr
+Pine Tree Sapling=Tallplanta
+Acacia Tree=Akaciaträd
+Acacia Wood Planks=Akaciaplankor
+Acacia Tree Leaves=Akacialöv
+Acacia Tree Sapling=Akaciaplanta
+Aspen Tree=Asp
+Aspen Wood Planks=Aspplankor
+Aspen Tree Leaves=Asplöv
+Aspen Tree Sapling=Aspplanta
+Coal Ore=Kolmalm
+Coal Block=Kolblock
+Iron Ore=Järnmalm
+Steel Block=Stålblock
+Copper Ore=Kopparmalm
+Copper Block=Kopparblock
+Tin Ore=Tennmalm
+Tin Block=Tennblock
+Bronze Block=Bronsblock
+Mese Ore=Mesemalm
+Mese Block=Meseblock
+Gold Ore=Guldmalm
+Gold Block=Guldblock
+Diamond Ore=Diamantmalm
+Diamond Block=Diamantblock
+Cactus=Kaktus
+Large Cactus Seedling=Stor kaktusplanta
+Papyrus=Papyrus
+Dry Shrub=Torr buske
+Jungle Grass=Djungelgräs
+Grass=Gräs
+Savanna Grass=Savanngräs
+Fern=Ormbunke
+Marram Grass=Marramgräs
+Bush Stem=Buskstam
+Bush Leaves=Busklöv
+Bush Sapling=Buskplanta
+Blueberry Bush Leaves with Berries=Blåbärsbuske med bär
+Blueberry Bush Leaves=Blåbärsbuske
+Blueberry Bush Sapling=Blåbärsbuskplanta
+Acacia Bush Stem=Akaciabuskstam
+Acacia Bush Leaves=Akaciabuske
+Acacia Bush Sapling=Akaciabuskplanta
+Pine Bush Stem=Tallbuskestam
+Pine Bush Needles=Tallgranbarr
+Pine Bush Sapling=Tallbuskplanta
+Kelp=Brunalg
+Green Coral=Grön korall
+Pink Coral=Rosa korall
+Cyan Coral=Cyan korall
+Brown Coral=Brun korall
+Orange Coral=Orange korall
+Coral Skeleton=Korallskelett
+Water Source=Vattenkälla
+Flowing Water=Flytande vatten
+River Water Source=Flodvattenkälla
+Flowing River Water=Flytande flodvatten
+Lava Source=Lavakälla
+Flowing Lava=Flytande lava
+Empty Bookshelf=Tom bokhylla
+Bookshelf (@1 written, @2 empty books)=Bokhylla (@1 skriva, @2 tomma böcker)
+Bookshelf=Bokhylla
+Text too long=Texten är för lång
+"@1"="@1"
+Wooden Sign=Träskylt
+Steel Sign=Stålskylt
+Wooden Ladder=Trästege
+Steel Ladder=Stålstege
+Apple Wood Fence=Äppleträstaket
+Acacia Wood Fence=Akaciastaket
+Jungle Wood Fence=Djungelstaket
+Pine Wood Fence=Tallstaket
+Aspen Wood Fence=Aspträdstaket
+Apple Wood Fence Rail=Äppleträstaketsräls
+Acacia Wood Fence Rail=Akaciastaketsräls
+Jungle Wood Fence Rail=Djungelstaketsräls
+Pine Wood Fence Rail=Tallstaketsräls
+Aspen Wood Fence Rail=Aspstaketsräls
+Glass=Glas
+Obsidian Glass=Obsidianglas
+Brick Block=Tegelstensblock
+Mese Lamp=Meselampa
+Apple Wood Mese Post Light=Äppleträ-meselykta
+Acacia Wood Mese Post Light=Acacia-meselykta
+Jungle Wood Mese Post Light=Djungel-meselykta
+Pine Wood Mese Post Light=Tall-meselykta
+Aspen Wood Mese Post Light=Aspträ-meselykta
+Cloud=Moln
+Wooden Pickaxe=Trähacka
+Stone Pickaxe=Stenhacka
+Bronze Pickaxe=Bronshacka
+Steel Pickaxe=Stålhacka
+Mese Pickaxe=Mesehacka
+Diamond Pickaxe=Diamanthacka
+Wooden Shovel=Träspade
+Stone Shovel=Stenspade
+Bronze Shovel=Bronsspade
+Steel Shovel=Stålspade
+Mese Shovel=Mesespade
+Diamond Shovel=Diamantspade
+Wooden Axe=Träyxa
+Stone Axe=Stenyxa
+Bronze Axe=Bronsyxa
+Steel Axe=Stålyxa
+Mese Axe=Meseyxa
+Diamond Axe=Diamantyxa
+Wooden Sword=Träsvärd
+Stone Sword=Stensvärd
+Bronze Sword=Bronssvärd
+Steel Sword=Stålsvärd
+Mese Sword=Mesesvärd
+Diamond Sword=Diamantsvärd
+Key=Nyckel
+Torch=Fackla
+@1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt.
--- a/mods/default/locale/default.uk.tr
+++ b/mods/default/locale/default.uk.tr
@@ -0,0 +1,214 @@
+# 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="@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=Алмазний Меч
+Torch=Факел
+@1 will intersect protection on growth.=@1 перетне захист за зростанням.
--- a/mods/default/locale/default.zh_CN.tr
+++ b/mods/default/locale/default.zh_CN.tr
@@ -1,17 +1,17 @@
 # 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=保存
 by @1=由@1
 Page @1 of @2=第@1页，共@2页。
 "@1" by @2="@1" by @2
-Skeleton Key=万能钥匙
-Key to @1's @2=@1的@2的钥匙
 Blueberries=蓝莓
 Book=书
 Book with Text=带文字的书
@@ -66,13 +66,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 +95,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 +129,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=相思灌木
@@ -210,9 +210,8 @@ Bronze Sword=青铜剑
 Steel Sword=铁剑
 Mese Sword=黄石剑
 Diamond Sword=钻石剑
-Key=钥匙
 Torch=火把
-@1 will intersect protection on growth.=@1将与增长的保护相交。
+@1 will intersect protection on growth.=@1生长时将与保护区域相交。


 ##### not used anymore #####
--- a/mods/default/locale/default.zh_TW.tr
+++ b/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=
 Title:=標題：
 Contents:=內容：
 Save=保存
 by @1=由@1
 Page @1 of @2=第@1頁，共@2頁。
 "@1" by @2="@1" by @2
-Skeleton Key=萬能鑰匙
-Key to @1's @2=@1的@2的鑰匙
 Blueberries=藍莓
 Book=書
 Book with Text=帶文字的書
@@ -210,7 +210,6 @@ Bronze Sword=青銅劍
 Steel Sword=鐵劍
 Mese Sword=黃石劍
 Diamond Sword=鑽石劍
-Key=鑰匙
 Torch=火把
@1 will intersect protection on growth.=@1將與增長的保護相交。

--- a/mods/default/locale/template.txt
+++ b/mods/default/locale/template.txt
@@ -4,14 +4,14 @@ Locked Chest (owned by @1)=
 You do not own this chest.=
 a locked chest=
 Chest=
+Write=
+Read=
 Title:=
 Contents:=
 Save=
 by @1=
 Page @1 of @2=
 "@1" by @2=
-Skeleton Key=
-Key to @1's @2=
 Blueberries=
 Book=
 Book with Text=
@@ -210,6 +210,5 @@ Bronze Sword=
 Steel Sword=
 Mese Sword=
 Diamond Sword=
-Key=
 Torch=
@1 will intersect protection on growth.=
--- a/mods/default/models/torch_ceiling.obj
+++ b/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
--- a/mods/default/models/torch_floor.obj
+++ b/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
--- a/mods/default/models/torch_wall.obj
+++ b/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
--- a/mods/default/sounds/default_water_footstep.4.ogg
+++ b/mods/default/sounds/default_water_footstep.4.ogg
--- a/mods/default/textures/default_key.png
+++ b/mods/default/textures/default_key.png
--- a/mods/default/textures/default_key_skeleton.png
+++ b/mods/default/textures/default_key_skeleton.png
--- a/mods/default/tools.lua
+++ b/mods/default/tools.lua
@@ -452,46 +452,6 @@ for name, mat in pairs(craft_ingreds) do
 	})
 end

-minetest.register_tool("default:key", {
-	description = S("Key"),
-	inventory_image = "default_key.png",
-	groups = {key = 1, not_in_creative_inventory = 1},
-	stack_max = 1,
-	on_place = function(itemstack, placer, pointed_thing)
-		local under = pointed_thing.under
-		local node = minetest.get_node(under)
-		local def = minetest.registered_nodes[node.name]
-		if def and def.on_rightclick and
-				not (placer and placer:is_player() and
-				placer:get_player_control().sneak) then
-			return def.on_rightclick(under, node, placer, itemstack,
-				pointed_thing) or itemstack
-		end
-		if pointed_thing.type ~= "node" then
-			return itemstack
-		end
-
-		local pos = pointed_thing.under
-		node = minetest.get_node(pos)
-
-		if not node or node.name == "ignore" then
-			return itemstack
-		end
-
-		local ndef = minetest.registered_nodes[node.name]
-		if not ndef then
-			return itemstack
-		end
-
-		local on_key_use = ndef.on_key_use
-		if on_key_use then
-			on_key_use(pos, placer)
-		end
-
-		return nil
-	end
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:pick_wood",
--- a/mods/default/torch.lua
+++ b/mods/default/torch.lua
@@ -11,7 +11,7 @@ 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.07},
 			true
 		)
 	end