Merge branch 'minetest:master' into day_sleeper

2022-03-24 01:07:41 +01:00 · 2022-03-24 01:07:41 +01:00 · 67c702d06b
parent 8d0a931a1a 659895c3ed
commit 67c702d06b
193 changed files with 2749 additions and 1310 deletions
--- a/README.md
+++ b/README.md
@ -1,31 +1,29 @@
 # Minetest Game

-The default game bundled in the Minetest engine.  
+The default game bundled in the Minetest engine.

-For further information, check 
-[this forum topic](https://forum.minetest.net/viewtopic.php?f=15&t=9724).   
-Also see the [Minetest Wiki](https://wiki.minetest.net/Subgames/Minetest_Game) 
-for more information.
+For further information, check [this forum topic](https://forum.minetest.net/viewtopic.php?f=15&t=9724).
+
+Also see the [Minetest Wiki](https://wiki.minetest.net/Subgames/Minetest_Game) for more information.

 ## Installation

- Unzip the archive, rename the folder to minetest_game and
-place it in .. minetest/games/
+- Unzip the archive, rename the folder to `minetest_game` and
+place it in .. `minetest/games/`

- GNU/Linux: If you use a system-wide installation place
-    it in ~/.minetest/games/.
+- GNU/Linux: If you use a system-wide installation place it in `~/.minetest/games/`.

 The Minetest engine can be found at [GitHub](https://github.com/minetest/minetest).

-For further information or help, see:  
-https://wiki.minetest.net/Installing_Mods
+For further information or help, see: [Installing Mods](https://wiki.minetest.net/Installing_Mods).

 ## Compatibility

-The Minetest Game GitHub master HEAD is generally compatible with the GitHub
-master HEAD of the Minetest engine.  
+The Minetest Game GitHub `master` `HEAD` is generally compatible with the GitHub
+`master` `HEAD` of the Minetest engine.
+
 Additionally, when the Minetest engine is tagged to be a certain version (e.g.
-0.4.10), Minetest Game is tagged with the version too.
+`0.4.10`), Minetest Game is tagged with the version, too.

 When stable releases are made, Minetest Game and the Minetest engine is packaged 
 and made available at [www.minetest.net](https://www.minetest.net/downloads/).
--- a/game.conf
+++ b/game.conf
@ -1,3 +1,3 @@
-name = Minetest Game
-author = Minetest
-description = A basic exploration, mining, crafting and building sandbox game with no NPCs, monsters or animals. Minetest Game is usually used with mods added and many mods are available for this game. Reliably maintained by Minetest Engine core developers.
+name        = Minetest Game
+author      = Minetest
+description = A basic exploration, mining, crafting, and building, sandbox game with no NPCs, monsters, or animals. Minetest Game is usually used with mods added, and many mods are available for this game. Reliably maintained by Minetest Engine core developers.
--- a/game_api.txt
+++ b/game_api.txt
@ -218,6 +218,8 @@ The doors mod allows modders to register custom doors and trapdoors.
 	description = "Door description",
 	inventory_image = "mod_door_inv.png",
 	groups = {choppy = 2},
+	model = "mod_door", -- (optional)
+	-- Model name without a suffix ("big_door" not "big_door_a.obj", "big_door_b.obj")
 	tiles = {"mod_door.png"}, -- UV map.
 	-- The front and back of the door must be identical in appearence as they swap on
 	-- open/close.
@ -228,13 +230,17 @@ The doors mod allows modders to register custom doors and trapdoors.
 	gain_open = 0.3, -- optional, defaults to 0.3
 	gain_close = 0.3, -- optional, defaults to 0.3
 	protected = false, -- If true, only placer can open the door (locked for others)
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) 
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing), 
 	-- optional function containing the on_rightclick callback, defaults to a doors.door_toggle-wrapper
+	use_texture_alpha = "clip",

 ### Trapdoor definition

 	description = "Trapdoor description",
 	inventory_image = "mod_trapdoor_inv.png",
+	nodebox_closed = {} -- Nodebox for closed model
+	nodebox_opened = {} -- Nodebox for opened model
+	-- (optional) both nodeboxes must be used, not one only
 	groups = {choppy = 2},
 	tile_front = "doors_trapdoor.png", -- the texture for the front and back of the trapdoor
 	tile_side = "doors_trapdoor_side.png",
@ -249,10 +255,9 @@ The doors mod allows modders to register custom doors and trapdoors.
 	gain_open = 0.3, -- optional, defaults to 0.3
 	gain_close = 0.3, -- optional, defaults to 0.3
 	protected = false, -- If true, only placer can open the door (locked for others)
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) 
-	-- function containing the on_rightclick callback
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) 
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) ,
 	-- function containing the on_rightclick callback
+	use_texture_alpha = "clip",

 ### Fence gate definition

@ -262,7 +267,7 @@ The doors mod allows modders to register custom doors and trapdoors.
 	material = "default:wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults(), -- optional
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) 
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 	-- function containing the on_rightclick callback


@ -435,11 +440,16 @@ Player API

 The player API can register player models and update the player's appearance.

+* `player_api.globalstep(dtime, ...)`
+	* The function called by the globalstep that controls player animations.
+	  You can override this to replace the globalstep with your own implementation.
+	* Receives all args that minetest.register_globalstep() passes
+
 * `player_api.register_model(name, def)`
 	* Register a new model to be used by players
 	* `name`: model filename such as "character.x", "foo.b3d", etc.
 	* `def`: see [#Model definition]
-    * Saved to player_api.registered_models
+	* Saved to player_api.registered_models

 * `player_api.registered_models[name]`
 	* Get a model's definition
@ -449,19 +459,25 @@ The player API can register player models and update the player's appearance.
 * `player_api.set_model(player, model_name)`
 	* Change a player's model
 	* `player`: PlayerRef
-	* `model_name`: model registered with player_api.register_model()
+	* `model_name`: model registered with `player_api.register_model`

 * `player_api.set_animation(player, anim_name, speed)`
-	* Applies an animation to a player
+	* Applies an animation to a player if speed or anim_name differ from the currently playing animation
 	* `player`: PlayerRef
 	* `anim_name`: name of the animation
-	* `speed`: frames per second. If nil, the default from the model def is used
+	* `speed`: keyframes per second. If nil, the default from the model def is used

 * `player_api.set_textures(player, textures)`
 	* Sets player textures
 	* `player`: PlayerRef
 	* `textures`: array of textures. If nil, the default from the model def is used

+* `player_api.set_textures(player, index, texture)`
+	* Sets one of the player textures
+	* `player`: PlayerRef
+	* `index`: Index into array of all textures
+	* `texture`: the texture string
+
 * `player_api.get_animation(player)`
 	* Returns a table containing fields `model`, `textures` and `animation`
 	* Any of the fields of the returned table may be nil
@ -477,18 +493,25 @@ The player API can register player models and update the player's appearance.
 ### Model Definition

 	{
-		animation_speed = 30,           -- Default animation speed, in FPS
-		textures = {"character.png", }, -- Default array of textures
-		visual_size = {x = 1, y = 1},   -- Used to scale the model
+		animation_speed = 30,           -- Default animation speed, in keyframes per second
+		textures = {"character.png"},   -- Default array of textures
 		animations = {
-			-- <anim_name> = {x = <start_frame>, y = <end_frame>},
-			foo = {x = 0, y = 19},
-			bar = {x = 20, y = 39},
-			-- ...
+			-- [anim_name] = {
+			--   x = <start_frame>,
+			--   y = <end_frame>,
+			--   collisionbox = <model collisionbox>, -- (optional)
+			--   eye_height = <model eye height>,     -- (optional)
+			--   -- suspend client side animations while this one is active (optional)
+			--   override_local = <true/false>
+			-- },
+			stand = ..., lay = ..., walk = ..., mine = ..., walk_mine = ..., -- required animations
+			sit = ... -- used by boats and other MTG mods
 		},
-		collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, -- In nodes from feet position
-		stepheight = 0.6,                                -- In nodes
-		eye_height = 1.47,                               -- In nodes above feet position
+		-- Default object properties, see lua_api.txt
+		visual_size = {x = 1, y = 1},
+		collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3},
+		stepheight = 0.6,
+		eye_height = 1.47
 	}


@ -723,6 +746,12 @@ Stairs API
 The stairs API lets you register stairs and slabs and ensures that they are registered the same way as those
 delivered with Minetest Game, to keep them compatible with other mods.

+The following node attributes are sourced from the recipeitem:
+ * use_texture_alpha
+ * sunlight_propagates
+ * light_source
+ * If the recipeitem is a fuel, the stair/slab is also registered as a fuel of proportionate burntime.
+
 `stairs.register_stair(subname, recipeitem, groups, images, description, sounds, worldaligntex)`

 * Registers a stair
--- a/mods/beds/functions.lua
+++ b/mods/beds/functions.lua
@ -123,8 +123,6 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		beds.bed_position[name] = bed_pos
 		beds.player[name] = {physics_override = player:get_physics_override()}

-		-- physics, eye_offset, etc
-		player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
 		local yaw, param2 = get_look_yaw(bed_pos)
 		player:set_look_horizontal(yaw)
 		local dir = minetest.facedir_to_dir(param2)
--- a/mods/beds/locale/beds.eo.tr
+++ b/mods/beds/locale/beds.eo.tr
@ -1,8 +1,10 @@
 # textdomain: beds
-Leave Bed=Ellitiĝu
+Fancy Bed=Luksa Lito
+Simple Bed=Simpla Lito
+This bed is already occupied!=
+You have to stop moving before going to bed!=
 Good morning.=Bonan matenon.
@1 of @2 players are in bed=@1 el @2 ludantoj estas en lito.
 Force night skip=Devigu nokta salton
 You can only sleep at night.=Vi povas nur dormi en la nokto. 
-Fancy Bed=Luksa Lito
-Simple Bed=Simpla Lito
+Leave Bed=Ellitiĝu
--- a/mods/beds/locale/beds.fr.tr
+++ b/mods/beds/locale/beds.fr.tr
@ -1,8 +1,8 @@
 # textdomain: beds
 Fancy Bed=Lit chic
 Simple Bed=Lit simple
-This bed is already occupied!=
-You have to stop moving before going to bed!=
+This bed is already occupied!=Ce lit est déjà occupé !
+You have to stop moving before going to bed!=Vous devez arrêter de bouger avant de vous coucher !
 Good morning.=Bonjour.
@1 of @2 players are in bed=@1 joueur(s) sur @2 sont au lit
 Force night skip=Forcer le passage de la nuit
--- a/mods/beds/locale/beds.ja.tr
+++ b/mods/beds/locale/beds.ja.tr
@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=ファンシーなベッド
+Simple Bed=シンプルなベッド
+This bed is already occupied!=ベッドはすでに使われています！
+You have to stop moving before going to bed!=寝るときは動かないでください！
+Good morning.=おはようございます。
+@1 of @2 players are in bed=ベッドに@1 / @2人います
+Force night skip=強制的に夜をスキップします
+You can only sleep at night.=夜しか寝れません。
+Leave Bed=ベッドから出ます
--- a/mods/beds/locale/beds.ru.tr
+++ b/mods/beds/locale/beds.ru.tr
@ -1,8 +1,8 @@
 # textdomain: beds
 Fancy Bed=Детализированная Кровать
 Simple Bed=Обычная Кровать
-This bed is already occupied!=
-You have to stop moving before going to bed!=
+This bed is already occupied!=Эта кровать уже занята!
+You have to stop moving before going to bed!=Нельзя воспользоваться кроватью на ходу!
 Good morning.=Доброе утро.
@1 of @2 players are in bed=@1 из @2 игроков в кровати
 Force night skip=Пропустить ночь
--- a/mods/beds/locale/beds.se.tr
+++ b/mods/beds/locale/beds.se.tr
@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Fin säng
-Simple Bed=Enkel Säng
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.= God morgon.
-@1 of @2 players are in bed=@1 av @2 spelar försöker sover.
-Force night skip=Tvinga över natten
-You can only sleep at night.=Du kan bara sova på natten.
-Leave Bed=Lämna Säng
--- a/mods/beds/locale/beds.sk.tr
+++ b/mods/beds/locale/beds.sk.tr
@ -1,8 +1,8 @@
 # textdomain: beds
 Fancy Bed=Pekná posteľ
 Simple Bed=Jednoduchá posteľ
-This bed is already occupied!=
-You have to stop moving before going to bed!=
+This bed is already occupied!=Táto posteľ je už obsadená
+You have to stop moving before going to bed!=Predtým ako si ľahneš do postele, sa musíš prestať pohybovať!
 Good morning.=Dobré ráno.
@1 of @2 players are in bed=@1 z @2 hráčov sú v posteli
 Force night skip=Nútene preskočiť noc
--- a/mods/beds/locale/beds.sv.tr
+++ b/mods/beds/locale/beds.sv.tr
@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=Fin säng
+Simple Bed=Enkel säng
+This bed is already occupied!=Den här sängen används redan!
+You have to stop moving before going to bed!=Du måste stanna innan du kan lägga dig!
+Good morning.=God morgon.
+@1 of @2 players are in bed=@1 av @2 spelare försöker sova.
+Force night skip=Tvinga att hoppa över natt
+You can only sleep at night.=Du kan bara sova på natten.
+Leave Bed=Lämna säng
--- a/mods/beds/locale/beds.uk.tr
+++ b/mods/beds/locale/beds.uk.tr
@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=Деталізована Постіль
+Simple Bed=Звичайна Постіль
+This bed is already occupied!=Ця постіль вже зайнята!
+You have to stop moving before going to bed!=Не можна скористатись постіллю на ходу!
+Good morning.=Доброго ранку.
+@1 of @2 players are in bed=@1 з @2 гравців в ліжку
+Force night skip=Пропустити ніч
+You can only sleep at night.=Ви можете спати тільки вночі.
+Leave Bed=Встати з ліжка
--- a/mods/beds/locale/beds.zh_CN.tr
+++ b/mods/beds/locale/beds.zh_CN.tr
@ -1,8 +1,8 @@
 # textdomain: beds
 Fancy Bed=花式床
 Simple Bed=简易床
-This bed is already occupied!=
-You have to stop moving before going to bed!=
+This bed is already occupied!=床上已有人！
+You have to stop moving before going to bed!=上床前要停止移动！
 Good morning.=早安！
@1 of @2 players are in bed=@2位玩家中的@1位在床上
 Force night skip=强制跳过夜晚
--- a/mods/binoculars/locale/binoculars.ja.tr
+++ b/mods/binoculars/locale/binoculars.ja.tr
@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=双眼鏡
+Use with 'Zoom' key=ズームキーで使います
--- a/mods/binoculars/locale/binoculars.se.tr
+++ b/mods/binoculars/locale/binoculars.se.tr
@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=Kikare
-Use with 'Zoom' key=Används med 'Zoom' knappen
--- a/mods/binoculars/locale/binoculars.sv.tr
+++ b/mods/binoculars/locale/binoculars.sv.tr
@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Kikare
+Use with 'Zoom' key=Använd med 'Zoom'-knappen
--- a/mods/binoculars/locale/binoculars.uk.tr
+++ b/mods/binoculars/locale/binoculars.uk.tr
@ -0,0 +1,3 @@
+# textdomain: binoculars
+Binoculars=Бінокль
+Use with 'Zoom' key=Використовується з правами 'Zoom'
--- a/mods/boats/locale/boats.ja.tr
+++ b/mods/boats/locale/boats.ja.tr
@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=クルージングモード・オン
+Boat cruise mode off=クルージングモード・オフ
+Boat=ボート
--- a/mods/boats/locale/boats.sk.tr
+++ b/mods/boats/locale/boats.sk.tr
@ -1,4 +1,4 @@
 # textdomain: boats
-Boat cruise mode on=Cestovný režim loďky zapnutý
-Boat cruise mode off=Cestovný režim loďky vypnutý
+Boat cruise mode on=Cestovný režim loďky je zapnutý
+Boat cruise mode off=Cestovný režim loďky je vypnutý
 Boat=Loďka
--- a/mods/boats/locale/boats.sv.tr
+++ b/mods/boats/locale/boats.sv.tr
--- a/mods/boats/locale/boats.uk.tr
+++ b/mods/boats/locale/boats.uk.tr
@ -0,0 +1,4 @@
+# textdomain: boats
+Boat cruise mode on=Режим мандрування на човні увімкнено
+Boat cruise mode off=Режим мандрування на човні вимкнено
+Boat=Човен
--- a/mods/bones/locale/bones.ja.tr
+++ b/mods/bones/locale/bones.ja.tr
@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=骨
+@1's old bones=@1の古い骨
+@1 died at @2.=@1は@2で死亡しました。
+@1 died at @2, and dropped their inventory.=@1は@2で死亡して持ち物を落としました。
+@1 died at @2, and bones were placed.=@1は@2で死亡して骨が残されました。
+@1's fresh bones=@1の新鮮な骨
+@1's bones=@1の骨
--- a/mods/bones/locale/bones.sv.tr
+++ b/mods/bones/locale/bones.sv.tr
--- a/mods/bones/locale/bones.uk.tr
+++ b/mods/bones/locale/bones.uk.tr
@ -0,0 +1,8 @@
+# textdomain: bones
+Bones=Кістки
+@1's old bones=старі кістки @1
+@1 died at @2.=@1 помер в @2.
+@1 died at @2, and dropped their inventory.=@1 помер в @2, та загубив вміст свого інвентарю.
+@1 died at @2, and bones were placed.=@1 помер в @2, розміщені кістки.
+@1's fresh bones=нові кістки @1
+@1's bones=кістки @1
--- a/mods/bones/locale/bones.zh_CN.tr
+++ b/mods/bones/locale/bones.zh_CN.tr
@ -2,7 +2,7 @@
 Bones=骨骸
@1's old bones=@1的旧骨骸
@1 died at @2.=@1在@2死亡。
-@1 died at @2, and dropped their inventory.=@1在@2死亡，丢掉了物品栏。
-@1 died at @2, and bones were placed.=@1在@2死亡，骨骸被放置。
+@1 died at @2, and dropped their inventory.=@1在@2死亡，丢掉了所有物品。
+@1 died at @2, and bones were placed.=@1在@2死亡，已放置骨骸。
@1's fresh bones=@1的新鲜骨骸
@1's bones=@1的骨骸
--- a/mods/bucket/locale/bucket.ja.tr
+++ b/mods/bucket/locale/bucket.ja.tr
@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=空のバケツ
+Water Bucket=水入りバケツ
+River Water Bucket=川の水入りバケツ
+Lava Bucket=溶岩入りバケツ
--- a/mods/bucket/locale/bucket.se.tr
+++ b/mods/bucket/locale/bucket.se.tr
@ -1,5 +0,0 @@
-# textdomain: bucket
-Empty Bucket=Tom hink
-Water Bucket=Vatten hink
-River Water Bucket=Flodvatten hink
-Lava Bucket=Lava hink
--- a/mods/bucket/locale/bucket.sv.tr
+++ b/mods/bucket/locale/bucket.sv.tr
@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Tom hink
+Water Bucket=Vattenhink
+River Water Bucket=Flodvattenshink
+Lava Bucket=Lavahink
--- a/mods/bucket/locale/bucket.uk.tr
+++ b/mods/bucket/locale/bucket.uk.tr
@ -0,0 +1,5 @@
+# textdomain: bucket
+Empty Bucket=Пусте Відро
+Water Bucket=Відро З Водою
+River Water Bucket=Відро З Річною Водою
+Lava Bucket=Відро З Лавою
--- a/mods/butterflies/locale/butterflies.ja.tr
+++ b/mods/butterflies/locale/butterflies.ja.tr
@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=白色の蝶
+Red Butterfly=赤色の蝶
+Violet Butterfly=紫色の蝶
--- a/mods/butterflies/locale/butterflies.sv.tr
+++ b/mods/butterflies/locale/butterflies.sv.tr
--- a/mods/butterflies/locale/butterflies.uk.tr
+++ b/mods/butterflies/locale/butterflies.uk.tr
@ -0,0 +1,4 @@
+# textdomain: butterflies
+White Butterfly=Білий Метелик
+Red Butterfly=Червоний Метелик
+Violet Butterfly=Фіолетовий Метелик
--- a/mods/carts/locale/carts.eo.tr
+++ b/mods/carts/locale/carts.eo.tr
@ -1,6 +1,6 @@
 # textdomain: carts
+Cart=Ĉaro
+(Sneak+Click to pick up)=(Ŝteliru+Alklaku por reprini)
 Rail=Relo
 Powered Rail=Elektra Relo
 Brake Rail=Bremsa Relo
-Cart=Ĉaro
-(Sneak+Click to pick up)=(Ŝteliru+Alklaku por reprini)
--- a/mods/carts/locale/carts.ja.tr
+++ b/mods/carts/locale/carts.ja.tr
@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=トロッコ
+(Sneak+Click to pick up)=(スニークキーとクリックで乗ります)
+Rail=レール
+Powered Rail=パワードレール
+Brake Rail=ブレーキレール
--- a/mods/carts/locale/carts.sv.tr
+++ b/mods/carts/locale/carts.sv.tr
@ -3,4 +3,4 @@ Cart=Vagn
 (Sneak+Click to pick up)=(Shift+Klicka för att plocka upp)
 Rail=Räls
 Powered Rail=Aktiverad räls
-Brake Rail=Broms räls
+Brake Rail=Bromsräls
--- a/mods/carts/locale/carts.uk.tr
+++ b/mods/carts/locale/carts.uk.tr
@ -0,0 +1,6 @@
+# textdomain: carts
+Cart=Вагонетка
+(Sneak+Click to pick up)=(Пригніться та клікніть по вагонетці, щоб забрати)
+Rail=Рейки
+Powered Rail=Задіяні Рейки
+Brake Rail=Гальмівні Рейки
--- a/mods/creative/inventory.lua
+++ b/mods/creative/inventory.lua
@ -125,7 +125,7 @@ function creative.update_creative_inventory(player_name, tab_content)
 end

 -- Create the trash field
-local trash = minetest.create_detached_inventory("creative_trash", {
+local trash = minetest.create_detached_inventory("trash", {
 	-- Allow the stack to be placed and remove it in on_put()
 	-- This allows the creative inventory to restore the stack
 	allow_put = function(inv, listname, index, stack, player)
@ -157,7 +157,7 @@ function creative.register_tab(name, title, items)
 				[[
 					image[4.08,4.2;0.8,0.8;creative_trash_icon.png]
 					listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]
-					list[detached:creative_trash;main;4.02,4.1;1,1;]
+					list[detached:trash;main;4.02,4.1;1,1;]
 					listring[]
 					image_button[5,4.05;0.8,0.8;creative_prev_icon.png;creative_prev;]
 					image_button[7.2,4.05;0.8,0.8;creative_next_icon.png;creative_next;]
--- a/mods/creative/locale/creative.eo.tr
+++ b/mods/creative/locale/creative.eo.tr
@ -1,4 +1,5 @@
 # textdomain: creative
+Allow player to use creative inventory=Permesu la ludanto uzi la krea stoko
 Search=Serĉu
 Reset=Rekomencigu
 Previous page=Pasinta paĝo
@ -7,4 +8,3 @@ All=Ĉio
 Nodes=Nodoj
 Tools=Iloj
 Items=Objektoj
-Allow player to use creative inventory=Permesu la ludanto uzi la krea stoko
--- a/mods/creative/locale/creative.ja.tr
+++ b/mods/creative/locale/creative.ja.tr
@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=プレーヤーにクリエイティブ インベントリーの使用を許可する
+Search=検索
+Reset=リセット
+Previous page=前のページ
+Next page=次のページ
+All=すべて
+Nodes=ブロック
+Tools=道具
+Items=アイテム
--- a/mods/creative/locale/creative.se.tr
+++ b/mods/creative/locale/creative.se.tr
@ -1,10 +0,0 @@
-# textdomain: creative
-Allow player to use creative inventory=Tilllåt spelare att används kreativa saker
-Search=Sök
-Reset=Återställ
-Previous page=Förra sidan
-Next page=Nästa sidan
-All=Alla
-Nodes=Noder
-Tools=Verktyg
-Items=Saker
--- a/mods/creative/locale/creative.sv.tr
+++ b/mods/creative/locale/creative.sv.tr
@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Tillåt spelare att använda kreativa saker
+Search=Sök
+Reset=Återställ
+Previous page=Förra sida
+Next page=Nästa sida
+All=Alla
+Nodes=Noder
+Tools=Verktyg
+Items=Saker
--- a/mods/creative/locale/creative.uk.tr
+++ b/mods/creative/locale/creative.uk.tr
@ -0,0 +1,10 @@
+# textdomain: creative
+Allow player to use creative inventory=Дозволити гравцеві використати творчий інвентар
+Search=Пошук
+Reset=Скинути
+Previous page=Попередня сторінка
+Next page=Наступна сторінка
+All=Все
+Nodes=Ноди
+Tools=Інструменти
+Items=Предмети
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@ -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/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
@ -1,4 +1,48 @@
 # 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
@ -117,6 +161,7 @@ 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
@ -135,10 +180,12 @@ Glass=Vitro
 Obsidian Glass=Obsidiana Vitro
 Brick Block=Brika Ŝtipo
 Mese Lamp=Mesea Lampo
-Mese Post Light=Mesea Fosta 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
-@1 will intersect protection on growth.=@1 sekcos protekto ĉe vegeto.
-Torch=Torĉo
 Wooden Pickaxe=Ligna Pioĉo
 Stone Pickaxe=Ŝtona Pioĉo
 Bronze Pickaxe=Bronza Pioĉo
@ -163,49 +210,10 @@ Bronze Sword=Bronza Glavo
 Steel Sword=Ŝtala Glavo
 Mese Sword=Mesea Glavo
 Diamond Sword=Diamanta Glavo
-Key=Ŝlosilo
-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
-Title:=Titolo
-Contents:=Entenaĵo
-Save=Konservu
-by @1=per @1
-Page @1 of @2=Paĝo @1 el @2
-"@1"="@1"
-"@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
-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
+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/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
--- a/mods/doors/init.lua
+++ b/mods/doors/init.lua
@ -264,6 +264,7 @@ function doors.register(name, def)
 				return itemstack
 			end

+			local doorname = itemstack:get_name()
 			local node = minetest.get_node(pointed_thing.under)
 			local pdef = minetest.registered_nodes[node.name]
 			if pdef and pdef.on_rightclick and
@ -315,10 +316,10 @@ function doors.register(name, def)
 			local state = 0
 			if minetest.get_item_group(minetest.get_node(aside).name, "door") == 1 then
 				state = state + 2
-				minetest.set_node(pos, {name = name .. "_b", param2 = dir})
+				minetest.set_node(pos, {name = doorname .. "_b", param2 = dir})
 				minetest.set_node(above, {name = "doors:hidden", param2 = (dir + 3) % 4})
 			else
-				minetest.set_node(pos, {name = name .. "_a", param2 = dir})
+				minetest.set_node(pos, {name = doorname .. "_a", param2 = dir})
 				minetest.set_node(above, {name = "doors:hidden", param2 = dir})
 			end

@ -445,18 +446,18 @@ function doors.register(name, def)
 	def.buildable_to = false
 	def.selection_box = {type = "fixed", fixed = {-1/2,-1/2,-1/2,1/2,3/2,-6/16}}
 	def.collision_box = {type = "fixed", fixed = {-1/2,-1/2,-1/2,1/2,3/2,-6/16}}
-	def.use_texture_alpha = "clip"
+	def.use_texture_alpha = def.use_texture_alpha or "clip"

-	def.mesh = "door_a.obj"
+	def.mesh = "door_a.b3d"
 	minetest.register_node(":" .. name .. "_a", table.copy(def))

-	def.mesh = "door_b.obj"
+	def.mesh = "door_b.b3d"
 	minetest.register_node(":" .. name .. "_b", table.copy(def))

-	def.mesh = "door_a2.obj"
+	def.mesh = "door_b.b3d"
 	minetest.register_node(":" .. name .. "_c", table.copy(def))

-	def.mesh = "door_b2.obj"
+	def.mesh = "door_a.b3d"
 	minetest.register_node(":" .. name .. "_d", table.copy(def))

 	doors.registered_doors[name .. "_a"] = true
@ -599,7 +600,7 @@ function doors.register_trapdoor(name, def)
 	def.paramtype = "light"
 	def.paramtype2 = "facedir"
 	def.is_ground_content = false
-	def.use_texture_alpha = "clip"
+	def.use_texture_alpha = def.use_texture_alpha or "clip"

 	if def.protected then
 		def.can_dig = can_dig_door
@ -669,10 +670,14 @@ function doors.register_trapdoor(name, def)
 	local def_opened = table.copy(def)
 	local def_closed = table.copy(def)

-	def_closed.node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
-	}
+	if def.nodebox_closed and def.nodebox_opened then
+		def_closed.node_box = def.nodebox_closed
+	else
+		def_closed.node_box = {
+		    type = "fixed",
+		    fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
+		}
+	end
 	def_closed.selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
@ -686,10 +691,14 @@ function doors.register_trapdoor(name, def)
 		def.tile_side
 	}

-	def_opened.node_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
-	}
+	if def.nodebox_opened and def.nodebox_closed then
+		def_opened.node_box = def.nodebox_opened
+	else
+		def_opened.node_box = {
+		    type = "fixed",
+		    fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
+		}
+	end
 	def_opened.selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
@ -775,8 +784,8 @@ function doors.register_fencegate(name, def)
 		sounds = def.sounds,
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			local node_def = minetest.registered_nodes[node.name]
-			minetest.swap_node(pos, {name = node_def.gate, param2 = node.param2})
-			minetest.sound_play(node_def.sound, {pos = pos, gain = 0.15,
+			minetest.swap_node(pos, {name = node_def._gate, param2 = node.param2})
+			minetest.sound_play(node_def._gate_sound, {pos = pos, gain = 0.15,
 				max_hear_distance = 8}, true)
 			return itemstack
 		end,
@ -804,8 +813,8 @@ function doors.register_fencegate(name, def)

 	local fence_closed = table.copy(fence)
 	fence_closed.mesh = "doors_fencegate_closed.obj"
-	fence_closed.gate = name .. "_open"
-	fence_closed.sound = "doors_fencegate_open"
+	fence_closed._gate = name .. "_open"
+	fence_closed._gate_sound = "doors_fencegate_open"
 	fence_closed.collision_box = {
 		type = "fixed",
 		fixed = {-1/2, -1/2, -1/8, 1/2, 1/2 + fence_collision_extra, 1/8}
@ -813,8 +822,8 @@ function doors.register_fencegate(name, def)

 	local fence_open = table.copy(fence)
 	fence_open.mesh = "doors_fencegate_open.obj"
-	fence_open.gate = name .. "_closed"
-	fence_open.sound = "doors_fencegate_close"
+	fence_open._gate = name .. "_closed"
+	fence_open._gate_sound = "doors_fencegate_close"
 	fence_open.groups.not_in_creative_inventory = 1
 	fence_open.collision_box = {
 		type = "fixed",
--- a/mods/doors/locale/doors.ja.tr
+++ b/mods/doors/locale/doors.ja.tr
@ -0,0 +1,18 @@
+# textdomain: doors
+Hidden Door Segment=隠しドアの区切り
+Owned by @1=所有者 @1
+You do not own this locked door.=あなたはこのロックされたドアの所有者ではありません。
+a locked door=ロックされたドア
+Wooden Door=木のドア
+Steel Door=鉄のドア
+Glass Door=ガラスのドア
+Obsidian Glass Door=黒曜石のガラスのドア
+You do not own this trapdoor.=あなたはこのトラップドアの所有者ではありません。
+a locked trapdoor=ロックされたトラップドア
+Wooden Trapdoor=木のトラップドア
+Steel Trapdoor=鉄のトラップドア
+Apple Wood Fence Gate=リンゴのフェンスゲート
+Acacia Wood Fence Gate=アカシアのフェンスゲート
+Jungle Wood Fence Gate=ジャングルのフェンスゲート
+Pine Wood Fence Gate=マツのフェンスゲート
+Aspen Wood Fence Gate=ポプラのフェンスゲート
--- a/mods/doors/locale/doors.se.tr
+++ b/mods/doors/locale/doors.se.tr
@ -1,18 +0,0 @@
-# textdomain: doors
-Hidden Door Segment=Dold dörrsegment
-Owned by @1=Ägd av @1
-You do not own this locked door.=Du äger inte denna låsta dörr.
-a locked door=en låst dörr
-Wooden Door=Trä Dörr
-Steel Door=Stål Dörr
-Glass Door=Glas Dörr
-Obsidian Glass Door=Obsidian Glas Dörr
-You do not own this trapdoor.=Du äger inte denna fallucka
-a locked trapdoor=en låst fallucka
-Wooden Trapdoor=Trä Fallucka
-Steel Trapdoor=Stål Fallucka
-Apple Wood Fence Gate=Äpple Trä Fallucka
-Acacia Wood Fence Gate=Akacia Trä Fallucka
-Jungle Wood Fence Gate=Djungel Trä Fallucka
-Pine Wood Fence Gate=Tall Trä Fallucka
-Aspen Wood Fence Gate=Asp Trä Fallucka
--- a/mods/doors/locale/doors.sv.tr
+++ b/mods/doors/locale/doors.sv.tr
@ -0,0 +1,18 @@
+# textdomain: doors
+Hidden Door Segment=Dolt dörrsegment
+Owned by @1=Ägd av @1
+You do not own this locked door.=Du äger inte denna låsta dörr.
+a locked door=en låst dörr
+Wooden Door=Trädörr
+Steel Door=Ståldörr
+Glass Door=Glasdörr
+Obsidian Glass Door=Obsidianglasdörr
+You do not own this trapdoor.=Du äger inte denna fallucka
+a locked trapdoor=en låst fallucka
+Wooden Trapdoor=Träfallucka
+Steel Trapdoor=Stålfallucka
+Apple Wood Fence Gate=Äppleträfallucka
+Acacia Wood Fence Gate=Akaciaträfallucka
+Jungle Wood Fence Gate=Djungelträfallucka
+Pine Wood Fence Gate=Tallträfallucka
+Aspen Wood Fence Gate=Aspträfallucka
--- a/mods/doors/locale/doors.uk.tr
+++ b/mods/doors/locale/doors.uk.tr
@ -0,0 +1,18 @@
+# textdomain: doors
+Hidden Door Segment=Захована Частина Дверей
+Owned by @1=Власник: @1
+You do not own this locked door.=Ви не власник цих заблокованих дверей.
+a locked door=заблоковані двері
+Wooden Door=Дерев'яні двері
+Steel Door=Сталеві Двері
+Glass Door=Скляні двері
+Obsidian Glass Door=Двері З Обсидіанового Скла
+You do not own this trapdoor.=Ви не є власником цього люка.
+a locked trapdoor=заблокований люк
+Wooden Trapdoor=Дерев'яний Люк
+Steel Trapdoor=Сталевий Люк
+Apple Wood Fence Gate=Яблунева Дерев'яна Хвіртка
+Acacia Wood Fence Gate=Дерев'яна Хвіртка З Акації
+Jungle Wood Fence Gate=Дерев'яна Хвіртка З Тропічного Дерева
+Pine Wood Fence Gate=Соснова Дерев'яна Хвіртка
+Aspen Wood Fence Gate=Осикова Дерев'яна Хвіртка
--- a/mods/doors/locale/doors.zh_CN.tr
+++ b/mods/doors/locale/doors.zh_CN.tr
@ -1,13 +1,13 @@
 # textdomain: doors
 Hidden Door Segment=隐藏门段
-Owned by @1=由@1拥有
-You do not own this locked door.=这个门不属于你所有。
+Owned by @1=由@1所有
+You do not own this locked door.=这个门不属于你。
 a locked door=一扇已上锁的门
 Wooden Door=木门
 Steel Door=铁门
 Glass Door=玻璃门
 Obsidian Glass Door=黑曜石玻璃门
-You do not own this trapdoor.=这个活板门不属于你所有。
+You do not own this trapdoor.=这个活板门不属于你。
 a locked trapdoor=一扇已上锁的活板门
 Wooden Trapdoor=木活板门
 Steel Trapdoor=铁活板门
--- a/mods/doors/models/door.blend
+++ b/mods/doors/models/door.blend
--- a/mods/doors/models/door_a.b3d
+++ b/mods/doors/models/door_a.b3d
--- a/mods/doors/models/door_a.obj
+++ b/mods/doors/models/door_a.obj
@ -1,40 +0,0 @@
-# Blender v2.76 (sub 0) OBJ File: 'door_a.blend'
-# www.blender.org
-mtllib door_a.mtl
-o door_a
-v 0.499000 -0.499000 -0.499000
-v 0.499000 1.499000 -0.499000
-v 0.499000 -0.499000 -0.375000
-v 0.499000 1.499000 -0.375000
-v -0.499000 -0.499000 -0.499000
-v -0.499000 1.499000 -0.499000
-v -0.499000 -0.499000 -0.375000
-v -0.499000 1.499000 -0.375000
-vt 0.842105 1.000000
-vt 0.894737 1.000000
-vt 0.894737 0.000000
-vt 0.842105 0.000000
-vt 0.421053 1.000000
-vt 0.421053 0.000000
-vt 0.947368 1.000000
-vt 0.947368 0.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.500000
-vt 0.947368 0.500000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 0.000000 1.000000
-vn -1.000000 0.000000 0.000000
-vn 0.000000 0.000000 -1.000000
-vn 0.000000 -1.000000 0.000000
-vn 0.000000 1.000000 0.000000
-usemtl None
-s off
-f 2/1/1 4/2/1 3/3/1 1/4/1
-f 4/5/2 8/1/2 7/4/2 3/6/2
-f 8/2/3 6/7/3 5/8/3 7/3/3
-f 6/9/4 2/5/4 1/6/4 5/10/4
-f 1/11/5 3/12/5 7/7/5 5/13/5
-f 6/14/6 8/8/6 4/12/6 2/11/6
--- a/mods/doors/models/door_a2.obj
+++ b/mods/doors/models/door_a2.obj
@ -1,50 +0,0 @@
-# Blender v2.79 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib door_a2.mtl
-o door_a2
-v -0.499000 1.499000 -0.499000
-v -0.499000 -0.499000 -0.499000
-v -0.499000 -0.499000 -0.375000
-v -0.499000 1.499000 -0.375000
-v 0.499000 -0.499000 -0.375000
-v 0.499000 1.499000 -0.375000
-v 0.499000 -0.499000 -0.499000
-v 0.499000 1.499000 -0.499000
-vt 0.894737 1.000000
-vt 0.894737 0.000000
-vt 0.842105 0.000000
-vt 0.842105 1.000000
-vt 0.421052 1.000000
-vt 0.421052 0.000000
-vt 0.000001 0.000000
-vt 0.000001 1.000000
-vt 0.894737 1.000000
-vt 0.894737 0.000000
-vt 0.947368 0.000000
-vt 0.947368 1.000000
-vt 0.842105 1.000000
-vt 0.842105 0.000000
-vt 0.421052 0.000000
-vt 0.421052 1.000000
-vt 0.947368 0.000000
-vt 0.947368 0.500000
-vt 1.000000 0.500000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 1.000000 0.500000
-vt 0.947368 0.500000
-vt 0.947368 1.000000
-vn -1.0000 -0.0000 0.0000
-vn 0.0000 -0.0000 1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-usemtl None.009
-s 1
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 4/5/2 3/6/2 5/7/2 6/8/2
-f 6/9/3 5/10/3 7/11/3 8/12/3
-f 8/13/4 7/14/4 2/15/4 1/16/4
-f 2/17/5 7/18/5 5/19/5 3/20/5
-f 8/21/6 1/22/6 4/23/6 6/24/6
--- a/mods/doors/models/door_b.b3d
+++ b/mods/doors/models/door_b.b3d
--- a/mods/doors/models/door_b.obj
+++ b/mods/doors/models/door_b.obj
@ -1,50 +0,0 @@
-# Blender v2.79 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib door_b.mtl
-o door_b
-v 0.499000 1.499000 -0.499000
-v 0.499000 1.499000 -0.375000
-v 0.499000 -0.499000 -0.375000
-v 0.499000 -0.499000 -0.499000
-v -0.499000 1.499000 -0.375000
-v -0.499000 -0.499000 -0.375000
-v -0.499000 1.499000 -0.499000
-v -0.499000 -0.499000 -0.499000
-vt 0.894736 1.000000
-vt 0.947368 1.000000
-vt 0.947368 0.000000
-vt 0.894736 0.000000
-vt 0.842105 1.000000
-vt 0.421053 1.000000
-vt 0.421053 0.000000
-vt 0.842105 0.000000
-vt 0.842105 1.000000
-vt 0.894736 1.000000
-vt 0.894736 0.000000
-vt 0.842105 0.000000
-vt 0.421053 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 0.421053 0.000000
-vt 1.000000 0.500000
-vt 0.947368 0.500000
-vt 0.947368 1.000000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vt 0.947368 0.000000
-vt 0.947368 0.500000
-vt 1.000000 0.500000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -0.0000 1.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-usemtl None.007
-s 1
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 2/5/2 5/6/2 6/7/2 3/8/2
-f 5/9/3 7/10/3 8/11/3 6/12/3
-f 7/13/4 1/14/4 4/15/4 8/16/4
-f 4/17/5 3/18/5 6/19/5 8/20/5
-f 7/21/6 5/22/6 2/23/6 1/24/6
--- a/mods/doors/models/door_b2.obj
+++ b/mods/doors/models/door_b2.obj
@ -1,50 +0,0 @@
-# Blender v2.79 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib door_b2.mtl
-o door_b2
-v 0.499000 1.499000 -0.499000
-v 0.499000 1.499000 -0.375000
-v 0.499000 -0.499000 -0.375000
-v 0.499000 -0.499000 -0.499000
-v -0.499000 1.499000 -0.375000
-v -0.499000 -0.499000 -0.375000
-v -0.499000 1.499000 -0.499000
-v -0.499000 -0.499000 -0.499000
-vt 0.842105 1.000000
-vt 0.894737 1.000000
-vt 0.894737 0.000000
-vt 0.842105 0.000000
-vt 0.421052 1.000000
-vt 0.000001 1.000000
-vt 0.000001 0.000000
-vt 0.421052 0.000000
-vt 0.894737 1.000000
-vt 0.947368 1.000000
-vt 0.947368 0.000000
-vt 0.894737 0.000000
-vt 0.842105 1.000000
-vt 0.421052 1.000000
-vt 0.421052 0.000000
-vt 0.842105 0.000000
-vt 1.000000 0.500000
-vt 0.947368 0.500000
-vt 0.947368 1.000000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vt 0.947368 0.000000
-vt 0.947368 0.500000
-vt 1.000000 0.500000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -0.0000 1.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-usemtl None.010
-s 1
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 2/5/2 5/6/2 6/7/2 3/8/2
-f 5/9/3 7/10/3 8/11/3 6/12/3
-f 7/13/4 1/14/4 4/15/4 8/16/4
-f 4/17/5 3/18/5 6/19/5 8/20/5
-f 7/21/6 5/22/6 2/23/6 1/24/6
--- a/mods/dye/locale/dye.ja.tr
+++ b/mods/dye/locale/dye.ja.tr
@ -0,0 +1,16 @@
+# textdomain: dye
+White Dye=白色の染料
+Grey Dye=灰色の染料
+Dark Grey Dye=濃灰色の染料
+Black Dye=黒色の染料
+Violet Dye=紫色の染料
+Blue Dye=青色の染料
+Cyan Dye=青緑色の染料
+Dark Green Dye=濃緑色の染料
+Green Dye=緑色の染料
+Yellow Dye=黄色の染料
+Brown Dye=茶色の染料
+Orange Dye=橙色の染料
+Red Dye=赤色の染料
+Magenta Dye=赤紫色の染料
+Pink Dye=桃色の染料
--- a/mods/dye/locale/dye.se.tr
+++ b/mods/dye/locale/dye.se.tr
@ -1,16 +0,0 @@
-# textdomain: dye
-White Dye=Vit Färg
-Grey Dye=Grå Färg
-Dark Grey Dye=Mörk Grå Färg
-Black Dye=Svart Färg
-Violet Dye=Violett Färg
-Blue Dye=Blå Färg
-Cyan Dye=Cyan Färg
-Dark Green Dye=Mörk Grön Färg
-Green Dye=Grön Färg
-Yellow Dye=Gul Färg
-Brown Dye=Brun Färg
-Orange Dye=Orange Färg
-Red Dye=Röd Färg
-Magenta Dye=Magenta Färg
-Pink Dye=Rosa Färg
--- a/mods/dye/locale/dye.sv.tr
+++ b/mods/dye/locale/dye.sv.tr
@ -0,0 +1,16 @@
+# textdomain: dye
+White Dye=Vit färg
+Grey Dye=Grå färg
+Dark Grey Dye=Mörkgrå färg
+Black Dye=Svart färg
+Violet Dye=Violett färg
+Blue Dye=Blå färg
+Cyan Dye=Cyan färg
+Dark Green Dye=Mörkgrön färg
+Green Dye=Grön färg
+Yellow Dye=Gul färg
+Brown Dye=Brun färg
+Orange Dye=Orange färg
+Red Dye=Röd färg
+Magenta Dye=Magenta färg
+Pink Dye=Rosa färg
--- a/mods/dye/locale/dye.uk.tr
+++ b/mods/dye/locale/dye.uk.tr
@ -0,0 +1,16 @@
+# textdomain: dye
+White Dye=Біла Фарба
+Grey Dye=Сіра Фарба
+Dark Grey Dye=Темно-Сіра фарба
+Black Dye=Чорна Фарба
+Violet Dye=Фіолетова Фарба
+Blue Dye=Синя Фарба
+Cyan Dye=Синьо-Зелена Фарба
+Dark Green Dye=Темно-Зелена Фарба
+Green Dye=Зелена Фарба
+Yellow Dye=Жовта Фарба
+Brown Dye=Коричнева Фарба
+Orange Dye=Помаранчева Фарба
+Red Dye=Червона Фарба
+Magenta Dye=Пурпурна Фарба
+Pink Dye=Рожева Фарба
--- a/mods/farming/api.lua
+++ b/mods/farming/api.lua
@ -60,7 +60,7 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses)
 	minetest.set_node(pt.under, {name = regN[under.name].soil.dry})
 	minetest.sound_play("default_dig_crumbly", {
 		pos = pt.under,
-		gain = 0.5,
+		gain = 0.3,
 	}, true)

 	if not minetest.is_creative_enabled(player_name) then
--- a/mods/farming/locale/farming.eo.tr
+++ b/mods/farming/locale/farming.eo.tr
@ -1,4 +1,19 @@
 # textdomain: farming
+Hoe=Sarkilo
+Seed=Semo
+Wooden Hoe=Ligna Sarkilo
+Stone Hoe=Ŝtona Sarkilo
+Steel Hoe=Ŝtala Sarkilo
+Bronze Hoe=Bronza Sarkilo
+Mese Hoe=Mesea Sarkilo
+Diamond Hoe=Diamanta Sarkilo
+Wheat Seed=Tritika Semo
+Wheat=Tritiko
+Flour=Faruno
+Bread=Pano
+Cotton Seed=Katuna Semo
+Cotton=Katuno
+String=Ŝnuro
 Soil=Tero
 Wet Soil=Malseka Tero
 Savanna Soil=Savana Tero
@ -11,18 +26,3 @@ Inner Straw Stair=Interna Pajla Ŝtupo
 Outer Straw Stair=Ekstera Pajla Ŝtupo
 Straw Slab=Pajla Plato
 Wild Cotton=Sovaĝa Katuno
-Wheat Seed=Tritika Semo
-Wheat=Tritiko
-Flour=Faruno
-Bread=Pano
-Cotton Seed=Katuna Semo
-Cotton=Katuno
-String=Ŝnuro
-Wooden Hoe=Ligna Sarkilo
-Stone Hoe=Ŝtona Sarkilo
-Steel Hoe=Ŝtala Sarkilo
-Bronze Hoe=Bronza Sarkilo
-Mese Hoe=Mesea Sarkilo
-Diamond Hoe=Diamanta Sarkilo
-Hoe=Sarkilo
-Seed=Semo
--- a/mods/farming/locale/farming.fr.tr
+++ b/mods/farming/locale/farming.fr.tr
@ -1,6 +1,6 @@
 # textdomain: farming
-Hoe=
-Seed=
+Hoe=Houe
+Seed=Grain
 Wooden Hoe=Houe en bois
 Stone Hoe=Houe en pierre
 Steel Hoe=Houe en acier
@ -16,8 +16,8 @@ Cotton=Coton
 String=Ficelle
 Soil=Sol
 Wet Soil=Sol humide
-Savanna Soil=
-Wet Savanna Soil=
+Savanna Soil=Sol de la savanne
+Wet Savanna Soil=Sol de la savanne humide
 Desert Sand Soil=Sol de sable du désert
 Wet Desert Sand Soil=Sol de sable du désert humide
 Straw=Paille
@ -25,7 +25,7 @@ Straw Stair=Escalier de paille
 Inner Straw Stair=Escalier intérieur en paille
 Outer Straw Stair=Escalier extérieur en paille
 Straw Slab=Dalle de paille
-Wild Cotton=
+Wild Cotton=Coton sauvage


 ##### not used anymore #####
--- a/mods/farming/locale/farming.ja.tr
+++ b/mods/farming/locale/farming.ja.tr
@ -0,0 +1,28 @@
+# textdomain: farming
+Hoe=クワ
+Seed=種
+Wooden Hoe=木のクワ
+Stone Hoe=石のクワ
+Steel Hoe=鉄のクワ
+Bronze Hoe=青銅のクワ
+Mese Hoe=メセのクワ
+Diamond Hoe=ダイヤモンドのクワ
+Wheat Seed=小麦の種
+Wheat=小麦
+Flour=小麦粉
+Bread=パン
+Cotton Seed=綿の種
+Cotton=綿
+String=糸
+Soil=土壌
+Wet Soil=湿った土壌
+Savanna Soil=サバンナの土壌
+Wet Savanna Soil=湿ったサバンナの土壌
+Desert Sand Soil=砂漠の砂の土壌
+Wet Desert Sand Soil=湿った砂漠の砂の土壌
+Straw=ワラ
+Straw Stair=ワラの階段
+Inner Straw Stair=へっこんだワラの階段
+Outer Straw Stair=でっぱったワラの階段
+Straw Slab=ワラのハーフブロック
+Wild Cotton=天然綿
--- a/mods/farming/locale/farming.ru.tr
+++ b/mods/farming/locale/farming.ru.tr
@ -1,6 +1,6 @@
 # textdomain: farming
-Hoe=
-Seed=
+Hoe=Мотыга
+Seed=Семя
 Wooden Hoe=Деревянная Мотыга
 Stone Hoe=Каменная Мотыга
 Steel Hoe=Стальная Мотыга
@ -11,13 +11,13 @@ Wheat Seed=Семена Пшеницы
 Wheat=Пшеница
 Flour=Мука
 Bread=Хлеб
-Cotton Seed=Семена Хлопка
+Cotton Seed=Семена Хлопчатника
 Cotton=Хлопок
 String=Нить
 Soil=Почва
 Wet Soil=Влажная Почва
-Savanna Soil=
-Wet Savanna Soil=
+Savanna Soil=Саванная Почва
+Wet Savanna Soil=Влажная Саванная Почва
 Desert Sand Soil=Пустынная Песчаная Почва
 Wet Desert Sand Soil=Влажная Пустынная Песчаная Почва
 Straw=Солома
@ -25,7 +25,7 @@ Straw Stair=Соломенная Ступень
 Inner Straw Stair=Угловая Соломенная Ступень (Внутренний Угол)
 Outer Straw Stair=Угловая Соломенная Ступень (Внешний Угол)
 Straw Slab=Соломенная Плита
-Wild Cotton=
+Wild Cotton=Неокультуренный Хлопчатник


 ##### not used anymore #####
--- a/mods/farming/locale/farming.se.tr
+++ b/mods/farming/locale/farming.se.tr
@ -1,34 +0,0 @@
-# textdomain: farming
-Hoe=
-Seed=
-Wooden Hoe=Träsko
-Stone Hoe=Stensko
-Steel Hoe=Stålsko
-Bronze Hoe=Bronssko
-Mese Hoe=Mesesko
-Diamond Hoe=Diamantsko
-Wheat Seed=Vetefrö
-Wheat=Vete
-Flour=Mjöl
-Bread=Bröd
-Cotton Seed=Bollumsfrö
-Cotton=Bomull
-String=Snöra
-Soil=Odlningsmark
-Wet Soil=Våt Odlningsmark
-Savanna Soil=
-Wet Savanna Soil=
-Desert Sand Soil=Öken Sand Odlningsmark
-Wet Desert Sand Soil=Våt Öken Sand Odlningsmark
-Straw=Halm
-Straw Stair=Halmstrappa
-Inner Straw Stair=Inre Halmstrappa
-Outer Straw Stair=Yttre Halmstrappa
-Straw Slab=Halmplatta
-Wild Cotton=
-
-
-##### not used anymore #####
-
-Dry Soil=Torr Odlningsmark
-Wet Dry Soil=Våt Torr Odlningsmark
--- a/mods/farming/locale/farming.sv.tr
+++ b/mods/farming/locale/farming.sv.tr
@ -0,0 +1,28 @@
+# textdomain: farming
+Hoe=Kratta
+Seed=Frö
+Wooden Hoe=Träkratta
+Stone Hoe=Stenkratta
+Steel Hoe=Stålkratta
+Bronze Hoe=Bronskratta
+Mese Hoe=Mesekratta
+Diamond Hoe=Diamantkratta
+Wheat Seed=Vetefrö
+Wheat=Vete
+Flour=Mjöl
+Bread=Bröd
+Cotton Seed=Bomullfrö
+Cotton=Bomull
+String=Snöre
+Soil=Odlinngsmark
+Wet Soil=Våt Odlingsmark
+Savanna Soil=Savannodlingsmark
+Wet Savanna Soil=Våt savannodlingsmark
+Desert Sand Soil=Ökensandsodlingsmark
+Wet Desert Sand Soil=Våt ökensandsodlingsmark
+Straw=Halm
+Straw Stair=Halmtrappa
+Inner Straw Stair=Inre halmtrappa
+Outer Straw Stair=Yttre halmtrappa
+Straw Slab=Halmplatta
+Wild Cotton=
--- a/mods/farming/locale/farming.uk.tr
+++ b/mods/farming/locale/farming.uk.tr
@ -0,0 +1,28 @@
+# textdomain: farming
+Hoe=Мотига
+Seed=Насіння
+Wooden Hoe=Дерев'яна Мотига
+Stone Hoe=Кам'яна Мотига
+Steel Hoe=Сталева Мотига
+Bronze Hoe=Бронзова Мотига
+Mese Hoe=Месе Мотига
+Diamond Hoe=Алмазна Мотига
+Wheat Seed=Насіння Пшениці
+Wheat=Пшениця
+Flour=Мука
+Bread=Хліб
+Cotton Seed=Насіння Бавовнику
+Cotton=Бавовна
+String=Нитка
+Soil=Ґрунт
+Wet Soil=Вологий Ґрунт
+Savanna Soil=Саванновий Ґрунт
+Wet Savanna Soil=Вологий Саванновий Ґрунт
+Desert Sand Soil=Пустинний Піщаний Ґрунт
+Wet Desert Sand Soil=Вологий Пустельний Піщаний Ґрунт
+Straw=Солома
+Straw Stair=Солом'яна Сходинка
+Inner Straw Stair=Кутова Солом'яна Сходинка (Внутрішній Кут)
+Outer Straw Stair=Кутова Солом'яна Сходинка (Зовнішній Кут)
+Straw Slab=Солом'яна Плита
+Wild Cotton=Дикий Бавовник
--- a/mods/farming/locale/farming.zh_CN.tr
+++ b/mods/farming/locale/farming.zh_CN.tr
@ -1,6 +1,6 @@
 # textdomain: farming
-Hoe=
-Seed=
+Hoe=锄头
+Seed=种子
 Wooden Hoe=木锄头
 Stone Hoe=石锄头
 Steel Hoe=铁锄头
@ -16,8 +16,8 @@ Cotton=棉
 String=线
 Soil=土
 Wet Soil=湿土
-Savanna Soil=
-Wet Savanna Soil=
+Savanna Soil=草原土
+Wet Savanna Soil=湿草原土
 Desert Sand Soil=沙漠沙土
 Wet Desert Sand Soil=湿沙漠沙土
 Straw=稻草
@ -25,7 +25,7 @@ Straw Stair=稻草台阶
 Inner Straw Stair=稻草内楼梯
 Outer Straw Stair=稻草外楼梯
 Straw Slab=稻草板
-Wild Cotton=
+Wild Cotton=野棉花


 ##### not used anymore #####
--- a/mods/fire/init.lua
+++ b/mods/fire/init.lua
@ -92,7 +92,7 @@ minetest.register_tool("fire:flint_and_steel", {
 	on_use = function(itemstack, user, pointed_thing)
 		local sound_pos = pointed_thing.above or user:get_pos()
 		minetest.sound_play("fire_flint_and_steel",
-			{pos = sound_pos, gain = 0.5, max_hear_distance = 8}, true)
+			{pos = sound_pos, gain = 0.2, max_hear_distance = 8}, true)
 		local player_name = user:get_player_name()
 		if pointed_thing.type == "node" then
 			local node_under = minetest.get_node(pointed_thing.under).name
--- a/mods/fire/locale/fire.fr.tr
+++ b/mods/fire/locale/fire.fr.tr
@ -1,6 +1,6 @@
 # textdomain: fire
-Fire=
-Permanent Fire=
+Fire=Feu
+Permanent Fire=Feu qui brûle en permanence
 Flint and Steel=Briquet à silex en acier


--- a/mods/fire/locale/fire.ja.tr
+++ b/mods/fire/locale/fire.ja.tr
@ -0,0 +1,4 @@
+# textdomain: fire
+Fire=炎
+Permanent Fire=燃え続ける炎
+Flint and Steel=火打ち石と打ち金
--- a/Show More
+++ b/Show More