diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..fea960c1 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,16 @@ +name: build +on: [push, pull_request] + +jobs: + luacheck: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Luarocks + run: | + sudo apt-get update -qyy + sudo apt-get install luarocks -qyy + - name: Install Luacheck + run: luarocks install --local luacheck + - name: Run Luacheck + run: $HOME/.luarocks/bin/luacheck mods diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a367215f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: generic -addons: - apt: - packages: - - luarocks -before_install: - - luarocks install --local luacheck -script: -- $HOME/.luarocks/bin/luacheck ./mods -notifications: - email: false diff --git a/README.md b/README.md index a88d83c7..099a7e03 100644 --- 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/). diff --git a/game.conf b/game.conf index 7c8ac2c4..1e48ae96 100644 --- 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. +title = 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. diff --git a/game_api.txt b/game_api.txt index bddf7e27..c8b4cec3 100644 --- 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. @@ -225,14 +227,20 @@ The doors mod allows modders to register custom doors and trapdoors. sounds = default.node_sound_wood_defaults(), -- optional sound_open = sound play for open door, -- optional sound_close = sound play for close door, -- optional + 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", @@ -244,11 +252,12 @@ The doors mod allows modders to register custom doors and trapdoors. sounds = default.node_sound_wood_defaults(), -- optional sound_open = sound play for open door, -- optional sound_close = sound play for close door, -- optional + 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 @@ -258,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 @@ -431,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 @@ -445,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 @@ -473,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 = { - -- = {x = , y = }, - foo = {x = 0, y = 19}, - bar = {x = 20, y = 39}, - -- ... + -- [anim_name] = { + -- x = , + -- y = , + -- collisionbox = , -- (optional) + -- eye_height = , -- (optional) + -- -- suspend client side animations while this one is active (optional) + -- override_local = + -- }, + 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 } @@ -719,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 @@ -1082,3 +1115,33 @@ This function registers a shapeless recipe that takes `ingredient` and `result` as input and outputs `result`. The metadata of the input `result` is copied to the output `result`. + + +Log API +------- + +Logs action of the player with a node at a certain position. +By default only actions of real players are logged. +Actions of non-players (usually machines) are logged only when +setting `log_non_player_actions` is enabled. +A player is considered non-player if `player:is_player()` returns +`false` or `player.is_fake_player` is truthy. The use of +`is_fake_player` is an unofficial standard between mods. +These non-players are marked by the content of `is_fake_player` +(if it is a string) or a "*" in brackets after the player name in +the log. + +`default.log_player_action(player, ...)` + + * `player` The player who performed the action + * `message_parts` Any mumber of message parts describing the action + in 3rd person singular present tense. It can also + contain a `pos` which is logged as "(X,Y,Z)" + +`default.set_inventory_action_loggers(def, name)` + + * sets the callbacks `on_metadata_inventory_move`, + `on_metadata_inventory_put` and `on_metadata_inventory_take` + that log corresponding actions + * `def` See [Node definition] + * `name` Description of the node in the log message diff --git a/minetest.conf.example b/minetest.conf.example index 86eba660..bb6eb644 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -72,6 +72,9 @@ default:torch 99,default:cobble 99 # Helps rivers create more sound, especially on level sections. #river_source_sounds = false -# Enable cloud variation by the 'weather' mod. +# Enable cloud and shadow intensity variation by the 'weather' mod. # Non-functional in V6 or Singlenode mapgens. #enable_weather = true + +# If enabled, non-player actions are logged +#log_non_player_actions = false diff --git a/mods/beds/functions.lua b/mods/beds/functions.lua index ddac52be..409aa376 100644 --- a/mods/beds/functions.lua +++ b/mods/beds/functions.lua @@ -116,8 +116,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) diff --git a/mods/beds/locale/beds.eo.tr b/mods/beds/locale/beds.eo.tr index 43c9ac32..6acb83d8 100644 --- a/mods/beds/locale/beds.eo.tr +++ b/mods/beds/locale/beds.eo.tr @@ -1,8 +1,10 @@ # textdomain: beds -Leave Bed=Ellitiĝu -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 +This bed is already occupied!=Tiu lito jam estas okupata! +You have to stop moving before going to bed!=Vi ĉesu moviĝi por enlitiĝi! +Good morning.=Bonan matenon. +@1 of @2 players are in bed=@1 el @2 ludantoj estas en lito +Force night skip=Devigi noktan salton +You can only sleep at night.=Vi povas dormi nur nokte. +Leave Bed=Ellitiĝi diff --git a/mods/beds/locale/beds.fr.tr b/mods/beds/locale/beds.fr.tr index e1f8e560..43c06e3c 100644 --- 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 diff --git a/mods/beds/locale/beds.ja.tr b/mods/beds/locale/beds.ja.tr new file mode 100644 index 00000000..50344566 --- /dev/null +++ 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=ベッドから出ます diff --git a/mods/beds/locale/beds.pl.tr b/mods/beds/locale/beds.pl.tr new file mode 100644 index 00000000..2bc03c61 --- /dev/null +++ b/mods/beds/locale/beds.pl.tr @@ -0,0 +1,10 @@ +# textdomain: beds +Fancy Bed=Fantazyjne łóżko +Simple Bed=Proste łóżko +This bed is already occupied!=To łóżko jest już zajęte! +You have to stop moving before going to bed!=Musisz się zatrzymać aby wejść do łóżka +Good morning.=Dzień dobry. +@1 of @2 players are in bed=@1 z @2 graczy śpią +Force night skip=Wymuś pominięcie nocy +You can only sleep at night.=Możesz spać tylko w nocy. +Leave Bed=Opuść łóżko diff --git a/mods/beds/locale/beds.ru.tr b/mods/beds/locale/beds.ru.tr index ac5bd2ee..73db735c 100644 --- 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=Пропустить ночь diff --git a/mods/beds/locale/beds.se.tr b/mods/beds/locale/beds.se.tr deleted file mode 100644 index b4d52ba0..00000000 --- a/mods/beds/locale/beds.se.tr +++ /dev/null @@ -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 diff --git a/mods/beds/locale/beds.sk.tr b/mods/beds/locale/beds.sk.tr index 37f39ddf..5f31f0fd 100644 --- 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 diff --git a/mods/beds/locale/beds.sv.tr b/mods/beds/locale/beds.sv.tr new file mode 100644 index 00000000..3b737b46 --- /dev/null +++ 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 diff --git a/mods/beds/locale/beds.uk.tr b/mods/beds/locale/beds.uk.tr new file mode 100644 index 00000000..f95da70b --- /dev/null +++ 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=Встати з ліжка diff --git a/mods/beds/locale/beds.zh_CN.tr b/mods/beds/locale/beds.zh_CN.tr index 6a06e09f..7e6cfc7a 100644 --- 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=强制跳过夜晚 diff --git a/mods/binoculars/locale/binoculars.eo.tr b/mods/binoculars/locale/binoculars.eo.tr index 53ad4274..bec8dc14 100644 --- a/mods/binoculars/locale/binoculars.eo.tr +++ b/mods/binoculars/locale/binoculars.eo.tr @@ -1,3 +1,3 @@ # textdomain: binoculars -Binoculars=Binokolo -Use with 'Zoom' key=Uzu per 'Zomo' klavo +Binoculars=Binoklo +Use with 'Zoom' key=Uzi per 'Zomo' klavo diff --git a/mods/binoculars/locale/binoculars.ja.tr b/mods/binoculars/locale/binoculars.ja.tr new file mode 100644 index 00000000..9766f461 --- /dev/null +++ b/mods/binoculars/locale/binoculars.ja.tr @@ -0,0 +1,3 @@ +# textdomain: binoculars +Binoculars=双眼鏡 +Use with 'Zoom' key=ズームキーで使います diff --git a/mods/binoculars/locale/binoculars.pl.tr b/mods/binoculars/locale/binoculars.pl.tr new file mode 100644 index 00000000..9fbd9032 --- /dev/null +++ b/mods/binoculars/locale/binoculars.pl.tr @@ -0,0 +1,3 @@ +# textdomain: binoculars +Binoculars=Lornetka +Use with 'Zoom' key=Aby użyć naciśnij 'Zoom' diff --git a/mods/binoculars/locale/binoculars.se.tr b/mods/binoculars/locale/binoculars.se.tr deleted file mode 100644 index 90326720..00000000 --- a/mods/binoculars/locale/binoculars.se.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Kikare -Use with 'Zoom' key=Används med 'Zoom' knappen diff --git a/mods/binoculars/locale/binoculars.sv.tr b/mods/binoculars/locale/binoculars.sv.tr new file mode 100644 index 00000000..f8a01db2 --- /dev/null +++ b/mods/binoculars/locale/binoculars.sv.tr @@ -0,0 +1,3 @@ +# textdomain: binoculars +Binoculars=Kikare +Use with 'Zoom' key=Använd med 'Zoom'-knappen diff --git a/mods/binoculars/locale/binoculars.uk.tr b/mods/binoculars/locale/binoculars.uk.tr new file mode 100644 index 00000000..cb1d0e5b --- /dev/null +++ b/mods/binoculars/locale/binoculars.uk.tr @@ -0,0 +1,3 @@ +# textdomain: binoculars +Binoculars=Бінокль +Use with 'Zoom' key=Використовується з правами 'Zoom' diff --git a/mods/boats/locale/boats.ja.tr b/mods/boats/locale/boats.ja.tr new file mode 100644 index 00000000..ee2d0863 --- /dev/null +++ b/mods/boats/locale/boats.ja.tr @@ -0,0 +1,4 @@ +# textdomain: boats +Boat cruise mode on=クルージングモード・オン +Boat cruise mode off=クルージングモード・オフ +Boat=ボート diff --git a/mods/boats/locale/boats.pl.tr b/mods/boats/locale/boats.pl.tr new file mode 100644 index 00000000..ce43286a --- /dev/null +++ b/mods/boats/locale/boats.pl.tr @@ -0,0 +1,4 @@ +# textdomain: boats +Boat cruise mode on=Tryb rejsu łodką włączony +Boat cruise mode off=Tryb rejsu łodką wyłączony +Boat=Łódka diff --git a/mods/boats/locale/boats.sk.tr b/mods/boats/locale/boats.sk.tr index b6ed7220..4d313cdf 100644 --- 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 diff --git a/mods/boats/locale/boats.se.tr b/mods/boats/locale/boats.sv.tr similarity index 100% rename from mods/boats/locale/boats.se.tr rename to mods/boats/locale/boats.sv.tr diff --git a/mods/boats/locale/boats.uk.tr b/mods/boats/locale/boats.uk.tr new file mode 100644 index 00000000..662ba6fc --- /dev/null +++ b/mods/boats/locale/boats.uk.tr @@ -0,0 +1,4 @@ +# textdomain: boats +Boat cruise mode on=Режим мандрування на човні увімкнено +Boat cruise mode off=Режим мандрування на човні вимкнено +Boat=Човен diff --git a/mods/bones/locale/bones.eo.tr b/mods/bones/locale/bones.eo.tr index 7e89de1e..d8028f14 100644 --- a/mods/bones/locale/bones.eo.tr +++ b/mods/bones/locale/bones.eo.tr @@ -1,8 +1,8 @@ # textdomain: bones Bones=Ostoj -@1's old bones=La malnova ostoj de @1 +@1's old bones=La malfreŝaj ostoj de @1 @1 died at @2.=@1 mortis ĉe @2 -@1 died at @2, and dropped their inventory.=@1 mortis ĉe @2, kaj ri delasis riaj objektoj. -@1 died at @2, and bones were placed.=@1 mortis ĉe @2, kaj ostoj metis. -@1's fresh bones=La nova ostoj de @1 +@1 died at @2, and dropped their inventory.=@1 mortis ĉe @2, kaj delasis sian stokon. +@1 died at @2, and bones were placed.=@1 mortis ĉe @2, kaj ostoj estas demetitaj. +@1's fresh bones=La freŝaj ostoj de @1 @1's bones=La ostoj de @1 diff --git a/mods/bones/locale/bones.ja.tr b/mods/bones/locale/bones.ja.tr new file mode 100644 index 00000000..8c3f7328 --- /dev/null +++ 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の骨 diff --git a/mods/bones/locale/bones.pl.tr b/mods/bones/locale/bones.pl.tr new file mode 100644 index 00000000..be48a0c9 --- /dev/null +++ b/mods/bones/locale/bones.pl.tr @@ -0,0 +1,8 @@ +# textdomain: bones +Bones=Kości +@1's old bones=Stare kości @1 +@1 died at @2.=@1 umarł w @2. +@1 died at @2, and dropped their inventory.=@1 umarł w @2, i upuścił swój ekwipunek. +@1 died at @2, and bones were placed.=@1 umarł w @2, kości zostały położone. +@1's fresh bones=Świeże kości @1 +@1's bones=Kości @1 diff --git a/mods/bones/locale/bones.se.tr b/mods/bones/locale/bones.sv.tr similarity index 100% rename from mods/bones/locale/bones.se.tr rename to mods/bones/locale/bones.sv.tr diff --git a/mods/bones/locale/bones.uk.tr b/mods/bones/locale/bones.uk.tr new file mode 100644 index 00000000..73b57a76 --- /dev/null +++ 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 diff --git a/mods/bones/locale/bones.zh_CN.tr b/mods/bones/locale/bones.zh_CN.tr index dadf55ef..7911e37c 100644 --- 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的骨骸 diff --git a/mods/bucket/locale/bucket.ja.tr b/mods/bucket/locale/bucket.ja.tr new file mode 100644 index 00000000..df3bbb63 --- /dev/null +++ b/mods/bucket/locale/bucket.ja.tr @@ -0,0 +1,5 @@ +# textdomain: bucket +Empty Bucket=空のバケツ +Water Bucket=水入りバケツ +River Water Bucket=川の水入りバケツ +Lava Bucket=溶岩入りバケツ diff --git a/mods/bucket/locale/bucket.pl.tr b/mods/bucket/locale/bucket.pl.tr new file mode 100644 index 00000000..31600f1b --- /dev/null +++ b/mods/bucket/locale/bucket.pl.tr @@ -0,0 +1,5 @@ +# textdomain: bucket +Empty Bucket=Puste wiadro +Water Bucket=Wiadro z wodą +River Water Bucket=Wiadro z rzeczną wodą +Lava Bucket=Wiadro z lawą diff --git a/mods/bucket/locale/bucket.se.tr b/mods/bucket/locale/bucket.se.tr deleted file mode 100644 index 105b5d3e..00000000 --- a/mods/bucket/locale/bucket.se.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Tom hink -Water Bucket=Vatten hink -River Water Bucket=Flodvatten hink -Lava Bucket=Lava hink diff --git a/mods/bucket/locale/bucket.sv.tr b/mods/bucket/locale/bucket.sv.tr new file mode 100644 index 00000000..59ee62df --- /dev/null +++ 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 diff --git a/mods/bucket/locale/bucket.uk.tr b/mods/bucket/locale/bucket.uk.tr new file mode 100644 index 00000000..a5251a5a --- /dev/null +++ b/mods/bucket/locale/bucket.uk.tr @@ -0,0 +1,5 @@ +# textdomain: bucket +Empty Bucket=Пусте Відро +Water Bucket=Відро З Водою +River Water Bucket=Відро З Річною Водою +Lava Bucket=Відро З Лавою diff --git a/mods/butterflies/locale/butterflies.eo.tr b/mods/butterflies/locale/butterflies.eo.tr index 3dec04e7..83d03a2e 100644 --- a/mods/butterflies/locale/butterflies.eo.tr +++ b/mods/butterflies/locale/butterflies.eo.tr @@ -1,4 +1,4 @@ # textdomain: butterflies White Butterfly=Blanka Papilio Red Butterfly=Ruĝa Papilio -Violet Butterfly=Viola Papilio +Violet Butterfly=Violkolora Papilio diff --git a/mods/butterflies/locale/butterflies.ja.tr b/mods/butterflies/locale/butterflies.ja.tr new file mode 100644 index 00000000..5a22d6bf --- /dev/null +++ b/mods/butterflies/locale/butterflies.ja.tr @@ -0,0 +1,4 @@ +# textdomain: butterflies +White Butterfly=白色の蝶 +Red Butterfly=赤色の蝶 +Violet Butterfly=紫色の蝶 diff --git a/mods/butterflies/locale/butterflies.pl.tr b/mods/butterflies/locale/butterflies.pl.tr new file mode 100644 index 00000000..577f0b88 --- /dev/null +++ b/mods/butterflies/locale/butterflies.pl.tr @@ -0,0 +1,4 @@ +# textdomain: butterflies +White Butterfly=Biały motyl +Red Butterfly=Czerwony motyl +Violet Butterfly=Fioletowy motyl diff --git a/mods/butterflies/locale/butterflies.se.tr b/mods/butterflies/locale/butterflies.sv.tr similarity index 100% rename from mods/butterflies/locale/butterflies.se.tr rename to mods/butterflies/locale/butterflies.sv.tr diff --git a/mods/butterflies/locale/butterflies.uk.tr b/mods/butterflies/locale/butterflies.uk.tr new file mode 100644 index 00000000..4a5995e8 --- /dev/null +++ b/mods/butterflies/locale/butterflies.uk.tr @@ -0,0 +1,4 @@ +# textdomain: butterflies +White Butterfly=Білий Метелик +Red Butterfly=Червоний Метелик +Violet Butterfly=Фіолетовий Метелик diff --git a/mods/carts/cart_entity.lua b/mods/carts/cart_entity.lua index 8008bcfb..3015409e 100644 --- a/mods/carts/cart_entity.lua +++ b/mods/carts/cart_entity.lua @@ -46,9 +46,7 @@ function cart_entity:on_activate(staticdata, dtime_s) return end self.railtype = data.railtype - if data.old_dir then - self.old_dir = data.old_dir - end + self.old_dir = data.old_dir or self.old_dir end function cart_entity:get_staticdata() @@ -192,11 +190,11 @@ local function rail_on_step(self, dtime) end local pos = self.object:get_pos() - local cart_dir = carts:velocity_to_dir(vel) - local same_dir = vector.equals(cart_dir, self.old_dir) + local dir = carts:velocity_to_dir(vel) + local dir_changed = not vector.equals(dir, self.old_dir) local update = {} - if self.old_pos and not self.punched and same_dir then + if self.old_pos and not self.punched and not dir_changed then local flo_pos = vector.round(pos) local flo_old = vector.round(self.old_pos) if vector.equals(flo_pos, flo_old) then @@ -216,7 +214,7 @@ local function rail_on_step(self, dtime) end local stop_wiggle = false - if self.old_pos and same_dir then + if self.old_pos and not dir_changed then -- Detection for "skipping" nodes (perhaps use average dtime?) -- It's sophisticated enough to take the acceleration in account local acc = self.object:get_acceleration() @@ -231,7 +229,7 @@ local function rail_on_step(self, dtime) -- No rail found: set to the expected position pos = new_pos update.pos = true - cart_dir = new_dir + dir = new_dir end elseif self.old_pos and self.old_dir.y ~= 1 and not self.punched then -- Stop wiggle @@ -241,21 +239,27 @@ local function rail_on_step(self, dtime) local railparams -- dir: New moving direction of the cart - -- switch_keys: Currently pressed L/R key, used to ignore the key on the next rail node - local dir, switch_keys = carts:get_rail_direction( - pos, cart_dir, ctrl, self.old_switch, self.railtype + -- switch_keys: Currently pressed L(1) or R(2) key, + -- used to ignore the key on the next rail node + local switch_keys + dir, switch_keys = carts:get_rail_direction( + pos, dir, ctrl, self.old_switch, self.railtype ) - local dir_changed = not vector.equals(dir, self.old_dir) + dir_changed = not vector.equals(dir, self.old_dir) - local new_acc = {x=0, y=0, z=0} + local acc = 0 if stop_wiggle or vector.equals(dir, {x=0, y=0, z=0}) then + dir = vector.new(self.old_dir) vel = {x = 0, y = 0, z = 0} local pos_r = vector.round(pos) if not carts:is_rail(pos_r, self.railtype) and self.old_pos then pos = self.old_pos elseif not stop_wiggle then + -- End of rail: Smooth out. pos = pos_r + dir_changed = false + dir.y = 0 else pos.y = math.floor(pos.y + 0.5) end @@ -282,7 +286,7 @@ local function rail_on_step(self, dtime) end -- Slow down or speed up.. - local acc = dir.y * -4.0 + acc = dir.y * -4.0 -- Get rail for corrected position railparams = get_railparams(pos) @@ -300,25 +304,22 @@ local function rail_on_step(self, dtime) acc = acc - 0.4 end end - - new_acc = vector.multiply(dir, acc) end - -- Limits - local max_vel = carts.speed_max - for _, v in pairs({"x","y","z"}) do - if math.abs(vel[v]) > max_vel then - vel[v] = carts:get_sign(vel[v]) * max_vel - new_acc[v] = 0 - update.vel = true - end + -- Limit cart speed + local vel_len = vector.length(vel) + if vel_len > carts.speed_max then + vel = vector.multiply(vel, carts.speed_max / vel_len) + update.vel = true + end + if vel_len >= carts.speed_max and acc > 0 then + acc = 0 end - self.object:set_acceleration(new_acc) + self.object:set_acceleration(vector.multiply(dir, acc)) + self.old_pos = vector.round(pos) - if not vector.equals(dir, {x=0, y=0, z=0}) and not stop_wiggle then - self.old_dir = vector.new(dir) - end + self.old_dir = vector.new(dir) self.old_switch = switch_keys if self.punched then @@ -344,11 +345,11 @@ local function rail_on_step(self, dtime) end local yaw = 0 - if self.old_dir.x < 0 then + if dir.x < 0 then yaw = 0.5 - elseif self.old_dir.x > 0 then + elseif dir.x > 0 then yaw = 1.5 - elseif self.old_dir.z < 0 then + elseif dir.z < 0 then yaw = 1 end self.object:set_yaw(yaw * math.pi) @@ -398,7 +399,7 @@ minetest.register_craftitem("carts:cart", { pointed_thing) or itemstack end - if not pointed_thing.type == "node" then + if pointed_thing.type ~= "node" then return end if carts:is_rail(pointed_thing.under) then diff --git a/mods/carts/locale/carts.eo.tr b/mods/carts/locale/carts.eo.tr index 4498e9bb..939e542e 100644 --- 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)=(Ŝteliri+Alklaki por reprini) Rail=Relo Powered Rail=Elektra Relo Brake Rail=Bremsa Relo -Cart=Ĉaro -(Sneak+Click to pick up)=(Ŝteliru+Alklaku por reprini) diff --git a/mods/carts/locale/carts.ja.tr b/mods/carts/locale/carts.ja.tr new file mode 100644 index 00000000..30c14ce2 --- /dev/null +++ b/mods/carts/locale/carts.ja.tr @@ -0,0 +1,6 @@ +# textdomain: carts +Cart=トロッコ +(Sneak+Click to pick up)=(スニークキーとクリックで乗ります) +Rail=レール +Powered Rail=パワードレール +Brake Rail=ブレーキレール diff --git a/mods/carts/locale/carts.pl.tr b/mods/carts/locale/carts.pl.tr new file mode 100644 index 00000000..d0cb8792 --- /dev/null +++ b/mods/carts/locale/carts.pl.tr @@ -0,0 +1,6 @@ +# textdomain: carts +Cart=Wagonik +(Sneak+Click to pick up)=(Skradanie+Naciśnij aby zebrać) +Rail=Tory +Powered Rail=Napędzane tory +Brake Rail=Hamujące tory diff --git a/mods/carts/locale/carts.se.tr b/mods/carts/locale/carts.sv.tr similarity index 84% rename from mods/carts/locale/carts.se.tr rename to mods/carts/locale/carts.sv.tr index b59871f2..0521ca85 100644 --- a/mods/carts/locale/carts.se.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 diff --git a/mods/carts/locale/carts.uk.tr b/mods/carts/locale/carts.uk.tr new file mode 100644 index 00000000..2b236c54 --- /dev/null +++ b/mods/carts/locale/carts.uk.tr @@ -0,0 +1,6 @@ +# textdomain: carts +Cart=Вагонетка +(Sneak+Click to pick up)=(Пригніться та клікніть по вагонетці, щоб забрати) +Rail=Рейки +Powered Rail=Задіяні Рейки +Brake Rail=Гальмівні Рейки diff --git a/mods/creative/inventory.lua b/mods/creative/inventory.lua index 46da80a1..1f9a1d50 100644 --- 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;] diff --git a/mods/creative/locale/creative.eo.tr b/mods/creative/locale/creative.eo.tr index 4d56c4aa..1bb4fdc0 100644 --- a/mods/creative/locale/creative.eo.tr +++ b/mods/creative/locale/creative.eo.tr @@ -1,10 +1,10 @@ # textdomain: creative -Search=Serĉu -Reset=Rekomencigu -Previous page=Pasinta paĝo -Next page=Sekvinta paĝo +Allow player to use creative inventory=Permesi ke la ludanto uzu la kreeman stokon +Search=Serĉi +Reset=Rekomencigi +Previous page=Antaŭa paĝo +Next page=Sekva paĝo All=Ĉio Nodes=Nodoj Tools=Iloj Items=Objektoj -Allow player to use creative inventory=Permesu la ludanto uzi la krea stoko diff --git a/mods/creative/locale/creative.ja.tr b/mods/creative/locale/creative.ja.tr new file mode 100644 index 00000000..1c215bbf --- /dev/null +++ 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=アイテム diff --git a/mods/creative/locale/creative.pl.tr b/mods/creative/locale/creative.pl.tr new file mode 100644 index 00000000..7844cd69 --- /dev/null +++ b/mods/creative/locale/creative.pl.tr @@ -0,0 +1,10 @@ +# textdomain: creative +Allow player to use creative inventory=Zezwól graczom na używanie kreatywnego ekwipunku +Search=Wyszukaj +Reset=Zresetuj +Previous page=Poprzednia strona +Next page=Następna strona +All=Wszystko +Nodes=Bloki +Tools=Narzędzia +Items=Przedmioty diff --git a/mods/creative/locale/creative.se.tr b/mods/creative/locale/creative.se.tr deleted file mode 100644 index 3b5da58f..00000000 --- a/mods/creative/locale/creative.se.tr +++ /dev/null @@ -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 diff --git a/mods/creative/locale/creative.sv.tr b/mods/creative/locale/creative.sv.tr new file mode 100644 index 00000000..a9a741f4 --- /dev/null +++ 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 diff --git a/mods/creative/locale/creative.uk.tr b/mods/creative/locale/creative.uk.tr new file mode 100644 index 00000000..4e68caa2 --- /dev/null +++ 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=Предмети diff --git a/mods/default/README.txt b/mods/default/README.txt index a2eaebd9..949b9402 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -178,7 +178,7 @@ Gambit (CC BY-SA 3.0): default_iron_lump.png default_gold_lump.png default_clay_lump.png - default_coal.png + default_coal_lump.png default_grass_*.png default_paper.png default_diamond_block.png @@ -188,8 +188,6 @@ Gambit (CC BY-SA 3.0): default_snow.png default_snow_side.png default_snowball.png - default_key.png - default_key_skeleton.png default_book.png asl97 (CC BY-SA 3.0): @@ -299,7 +297,6 @@ https://www.freesound.org/people/AGFX/packs/1253/ default_water_footstep.1.ogg default_water_footstep.2.ogg default_water_footstep.3.ogg -(default_water_footstep.4.ogg is silent) blukotek (CC0 1.0): https://www.freesound.org/people/blukotek/sounds/251660/ diff --git a/mods/default/chests.lua b/mods/default/chests.lua index f4462ae7..585b5f7c 100644 --- a/mods/default/chests.lua +++ b/mods/default/chests.lua @@ -222,21 +222,7 @@ function default.chest.register_chest(prefixed_name, d) end end - def.on_metadata_inventory_move = function(pos, from_list, from_index, - to_list, to_index, count, player) - minetest.log("action", player:get_player_name() .. - " moves stuff in chest at " .. minetest.pos_to_string(pos)) - end - def.on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name() .. - " moves " .. stack:get_name() .. - " to chest at " .. minetest.pos_to_string(pos)) - end - def.on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name() .. - " takes " .. stack:get_name() .. - " from chest at " .. minetest.pos_to_string(pos)) - end + default.set_inventory_action_loggers(def, "chest") local def_opened = table.copy(def) local def_closed = table.copy(def) diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index efb26ef3..d2e827f4 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -3,6 +3,52 @@ -- 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 book_writers = {} + +minetest.register_on_leaveplayer(function(player) + book_writers[player:get_player_name()] = nil +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 +65,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 +76,28 @@ 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) + -- Store the wield index in case the user accidentally switches before the formspec is shown + book_writers[player_name] = {wield_index = user:get_wield_index()} return itemstack end @@ -68,14 +105,56 @@ local max_text_size = 10000 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 + 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() + if not book_writers[player_name] then + return + end + local wield_index = book_writers[player_name].wield_index + local wield_list = player:get_wield_list() + local stack = inv:get_stack(wield_list, wield_index) + local written = stack:get_name() == "default:book_written" + if stack:get_name() ~= "default:book" and not written then + -- No book in the wield slot, abort & inform the player + minetest.chat_send_player(player_name, S("The book you were writing to mysteriously disappeared.")) + return + end + 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 - if stack:get_name() ~= "default:book_written" then + 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.close then + book_writers[player_name] = nil + end + + if fields.save and fields.title and fields.text then + local new_stack + if not written then local count = stack:get_count() if count == 1 then stack:set_name("default:book_written") @@ -83,11 +162,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 +194,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 @@ -142,64 +218,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end -- Update stack - player:set_wielded_item(stack) + inv:set_stack(wield_list, wield_index, 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 +449,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 +492,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", diff --git a/mods/default/functions.lua b/mods/default/functions.lua index 1e46c45e..0afd97ed 100644 --- 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 @@ -711,6 +715,47 @@ function default.register_craft_metadata_copy(ingredient, result) end) end +-- +-- Log API / helpers +-- + +local log_non_player_actions = minetest.settings:get_bool("log_non_player_actions", false) + +local is_pos = function(v) + return type(v) == "table" and + type(v.x) == "number" and type(v.y) == "number" and type(v.z) == "number" +end + +function default.log_player_action(player, ...) + local msg = player:get_player_name() + if player.is_fake_player or not player:is_player() then + if not log_non_player_actions then + return + end + msg = msg .. "(" .. (type(player.is_fake_player) == "string" + and player.is_fake_player or "*") .. ")" + end + for _, v in ipairs({...}) do + -- translate pos + local part = is_pos(v) and minetest.pos_to_string(v) or v + -- no leading spaces before punctuation marks + msg = msg .. (string.match(part, "^[;,.]") and "" or " ") .. part + end + minetest.log("action", msg) +end + +function default.set_inventory_action_loggers(def, name) + def.on_metadata_inventory_move = function(pos, from_list, from_index, + to_list, to_index, count, player) + default.log_player_action(player, "moves stuff in", name, "at", pos) + end + def.on_metadata_inventory_put = function(pos, listname, index, stack, player) + default.log_player_action(player, "moves", stack:get_name(), "to", name, "at", pos) + end + def.on_metadata_inventory_take = function(pos, listname, index, stack, player) + default.log_player_action(player, "takes", stack:get_name(), "from", name, "at", pos) + end +end -- -- NOTICE: This method is not an official part of the API yet. diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua index d5703cd6..e4bc0568 100644 --- a/mods/default/furnace.lua +++ b/mods/default/furnace.lua @@ -3,6 +3,9 @@ -- support for MT game translation. local S = default.get_translator +-- List of sound handles for active furnace +local furnace_fire_sounds = {} + -- -- Formspecs -- @@ -91,6 +94,17 @@ local function allow_metadata_inventory_take(pos, listname, index, stack, player return stack:get_count() end +local function stop_furnace_sound(pos, fadeout_step) + local hash = minetest.hash_node_position(pos) + local sound_ids = furnace_fire_sounds[hash] + if sound_ids then + for _, sound_id in ipairs(sound_ids) do + minetest.sound_fade(sound_id, -1, 0) + end + furnace_fire_sounds[hash] = nil + end +end + local function swap_node(pos, name) local node = minetest.get_node(pos) if node.name == name then @@ -159,7 +173,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 +191,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 +266,30 @@ 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 - minetest.sound_play("default_furnace_active", - {pos = pos, max_hear_distance = 16, gain = 0.5}, true) + if timer_elapsed == 0 or (timer_elapsed + 1) % 5 == 0 then + local sound_id = minetest.sound_play("default_furnace_active", + {pos = pos, max_hear_distance = 16, gain = 0.25}) + local hash = minetest.hash_node_position(pos) + furnace_fire_sounds[hash] = furnace_fire_sounds[hash] or {} + table.insert(furnace_fire_sounds[hash], sound_id) + -- Only remember the 3 last sound handles + if #furnace_fire_sounds[hash] > 3 then + table.remove(furnace_fire_sounds[hash], 1) + end + -- Remove the sound ID automatically from table after 11 seconds + minetest.after(11, function() + if not furnace_fire_sounds[hash] then + return + end + for f=#furnace_fire_sounds[hash], 1, -1 do + if furnace_fire_sounds[hash][f] == sound_id then + table.remove(furnace_fire_sounds[hash], f) + end + end + if #furnace_fire_sounds[hash] == 0 then + furnace_fire_sounds[hash] = nil + end + end) end else if fuellist and not fuellist[1]:is_empty() then @@ -258,6 +300,8 @@ local function furnace_node_timer(pos, elapsed) -- stop timer on the inactive furnace minetest.get_node_timer(pos):stop() meta:set_int("timer_elapsed", 0) + + stop_furnace_sound(pos) end @@ -362,6 +406,9 @@ minetest.register_node("default:furnace_active", { is_ground_content = false, sounds = default.node_sound_stone_defaults(), on_timer = furnace_node_timer, + on_destruct = function(pos) + stop_furnace_sound(pos) + end, can_dig = can_dig, diff --git a/mods/default/init.lua b/mods/default/init.lua index 7d27f98a..993316b8 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -17,10 +17,7 @@ default.get_translator = S -- and avoids obscure, hard to debug runtime errors. -- This section should be updated before release and older checks can be dropped -- when newer ones are introduced. -if not minetest.is_creative_enabled or not minetest.has_feature({ - direct_velocity_on_players = true, - use_texture_alpha_string_modes = true, - }) then +if ItemStack("").add_wear_by_uses == nil then error("\nThis version of Minetest Game is incompatible with your engine version ".. "(which is too old). You should download a version of Minetest Game that ".. "matches the installed engine version.\n") diff --git a/mods/default/item_entity.lua b/mods/default/item_entity.lua index 25fb8328..3e6cc9db 100644 --- 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({ diff --git a/mods/default/locale/default.de.tr b/mods/default/locale/default.de.tr index a1e49dc0..9bee6b8a 100644 --- a/mods/default/locale/default.de.tr +++ b/mods/default/locale/default.de.tr @@ -4,14 +4,15 @@ 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 +The book you were writing to mysteriously disappeared.=Das Buch, an dem Sie geschrieben haben, ist auf mysteriöse Weise verschwunden. "@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 +211,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. diff --git a/mods/default/locale/default.eo.tr b/mods/default/locale/default.eo.tr index 824a6b77..d50f3b43 100644 --- a/mods/default/locale/default.eo.tr +++ b/mods/default/locale/default.eo.tr @@ -1,32 +1,77 @@ # 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 tiun keston. +a locked chest=ŝlosita kesto +Chest=Kesto +Write=Skribi +Read=Legi +Title:=Titolo: +Contents:=Enhavo: +Save=Konservi +by @1=per @1 +Page @1 of @2=Paĝo @1 el @2 +The book you were writing to mysteriously disappeared.=La libro, kiun vi skribis, mistere malaperis. +"@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% (plena eligo) +@1%=@1% +Not cookable=Nekuirebla +Empty=Malplena +Furnace active=Forno laboras +Furnace inactive=Forno ne laboras +(Item: @1; Fuel: @2)=(Objekto: @1; Brulaĵo: @2) +Furnace=Forno Stone=Ŝtono Cobblestone=Pavimŝtono Stone Brick=Ŝtona Briko -Stone Block=Ŝtona Ŝtipo +Stone Block=Ŝtona Bloko Mossy Cobblestone=Muska Pavimŝtono Desert Stone=Dezerta Ŝtono Desert Cobblestone=Dezerta Pavimŝtono Desert Stone Brick=Dezerta Ŝtona Briko -Desert Stone Block=Dezerta Ŝtona Ŝtipo +Desert Stone Block=Dezerta Ŝtona Bloko Sandstone=Sablaŝtono Sandstone Brick=Sablaŝtono Briko -Sandstone Block=Sablaŝtono Ŝtipo +Sandstone Block=Sablaŝtono Bloko Desert Sandstone=Dezerta Sablaŝtono Desert Sandstone Brick=Dezerta Sablaŝtono Briko -Desert Sandstone Block=Dezerta Sablaŝtono Ŝtipo +Desert Sandstone Block=Dezerta Sablaŝtono Bloko Silver Sandstone=Arĝenta Sablaŝtono Silver Sandstone Brick=Arĝenta Sablaŝtono Briko -Silver Sandstone Block=Arĝenta Sablaŝtono Ŝtipo +Silver Sandstone Block=Arĝenta Sablaŝtono Bloko Obsidian=Obsidiano Obsidian Brick=Obsidiana Briko -Obsidian Block=Obsidiana Ŝtipo +Obsidian Block=Obsidiana Bloko Dirt=Tero Dirt with Grass=Tero kun Herbo Dirt with Grass and Footsteps=Tero kun Herbo kaj Piedpaŝoj Dirt with Savanna Grass=Tero kun Savana Herbo Dirt with Snow=Tero kun Neĝo Dirt with Rainforest Litter=Tero kun Pluvarbara Folioj -Dirt with Coniferous Litter=Tero kun Konifera Folioj +Dirt with Coniferous Litter=Tero kun Koniferaj Folioj Savanna Dirt=Savana Tero Savanna Dirt with Savanna Grass=Savana Tero kun Savana Herbo Permafrost=Ĉiamfrosto @@ -38,47 +83,47 @@ Silver Sand=Arĝenta Sablo Gravel=Gruzo Clay=Argilo Snow=Neĝo -Snow Block=Neĝa Ŝtipo +Snow Block=Neĝa Bloko Ice=Glacio Cave Ice=Kaverna Glacio -Apple Tree=Poma Arbo -Apple Wood Planks=Poma Ligna Tabuloj -Apple Tree Sapling=Poma Arba Arbido -Apple Tree Leaves=Poma Arba Folioj +Apple Tree=Pomarbo +Apple Wood Planks=Pomarbaj Lignaj Tabuloj +Apple Tree Sapling=Pomarba Arbido +Apple Tree Leaves=Pomarbaj Folioj Apple=Pomo Apple Marker=Poma Marko Jungle Tree=Ĝangala Arbo -Jungle Wood Planks=Ĝangala Ligna Tabuloj -Jungle Tree Leaves=Ĝangala Arba Folioj +Jungle Wood Planks=Ĝangalaj Lignaj Tabuloj +Jungle Tree Leaves=Ĝangalaj Arbaj Folioj Jungle Tree Sapling=Ĝangala Arba Arbido Emergent Jungle Tree Sapling=Nova Ĝangala Arba Arbido -Pine Tree=Pina Arbo -Pine Wood Planks=Pina Ligna Tabuloj +Pine Tree=Pino +Pine Wood Planks=Pinaj Lignaj Tabuloj Pine Needles=Pinpingloj -Pine Tree Sapling=Pina Arba Arbido -Acacia Tree=Akacia Arbo -Acacia Wood Planks=Akacia Ligna Tabuloj -Acacia Tree Leaves=Akacia Arba Folioj -Acacia Tree Sapling=Akacia Arba Arbido -Aspen Tree=Tremola Arba -Aspen Wood Planks=Tremola Ligna Tabuloj -Aspen Tree Leaves=Tremola Arbo Folioj -Aspen Tree Sapling=Tremola Arba Arbido +Pine Tree Sapling=Pina Arbido +Acacia Tree=Akacio +Acacia Wood Planks=Akaciaj Lignaj Tabuloj +Acacia Tree Leaves=Akaciaj Folioj +Acacia Tree Sapling=Akacia Arbido +Aspen Tree=Tremolo +Aspen Wood Planks=Tremolaj Lignaj Tabuloj +Aspen Tree Leaves=Tremolaj Folioj +Aspen Tree Sapling=Tremola Arbido Coal Ore=Karba Minaĵo -Coal Block=Karba Ŝtipo +Coal Block=Karba Bloko Iron Ore=Fera Minaĵo -Steel Block=Ŝtala Ŝtipo +Steel Block=Ŝtala Bloko Copper Ore=Kupra Minaĵo -Copper Block=Kupra Ŝtipo +Copper Block=Kupra Bloko Tin Ore=Stana Minaĵo -Tin Block=Stana Ŝtipo -Bronze Block=Bronza Ŝtipo +Tin Block=Stana Bloko +Bronze Block=Bronza Bloko Mese Ore=Mesea Minaĵo -Mese Block=Mesea Ŝtipo +Mese Block=Mesea Bloko Gold Ore=Ora Minaĵo -Gold Block=Ora Ŝtipo +Gold Block=Ora Bloko Diamond Ore=Diamanta Minaĵo -Diamond Block=Diamanta Ŝtipo +Diamond Block=Diamanta Bloko Cactus=Kakto Large Cactus Seedling=Granda Kakta Kreskaĵo Papyrus=Papiruso @@ -89,23 +134,23 @@ Savanna Grass=Savana Herbo Fern=Filiko Marram Grass=Amofilo Bush Stem=Arbateĵa Tubo -Bush Leaves=Arbateĵa Folioj +Bush Leaves=Arbateĵaj Folioj Bush Sapling=Arbateĵa Arbido -Blueberry Bush Leaves with Berries=Mirtela Arbateĵa Folioj kaj Beroj -Blueberry Bush Leaves=Mirtela Arbateĵa Folioj +Blueberry Bush Leaves with Berries=Mirtelaj Arbateĵaj Folioj kaj Beroj +Blueberry Bush Leaves=Mirtelaj Arbateĵaj Folioj Blueberry Bush Sapling=Mirtela Arbateĵa Arbido Acacia Bush Stem=Akacia Arbateĵa Tubo -Acacia Bush Leaves=Akacia Arbateĵa Folioj +Acacia Bush Leaves=Akaciaj Arbateĵaj Folioj Acacia Bush Sapling=Akacia Arbateĵa Arbido Pine Bush Stem=Pina Arbateĵa Tubo -Pine Bush Needles=Pina Arbateĵa Pingloj +Pine Bush Needles=Pinaj Arbateĵaj Pingloj Pine Bush Sapling=Pina Arbateĵa Arbido Kelp=Fuko Green Coral=Verda Koralo Pink Coral=Rozkolora Koralo Cyan Coral=Bluverda Koralo Brown Coral=Bruna Koralo -Orange Coral=Oranĝa Koralo +Orange Coral=Oranĝkolora Koralo Coral Skeleton=Korala Framo Water Source=Akva Fonto Flowing Water=Flua Akvo @@ -114,9 +159,9 @@ Flowing River Water=Flua Rivera Akvo Lava Source=Lafa Fonto Flowing Lava=Flua Lafa Empty Bookshelf=Malplena Librobreto -Bookshelf (@1 written, @2 empty books)=Librobreto (@1 skriba, @2 malplena libroj) +Bookshelf (@1 written, @2 empty books)=Librobreto (@1 skriba(j), @2 malplena(j) libro(j)) Bookshelf=Librobreto -Text too long=Teksto estas ekscesa longo +Text too long=Tro longa teksto Wooden Sign=Ligna Signo Steel Sign=Ŝtala Signo Wooden Ladder=Ligna Ŝtupetaro @@ -133,12 +178,14 @@ Pine Wood Fence Rail=Pina Ligna Barila Relo Aspen Wood Fence Rail=Tremola Ligna Barila Relo Glass=Vitro Obsidian Glass=Obsidiana Vitro -Brick Block=Brika Ŝtipo +Brick Block=Brika Bloko Mese Lamp=Mesea Lampo -Mese Post Light=Mesea Fosta Lampo +Apple Wood Mese Post Light=Poma Ligna Mesea Fosta Lampo +Acacia Wood Mese Post Light=Akacia Ligna Mesea Fosta Lampo +Jungle Wood Mese Post Light=Ĝangala Ligna Mesea Fosta Lampo +Pine Wood Mese Post Light=Pina Ligna Mesea Fosta Lampo +Aspen Wood Mese Post Light=Tremola Ligna Mesea Fosta Lampo 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,11 @@ 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 protekton dum kresko. + + +##### not used anymore ##### + +Mese Post Light=Mesea Fosta Lampo + diff --git a/mods/default/locale/default.es.tr b/mods/default/locale/default.es.tr index 094e8c61..d08c2d2e 100644 --- a/mods/default/locale/default.es.tr +++ b/mods/default/locale/default.es.tr @@ -1,18 +1,18 @@ # 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 +The book you were writing to mysteriously disappeared.= "@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 +211,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. diff --git a/mods/default/locale/default.fr.tr b/mods/default/locale/default.fr.tr index d74cb83d..c5e5bf04 100644 --- a/mods/default/locale/default.fr.tr +++ b/mods/default/locale/default.fr.tr @@ -4,14 +4,15 @@ 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 +The book you were writing to mysteriously disappeared.= "@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 +64,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 +130,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 +153,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 +165,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 +181,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 +206,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. diff --git a/mods/default/locale/default.id.tr b/mods/default/locale/default.id.tr index 658f0741..fbeec327 100644 --- a/mods/default/locale/default.id.tr +++ b/mods/default/locale/default.id.tr @@ -4,14 +4,15 @@ 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 +The book you were writing to mysteriously disappeared.= "@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 +211,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. diff --git a/mods/default/locale/default.it.tr b/mods/default/locale/default.it.tr index 92029d66..39406659 100644 --- a/mods/default/locale/default.it.tr +++ b/mods/default/locale/default.it.tr @@ -4,14 +4,15 @@ 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= +The book you were writing to mysteriously disappeared.= "@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 +211,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. diff --git a/mods/default/locale/default.ja.tr b/mods/default/locale/default.ja.tr new file mode 100644 index 00000000..e6249d93 --- /dev/null +++ b/mods/default/locale/default.ja.tr @@ -0,0 +1,215 @@ +# 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 ページ +The book you were writing to mysteriously disappeared.= +"@1" by @2=@2著「@1」 +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は成長するとき保護と交差します。 diff --git a/mods/default/locale/default.jbo.tr b/mods/default/locale/default.jbo.tr index 6f3e7492..5ae97224 100644 --- a/mods/default/locale/default.jbo.tr +++ b/mods/default/locale/default.jbo.tr @@ -4,14 +4,15 @@ 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=ciska +Read=tcidu 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 +Page @1 of @2=meirmoi fe li @1 li @2 +The book you were writing to mysteriously disappeared.=lo cukta poi do ciska ke'a cu cizra canci "@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 @@ -58,7 +59,7 @@ Sandstone Block=lo canro'i bliku Desert Sandstone=lo cantu'a canro'i Desert Sandstone Brick=lo morna ke cantu'a canro'i Desert Sandstone Block=lo cantu'a canro'i bliku -Silver Sandstone=lo rijyska sanro'i +Silver Sandstone=lo rijyska canro'i Silver Sandstone Brick=lo morna ke rijyska canro'i Silver Sandstone Block=lo rijyska canro'i bliku Obsidian=lo je'erma'ablaci @@ -73,9 +74,9 @@ Dirt with Rainforest Litter=lo dertu joi glatimdemricfoi bo festi Dirt with Coniferous Litter=lo dertu joi ckunu bo festi Savanna Dirt=lo sudytu'a dertu Savanna Dirt with Savanna Grass=lo sudysu'a bo dertu joi sudytu'a bo srasu -Permafrost=le bislunsa dertu -Permafrost with Stones=le bislunsa bo dertu joi rokci -Permafrost with Moss=le bislunsa bo dertu joi clika +Permafrost=lo vi'orbisloi +Permafrost with Stones=lo vi'orbisloi joi rokci +Permafrost with Moss=lo vi'orbisloi joi clika Sand=lo canre Desert Sand=lo cantu'a canre Silver Sand=lo rijyska canre @@ -86,7 +87,7 @@ Snow Block=lo snime bliku Ice=lo bisli Cave Ice=lo kevzda bisli Apple Tree=lo plisytricu ricystani -Apple Wood Planks=lo plise mudri tanbo +Apple Wood Planks=lo plisymudri tanbo Apple Tree Sapling=lo plisytricu ciftricu Apple Tree Leaves=lo plisytricu pezli Apple=lo plise @@ -97,7 +98,7 @@ Jungle Tree Leaves=lo glatimdemricfoi pezli Jungle Tree Sapling=lo glatimdemricfoi ciftricu Emergent Jungle Tree Sapling=lo barda ke glatimdemricfoi ciftricu Pine Tree=lo ckunu ricystani -Pine Wood Planks=lo ckunu mudri tanbo +Pine Wood Planks=lo ku'urmudri tanbo Pine Needles=lo ckunu jezpezli Pine Tree Sapling=lo ckunu ciftricu Acacia Tree=lo atkaci,ia ricystani @@ -166,25 +167,25 @@ Wooden Sign=lo mudri sinxa Steel Sign=lo gasta sinxa Wooden Ladder=lo mudri rajyserti Steel Ladder=lo gasta rajyserti -Apple Wood Fence=lo plise mudri garbi'u +Apple Wood Fence=lo plisymudri garbi'u Acacia Wood Fence=lo atkaci,ia mudri garbi'u Jungle Wood Fence=lo glatimdemricfoi mudri garbi'u -Pine Wood Fence=lo ckunu mudri garbi'u +Pine Wood Fence=lo ku'urmudri garbi'u Aspen Wood Fence=lo mudrpopulu garbi'u -Apple Wood Fence Rail=lo plise mudri garbi'u garna +Apple Wood Fence Rail=lo plisymudri garbi'u garna Acacia Wood Fence Rail=lo atkaci,ia mudri garbi'u garna Jungle Wood Fence Rail=lo glatimdemricfoi mudri garbi'u garna -Pine Wood Fence Rail=lo ckunu mudri garbi'u garna +Pine Wood Fence Rail=lo ku'urmudri garbi'u garna Aspen Wood Fence Rail=lo mudrpopulu garbi'u garna Glass=lo blaci Obsidian Glass=lo je'erma'ablaci blaci Brick Block=lo kitybli bliku -Mese Lamp=lo za'e kunrmese tergu'i -Apple Wood Mese Post Light=lo plise mudri za'e kunrmese ke kamju tergu'i -Acacia Wood Mese Post Light=lo atkaci,ia mudri za'e kunrmese ke kamju tergu'i -Jungle Wood Mese Post Light=lo glatimdemricfoi mudri za'e kunrmese ke kamju tergu'i -Pine Wood Mese Post Light=lo ckunu mudri za'e kunrmese ke kamju tergu'i -Aspen Wood Mese Post Light=lo mudrpopulu za'e kunrmese ke kamju tergu'i +Mese Lamp=lo za'e gusrmese +Apple Wood Mese Post Light=lo plisymudri ke kamju za'e gusrmese +Acacia Wood Mese Post Light=lo atkaci,ia mudri ke kamju za'e gusrmese +Jungle Wood Mese Post Light=lo glatimdemricfoi mudri ke kamju za'e gusrmese +Pine Wood Mese Post Light=lo ku'urmudri ke kamju za'e gusrmese +Aspen Wood Mese Post Light=lo mudrpopulu ke kamju za'e gusrmese Cloud=lo dilnu Wooden Pickaxe=lo mudri velkakpymru Stone Pickaxe=lo rokci velkakpymru @@ -210,6 +211,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 diff --git a/mods/default/locale/default.ms.tr b/mods/default/locale/default.ms.tr index 8c1ed42c..35d66d20 100644 --- a/mods/default/locale/default.ms.tr +++ b/mods/default/locale/default.ms.tr @@ -4,14 +4,15 @@ 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 +The book you were writing to mysteriously disappeared.= "@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 +211,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. diff --git a/mods/default/locale/default.pl.tr b/mods/default/locale/default.pl.tr new file mode 100644 index 00000000..dd08b841 --- /dev/null +++ b/mods/default/locale/default.pl.tr @@ -0,0 +1,215 @@ +# textdomain: default +Locked Chest=Zablokowana skrzynia +Locked Chest (owned by @1)=Zablokowana skrzynia (właściciel: @1) +You do not own this chest.=Nie jesteś właścicielem tej skrzyni. +a locked chest=zablokowana skrzynia +Chest=Skrzynia +Write=Zapis +Read=Odczyt +Title:=Tytuł: +Contents:=Zawartość: +Save=Zapisz +by @1=autor: @1 +Page @1 of @2=Strona @1 z @2 +The book you were writing to mysteriously disappeared.= +"@1" by @2="@1" przez @2 +Blueberries=Jagody +Book=Książka +Book with Text=Zapisana książka +Bronze Ingot=Sztabka brązu +Clay Brick=Gliniana cegła +Clay Lump=Glina +Coal Lump=Węgiel +Copper Ingot=Sztabka miedzi +Copper Lump=Bryłka miedzi +Diamond=Diament +Flint=Krzemień +Gold Ingot=Sztabka złota +Gold Lump=Bryłka złota +Iron Lump=Bryłka żelaza +Mese Crystal=Kryształ Mese +Mese Crystal Fragment=Fragment kryształu Mese +Obsidian Shard=Odłamek obsydianu +Paper=Papier +Steel Ingot=Sztabka stali +Stick=Patyk +Tin Ingot=Sztabka cyny +Tin Lump=Bryłka cyny +Furnace is empty=Piec jest pusty +100% (output full)=100% (zapełnione) +@1%=@1% +Not cookable=Nie nadaje się do przepalania +Empty=Puste +Furnace active=Piec aktywny +Furnace inactive=Piec nieaktywny +(Item: @1; Fuel: @2)=(Przedmiot: @1; Paliwo: @2) +Furnace=Piec +Stone=Kamień +Cobblestone=Bruk +Stone Brick=Kamienne cegły +Stone Block=Blok kamienia +Mossy Cobblestone=Bruk z mchem +Desert Stone=Pustynny kamień +Desert Cobblestone=Pustynny bruk +Desert Stone Brick=Pustynne kamienne cegły +Desert Stone Block=Blok pustynnego kamienia +Sandstone=Piaskowiec +Sandstone Brick=Cegły z piaskowca +Sandstone Block=Blok piaskowca +Desert Sandstone=Pustynny piaskowiec +Desert Sandstone Brick=Cegły z pustynnego piaskowca +Desert Sandstone Block=Blok pustynnego piaskowca +Silver Sandstone=Srebrny piaskowiec +Silver Sandstone Brick=Cegły z srebrnego piaskowca +Silver Sandstone Block=Blok srebrnego piaskowca +Obsidian=Obsydian +Obsidian Brick=Obsydianowe cegły +Obsidian Block=Blok obsydianu +Dirt=Ziemia +Dirt with Grass=Ziemia z trawą +Dirt with Grass and Footsteps=Ziemia z trawą i śladami +Dirt with Savanna Grass=Ziemia z sawannową trawą +Dirt with Snow=Ziemia ze śniegiem +Dirt with Rainforest Litter=Ziemia ze ściółką lasu deszczowego +Dirt with Coniferous Litter=Ziemia ze ściółką lasu iglastego +Savanna Dirt=Sawannowa ziemia +Savanna Dirt with Savanna Grass=Sawannowa ziemia z sawannową trawą +Permafrost=Zmarzlina +Permafrost with Stones=Zmarzlina z kamieniami +Permafrost with Moss=Zmarzlina z mchem +Sand=Piasek +Desert Sand=Pustynny piasek +Silver Sand=Srebrny piasek +Gravel=Żwir +Clay=Glina +Snow=Śnieg +Snow Block=Blok śniegu +Ice=Lód +Cave Ice=Jaskiniowy lód +Apple Tree=Jabłkowe drewno +Apple Wood Planks=Deski z drzewa jabłkowego +Apple Tree Sapling=Sadzonka drzewa jabłkowego +Apple Tree Leaves=Liście drzewa jabłkowego +Apple=Jabłko +Apple Marker=Znacznik jabłka +Jungle Tree=Dżunglowe drewno +Jungle Wood Planks=Deski z dżunglowego drzewa +Jungle Tree Leaves=Liście dżunglowego drzewa +Jungle Tree Sapling=Sadzonka dżunglowego drzewa +Emergent Jungle Tree Sapling=Wyłaniająca się sadzonka dżunglowego drzewa +Pine Tree=Sosnowe drewno +Pine Wood Planks=Deski z sosnowego drzewa +Pine Needles=Sosnowe igły +Pine Tree Sapling=Sadzonka sosnowego drzewa +Acacia Tree=Akacjowe drewno +Acacia Wood Planks=Deski z akacjowego drzewa +Acacia Tree Leaves=Liście akacjowego drzewa +Acacia Tree Sapling=Sadzonka akacjowego drzewa +Aspen Tree=Brzozowe drzewo +Aspen Wood Planks=Deski z brzozowego drzewa +Aspen Tree Leaves=Liście brzozowego drzewa +Aspen Tree Sapling=Sadzonka brzozowego drzewa +Coal Ore=Ruda węgla +Coal Block=Blok węgla +Iron Ore=Ruda żelaza +Steel Block=Blok stali +Copper Ore=Ruda miedzi +Copper Block=Blok miedzi +Tin Ore=Ruda cyny +Tin Block=Blok cyny +Bronze Block=Blok brązu +Mese Ore=Ruda Mese +Mese Block=Blok Mese +Gold Ore=Ruda złota +Gold Block=Blok złota +Diamond Ore=Ruda diamentu +Diamond Block=Blok diamentu +Cactus=Kaktus +Large Cactus Seedling=Sadzonka dużego kaktusa +Papyrus=Papirus +Dry Shrub=Uschnięty krzak +Jungle Grass=Dżunglowa trawa +Grass=Trawa +Savanna Grass=Sawannowa trawa +Fern=Paproć +Marram Grass=Trzcinnik leśny +Bush Stem=Korzeń krzaku +Bush Leaves=Liście krzaku +Bush Sapling=Sadzonka krzaku +Blueberry Bush Leaves with Berries=Liście jagodowego krzaku z jagodami +Blueberry Bush Leaves=Liście jagodowego krzaku +Blueberry Bush Sapling=Sadzonka jagodowego krzaku +Acacia Bush Stem=Korzeń akacjowego krzaku +Acacia Bush Leaves=Liście akacjowego krzaku +Acacia Bush Sapling=Sadzonka akacjowego krzaku +Pine Bush Stem=Korzeń sosnowego krzaku +Pine Bush Needles=Igły sosnowego krzaku +Pine Bush Sapling=Sadzonka sosnowego krzaku +Kelp=Wodorost +Green Coral=Zielony koralowiec +Pink Coral=Różowy koralowiec +Cyan Coral=Cyjanowy koralowiec +Brown Coral=Brązowy koralowiec +Orange Coral=Pomarańczowy koralowiec +Coral Skeleton=Szkielet koralowca +Water Source=Źródło wody +Flowing Water=Płynąca woda +River Water Source=Źródło wody rzecznej +Flowing River Water=Płynąca woda rzeczna +Lava Source=Źródło lawy +Flowing Lava=Płynąca lawa +Empty Bookshelf=Pusta półka na książki +Bookshelf (@1 written, @2 empty books)=Półka na książki (@1 zapisanych, @2 pustych książek) +Bookshelf=Półka na książki +Text too long=Tekst jest zbyt długi +"@1"="@1" +Wooden Sign=Drewniana tabliczka +Steel Sign=Stalowa tabliczka +Wooden Ladder=Drewniana drabina +Steel Ladder=Stalowa drabina +Apple Wood Fence=Płot z jabłkowego drzewa +Acacia Wood Fence=Płot z akacjowego drzewa +Jungle Wood Fence=Płot z dżunglowego drzewa +Pine Wood Fence=Płot z sosnowego drzewa +Aspen Wood Fence=Płot z brzozowego drzewa +Apple Wood Fence Rail=Szyna ogrodzeniowa z jabłkowego drzewa +Acacia Wood Fence Rail=Szyna ogrodzeniowa z akacjowego drzewa +Jungle Wood Fence Rail=Szyna ogrodzeniowa z dżunglowego drzewa +Pine Wood Fence Rail=Szyna ogrodzeniowa z sosnowego drzewa +Aspen Wood Fence Rail=Szyna ogrodzeniowa z brzozowego drzewa +Glass=Szkło +Obsidian Glass=Obsydianowe szkło +Brick Block=Blok cegieł +Mese Lamp=Lampa Mese +Apple Wood Mese Post Light=Lampa Mese z obramowaniem z jabłkowego drzewa +Acacia Wood Mese Post Light=Lampa Mese z obramowaniem z akacjowego drzewa +Jungle Wood Mese Post Light=Lampa Mese z obramowaniem z dżunglowego drzewa +Pine Wood Mese Post Light=Lampa Mese z obramowaniem z sosnowego drzewa +Aspen Wood Mese Post Light=Lampa Mese z obramowaniem z brzozowego drzewa +Cloud=Chmura +Wooden Pickaxe=Drewniany kilof +Stone Pickaxe=Kamienny kilof +Bronze Pickaxe=Brązowy kilof +Steel Pickaxe=Stalowy kilof +Mese Pickaxe=Mesowy kilof +Diamond Pickaxe=Diamentowy kilof +Wooden Shovel=Drewniana łopata +Stone Shovel=Kamienna łopata +Bronze Shovel=Brązowa łopata +Steel Shovel=Stalowa łopata +Mese Shovel=Mesowa łopata +Diamond Shovel=Diamentowa łopata +Wooden Axe=Drewniana siekiera +Stone Axe=Kamienna siekiera +Bronze Axe=Brązowa siekiera +Steel Axe=Stalowa siekiera +Mese Axe=Mesowa siekiera +Diamond Axe=Diamentowa siekiera +Wooden Sword=Drewniany miecz +Stone Sword=Kamienny miecz +Bronze Sword=Brązowy miecz +Steel Sword=Stalowy miecz +Mese Sword=Mesowy miecz +Diamond Sword=Diamentowy miecz +Torch=Pochodnia +@1 will intersect protection on growth.=@1 będzie kolidować z ochroną terenu podczas rośnięcia. diff --git a/mods/default/locale/default.pt_BR.tr b/mods/default/locale/default.pt_BR.tr index 34ae20ae..124e1fa0 100644 --- a/mods/default/locale/default.pt_BR.tr +++ b/mods/default/locale/default.pt_BR.tr @@ -4,14 +4,15 @@ 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 +The book you were writing to mysteriously disappeared.= "@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 +211,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. diff --git a/mods/default/locale/default.ru.tr b/mods/default/locale/default.ru.tr index 4415f672..fc9f12cd 100644 --- a/mods/default/locale/default.ru.tr +++ b/mods/default/locale/default.ru.tr @@ -4,14 +4,15 @@ 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 +The book you were writing to mysteriously disappeared.= "@1" by @2="@1" @2 -Skeleton Key=Ключ Скелета -Key to @1's @2=Ключ к @2 от @1 Blueberries=Черника Book=Книга Book with Text=Книга с Текстом @@ -67,12 +68,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 +130,7 @@ Papyrus=Папирус Dry Shrub=Сухой Куст Jungle Grass=Тропическая Трава Grass=Трава -Savanna Grass= +Savanna Grass=Саванная Трава Fern=Папоротник Marram Grass=Песколюб Bush Stem=Стебли Куста @@ -180,11 +181,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 +211,6 @@ Bronze Sword=Бронзовый Меч Steel Sword=Стальной Меч Mese Sword=Месе Меч Diamond Sword=Алмазный Меч -Key=Ключ Torch=Факел @1 will intersect protection on growth.=@1 пересечёт защиту по росту. diff --git a/mods/default/locale/default.se.tr b/mods/default/locale/default.se.tr deleted file mode 100644 index 74f165f2..00000000 --- a/mods/default/locale/default.se.tr +++ /dev/null @@ -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 diff --git a/mods/default/locale/default.sk.tr b/mods/default/locale/default.sk.tr index 25f4b919..337ebcfb 100644 --- a/mods/default/locale/default.sk.tr +++ b/mods/default/locale/default.sk.tr @@ -4,14 +4,15 @@ 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 +The book you were writing to mysteriously disappeared.= "@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 +211,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. diff --git a/mods/default/locale/default.sv.tr b/mods/default/locale/default.sv.tr new file mode 100644 index 00000000..90df6c3c --- /dev/null +++ b/mods/default/locale/default.sv.tr @@ -0,0 +1,215 @@ +# 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 +The book you were writing to mysteriously disappeared.= +"@1" by @2="@1" av @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 +Torch=Fackla +@1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt. diff --git a/mods/default/locale/default.uk.tr b/mods/default/locale/default.uk.tr new file mode 100644 index 00000000..c3263522 --- /dev/null +++ b/mods/default/locale/default.uk.tr @@ -0,0 +1,215 @@ +# 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 +The book you were writing to mysteriously disappeared.= +"@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 перетне захист за зростанням. diff --git a/mods/default/locale/default.zh_CN.tr b/mods/default/locale/default.zh_CN.tr index 0db652d4..e4ef9463 100644 --- a/mods/default/locale/default.zh_CN.tr +++ b/mods/default/locale/default.zh_CN.tr @@ -1,17 +1,18 @@ # 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页。 +The book you were writing to mysteriously disappeared.= "@1" by @2="@1" by @2 -Skeleton Key=万能钥匙 -Key to @1's @2=@1的@2的钥匙 Blueberries=蓝莓 Book=书 Book with Text=带文字的书 @@ -66,13 +67,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 +96,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 +130,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 +211,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 ##### diff --git a/mods/default/locale/default.zh_TW.tr b/mods/default/locale/default.zh_TW.tr index 257f0e5d..8fcbd60b 100644 --- a/mods/default/locale/default.zh_TW.tr +++ b/mods/default/locale/default.zh_TW.tr @@ -4,14 +4,15 @@ 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頁。 +The book you were writing to mysteriously disappeared.= "@1" by @2="@1" by @2 -Skeleton Key=萬能鑰匙 -Key to @1's @2=@1的@2的鑰匙 Blueberries=藍莓 Book=書 Book with Text=帶文字的書 @@ -210,7 +211,6 @@ Bronze Sword=青銅劍 Steel Sword=鐵劍 Mese Sword=黃石劍 Diamond Sword=鑽石劍 -Key=鑰匙 Torch=火把 @1 will intersect protection on growth.=@1將與增長的保護相交。 diff --git a/mods/default/locale/template.txt b/mods/default/locale/template.txt index 8734752a..815c29c5 100644 --- a/mods/default/locale/template.txt +++ b/mods/default/locale/template.txt @@ -4,14 +4,15 @@ 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= +The book you were writing to mysteriously disappeared.= "@1" by @2= -Skeleton Key= -Key to @1's @2= Blueberries= Book= Book with Text= @@ -210,6 +211,5 @@ Bronze Sword= Steel Sword= Mese Sword= Diamond Sword= -Key= Torch= @1 will intersect protection on growth.= diff --git a/mods/default/models/torch_ceiling.obj b/mods/default/models/torch_ceiling.obj index ea51f3ce..5df8597c 100644 --- 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 diff --git a/mods/default/models/torch_floor.obj b/mods/default/models/torch_floor.obj index e2487efe..dfd25e8f 100644 --- 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 diff --git a/mods/default/models/torch_wall.obj b/mods/default/models/torch_wall.obj index 57baa9e6..6de4b131 100644 --- 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 diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index a2974517..41d50199 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -2057,10 +2057,9 @@ local function coral_on_place(itemstack, placer, pointed_thing) if minetest.is_protected(pos_under, player_name) or minetest.is_protected(pos_above, player_name) then - minetest.log("action", player_name - .. " tried to place " .. itemstack:get_name() - .. " at protected position " - .. minetest.pos_to_string(pos_under)) + default.log_player_action(placer, + "tried to place", itemstack:get_name(), + "at protected position", pos_under) minetest.record_protection_violation(pos_under, player_name) return itemstack end @@ -2525,7 +2524,7 @@ local function update_bookshelf(pos) end end -minetest.register_node("default:bookshelf", { +local default_bookshelf_def = { description = S("Bookshelf"), tiles = {"default_wood.png", "default_wood.png", "default_wood.png", "default_wood.png", "default_bookshelf.png", "default_bookshelf.png"}, @@ -2550,21 +2549,6 @@ minetest.register_node("default:bookshelf", { end return 0 end, - on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name() .. - " moves stuff in bookshelf at " .. minetest.pos_to_string(pos)) - update_bookshelf(pos) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name() .. - " puts stuff to bookshelf at " .. minetest.pos_to_string(pos)) - update_bookshelf(pos) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name() .. - " takes stuff from bookshelf at " .. minetest.pos_to_string(pos)) - update_bookshelf(pos) - end, on_blast = function(pos) local drops = {} default.get_inventory_drops(pos, "books", drops) @@ -2572,7 +2556,9 @@ minetest.register_node("default:bookshelf", { minetest.remove_node(pos) return drops end, -}) +} +default.set_inventory_action_loggers(default_bookshelf_def, "bookshelf") +minetest.register_node("default:bookshelf", default_bookshelf_def) local function register_sign(material, desc, def) minetest.register_node("default:sign_wall_" .. material, { @@ -2615,8 +2601,8 @@ local function register_sign(material, desc, def) minetest.chat_send_player(player_name, S("Text too long")) return end - minetest.log("action", player_name .. " wrote \"" .. text .. - "\" to the sign at " .. minetest.pos_to_string(pos)) + default.log_player_action(sender, "wrote \"" .. text .. + "\" to the sign at", pos) local meta = minetest.get_meta(pos) meta:set_string("text", text) @@ -2810,7 +2796,6 @@ minetest.register_node("default:glass", { tiles = {"default_glass.png", "default_glass_detail.png"}, use_texture_alpha = "clip", -- only needed for stairs API paramtype = "light", - paramtype2 = "glasslikeliquidlevel", sunlight_propagates = true, is_ground_content = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, @@ -2823,7 +2808,6 @@ minetest.register_node("default:obsidian_glass", { tiles = {"default_obsidian_glass.png", "default_obsidian_glass_detail.png"}, use_texture_alpha = "clip", -- only needed for stairs API paramtype = "light", - paramtype2 = "glasslikeliquidlevel", is_ground_content = false, sunlight_propagates = true, sounds = default.node_sound_glass_defaults(), diff --git a/mods/default/sounds/default_water_footstep.4.ogg b/mods/default/sounds/default_water_footstep.4.ogg deleted file mode 100644 index 6f1eab82..00000000 Binary files a/mods/default/sounds/default_water_footstep.4.ogg and /dev/null differ diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 44468c56..1a95a50d 100644 --- 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", diff --git a/mods/default/torch.lua b/mods/default/torch.lua index a19f5314..e8f734c7 100644 --- 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 diff --git a/mods/default/trees.lua b/mods/default/trees.lua index 569beee8..24a96cf0 100644 --- a/mods/default/trees.lua +++ b/mods/default/trees.lua @@ -572,8 +572,7 @@ function default.sapling_on_place(itemstack, placer, pointed_thing, return itemstack end - minetest.log("action", player_name .. " places node " - .. sapling_name .. " at " .. minetest.pos_to_string(pos)) + default.log_player_action(placer, "places node", sapling_name, "at", pos) local take_item = not minetest.is_creative_enabled(player_name) local newnode = {name = sapling_name} diff --git a/mods/doors/init.lua b/mods/doors/init.lua index 0e1eaee6..0c0f0896 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -170,10 +170,10 @@ function doors.door_toggle(pos, node, clicker) if state % 2 == 0 then minetest.sound_play(def.door.sounds[1], - {pos = pos, gain = 0.3, max_hear_distance = 10}, true) + {pos = pos, gain = def.door.gains[1], max_hear_distance = 10}, true) else minetest.sound_play(def.door.sounds[2], - {pos = pos, gain = 0.3, max_hear_distance = 10}, true) + {pos = pos, gain = def.door.gains[2], max_hear_distance = 10}, true) end minetest.swap_node(pos, { @@ -260,10 +260,11 @@ function doors.register(name, def) on_place = function(itemstack, placer, pointed_thing) local pos - if not pointed_thing.type == "node" then + if pointed_thing.type ~= "node" then 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 @@ -364,12 +365,21 @@ function doors.register(name, def) def.sound_close = "doors_door_close" end + if not def.gain_open then + def.gain_open = 0.3 + end + + if not def.gain_close then + def.gain_close = 0.3 + end + def.groups.not_in_creative_inventory = 1 def.groups.door = 1 def.drop = name def.door = { name = name, - sounds = { def.sound_close, def.sound_open }, + sounds = {def.sound_close, def.sound_open}, + gains = {def.gain_close, def.gain_open}, } if not def.on_rightclick then def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) @@ -436,19 +446,19 @@ 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" - minetest.register_node(":" .. name .. "_a", def) + def.mesh = "door_a.b3d" + minetest.register_node(":" .. name .. "_a", table.copy(def)) - def.mesh = "door_b.obj" - minetest.register_node(":" .. name .. "_b", def) + def.mesh = "door_b.b3d" + minetest.register_node(":" .. name .. "_b", table.copy(def)) - def.mesh = "door_a2.obj" - minetest.register_node(":" .. name .. "_c", def) + def.mesh = "door_b.b3d" + minetest.register_node(":" .. name .. "_c", table.copy(def)) - def.mesh = "door_b2.obj" - minetest.register_node(":" .. name .. "_d", def) + def.mesh = "door_a.b3d" + minetest.register_node(":" .. name .. "_d", table.copy(def)) doors.registered_doors[name .. "_a"] = true doors.registered_doors[name .. "_b"] = true @@ -461,6 +471,8 @@ doors.register("door_wood", { description = S("Wooden Door"), inventory_image = "doors_item_wood.png", groups = {node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + gain_open = 0.06, + gain_close = 0.13, recipe = { {"group:wood", "group:wood"}, {"group:wood", "group:wood"}, @@ -477,6 +489,8 @@ doors.register("door_steel", { sounds = default.node_sound_metal_defaults(), sound_open = "doors_steel_door_open", sound_close = "doors_steel_door_close", + gain_open = 0.2, + gain_close = 0.2, recipe = { {"default:steel_ingot", "default:steel_ingot"}, {"default:steel_ingot", "default:steel_ingot"}, @@ -492,6 +506,8 @@ doors.register("door_glass", { sounds = default.node_sound_glass_defaults(), sound_open = "doors_glass_door_open", sound_close = "doors_glass_door_close", + gain_open = 0.3, + gain_close = 0.25, recipe = { {"default:glass", "default:glass"}, {"default:glass", "default:glass"}, @@ -507,6 +523,8 @@ doors.register("door_obsidian_glass", { sounds = default.node_sound_glass_defaults(), sound_open = "doors_glass_door_open", sound_close = "doors_glass_door_close", + gain_open = 0.3, + gain_close = 0.25, recipe = { {"default:obsidian_glass", "default:obsidian_glass"}, {"default:obsidian_glass", "default:obsidian_glass"}, @@ -553,12 +571,12 @@ function doors.trapdoor_toggle(pos, node, clicker) if string.sub(node.name, -5) == "_open" then minetest.sound_play(def.sound_close, - {pos = pos, gain = 0.3, max_hear_distance = 10}, true) + {pos = pos, gain = def.gain_close, max_hear_distance = 10}, true) minetest.swap_node(pos, {name = string.sub(node.name, 1, string.len(node.name) - 5), param1 = node.param1, param2 = node.param2}) else minetest.sound_play(def.sound_open, - {pos = pos, gain = 0.3, max_hear_distance = 10}, true) + {pos = pos, gain = def.gain_open, max_hear_distance = 10}, true) minetest.swap_node(pos, {name = node.name .. "_open", param1 = node.param1, param2 = node.param2}) end @@ -582,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 @@ -641,13 +659,25 @@ function doors.register_trapdoor(name, def) def.sound_close = "doors_door_close" end + if not def.gain_open then + def.gain_open = 0.3 + end + + if not def.gain_close then + def.gain_close = 0.3 + end + 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} @@ -661,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} @@ -694,6 +728,8 @@ doors.register_trapdoor("doors:trapdoor", { wield_image = "doors_trapdoor.png", tile_front = "doors_trapdoor.png", tile_side = "doors_trapdoor_side.png", + gain_open = 0.06, + gain_close = 0.13, groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1}, }) @@ -707,6 +743,8 @@ doors.register_trapdoor("doors:trapdoor_steel", { sounds = default.node_sound_metal_defaults(), sound_open = "doors_steel_door_open", sound_close = "doors_steel_door_close", + gain_open = 0.2, + gain_close = 0.2, groups = {cracky = 1, level = 2, door = 1}, }) @@ -746,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.3, + 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, @@ -775,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} @@ -784,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", diff --git a/mods/doors/locale/doors.eo.tr b/mods/doors/locale/doors.eo.tr index b5667324..8b7a99a6 100644 --- a/mods/doors/locale/doors.eo.tr +++ b/mods/doors/locale/doors.eo.tr @@ -1,13 +1,13 @@ # textdomain: doors Hidden Door Segment=Kaŝita Porda Segmento -Owned by @1=Estas de @1 -You do not own this locked door.=Vi ne posedas ĉi tiu ŝlosita pordo. +Owned by @1=Posedita de @1 +You do not own this locked door.=Vi ne posedas ĉi tiun ŝlositan pordon. a locked door=ŝlosita pordo Wooden Door=Ligna Pordo Steel Door=Ŝtala Pordo Glass Door=Vitra Pordo Obsidian Glass Door=Obsidiana Vitra Pordo -You do not own this trapdoor.=Vi ne posedas ĉi tiu plankpordo. +You do not own this trapdoor.=Vi ne posedas ĉi tiun plankpordon. a locked trapdoor=ŝlosita plankpordo Wooden Trapdoor=Ligna Plankpordo Steel Trapdoor=Ŝtala Plankpordo diff --git a/mods/doors/locale/doors.ja.tr b/mods/doors/locale/doors.ja.tr new file mode 100644 index 00000000..910e0ae1 --- /dev/null +++ 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=ポプラのフェンスゲート diff --git a/mods/doors/locale/doors.jbo.tr b/mods/doors/locale/doors.jbo.tr index 48daa0a8..f15854eb 100644 --- a/mods/doors/locale/doors.jbo.tr +++ b/mods/doors/locale/doors.jbo.tr @@ -11,8 +11,8 @@ You do not own this trapdoor.=.i do na ponse lo ti selstela lolvrogai a locked trapdoor=lo selstela lolvrogai Wooden Trapdoor=lo mudri lolvrogai Steel Trapdoor=lo gasta lolvrogai -Apple Wood Fence Gate=lo plise mudri garbimvrogai +Apple Wood Fence Gate=lo plisymudri garbimvrogai Acacia Wood Fence Gate=lo atkaci,ia mudri garbimvrogai Jungle Wood Fence Gate=lo glatimdemricfoi mudri garbimvrogai -Pine Wood Fence Gate=lo ckunu mudri garbimvrogai +Pine Wood Fence Gate=lo ku'urmudri garbimvrogai Aspen Wood Fence Gate=lo mudrpopulu garbimvrogai diff --git a/mods/doors/locale/doors.pl.tr b/mods/doors/locale/doors.pl.tr new file mode 100644 index 00000000..6aec2852 --- /dev/null +++ b/mods/doors/locale/doors.pl.tr @@ -0,0 +1,18 @@ +# textdomain: doors +Hidden Door Segment=Ukryty segment drzwi +Owned by @1=Właściciel: @1 +You do not own this locked door.=Nie jesteś właścicielem tych zablokowanych drzwi. +a locked door=zablokowane drzwi +Wooden Door=Drewniane drzwi +Steel Door=Stalowe drzwi +Glass Door=Szklane drzwi +Obsidian Glass Door=Drzwi z obsydianowego szkła +You do not own this trapdoor.=Nie jesteś właścicielem tego włazu. +a locked trapdoor=zablokowany właz +Wooden Trapdoor=Drewniany właz +Steel Trapdoor=Stalowy właz +Apple Wood Fence Gate=Furtka z jabłkowego drzewa +Acacia Wood Fence Gate=Furtka z akacjowego drzewa +Jungle Wood Fence Gate=Furtka z dżunglowego drzewa +Pine Wood Fence Gate=Furtka z sosnowego drzewa +Aspen Wood Fence Gate=Furtka z brzozowego drzewa diff --git a/mods/doors/locale/doors.se.tr b/mods/doors/locale/doors.se.tr deleted file mode 100644 index 1f856ef1..00000000 --- a/mods/doors/locale/doors.se.tr +++ /dev/null @@ -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 diff --git a/mods/doors/locale/doors.sv.tr b/mods/doors/locale/doors.sv.tr new file mode 100644 index 00000000..9f31d9c8 --- /dev/null +++ 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 diff --git a/mods/doors/locale/doors.uk.tr b/mods/doors/locale/doors.uk.tr new file mode 100644 index 00000000..ae2ad14e --- /dev/null +++ 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=Осикова Дерев'яна Хвіртка diff --git a/mods/doors/locale/doors.zh_CN.tr b/mods/doors/locale/doors.zh_CN.tr index 50f38c05..cf32996e 100644 --- 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=铁活板门 diff --git a/mods/doors/models/door.blend b/mods/doors/models/door.blend new file mode 100644 index 00000000..56047b16 Binary files /dev/null and b/mods/doors/models/door.blend differ diff --git a/mods/doors/models/door_a.b3d b/mods/doors/models/door_a.b3d new file mode 100644 index 00000000..7f9249fe Binary files /dev/null and b/mods/doors/models/door_a.b3d differ diff --git a/mods/doors/models/door_a.obj b/mods/doors/models/door_a.obj deleted file mode 100644 index 7948f2f3..00000000 --- a/mods/doors/models/door_a.obj +++ /dev/null @@ -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 diff --git a/mods/doors/models/door_a2.obj b/mods/doors/models/door_a2.obj deleted file mode 100644 index 3bedc202..00000000 --- a/mods/doors/models/door_a2.obj +++ /dev/null @@ -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 diff --git a/mods/doors/models/door_b.b3d b/mods/doors/models/door_b.b3d new file mode 100644 index 00000000..77a1a16c Binary files /dev/null and b/mods/doors/models/door_b.b3d differ diff --git a/mods/doors/models/door_b.obj b/mods/doors/models/door_b.obj deleted file mode 100644 index 87f1729c..00000000 --- a/mods/doors/models/door_b.obj +++ /dev/null @@ -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 diff --git a/mods/doors/models/door_b2.obj b/mods/doors/models/door_b2.obj deleted file mode 100644 index 35632a5e..00000000 --- a/mods/doors/models/door_b2.obj +++ /dev/null @@ -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 diff --git a/mods/dye/locale/dye.eo.tr b/mods/dye/locale/dye.eo.tr index 2a1c5d6d..e0fda93e 100644 --- a/mods/dye/locale/dye.eo.tr +++ b/mods/dye/locale/dye.eo.tr @@ -3,14 +3,14 @@ White Dye=Blanka Tinkturo Grey Dye=Griza Tinkturo Dark Grey Dye=Malhela Griza Tinkturo Black Dye=Nigra Tinkturo -Violet Dye=Viola Tinkturo +Violet Dye=Violkolora Tinkturo Blue Dye=Blua Tinkturo Cyan Dye=Bluverda Tinkturo Dark Green Dye=Malhela Verda Tinkturo Green Dye=Verda Tinkturo Yellow Dye=Flava Tinkturo Brown Dye=Bruna Tinkturo -Orange Dye=Oranĝa Tinkturo +Orange Dye=Oranĝkolora Tinkturo Red Dye=Ruĝa Tinkturo Magenta Dye=Fiksina Tinkturo -Pink Dye=Roza Tinkturo +Pink Dye=Rozkolora Tinkturo diff --git a/mods/dye/locale/dye.ja.tr b/mods/dye/locale/dye.ja.tr new file mode 100644 index 00000000..d7ae3068 --- /dev/null +++ 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=桃色の染料 diff --git a/mods/dye/locale/dye.pl.tr b/mods/dye/locale/dye.pl.tr new file mode 100644 index 00000000..a4bfa640 --- /dev/null +++ b/mods/dye/locale/dye.pl.tr @@ -0,0 +1,16 @@ +# textdomain: dye +White Dye=Biały barwnik +Grey Dye=Szary barwnik +Dark Grey Dye=Ciemnoszary barwnik +Black Dye=Czarny barwnik +Violet Dye=Fioletowy barwnik +Blue Dye=Niebieski barwnik +Cyan Dye=Cyjanowy barwnik +Dark Green Dye=Ciemnozielony barwnik +Green Dye=Zielony barwnik +Yellow Dye=Żółty barwnik +Brown Dye=Brązowy barwnik +Orange Dye=Pomarańczowy barwnik +Red Dye=Czerwony barwnik +Magenta Dye=Karmazynowy barwnik +Pink Dye=Różowy barwnik diff --git a/mods/dye/locale/dye.se.tr b/mods/dye/locale/dye.se.tr deleted file mode 100644 index 936f161e..00000000 --- a/mods/dye/locale/dye.se.tr +++ /dev/null @@ -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 diff --git a/mods/dye/locale/dye.sv.tr b/mods/dye/locale/dye.sv.tr new file mode 100644 index 00000000..ecde4433 --- /dev/null +++ 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 diff --git a/mods/dye/locale/dye.uk.tr b/mods/dye/locale/dye.uk.tr new file mode 100644 index 00000000..e3698b03 --- /dev/null +++ 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=Рожева Фарба diff --git a/mods/farming/api.lua b/mods/farming/api.lua index 17a5fa74..414ebc0f 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -60,13 +60,13 @@ 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 -- wear tool local wdef = itemstack:get_definition() - itemstack:add_wear(65535/(uses-1)) + itemstack:add_wear_by_uses(uses) -- tool break sound if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then minetest.sound_play(wdef.sound.breaks, {pos = pt.above, @@ -178,8 +178,7 @@ farming.place_seed = function(itemstack, placer, pointed_thing, plantname) end -- add the node and remove 1 item from the itemstack - minetest.log("action", player_name .. " places node " .. plantname .. " at " .. - minetest.pos_to_string(pt.above)) + default.log_player_action(placer, "places node", plantname, "at", pt.above) minetest.add_node(pt.above, {name = plantname, param2 = 1}) tick(pt.above) if not minetest.is_creative_enabled(player_name) then diff --git a/mods/farming/locale/farming.eo.tr b/mods/farming/locale/farming.eo.tr index 70caa100..6ccef7d8 100644 --- 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 @@ -10,19 +25,4 @@ Straw Stair=Pajla Ŝtupo 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 +Wild Cotton=Sovaĝa Kotonujo diff --git a/mods/farming/locale/farming.fr.tr b/mods/farming/locale/farming.fr.tr index 84d52b0a..826949e1 100644 --- 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 ##### diff --git a/mods/farming/locale/farming.ja.tr b/mods/farming/locale/farming.ja.tr new file mode 100644 index 00000000..a95d40c8 --- /dev/null +++ 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=天然綿 diff --git a/mods/farming/locale/farming.jbo.tr b/mods/farming/locale/farming.jbo.tr index 06bfa32a..51bb9db9 100644 --- a/mods/farming/locale/farming.jbo.tr +++ b/mods/farming/locale/farming.jbo.tr @@ -13,7 +13,7 @@ Flour=lo grupu'o Bread=lo nanba Cotton Seed=lo tsiju be lo mapni Cotton=lo mapni -String=lo cilta +String=lo skori Soil=lo ferti dertu Wet Soil=lo cilmo ke ferti dertu Savanna Soil=lo ferti ke sudytu'a dertu diff --git a/mods/farming/locale/farming.pl.tr b/mods/farming/locale/farming.pl.tr new file mode 100644 index 00000000..ffde3b76 --- /dev/null +++ b/mods/farming/locale/farming.pl.tr @@ -0,0 +1,28 @@ +# textdomain: farming +Hoe=Motyka +Seed=Nasiona +Wooden Hoe=Drewniana motyka +Stone Hoe=Kamienna motyka +Steel Hoe=Stalowa motyka +Bronze Hoe=Brązowa motyka +Mese Hoe=Mesowa motyka +Diamond Hoe=Diamentowa motyka +Wheat Seed=Nasiona pszenicy +Wheat=Pszenica +Flour=Mąka +Bread=Chleb +Cotton Seed=Nasiona bawełny +Cotton=Bawełna +String=Nić +Soil=Gleba +Wet Soil=Mokra gleba +Savanna Soil=Sawannowa gleba +Wet Savanna Soil=Mokra sawannowa gleba +Desert Sand Soil=Pustynno-piaszczysta gleba +Wet Desert Sand Soil=Mokra pustynno-piaszczysta gleba +Straw=Słoma +Straw Stair=Słomiane schody +Inner Straw Stair=Wewnętrzne słomiane schody +Outer Straw Stair=Zewnętrzne słomiane schody +Straw Slab=Słomiany półblok +Wild Cotton=Dzika bawełna diff --git a/mods/farming/locale/farming.ru.tr b/mods/farming/locale/farming.ru.tr index a6d1b6d8..4da864e9 100644 --- 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 ##### diff --git a/mods/farming/locale/farming.se.tr b/mods/farming/locale/farming.se.tr deleted file mode 100644 index 3b69fba7..00000000 --- a/mods/farming/locale/farming.se.tr +++ /dev/null @@ -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 diff --git a/mods/farming/locale/farming.sv.tr b/mods/farming/locale/farming.sv.tr new file mode 100644 index 00000000..e6c9e685 --- /dev/null +++ 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= diff --git a/mods/farming/locale/farming.uk.tr b/mods/farming/locale/farming.uk.tr new file mode 100644 index 00000000..854491c1 --- /dev/null +++ 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=Дикий Бавовник diff --git a/mods/farming/locale/farming.zh_CN.tr b/mods/farming/locale/farming.zh_CN.tr index 741ba453..33ad9be4 100644 --- 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 ##### diff --git a/mods/fire/init.lua b/mods/fire/init.lua index 621e00e4..3069aa80 100644 --- 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 @@ -114,7 +114,7 @@ minetest.register_tool("fire:flint_and_steel", { if not minetest.is_creative_enabled(player_name) then -- Wear tool local wdef = itemstack:get_definition() - itemstack:add_wear(1000) + itemstack:add_wear_by_uses(66) -- Tool break sound if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then diff --git a/mods/fire/locale/fire.fr.tr b/mods/fire/locale/fire.fr.tr index a16b4718..4d5d08ac 100644 --- 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 diff --git a/mods/fire/locale/fire.ja.tr b/mods/fire/locale/fire.ja.tr new file mode 100644 index 00000000..bf5fec4e --- /dev/null +++ b/mods/fire/locale/fire.ja.tr @@ -0,0 +1,4 @@ +# textdomain: fire +Fire=炎 +Permanent Fire=燃え続ける炎 +Flint and Steel=火打ち石と打ち金 diff --git a/mods/fire/locale/fire.pl.tr b/mods/fire/locale/fire.pl.tr new file mode 100644 index 00000000..a19e6aff --- /dev/null +++ b/mods/fire/locale/fire.pl.tr @@ -0,0 +1,4 @@ +# textdomain: fire +Fire=Ogień +Permanent Fire=Stały ogień +Flint and Steel=Zapalniczka diff --git a/mods/fire/locale/fire.ru.tr b/mods/fire/locale/fire.ru.tr index d2cb81f4..496e81c1 100644 --- a/mods/fire/locale/fire.ru.tr +++ b/mods/fire/locale/fire.ru.tr @@ -1,6 +1,6 @@ # textdomain: fire -Fire= -Permanent Fire= +Fire=Огонь +Permanent Fire=Вечный Огонь Flint and Steel=Огниво diff --git a/mods/fire/locale/fire.se.tr b/mods/fire/locale/fire.se.tr deleted file mode 100644 index 9a51aed2..00000000 --- a/mods/fire/locale/fire.se.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: fire -Fire= -Permanent Fire= -Flint and Steel=Flinta och Stål - - -##### not used anymore ##### - -# textdomain: fire -Permanent Flame=Permanent Eld diff --git a/mods/fire/locale/fire.sv.tr b/mods/fire/locale/fire.sv.tr new file mode 100644 index 00000000..28e9a4a2 --- /dev/null +++ b/mods/fire/locale/fire.sv.tr @@ -0,0 +1,4 @@ +# textdomain: fire +Fire=Eld +Permanent Fire=Permanent eld +Flint and Steel=Flinta och stål diff --git a/mods/fire/locale/fire.uk.tr b/mods/fire/locale/fire.uk.tr new file mode 100644 index 00000000..9da0beb6 --- /dev/null +++ b/mods/fire/locale/fire.uk.tr @@ -0,0 +1,4 @@ +# textdomain: fire +Fire=Вогонь +Permanent Fire=Вічний Вогонь +Flint and Steel=Кремінь і Сталь diff --git a/mods/fire/locale/fire.zh_CN.tr b/mods/fire/locale/fire.zh_CN.tr index 052089a3..7b0a4727 100644 --- a/mods/fire/locale/fire.zh_CN.tr +++ b/mods/fire/locale/fire.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: fire Fire=火焰 Permanent Fire=永久火焰 -Flint and Steel=火石和钢 +Flint and Steel=火石和划片 diff --git a/mods/fireflies/init.lua b/mods/fireflies/init.lua index 59a40c54..5593afe4 100644 --- a/mods/fireflies/init.lua +++ b/mods/fireflies/init.lua @@ -108,7 +108,7 @@ minetest.register_tool("fireflies:bug_net", { end end if not minetest.is_creative_enabled(player_name) then - itemstack:add_wear(256) + itemstack:add_wear_by_uses(256) return itemstack end end diff --git a/mods/fireflies/locale/fireflies.eo.tr b/mods/fireflies/locale/fireflies.eo.tr index 7145cf97..d4402ee2 100644 --- a/mods/fireflies/locale/fireflies.eo.tr +++ b/mods/fireflies/locale/fireflies.eo.tr @@ -1,5 +1,5 @@ # textdomain: fireflies -Firefly=Fulgoro -Hidden Firefly=Kaŝita Fulgoro -Bug Net=Cima Reto -Firefly in a Bottle=Fulgoro en Botelo +Firefly=Lampiro +Hidden Firefly=Kaŝita Lampiro +Bug Net=Insekta Reto +Firefly in a Bottle=Lampiro en Botelo diff --git a/mods/fireflies/locale/fireflies.ja.tr b/mods/fireflies/locale/fireflies.ja.tr new file mode 100644 index 00000000..4116ca2f --- /dev/null +++ b/mods/fireflies/locale/fireflies.ja.tr @@ -0,0 +1,5 @@ +# textdomain: fireflies +Firefly=ホタル +Hidden Firefly=隠されたホタル +Bug Net=虫取り網 +Firefly in a Bottle=ホタルの入った瓶 diff --git a/mods/fireflies/locale/fireflies.pl.tr b/mods/fireflies/locale/fireflies.pl.tr new file mode 100644 index 00000000..b07152b9 --- /dev/null +++ b/mods/fireflies/locale/fireflies.pl.tr @@ -0,0 +1,5 @@ +# textdomain: fireflies +Firefly=Świetlik +Hidden Firefly=Ukryty świetlik +Bug Net=Siatka na owady +Firefly in a Bottle=Świetlik w butelce diff --git a/mods/fireflies/locale/fireflies.se.tr b/mods/fireflies/locale/fireflies.sv.tr similarity index 62% rename from mods/fireflies/locale/fireflies.se.tr rename to mods/fireflies/locale/fireflies.sv.tr index ebd0cf9e..d8016f99 100644 --- a/mods/fireflies/locale/fireflies.se.tr +++ b/mods/fireflies/locale/fireflies.sv.tr @@ -1,5 +1,5 @@ # textdomain: fireflies Firefly=Eldfluga -Hidden Firefly=Gömd Eldfluga -Bug Net=Buggernät +Hidden Firefly=Gömd eldfluga +Bug Net=Insektshåv Firefly in a Bottle=Eldfluga i en flaska diff --git a/mods/fireflies/locale/fireflies.uk.tr b/mods/fireflies/locale/fireflies.uk.tr new file mode 100644 index 00000000..f1aa265f --- /dev/null +++ b/mods/fireflies/locale/fireflies.uk.tr @@ -0,0 +1,5 @@ +# textdomain: fireflies +Firefly=Світлячок +Hidden Firefly=Світлячок, що причаївся +Bug Net=Сачок Для Ловлі Комах +Firefly in a Bottle=Світлячок у Пляшці diff --git a/mods/flowers/locale/flowers.eo.tr b/mods/flowers/locale/flowers.eo.tr index 0153fdff..df515888 100644 --- a/mods/flowers/locale/flowers.eo.tr +++ b/mods/flowers/locale/flowers.eo.tr @@ -1,6 +1,6 @@ # textdomain: flowers Red Rose=Ruĝa Rozo -Orange Tulip=Oranĝa Tulipo +Orange Tulip=Oranĝkolora Tulipo Yellow Dandelion=Flava Leontodo Green Chrysanthemum=Verda Krizantemo Blue Geranium=Blua Geranio diff --git a/mods/flowers/locale/flowers.ja.tr b/mods/flowers/locale/flowers.ja.tr new file mode 100644 index 00000000..bea87e27 --- /dev/null +++ b/mods/flowers/locale/flowers.ja.tr @@ -0,0 +1,12 @@ +# textdomain: flowers +Red Rose=赤色のバラ +Orange Tulip=橙色のチューリップ +Yellow Dandelion=黄色のタンポポ +Green Chrysanthemum=緑色のキク +Blue Geranium=青色のゼラニウム +Viola=ビオラ +White Dandelion=白色のタンポポ +Black Tulip=黒色のチューリップ +Red Mushroom=赤色のキノコ +Brown Mushroom=茶色のキノコ +Waterlily=スイレン diff --git a/mods/flowers/locale/flowers.jbo.tr b/mods/flowers/locale/flowers.jbo.tr index 8f816082..1df06ec5 100644 --- a/mods/flowers/locale/flowers.jbo.tr +++ b/mods/flowers/locale/flowers.jbo.tr @@ -9,4 +9,4 @@ White Dandelion=lo blabi spatrtaraksaku Black Tulip=lo xekri tujli Red Mushroom=lo xunre ledgrute Brown Mushroom=lo bunre ledgrute -Waterlily=lo spatrnimfe'a +Waterlily=lo jacrulspa diff --git a/mods/flowers/locale/flowers.pl.tr b/mods/flowers/locale/flowers.pl.tr new file mode 100644 index 00000000..ff6a5e20 --- /dev/null +++ b/mods/flowers/locale/flowers.pl.tr @@ -0,0 +1,12 @@ +# textdomain: flowers +Red Rose=Czerwona róża +Orange Tulip=Pomarańczowy tulipan +Yellow Dandelion=Żółty mlecz +Green Chrysanthemum=Zielona chryzantema +Blue Geranium=Niebieska pelargonia +Viola=Fiołek +White Dandelion=Biały mlecz +Black Tulip=Czarny tulipan +Red Mushroom=Czerwony muchomor +Brown Mushroom=Brązowy grzyb +Waterlily=Lilia wodna diff --git a/mods/flowers/locale/flowers.se.tr b/mods/flowers/locale/flowers.se.tr deleted file mode 100644 index 018e133b..00000000 --- a/mods/flowers/locale/flowers.se.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Röd ros -Orange Tulip=Orange Tulpan -Yellow Dandelion=Gul Maskros -Green Chrysanthemum=Grön Krysantemum -Blue Geranium=Blå Geranium -Viola=Violett Viola -White Dandelion=Vit Maskros -Black Tulip=Svart Tulpan -Red Mushroom=Röd Svamp -Brown Mushroom=Brun Svamp -Waterlily=Näckros diff --git a/mods/flowers/locale/flowers.sv.tr b/mods/flowers/locale/flowers.sv.tr new file mode 100644 index 00000000..c8a26a3d --- /dev/null +++ b/mods/flowers/locale/flowers.sv.tr @@ -0,0 +1,12 @@ +# textdomain: flowers +Red Rose=Röd ros +Orange Tulip=Orange tulpan +Yellow Dandelion=Gul maskros +Green Chrysanthemum=Grön krysantemum +Blue Geranium=Blå geranium +Viola=Violett viola +White Dandelion=Vit maskros +Black Tulip=Svart tulpan +Red Mushroom=Röd svamp +Brown Mushroom=Brun svamp +Waterlily=Näckros diff --git a/mods/flowers/locale/flowers.uk.tr b/mods/flowers/locale/flowers.uk.tr new file mode 100644 index 00000000..25d8f82a --- /dev/null +++ b/mods/flowers/locale/flowers.uk.tr @@ -0,0 +1,12 @@ +# textdomain: flowers +Red Rose=Червона Троянда +Orange Tulip=Помаранчевий Тюльпан +Yellow Dandelion=Жовта Кульбабка +Green Chrysanthemum=Зелена Хризантема +Blue Geranium=Синій Геран +Viola=Фіалка +White Dandelion=Біла Кульбабка +Black Tulip=Чорний Тюльпан +Red Mushroom=Мухомор +Brown Mushroom=Коричневий Гриб +Waterlily=Водяна Лілія diff --git a/mods/game_commands/locale/game_commands.eo.tr b/mods/game_commands/locale/game_commands.eo.tr index 08bcdecc..0ff99aab 100644 --- a/mods/game_commands/locale/game_commands.eo.tr +++ b/mods/game_commands/locale/game_commands.eo.tr @@ -1,4 +1,4 @@ # textdomain: game_commands -Kill yourself to respawn=Ĉesigu vi mem por renaski +Kill yourself to respawn=Sinmortigu por renaski No static_spawnpoint defined=Ne estas difina static_spawnpoint -You need to be online to be killed!=Vi devas esti onlina por ĉesigi! +You need to be online to be killed!=Vi devas esti enreta por esti mortigita! diff --git a/mods/game_commands/locale/game_commands.ja.tr b/mods/game_commands/locale/game_commands.ja.tr new file mode 100644 index 00000000..b6c77dce --- /dev/null +++ b/mods/game_commands/locale/game_commands.ja.tr @@ -0,0 +1,4 @@ +# textdomain: game_commands +Kill yourself to respawn=リセットしてリスポーンします +No static_spawnpoint defined=static_spawnpoint が設定されていません +You need to be online to be killed!=リセットするにはオンラインである必要があります diff --git a/mods/game_commands/locale/game_commands.pl.tr b/mods/game_commands/locale/game_commands.pl.tr new file mode 100644 index 00000000..52477c6d --- /dev/null +++ b/mods/game_commands/locale/game_commands.pl.tr @@ -0,0 +1,4 @@ +# textdomain: game_commands +Kill yourself to respawn=Zastosować komendę kill aby się zrespawnować +No static_spawnpoint defined=Nie zdefiniowano static_spawnpoint +You need to be online to be killed!=Musisz być online aby zastosować komendę kill diff --git a/mods/game_commands/locale/game_commands.se.tr b/mods/game_commands/locale/game_commands.sv.tr similarity index 72% rename from mods/game_commands/locale/game_commands.se.tr rename to mods/game_commands/locale/game_commands.sv.tr index afefc9b3..e3110dad 100644 --- a/mods/game_commands/locale/game_commands.se.tr +++ b/mods/game_commands/locale/game_commands.sv.tr @@ -1,4 +1,4 @@ # textdomain: game_commands Kill yourself to respawn=Döda dig själv för att respawna -No static_spawnpoint defined=Ingen static_spawnpoint definierat +No static_spawnpoint defined=Ingen static_spawnpoint definierad You need to be online to be killed!=Du måsta vara online för att bli dödad! diff --git a/mods/game_commands/locale/game_commands.uk.tr b/mods/game_commands/locale/game_commands.uk.tr new file mode 100644 index 00000000..7e8241e8 --- /dev/null +++ b/mods/game_commands/locale/game_commands.uk.tr @@ -0,0 +1,4 @@ +# textdomain: game_commands +Kill yourself to respawn=Вбийте себе щоб відродися +No static_spawnpoint defined=static_spawnpoint не визначений +You need to be online to be killed!=Ви повинні бути онлайн, щоб вбити себе! diff --git a/mods/game_commands/locale/game_commands.zh_CN.tr b/mods/game_commands/locale/game_commands.zh_CN.tr index 3c69dfb7..ba9a0275 100644 --- a/mods/game_commands/locale/game_commands.zh_CN.tr +++ b/mods/game_commands/locale/game_commands.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: game_commands -Kill yourself to respawn=杀死自己并重生 +Kill yourself to respawn=自杀并重生 No static_spawnpoint defined=static_spawnpoint 未定义 You need to be online to be killed!=您需要在线才能被杀死！ diff --git a/mods/keys/README.txt b/mods/keys/README.txt new file mode 100644 index 00000000..86591203 --- /dev/null +++ b/mods/keys/README.txt @@ -0,0 +1,21 @@ +Minetest Game mod: keys +========================== +See license.txt for license information. + +Authors of source code +---------------------- +Originally by celeron55, Perttu Ahola (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) + +Authors of media (textures, sounds, models and schematics) +---------------------------------------------------------- + +Textures +-------- +Gambit (CC BY-SA 3.0): + keys_key.png + keys_key_skeleton.png + +Features +-------- +This mod uses the key API as defined in game_api.txt section [Key API]. diff --git a/mods/keys/aliases.lua b/mods/keys/aliases.lua new file mode 100644 index 00000000..4297498b --- /dev/null +++ b/mods/keys/aliases.lua @@ -0,0 +1,6 @@ +-- +-- Aliases for backward compatibility +-- + +minetest.register_alias("default:key", "keys:key") +minetest.register_alias("default:skeleton_key", "keys:skeleton_key") diff --git a/mods/keys/crafting.lua b/mods/keys/crafting.lua new file mode 100644 index 00000000..b9b503a5 --- /dev/null +++ b/mods/keys/crafting.lua @@ -0,0 +1,28 @@ +-- +-- Crafting recipes +-- + +minetest.register_craft({ + output = "keys:skeleton_key", + recipe = { + {"default:gold_ingot"}, + } +}) + +-- +-- Cooking recipes +-- + +minetest.register_craft({ + type = "cooking", + output = "default:gold_ingot", + recipe = "keys:key", + cooktime = 5, +}) + +minetest.register_craft({ + type = "cooking", + output = "default:gold_ingot", + recipe = "keys:skeleton_key", + cooktime = 5, +}) diff --git a/mods/keys/craftitems.lua b/mods/keys/craftitems.lua new file mode 100644 index 00000000..45e0b824 --- /dev/null +++ b/mods/keys/craftitems.lua @@ -0,0 +1,101 @@ +-- Load support for MT game translation. +local S = minetest.get_translator("keys") + +-- +-- Craftitems +-- + +minetest.register_craftitem("keys:skeleton_key", { + description = S("Skeleton Key"), + inventory_image = "keys_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("keys: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 +}) + +minetest.register_craftitem("keys:key", { + description = S("Key"), + inventory_image = "keys_key.png", + groups = {key = 1, not_in_creative_inventory = 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 +}) diff --git a/mods/keys/init.lua b/mods/keys/init.lua new file mode 100644 index 00000000..6c2ed825 --- /dev/null +++ b/mods/keys/init.lua @@ -0,0 +1,6 @@ +-- Minetest mod: keys +local keys_path = minetest.get_modpath("keys") + +dofile(keys_path.."/craftitems.lua") +dofile(keys_path.."/crafting.lua") +dofile(keys_path.."/aliases.lua") diff --git a/mods/keys/license.txt b/mods/keys/license.txt new file mode 100644 index 00000000..95f02ef9 --- /dev/null +++ b/mods/keys/license.txt @@ -0,0 +1,52 @@ +License of source code +---------------------- + +GNU Lesser General Public License, version 2.1 +Copyright (C) 2011-2018 celeron55, Perttu Ahola +Copyright (C) 2011-2018 Various Minetest developers and contributors + +This program is free software; you can redistribute it and/or modify it under the terms +of the GNU Lesser General Public License as published by the Free Software Foundation; +either version 2.1 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU Lesser General Public License for more details: +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + + +Licenses of media (textures, models and sounds) +----------------------------------------------- + +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +Copyright (C) 2010-2018: + + Gambit + +You are free to: +Share — copy and redistribute the material in any medium or format. +Adapt — remix, transform, and build upon the material for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the license terms. + +Under the following terms: + +Attribution — You must give appropriate credit, provide a link to the license, and +indicate if changes were made. You may do so in any reasonable manner, but not in any way +that suggests the licensor endorses you or your use. + +ShareAlike — If you remix, transform, or build upon the material, you must distribute +your contributions under the same license as the original. + +No additional restrictions — You may not apply legal terms or technological measures that +legally restrict others from doing anything the license permits. + +Notices: + +You do not have to comply with the license for elements of the material in the public +domain or where your use is permitted by an applicable exception or limitation. +No warranties are given. The license may not give you all of the permissions necessary +for your intended use. For example, other rights such as publicity, privacy, or moral +rights may limit how you use the material. + +For more details: +http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/mods/keys/locale/keys.de.tr b/mods/keys/locale/keys.de.tr new file mode 100644 index 00000000..499a6ba7 --- /dev/null +++ b/mods/keys/locale/keys.de.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Schlüssel +Key to @1's @2=Schlüssel für @2 von @1 +Skeleton Key=Skelettschlüssel diff --git a/mods/keys/locale/keys.eo.tr b/mods/keys/locale/keys.eo.tr new file mode 100644 index 00000000..e73f6c4e --- /dev/null +++ b/mods/keys/locale/keys.eo.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Ŝlosilo +Key to @1's @2=Ŝlosilo por la @2 de @1 +Skeleton Key=Skeleta Ŝlosilo diff --git a/mods/keys/locale/keys.es.tr b/mods/keys/locale/keys.es.tr new file mode 100644 index 00000000..e408c32a --- /dev/null +++ b/mods/keys/locale/keys.es.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Llave +Key to @1's @2=Llave para @2 de @1 +Skeleton Key=Llave esqueleto diff --git a/mods/keys/locale/keys.fr.tr b/mods/keys/locale/keys.fr.tr new file mode 100644 index 00000000..b1b9e6a8 --- /dev/null +++ b/mods/keys/locale/keys.fr.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Clé +Key to @1's @2=Clé pour @2 de @1 +Skeleton Key=Squelette diff --git a/mods/keys/locale/keys.id.tr b/mods/keys/locale/keys.id.tr new file mode 100644 index 00000000..58f8fc55 --- /dev/null +++ b/mods/keys/locale/keys.id.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Kunci +Key to @1's @2=Kunci @2 milik @1 +Skeleton Key=Kunci Induk diff --git a/mods/keys/locale/keys.it.tr b/mods/keys/locale/keys.it.tr new file mode 100644 index 00000000..ed7bb312 --- /dev/null +++ b/mods/keys/locale/keys.it.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Chiave +Key to @1's @2=Chiave per @2 di @1 +Skeleton Key=Chiave dello Scheletro diff --git a/mods/keys/locale/keys.ja.tr b/mods/keys/locale/keys.ja.tr new file mode 100644 index 00000000..b356178a --- /dev/null +++ b/mods/keys/locale/keys.ja.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=鍵 +Key to @1's @2=@1の@2への鍵 +Skeleton Key=スケルトンの鍵 diff --git a/mods/keys/locale/keys.jbo.tr b/mods/keys/locale/keys.jbo.tr new file mode 100644 index 00000000..bd12f09b --- /dev/null +++ b/mods/keys/locale/keys.jbo.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=lo ckiku +Key to @1's @2=lo ckiku be @2 po la'o zo'i.@1.zo'i +Skeleton Key=lo greku ckiku diff --git a/mods/keys/locale/keys.ms.tr b/mods/keys/locale/keys.ms.tr new file mode 100644 index 00000000..58f8fc55 --- /dev/null +++ b/mods/keys/locale/keys.ms.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Kunci +Key to @1's @2=Kunci @2 milik @1 +Skeleton Key=Kunci Induk diff --git a/mods/keys/locale/keys.pl.tr b/mods/keys/locale/keys.pl.tr new file mode 100644 index 00000000..864d8a94 --- /dev/null +++ b/mods/keys/locale/keys.pl.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Klucz +Key to @1's @2=Klucz do @2 gracza @1 +Skeleton Key=Szkieletowy klucz diff --git a/mods/keys/locale/keys.pt_BR.tr b/mods/keys/locale/keys.pt_BR.tr new file mode 100644 index 00000000..ef9ca1ee --- /dev/null +++ b/mods/keys/locale/keys.pt_BR.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Chave +Key to @1's @2=Chave para @2 de @1 +Skeleton Key=Chave de Mestra diff --git a/mods/keys/locale/keys.ru.tr b/mods/keys/locale/keys.ru.tr new file mode 100644 index 00000000..00b4e097 --- /dev/null +++ b/mods/keys/locale/keys.ru.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Ключ +Key to @1's @2=Ключ к @2 от @1 +Skeleton Key=Ключ Скелета diff --git a/mods/keys/locale/keys.sv.tr b/mods/keys/locale/keys.sv.tr new file mode 100644 index 00000000..f666eb3d --- /dev/null +++ b/mods/keys/locale/keys.sv.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Nyckel +Key to @1's @2=Nyckel till @1s @2 +Skeleton Key=Skelettnyckel diff --git a/mods/keys/locale/keys.uk.tr b/mods/keys/locale/keys.uk.tr new file mode 100644 index 00000000..832d1c70 --- /dev/null +++ b/mods/keys/locale/keys.uk.tr @@ -0,0 +1,4 @@ +# textdomain: keys +Key=Ключ +Key to @1's @2=Ключ до @2 від @1 +Skeleton Key=Ключ Кістяка diff --git a/mods/keys/locale/keys.zh_CN.tr b/mods/keys/locale/keys.zh_CN.tr new file mode 100644 index 00000000..57f632ae --- /dev/null +++ b/mods/keys/locale/keys.zh_CN.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=钥匙 +Key to @1's @2=@1的@2的钥匙 +Skeleton Key=万能钥匙 diff --git a/mods/keys/locale/keys.zh_TW.tr b/mods/keys/locale/keys.zh_TW.tr new file mode 100644 index 00000000..c97879ca --- /dev/null +++ b/mods/keys/locale/keys.zh_TW.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=鑰匙 +Key to @1's @2=@1的@2的鑰匙 +Skeleton Key=萬能鑰匙 diff --git a/mods/keys/locale/template.txt b/mods/keys/locale/template.txt new file mode 100644 index 00000000..9fbf62fd --- /dev/null +++ b/mods/keys/locale/template.txt @@ -0,0 +1,5 @@ +# textdomain: keys + +Key= +Key to @1's @2= +Skeleton Key= diff --git a/mods/keys/mod.conf b/mods/keys/mod.conf new file mode 100644 index 00000000..8b8d6693 --- /dev/null +++ b/mods/keys/mod.conf @@ -0,0 +1,3 @@ +name = keys +description = Minetest Game mod: keys +depends = default diff --git a/mods/default/textures/default_key.png b/mods/keys/textures/keys_key.png similarity index 100% rename from mods/default/textures/default_key.png rename to mods/keys/textures/keys_key.png diff --git a/mods/default/textures/default_key_skeleton.png b/mods/keys/textures/keys_key_skeleton.png similarity index 100% rename from mods/default/textures/default_key_skeleton.png rename to mods/keys/textures/keys_key_skeleton.png diff --git a/mods/map/locale/map.eo.tr b/mods/map/locale/map.eo.tr index 15c1cab3..9225cfd7 100644 --- a/mods/map/locale/map.eo.tr +++ b/mods/map/locale/map.eo.tr @@ -1,3 +1,3 @@ # textdomain: map Mapping Kit=Mapa Ilaro -Use with 'Minimap' key=Uzu per 'malgrandmapo' ŝlosilo +Use with 'Minimap' key=Uzi per 'Minimapo' klavo diff --git a/mods/map/locale/map.ja.tr b/mods/map/locale/map.ja.tr new file mode 100644 index 00000000..7205f244 --- /dev/null +++ b/mods/map/locale/map.ja.tr @@ -0,0 +1,3 @@ +# textdomain: map +Mapping Kit=地図キット +Use with 'Minimap' key=ミニマップキーで使います diff --git a/mods/map/locale/map.pl.tr b/mods/map/locale/map.pl.tr new file mode 100644 index 00000000..d665de0c --- /dev/null +++ b/mods/map/locale/map.pl.tr @@ -0,0 +1,3 @@ +# textdomain: map +Mapping Kit=Zestaw kartograficzny +Use with 'Minimap' key=Naciśnij 'Minimap' aby użyć diff --git a/mods/map/locale/map.se.tr b/mods/map/locale/map.se.tr deleted file mode 100644 index de6ac361..00000000 --- a/mods/map/locale/map.se.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Kartläggningssats -Use with 'Minimap' key=Använd med 'Minimap' tangent diff --git a/mods/map/locale/map.sv.tr b/mods/map/locale/map.sv.tr new file mode 100644 index 00000000..bc79d44e --- /dev/null +++ b/mods/map/locale/map.sv.tr @@ -0,0 +1,3 @@ +# textdomain: map +Mapping Kit=Kartläggningssats +Use with 'Minimap' key=Använd med 'Minimap'-tangent diff --git a/mods/map/locale/map.uk.tr b/mods/map/locale/map.uk.tr new file mode 100644 index 00000000..3f58b781 --- /dev/null +++ b/mods/map/locale/map.uk.tr @@ -0,0 +1,3 @@ +# textdomain: map +Mapping Kit=Картографічний Комплект +Use with 'Minimap' key=Використовуйте за допомогою ключа 'Minimap' diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr b/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr index 428e5281..6e0f028c 100644 --- a/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr +++ b/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr @@ -1,57 +1,54 @@ # textdomain: mtg_craftguide - -### init.lua ### - -Any black dye=Ajna nigra tinkturo -Any black flower=Ajna nigra floro -Any blue dye=Ajna blua tinkturo -Any blue flower=Ajna blua floro -Any brown dye=Ajna bruna tinkturo Any coal=Ajna karbo -Any cyan dye=Ajna bluverda tinkturo -Any dark green dye=Ajna malhela verda tinkturo -Any dark grey dye=Ajna malhela graja tinkturo -Any green dye=Ajna verda tinkturo -Any green flower=Ajna verda floro -Any grey dye=Ajna graja tinkturo -Any item belonging to the group(s): @1=Ajna objekto de la aro(j) -Any kind of stone block=Ia ŝtona ŝtipo -Any magenta dye=Ajna fuksina tinkturo -Any orange dye=Ajna oranĝa tinkturo -Any orange flower=Ajna oranĝa floro -Any pink dye=Ajna rosa tinkturo -Any red dye=Ajna ruĝa tinkturo -Any red flower=Ajna ruĝa floro Any sand=Ajna sablo +Any wool=Ajna lano Any stick=Ajna bastono Any vessel=Ajna vazo -Any violet dye=Ajna viola tinkturo -Any violet flower=Ajna viola floro -Any white dye=Ajna blanka tinkturo +Any wood planks=Ajnaj lignaj tabuloj +Any kind of stone block=Ia ŝtona bloko +Any red flower=Ajna ruĝa floro +Any blue flower=Ajna blua floro +Any black flower=Ajna nigra floro +Any green flower=Ajna verda floro Any white flower=Ajna blanka floro -Any wood planks=Ajna ligna tabulo -Any wool=Ajna lano -Any yellow dye=Ajna flava tinkturo +Any orange flower=Ajna oranĝkolora floro +Any violet flower=Ajna violkolora floro Any yellow flower=Ajna flava floro -Click again to show recipes.=Anklaku ankoraŭ por prezenti receptojn -Click again to show usages.=Anklaku ankoraŭ por prezenti utiloj -Cooking time: @1=Tempo por kuirado: @1 -Fuel=Brulaĵo +Any red dye=Ajna ruĝa tinkturo +Any blue dye=Ajna blua tinkturo +Any cyan dye=Ajna bluverda tinkturo +Any grey dye=Ajna griza tinkturo +Any pink dye=Ajna rozkolora tinkturo +Any black dye=Ajna nigra tinkturo +Any brown dye=Ajna bruna tinkturo +Any green dye=Ajna verda tinkturo +Any white dye=Ajna blanka tinkturo +Any orange dye=Ajna oranĝkolora tinkturo +Any violet dye=Ajna violkolora tinkturo +Any yellow dye=Ajna flava tinkturo +Any magenta dye=Ajna fuksina tinkturo +Any dark grey dye=Ajna malhela griza tinkturo +Any dark green dye=Ajna malhela verda tinkturo # Label for group ingredients G=A -Next page=Sekvinta paĝo -Next recipe=Sekvinta recepto -No items to show.=Ne estas objektoj por prezenti -No recipes.=Ne estas receptoj -No usages.=Ne estas utiloj -Previous page=Pasinta paĝo -Previous recipe=Pasinta recepto +Any item belonging to the group(s): @1=Ajna objekto de la aro(j): @1 +Unknown Item=Nekonata Objekto +Fuel=Brulaĵo +Usage @1 of @2=Uzo @1 el @2 Recipe @1 of @2=Recepto @1 el @2 -Recipe is too big to be displayed.=La recepto estas tro granda por prezenti -Recipes=Receptoj -Reset=Rekomincigu -Search=Ŝerĉu +Previous recipe=Antaŭa recepto +Next recipe=Sekva recepto +Recipe is too big to be displayed.=La recepto estas tro granda por prezenti. Shapeless=Senforma -Unknown Item=Obskura Objekto -Usage @1 of @2=Utilo @1 el @2 +Cooking time: @1=Tempo por kuirado: @1 +Search=Serĉi +Reset=Rekomincigi +Previous page=Antaŭa paĝo +Next page=Sekva paĝo +No items to show.=Neniu objekto por prezenti. +No usages.=Neniu uzo. +Click again to show recipes.=Reklaki por prezenti receptojn. +No recipes.=Neniu recepto. +Click again to show usages.=Reklaki por prezenti uzojn. +Recipes=Receptoj diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.es.tr b/mods/mtg_craftguide/locale/mtg_craftguide.es.tr index 6108bf01..a5b5149d 100644 --- a/mods/mtg_craftguide/locale/mtg_craftguide.es.tr +++ b/mods/mtg_craftguide/locale/mtg_craftguide.es.tr @@ -1,5 +1,4 @@ # textdomain: mtg_craftguide - Any coal=Carbón Any sand=Arena Any wool=Lana @@ -30,10 +29,7 @@ Any yellow dye=Tinte amarillo Any magenta dye=Tinte magenta Any dark grey dye=Tinte gris oscuro Any dark green dye=Tinte verde oscuro - - # Label for group ingredients - G=G Any item belonging to the group(s): @1=Objeto del grupo: @1 Unknown Item=Objeto desconocido diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr b/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr index 78ab6ebb..afc82249 100644 --- a/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr +++ b/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr @@ -1,4 +1,5 @@ # textdomain: mtg_craftguide + Any coal=Quelconque charbon Any sand=Quelconque sable Any wool=Quelconque laine @@ -30,24 +31,24 @@ Any magenta dye=Quelconque colorant magenta Any dark grey dye=Quelconque colorant gris foncé Any dark green dye=Quelconque colorant vert foncé # Label for group ingredients -G= +G=G Any item belonging to the group(s): @1=Tout item appartenant au(x) groupe(s) : @1 -Unknown Item= -Fuel= +Unknown Item=Object inconnu +Fuel=Combustible Usage @1 of @2=Usage @1 sur @2 Recipe @1 of @2=Recette @1 sur @2 -Previous recipe= -Next recipe= -Recipe is too big to be displayed.= +Previous recipe=Recette précédente +Next recipe=Prochaine recette +Recipe is too big to be displayed.=Recette trop grande pour être affichée. Shapeless=Sans forme Cooking time: @1=Temps de cuisson : @1 -Search= -Reset= -Previous page= -Next page= -No items to show.= -No usages.= -Click again to show recipes.= -No recipes.= -Click again to show usages.= +Search=Recherche +Reset=Réinitialiser +Previous page=Page précédente +Next page=Prochaine page +No items to show.=Aucun item à afficher. +No usages.=Sans utilité. +Click again to show recipes.=Cliquez encore pour afficher la recette. +No recipes.=Aucune recette. +Click again to show usages.=Cliquez encore pour afficher l'usage. Recipes=Recettes diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.ja.tr b/mods/mtg_craftguide/locale/mtg_craftguide.ja.tr new file mode 100644 index 00000000..c6ec66ae --- /dev/null +++ b/mods/mtg_craftguide/locale/mtg_craftguide.ja.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=石炭 +Any sand=砂 +Any wool=羊毛 +Any stick=棒 +Any vessel=瓶 +Any wood planks=板材 +Any kind of stone block=石のブロック +Any red flower=赤色の花 +Any blue flower=青色の花 +Any black flower=黒色の花 +Any green flower=緑色の花 +Any white flower=白色の花 +Any orange flower=橙色の花 +Any violet flower=紫色の花 +Any yellow flower=黄色の花 +Any red dye=赤色の染料 +Any blue dye=青色の染料 +Any cyan dye=青緑色の染料 +Any grey dye=灰色の染料 +Any pink dye=桃色の染料 +Any black dye=黒色の染料 +Any brown dye=茶色の染料 +Any green dye=緑色の染料 +Any white dye=白色の染料 +Any orange dye=橙色の染料 +Any violet dye=紫色の染料 +Any yellow dye=黄色の染料 +Any magenta dye=赤紫色の染料 +Any dark grey dye=濃灰色の染料 +Any dark green dye=濃緑色の染料 +# Label for group ingredients +G= +Any item belonging to the group(s): @1=グループに属するアイテム: @1 +Unknown Item=不明なアイテム +Fuel=燃料 +Usage @1 of @2=利用方法 @1 / @2 +Recipe @1 of @2=レシピ @1 / @2 +Previous recipe=前のレシピ +Next recipe=次のレシピ +Recipe is too big to be displayed.=レシピが大きすぎて表示できません。 +Shapeless=無形 +Cooking time: @1=調理時間: @1 +Search=検索 +Reset=リセット +Previous page=前のページ +Next page=次のページ +No items to show.=表示する項目がありません。 +No usages.=利用方法がありません。 +Click again to show recipes.=もう一度クリックするとレシピを表示します。 +No recipes.=レシピがありません。 +Click again to show usages.=もう一度クリックすると使用方法を表示します。 +Recipes=レシピ diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.pl.tr b/mods/mtg_craftguide/locale/mtg_craftguide.pl.tr new file mode 100644 index 00000000..88d8e95e --- /dev/null +++ b/mods/mtg_craftguide/locale/mtg_craftguide.pl.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=Dowolny węgiel +Any sand=Dowonly piasek +Any wool=Dowolna wełna +Any stick=Dowolny patyk +Any vessel=Dowolne naczynie +Any wood planks=Dowolne deski +Any kind of stone block=Dowolny rodzaj kamiennego bloku +Any red flower=Dowolny czerwony kwiat +Any blue flower=Dowolny niebieski kwiat +Any black flower=Dowolny czarny kwiat +Any green flower=Dowolny zielony kwiat +Any white flower=Dowolny biały kwiat +Any orange flower=Dowolny pomarańczowy kwiat +Any violet flower=Dowolny fioletowy kwiat +Any yellow flower=Dowolny żółty kwiat +Any red dye=Dowolny czerwony barwnik +Any blue dye=Dowolny niebieski barwnik +Any cyan dye=Dowolny cyjanowy barwnik +Any grey dye=Dowolny szary barwnik +Any pink dye=Dowolny różowy barwnik +Any black dye=Dowolny czarny barwnik +Any brown dye=Dowolny brązowy barwnik +Any green dye=Dowolny zielony barwnik +Any white dye=Dowolny biały barwnik +Any orange dye=Dowolny pomarańczowy barwnik +Any violet dye=Dowolny fioletowy barwnik +Any yellow dye=Dowolny zółty barwnik +Any magenta dye=Dowolny karmazynowy barwnik +Any dark grey dye=Dowolny ciemnoszary barwnik +Any dark green dye=Dowolny ciemnozielony barwnik +# Label for group ingredients +G=G +Any item belonging to the group(s): @1= +Unknown Item=Nieznany przedmiot +Fuel=Paliwo +Usage @1 of @2=Użycie @1 z @2 +Recipe @1 of @2=Receptura @1 z @2 +Previous recipe=Poprzednia receptura +Next recipe=Następna receptura +Recipe is too big to be displayed.=Receptura jest zbyt duża aby mogła być wyświetlona. +Shapeless=Bez kształtu +Cooking time: @1=Czas przepalania: @1 +Search=Wyszukaj +Reset=Zresetuj +Previous page=Poprzednia strona +Next page=Następna strona +No items to show.=Brak przedmiotów do pokazania. +No usages.=Brak użyć. +Click again to show recipes.=Naciśnij jeszcze raz aby pokazać receptury. +No recipes.=Brak receptur. +Click again to show usages.=Naciśnij jeszcze raz aby pokazać użycia. +Recipes=Receptury diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr b/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr new file mode 100644 index 00000000..00b40564 --- /dev/null +++ b/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=Någon typ av kol +Any sand=Någon typ av sand +Any wool=Någon typ av ull +Any stick=Någon typ av pinne +Any vessel=Någon typ av fartygshylla +Any wood planks=Någon typ av träplanka +Any kind of stone block=Någon typ av stenblock +Any red flower=Någon typ av röd blomma +Any blue flower=Någon typ av blå blomma +Any black flower=Någon typ av svart blomma +Any green flower=Någon typ av grön blomma +Any white flower=Någon typ av vit blomma +Any orange flower=Någon typ av orange blomma +Any violet flower=Någon typ av violett blomma +Any yellow flower=Någon typ av gul blomma +Any red dye=Någon typ av röd färg +Any blue dye=Någon typ av blå färg +Any cyan dye=Någon typ av cyan färg +Any grey dye=Någon typ av grå färg +Any pink dye=Någon typ av rosa färg +Any black dye=Någon typ av svart färg +Any brown dye=Någon typ av brun färg +Any green dye=Någon typ av grön färg +Any white dye=Någon typ av vit färg +Any orange dye=Någon typ av orange färg +Any violet dye=Någon typ av violett färg +Any yellow dye=Någon typ av gul färg +Any magenta dye=Någon typ av magenta färg +Any dark grey dye=Någon typ av mörkgrå färg +Any dark green dye=Någon typ av mörkgrön färg +# Label for group ingredients +G=G +Any item belonging to the group(s): @1=Vilket föremål som helst som tillhör grupp(erna): @1 +Unknown Item=Okänt föremål +Fuel=Bränsle +Usage @1 of @2=Användning @1 av @2 +Recipe @1 of @2=Recept @1 av @2 +Previous recipe=Föregående recept +Next recipe=Nästa recept +Recipe is too big to be displayed.=Receptet är för stort för att visas. +Shapeless=Formlöst +Cooking time: @1=Tillagningstid: @1 +Search=Sök +Reset=Återställ +Previous page=Föregående sida +Next page=Nästa sida +No items to show.=Inga föremål att visa. +No usages.=Inga användningsområden. +Click again to show recipes.=Tryck igen för att visa recept. +No recipes.=Inga recept. +Click again to show usages.=Tryck igen för att visa användningsområden. +Recipes=Recept diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr b/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr new file mode 100644 index 00000000..52d33a45 --- /dev/null +++ b/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=Будь-яке вугілля +Any sand=Будь-якій пісок +Any wool=Будь-яка вовна +Any stick=Будь-яка паличка +Any vessel=Будь-який посуд +Any wood planks=Будь-які дерев'яні палички +Any kind of stone block=Будь-який кам'яний блок +Any red flower=Будь-яка червона квітка +Any blue flower=Будь-яка синя квітка +Any black flower=Будь-яка чорна квітка +Any green flower=Будь-яка зелена квітка +Any white flower=Будь-яка біла квітка +Any orange flower=Будь-яка помаранчева квітка +Any violet flower=Будь-яка фіолетова квітка +Any yellow flower=Будь-яка жовта квітка +Any red dye=Будь-яка червона фарба +Any blue dye=Будь-яка синя фарба +Any cyan dye=Будь-яка синьо-зелена фарба +Any grey dye=Будь-яка сіра фарба +Any pink dye=Будь-яка рожева фарба +Any black dye=Будь-яка чорна фарба +Any brown dye=Будь-яка коричнева фарба +Any green dye=Будь-яка зелена фарба +Any white dye=Будь-яка біла фарба +Any orange dye=Будь-яка помаранчева фарба +Any violet dye=Будь-яка фіолетова фарба +Any yellow dye=Будь-яка жовта фарба +Any magenta dye=Будь-який пурпурна фарба +Any dark grey dye=Будь-яка темно-сіра фарба +Any dark green dye=Будь-яка темно-зелена фарба +# Label for group ingredients +G= +Any item belonging to the group(s): @1=Будь-який предмет з груп(и): @1 +Unknown Item=Невідомий предмет +Fuel=Паливо +Usage @1 of @2=Використано @1 з @2 +Recipe @1 of @2=Рецепт @1 з @2 +Previous recipe=Попередній рецепт +Next recipe=Наступний рецепт +Recipe is too big to be displayed.=Рецепт занадто великий для показу. +Shapeless=Безформний +Cooking time: @1=Час виготовлення: @1 +Search=Пошук +Reset=Скинути +Previous page=Попередня сторінка +Next page=Наступна сторінка +No items to show.=Немає елементів для показу. +No usages.=Не використовується. +Click again to show recipes.=Натисніть ще раз, щоб показати рецепти. +No recipes.=Немає рецептів. +Click again to show usages.=Натисніть ще раз, щоб показати використання. +Recipes=Рецепти diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index 0aee048e..e39847db 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -1,54 +1,84 @@ --- Minetest 0.4 mod: player --- See README.txt for licensing and other information. - player_api = {} -- Player animation blending -- Note: This is currently broken due to a bug in Irrlicht, leave at 0 local animation_blend = 0 -player_api.registered_models = { } +player_api.registered_models = {} -- Local for speed. local models = player_api.registered_models +local function collisionbox_equals(collisionbox, other_collisionbox) + if collisionbox == other_collisionbox then + return true + end + for index = 1, 6 do + if collisionbox[index] ~= other_collisionbox[index] then + return false + end + end + return true +end + function player_api.register_model(name, def) models[name] = def + def.visual_size = def.visual_size or {x = 1, y = 1} + def.collisionbox = def.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3} + def.stepheight = def.stepheight or 0.6 + def.eye_height = def.eye_height or 1.47 + + -- Sort animations into property classes: + -- Animations with same properties have the same _equals value + for animation_name, animation in pairs(def.animations) do + animation.eye_height = animation.eye_height or def.eye_height + animation.collisionbox = animation.collisionbox or def.collisionbox + animation.override_local = animation.override_local or false + + for _, other_animation in pairs(def.animations) do + if other_animation._equals then + if collisionbox_equals(animation.collisionbox, other_animation.collisionbox) + and animation.eye_height == other_animation.eye_height then + animation._equals = other_animation._equals + break + end + end + end + animation._equals = animation._equals or animation_name + end end -- Player stats and animations -local player_model = {} -local player_textures = {} -local player_anim = {} -local player_sneak = {} +-- model, textures, animation +local players = {} player_api.player_attached = {} +local function get_player_data(player) + return assert(players[player:get_player_name()]) +end + function player_api.get_animation(player) - local name = player:get_player_name() - return { - model = player_model[name], - textures = player_textures[name], - animation = player_anim[name], - } + return get_player_data(player) end -- Called when a player's appearance needs to be updated function player_api.set_model(player, model_name) - local name = player:get_player_name() + local player_data = get_player_data(player) + if player_data.model == model_name then + return + end + player_data.model = model_name + local model = models[model_name] if model then - if player_model[name] == model_name then - return - end player:set_properties({ mesh = model_name, - textures = player_textures[name] or model.textures, + textures = player_data.textures or model.textures, visual = "mesh", - visual_size = model.visual_size or {x = 1, y = 1}, - collisionbox = model.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, - stepheight = model.stepheight or 0.6, - eye_height = model.eye_height or 1.47, + visual_size = model.visual_size, + stepheight = model.stepheight }) + -- sets local_animation, collisionbox & eye_height player_api.set_animation(player, "stand") else player:set_properties({ @@ -60,37 +90,77 @@ function player_api.set_model(player, model_name) eye_height = 1.625, }) end - player_model[name] = model_name +end + +function player_api.get_textures(player) + local player_data = get_player_data(player) + local model = models[player_data.model] + return assert(player_data.textures or (model and model.textures)) end function player_api.set_textures(player, textures) - local name = player:get_player_name() - local model = models[player_model[name]] - local model_textures = model and model.textures or nil - player_textures[name] = textures or model_textures - player:set_properties({textures = textures or model_textures}) + local player_data = get_player_data(player) + local model = models[player_data.model] + local new_textures = assert(textures or (model and model.textures)) + player_data.textures = new_textures + player:set_properties({textures = new_textures}) +end + +function player_api.set_texture(player, index, texture) + local textures = table.copy(player_api.get_textures(player)) + textures[index] = texture + player_api.set_textures(player, textures) end function player_api.set_animation(player, anim_name, speed) - local name = player:get_player_name() - if player_anim[name] == anim_name then - return - end - local model = player_model[name] and models[player_model[name]] + local player_data = get_player_data(player) + local model = models[player_data.model] if not (model and model.animations[anim_name]) then return end + speed = speed or model.animation_speed + if player_data.animation == anim_name and player_data.animation_speed == speed then + return + end + local previous_anim = model.animations[player_data.animation] or {} local anim = model.animations[anim_name] - player_anim[name] = anim_name - player:set_animation(anim, speed or model.animation_speed, animation_blend) + player_data.animation = anim_name + player_data.animation_speed = speed + -- If necessary change the local animation (only seen by the client of *that* player) + -- `override_local` <=> suspend local animations while this one is active + -- (this is basically a hack, proper engine feature needed...) + if anim.override_local ~= previous_anim.override_local then + if anim.override_local then + local none = {x=0, y=0} + player:set_local_animation(none, none, none, none, 1) + else + local a = model.animations -- (not specific to the animation being set) + player:set_local_animation( + a.stand, a.walk, a.mine, a.walk_mine, + model.animation_speed or 30 + ) + end + end + -- Set the animation seen by everyone else + player:set_animation(anim, speed, animation_blend) + -- Update related properties if they changed + if anim._equals ~= previous_anim._equals then + player:set_properties({ + collisionbox = anim.collisionbox, + eye_height = anim.eye_height + }) + end end +minetest.register_on_joinplayer(function(player) + local name = player:get_player_name() + players[name] = {} + player_api.player_attached[name] = false +end) + minetest.register_on_leaveplayer(function(player) local name = player:get_player_name() - player_model[name] = nil - player_anim[name] = nil - player_textures[name] = nil - player_sneak[name] = nil + players[name] = nil player_api.player_attached[name] = nil end) @@ -108,11 +178,11 @@ function minetest.calculate_knockback(player, ...) end -- Check each player and apply animations -minetest.register_globalstep(function() - for _, player in pairs(minetest.get_connected_players()) do +function player_api.globalstep() + for _, player in ipairs(minetest.get_connected_players()) do local name = player:get_player_name() - local model_name = player_model[name] - local model = model_name and models[model_name] + local player_data = players[name] + local model = player_data and models[player_data.model] if model and not player_attached[name] then local controls = player:get_player_control() local animation_speed_mod = model.animation_speed or 30 @@ -125,12 +195,7 @@ minetest.register_globalstep(function() -- Apply animations based on what the player is doing if player:get_hp() == 0 then player_set_animation(player, "lay") - -- Determine if the player is walking elseif controls.up or controls.down or controls.left or controls.right then - if player_sneak[name] ~= controls.sneak then - player_anim[name] = nil - player_sneak[name] = controls.sneak - end if controls.LMB or controls.RMB then player_set_animation(player, "walk_mine", animation_speed_mod) else @@ -143,4 +208,21 @@ minetest.register_globalstep(function() end end end +end + +-- Mods can modify the globalstep by overriding player_api.globalstep +minetest.register_globalstep(function(...) + player_api.globalstep(...) end) + +for _, api_function in pairs({"get_animation", "set_animation", "set_model", "set_textures"}) do + local original_function = player_api[api_function] + player_api[api_function] = function(player, ...) + if not players[player:get_player_name()] then + -- HACK for keeping backwards compatibility + minetest.log("warning", api_function .. " called on offline player") + return + end + return original_function(player, ...) + end +end diff --git a/mods/player_api/init.lua b/mods/player_api/init.lua index 1176b0ea..f258aea7 100644 --- a/mods/player_api/init.lua +++ b/mods/player_api/init.lua @@ -1,5 +1,3 @@ --- player/init.lua - dofile(minetest.get_modpath("player_api") .. "/api.lua") -- Default player appearance @@ -9,11 +7,13 @@ player_api.register_model("character.b3d", { animations = { -- Standard animations. stand = {x = 0, y = 79}, - lay = {x = 162, y = 166}, + lay = {x = 162, y = 166, eye_height = 0.3, override_local = true, + collisionbox = {-0.6, 0.0, -0.6, 0.6, 0.3, 0.6}}, walk = {x = 168, y = 187}, mine = {x = 189, y = 198}, walk_mine = {x = 200, y = 219}, - sit = {x = 81, y = 160}, + sit = {x = 81, y = 160, eye_height = 0.8, override_local = true, + collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.0, 0.3}} }, collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, stepheight = 0.6, @@ -22,13 +22,5 @@ player_api.register_model("character.b3d", { -- Update appearance when the player joins minetest.register_on_joinplayer(function(player) - player_api.player_attached[player:get_player_name()] = false player_api.set_model(player, "character.b3d") - player:set_local_animation( - {x = 0, y = 79}, - {x = 168, y = 187}, - {x = 189, y = 198}, - {x = 200, y = 219}, - 30 - ) end) diff --git a/mods/player_api/mod.conf b/mods/player_api/mod.conf index 198b86dc..bf62327b 100644 --- a/mods/player_api/mod.conf +++ b/mods/player_api/mod.conf @@ -1,2 +1,2 @@ name = player_api -description = Minetest Game mod: player_api +description = Minetest Game mod: Manages player visuals diff --git a/mods/player_api/models/character.b3d b/mods/player_api/models/character.b3d index 764197d9..3e0827e4 100644 Binary files a/mods/player_api/models/character.b3d and b/mods/player_api/models/character.b3d differ diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua index 98548f0b..48684cfb 100644 --- a/mods/screwdriver/init.lua +++ b/mods/screwdriver/init.lua @@ -141,7 +141,7 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses) end if not minetest.is_creative_enabled(player_name) then - itemstack:add_wear(65535 / ((uses or 200) - 1)) + itemstack:add_wear_by_uses(uses or 200) end return itemstack diff --git a/mods/screwdriver/locale/screwdriver.eo.tr b/mods/screwdriver/locale/screwdriver.eo.tr index cf0976a5..7f8fedfa 100644 --- a/mods/screwdriver/locale/screwdriver.eo.tr +++ b/mods/screwdriver/locale/screwdriver.eo.tr @@ -1,3 +1,3 @@ # textdomain: screwdriver Screwdriver=Ŝraŭbturnilo -(left-click rotates face, right-click rotates axis)=(maldekstra-klako turnas supraĵo, dekstra-klako turnas akso) +(left-click rotates face, right-click rotates axis)=(maldekstra-klako turnas supraĵon, dekstra-klako turnas akson) diff --git a/mods/screwdriver/locale/screwdriver.ja.tr b/mods/screwdriver/locale/screwdriver.ja.tr new file mode 100644 index 00000000..55690f25 --- /dev/null +++ b/mods/screwdriver/locale/screwdriver.ja.tr @@ -0,0 +1,3 @@ +# textdomain: screwdriver +Screwdriver=ドライバー +(left-click rotates face, right-click rotates axis)=(左クリックで面が回転。右クリックで軸が回転) diff --git a/mods/screwdriver/locale/screwdriver.pl.tr b/mods/screwdriver/locale/screwdriver.pl.tr new file mode 100644 index 00000000..3b4bfd6e --- /dev/null +++ b/mods/screwdriver/locale/screwdriver.pl.tr @@ -0,0 +1,3 @@ +# textdomain: screwdriver +Screwdriver=Śrubokręt +(left-click rotates face, right-click rotates axis)=(lewy przycisk myszy obraca powierzchnię, prawy przycisk myszy obraca oś) diff --git a/mods/screwdriver/locale/screwdriver.se.tr b/mods/screwdriver/locale/screwdriver.sv.tr similarity index 100% rename from mods/screwdriver/locale/screwdriver.se.tr rename to mods/screwdriver/locale/screwdriver.sv.tr diff --git a/mods/screwdriver/locale/screwdriver.uk.tr b/mods/screwdriver/locale/screwdriver.uk.tr new file mode 100644 index 00000000..363e4c4c --- /dev/null +++ b/mods/screwdriver/locale/screwdriver.uk.tr @@ -0,0 +1,3 @@ +# textdomain: screwdriver +Screwdriver=Викрутка +(left-click rotates face, right-click rotates axis)=(клік лівою кнопкою миші повертає край, клік правою кнопкою миші - вісь) diff --git a/mods/sethome/locale/sethome.eo.tr b/mods/sethome/locale/sethome.eo.tr index c505064c..eb8f0a61 100644 --- a/mods/sethome/locale/sethome.eo.tr +++ b/mods/sethome/locale/sethome.eo.tr @@ -1,8 +1,8 @@ # textdomain: sethome Can use /sethome and /home=Povas uzi /sethome kaj /home -Teleport you to your home point=Teletransportu vi al via hejmo -Teleported to home!=Teletransportis al hejmo! +Teleport you to your home point=Teletransporti vin al via hejmo +Teleported to home!=Teletransportita al hejmo! Set a home using /sethome=Fiksi hejmon per /sethome -Set your home point=Fiksi vian hejman punkto -Home set!=Hejmo fiksis! -Player not found!=Ludanto ne estas trovebla! +Set your home point=Fiksi vian hejman punkton +Home set!=Fiksita hejmo! +Player not found!=Ludanto ne troveblas! diff --git a/mods/sethome/locale/sethome.ja.tr b/mods/sethome/locale/sethome.ja.tr new file mode 100644 index 00000000..3d636b59 --- /dev/null +++ b/mods/sethome/locale/sethome.ja.tr @@ -0,0 +1,8 @@ +# textdomain: sethome +Can use /sethome and /home=/sethomeと/homeが使えます +Teleport you to your home point=ホーム地点にテレポートします +Teleported to home!=ホームにテレポート！ +Set a home using /sethome=/sethomeを使ってホームを設定します +Set your home point=ホーム地点を設定します +Home set!=ホーム地点をセット！ +Player not found!=プレーヤーが見つかりません！ diff --git a/mods/sethome/locale/sethome.jbo.tr b/mods/sethome/locale/sethome.jbo.tr index 46279dd5..90ac1a35 100644 --- a/mods/sethome/locale/sethome.jbo.tr +++ b/mods/sethome/locale/sethome.jbo.tr @@ -1,8 +1,8 @@ # textdomain: sethome -Can use /sethome and /home=Kann /sethome und /home benutzen -Teleport you to your home point=Teleportieren Sie sich zu Ihrem Zuhause-Punkt -Teleported to home!=Nach Hause teleportiert! -Set a home using /sethome=Ein Zuhause mit /sethome setzen -Set your home point=Ihren Zuhause-Punkt setzen -Home set!=Zuhause gesetzt! -Player not found!=Spieler nicht gefunden! +Can use /sethome and /home=kakne lo nu pilno lo me zoi gy./sethome.gy. ku .e lo me zoi gy./home.gy. +Teleport you to your home point=sukmu'u lo do zdani mokca +Teleported to home!=puba'o sukmu'u lo zdani +Set a home using /sethome=ko tcimi'e fi lo zdani sepi'o lo me zoi gy./sethome.gy. +Set your home point=tcimi'e fi lo do zdani mokca +Home set!=puba'o tcimi'e fi lo zdani +Player not found!=lo kelci na te facki diff --git a/mods/sethome/locale/sethome.pl.tr b/mods/sethome/locale/sethome.pl.tr new file mode 100644 index 00000000..981a8c45 --- /dev/null +++ b/mods/sethome/locale/sethome.pl.tr @@ -0,0 +1,8 @@ +# textdomain: sethome +Can use /sethome and /home=Może używać /sethome i /home +Teleport you to your home point=Teleportuj się do swojego punktu domowego +Teleported to home!=Teleportowano do punktu domowego +Set a home using /sethome=Ustaw punkt domowy używając /sethome +Set your home point=Ustaw swój punkt domowy +Home set!=Punkt domowy ustawiony! +Player not found!=Gracz nie odnaleziony! diff --git a/mods/sethome/locale/sethome.se.tr b/mods/sethome/locale/sethome.sv.tr similarity index 71% rename from mods/sethome/locale/sethome.se.tr rename to mods/sethome/locale/sethome.sv.tr index 4ae8c528..60673ae5 100644 --- a/mods/sethome/locale/sethome.se.tr +++ b/mods/sethome/locale/sethome.sv.tr @@ -1,8 +1,8 @@ # textdomain: sethome -Can use /sethome and /home=Kan används /sethome och /home +Can use /sethome and /home=Kan använda /sethome och /home Teleport you to your home point=Teleportera dig till din hempunkt Teleported to home!=Teleporterad hem! Set a home using /sethome=Ställ in ett hem med /sethome Set your home point=Ställ in din hempunkt Home set!=Hem inställt! -Player not found!=Spelare inte hittad! +Player not found!=Spelare finns inte! diff --git a/mods/sethome/locale/sethome.uk.tr b/mods/sethome/locale/sethome.uk.tr new file mode 100644 index 00000000..d8d4a8fc --- /dev/null +++ b/mods/sethome/locale/sethome.uk.tr @@ -0,0 +1,8 @@ +# textdomain: sethome +Can use /sethome and /home=Можливість використання /sethome та /home +Teleport you to your home point=Ви телепортуєтесь у свою домашню точку +Teleported to home!=Ви телепортувались додому! +Set a home using /sethome=Встановіть домашню точку, використовуючи /sethome +Set your home point=Встановіть домашню точку +Home set!=Домашня точка встановлена! +Player not found!=Гравець не визначений! diff --git a/mods/sethome/locale/sethome.zh_CN.tr b/mods/sethome/locale/sethome.zh_CN.tr index 9e3780a7..0af54ce7 100644 --- a/mods/sethome/locale/sethome.zh_CN.tr +++ b/mods/sethome/locale/sethome.zh_CN.tr @@ -1,6 +1,6 @@ # textdomain: sethome Can use /sethome and /home=可以使用/sethome和/home -Teleport you to your home point=传送您到您家的地点 +Teleport you to your home point=将您传送到家 Teleported to home!=已传送到家！ Set a home using /sethome=使用/sethome设定家 Set your home point=设定您家的地点 diff --git a/mods/sfinv/locale/sfinv.ja.tr b/mods/sfinv/locale/sfinv.ja.tr new file mode 100644 index 00000000..04122d72 --- /dev/null +++ b/mods/sfinv/locale/sfinv.ja.tr @@ -0,0 +1,2 @@ +# textdomain: sfinv +Crafting=クラフト diff --git a/mods/sfinv/locale/sfinv.pl.tr b/mods/sfinv/locale/sfinv.pl.tr new file mode 100644 index 00000000..6230d82d --- /dev/null +++ b/mods/sfinv/locale/sfinv.pl.tr @@ -0,0 +1,2 @@ +# textdomain: sfinv +Crafting=Konstruowanie diff --git a/mods/sfinv/locale/sfinv.se.tr b/mods/sfinv/locale/sfinv.sv.tr similarity index 100% rename from mods/sfinv/locale/sfinv.se.tr rename to mods/sfinv/locale/sfinv.sv.tr diff --git a/mods/sfinv/locale/sfinv.uk.tr b/mods/sfinv/locale/sfinv.uk.tr new file mode 100644 index 00000000..d7c11b2f --- /dev/null +++ b/mods/sfinv/locale/sfinv.uk.tr @@ -0,0 +1,2 @@ +# textdomain: sfinv +Crafting=Крафтинг diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index 89e0d24a..4ba854fa 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -57,13 +57,24 @@ local function warn_if_exists(nodename) end end +-- get node settings to use for stairs +local function get_node_vars(nodename) + + local def = minetest.registered_nodes[nodename] + + if def then + return def.light_source, def.use_texture_alpha, def.sunlight_propagates + end + + return nil, nil, nil +end -- Register stair -- Node will be called stairs:stair_ function stairs.register_stair(subname, recipeitem, groups, images, description, sounds, worldaligntex) - local src_def = minetest.registered_nodes[recipeitem] + local light_source, texture_alpha, sunlight = get_node_vars(recipeitem) -- Set backface culling and world-aligned textures local stair_images = {} @@ -93,7 +104,9 @@ function stairs.register_stair(subname, recipeitem, groups, images, description, description = description, drawtype = "nodebox", tiles = stair_images, - use_texture_alpha = src_def and src_def.use_texture_alpha, + use_texture_alpha = texture_alpha, + sunlight_propagates = sunlight, + light_source = light_source, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, @@ -165,7 +178,7 @@ end function stairs.register_slab(subname, recipeitem, groups, images, description, sounds, worldaligntex) - local src_def = minetest.registered_nodes[recipeitem] + local light_source, texture_alpha, sunlight = get_node_vars(recipeitem) -- Set world-aligned textures local slab_images = {} @@ -191,7 +204,9 @@ function stairs.register_slab(subname, recipeitem, groups, images, description, description = description, drawtype = "nodebox", tiles = slab_images, - use_texture_alpha = src_def and src_def.use_texture_alpha, + use_texture_alpha = texture_alpha, + sunlight_propagates = sunlight, + light_source = light_source, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, @@ -303,7 +318,7 @@ end function stairs.register_stair_inner(subname, recipeitem, groups, images, description, sounds, worldaligntex, full_description) - local src_def = minetest.registered_nodes[recipeitem] + local light_source, texture_alpha, sunlight = get_node_vars(recipeitem) -- Set backface culling and world-aligned textures local stair_images = {} @@ -338,7 +353,9 @@ function stairs.register_stair_inner(subname, recipeitem, groups, images, description = description, drawtype = "nodebox", tiles = stair_images, - use_texture_alpha = src_def and src_def.use_texture_alpha, + use_texture_alpha = texture_alpha, + sunlight_propagates = sunlight, + light_source = light_source, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, @@ -393,7 +410,7 @@ end function stairs.register_stair_outer(subname, recipeitem, groups, images, description, sounds, worldaligntex, full_description) - local src_def = minetest.registered_nodes[recipeitem] + local light_source, texture_alpha, sunlight = get_node_vars(recipeitem) -- Set backface culling and world-aligned textures local stair_images = {} @@ -428,7 +445,9 @@ function stairs.register_stair_outer(subname, recipeitem, groups, images, description = description, drawtype = "nodebox", tiles = stair_images, - use_texture_alpha = src_def and src_def.use_texture_alpha, + use_texture_alpha = texture_alpha, + sunlight_propagates = sunlight, + light_source = light_source, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, diff --git a/mods/stairs/locale/stairs.eo.tr b/mods/stairs/locale/stairs.eo.tr index 3609d8de..078cc9cc 100644 --- a/mods/stairs/locale/stairs.eo.tr +++ b/mods/stairs/locale/stairs.eo.tr @@ -59,10 +59,10 @@ Desert Stone Brick Stair=Dezerta Ŝtona Brika Ŝtupo Inner Desert Stone Brick Stair=Interna Dezerta Ŝtona Brika Ŝtupo Outer Desert Stone Brick Stair=Ekstera Dezerta Ŝtona Brika Ŝtupo Desert Stone Brick Slab=Dezerta Ŝtona Brika Plato -Desert Stone Block Stair=Dezerta Ŝtona Ŝtipo Ŝtupo -Inner Desert Stone Block Stair=Interna Dezerta Ŝtona Ŝtipo Stupo -Outer Desert Stone Block Stair=Ekstera Dezerta Ŝtona Ŝtipo Ŝtupo -Desert Stone Block Slab=Dezerta Ŝtona Ŝtipo Plato +Desert Stone Block Stair=Dezerta Ŝtona Bloko Ŝtupo +Inner Desert Stone Block Stair=Interna Dezerta Ŝtona Bloko Stupo +Outer Desert Stone Block Stair=Ekstera Dezerta Ŝtona Bloko Ŝtupo +Desert Stone Block Slab=Dezerta Ŝtona Bloko Plato Sandstone Stair=Sablŝtona Ŝtupo Inner Sandstone Stair=Interna Ŝablŝtona Ŝtupo Outer Sandstone Stair=Ekstera Ŝablŝtona Ŝtupo diff --git a/mods/stairs/locale/stairs.ja.tr b/mods/stairs/locale/stairs.ja.tr new file mode 100644 index 00000000..73e2703c --- /dev/null +++ b/mods/stairs/locale/stairs.ja.tr @@ -0,0 +1,145 @@ +# textdomain: stairs +Glass Stair=ガラスの階段 +Glass Slab=ガラスのハーフブロック +Inner Glass Stair=へっこんだガラスの階段 +Outer Glass Stair=でっぱったガラスの階段 +Obsidian Glass Stair=黒曜石ガラスの階段 +Obsidian Glass Slab=黒曜石ガラスのハーフブロック +Inner Obsidian Glass Stair=へっこんだ黒曜石ガラスの階段 +Outer Obsidian Glass Stair=でっぱった黒曜石ガラスの階段 +Wooden Stair=木の階段 +Inner Wooden Stair=へっこんだ木の階段 +Outer Wooden Stair=でっぱった木の階段 +Wooden Slab=木のハーフブロック +Jungle Wood Stair=ジャングルの階段 +Inner Jungle Wood Stair=へっこんだジャングルの階段 +Outer Jungle Wood Stair=でっぱったジャングルの階段 +Jungle Wood Slab=ジャングルのハーフブロック +Pine Wood Stair=マツの木の階段 +Inner Pine Wood Stair=へっこんだマツの階段 +Outer Pine Wood Stair=でっぱったマツの階段 +Pine Wood Slab=マツのハーフブロック +Acacia Wood Stair=アカシアの階段 +Inner Acacia Wood Stair=へっこんだアカシアの階段 +Outer Acacia Wood Stair=でっぱったアカシアの階段 +Acacia Wood Slab=アカシアのハーフブロック +Aspen Wood Stair=ポプラの階段 +Inner Aspen Wood Stair=へっこんだポプラの階段 +Outer Aspen Wood Stair=でっぱったポプラの階段 +Aspen Wood Slab=ポプラのハーフブロック +Stone Stair=石の階段 +Inner Stone Stair=へっこんだ石の階段 +Outer Stone Stair=でっぱった石の階段 +Stone Slab=石のハーフブロック +Cobblestone Stair=丸石の階段 +Inner Cobblestone Stair=へっこんだ丸石の階段 +Outer Cobblestone Stair=でっぱった丸石の階段 +Cobblestone Slab=丸石のハーフブロック +Mossy Cobblestone Stair=苔むした丸石の階段 +Inner Mossy Cobblestone Stair=へっこんだ苔むした丸石の階段 +Outer Mossy Cobblestone Stair=でっぱった苔むした丸石の階段 +Mossy Cobblestone Slab=苔むした丸石のハーフブロック +Stone Brick Stair=石レンガの階段 +Inner Stone Brick Stair=へっこんだ石レンガの階段 +Outer Stone Brick Stair=でっぱった石レンガの階段 +Stone Brick Slab=石レンガのハーフブロック +Stone Block Stair=石ブロックの階段 +Inner Stone Block Stair=へっこんだ石ブロックの階段 +Outer Stone Block Stair=でっぱった石ブロックの階段 +Stone Block Slab=石ブロックのハーフブロック +Desert Stone Stair=砂漠の石の階段 +Inner Desert Stone Stair=へっこんだ砂漠の石の階段 +Outer Desert Stone Stair=でっぱった砂漠の石の階段 +Desert Stone Slab=砂漠の石のハーフブロック +Desert Cobblestone Stair=砂漠の丸石の階段 +Inner Desert Cobblestone Stair=へっこんだ砂漠の丸石の階段 +Outer Desert Cobblestone Stair=でっぱった砂漠の丸石の階段 +Desert Cobblestone Slab=砂漠の丸石のハーフブロック +Desert Stone Brick Stair=砂漠の石レンガの階段 +Inner Desert Stone Brick Stair=へっこんだ砂漠の石レンガの階段 +Outer Desert Stone Brick Stair=でっぱった砂漠の石レンガの階段 +Desert Stone Brick Slab=砂漠の石レンガのハーフブロック +Desert Stone Block Stair=砂漠の石ブロックの階段 +Inner Desert Stone Block Stair=へっこんだ砂漠の石ブロックの階段 +Outer Desert Stone Block Stair=でっぱった砂漠の石ブロックの階段 +Desert Stone Block Slab=砂漠の石ブロックのハーフブロック +Sandstone Stair=砂岩の階段 +Inner Sandstone Stair=へっこんだ砂岩の階段 +Outer Sandstone Stair=でっぱった砂岩の階段 +Sandstone Slab=砂岩のハーフブロック +Sandstone Brick Stair=砂岩レンガの階段 +Inner Sandstone Brick Stair=へっこんだ砂岩レンガの階段 +Outer Sandstone Brick Stair=でっぱった砂岩レンガの階段 +Sandstone Brick Slab=砂岩レンガのハーフブロック +Sandstone Block Stair=砂岩ブロックの階段 +Inner Sandstone Block Stair=へっこんだ砂岩ブロックの階段 +Outer Sandstone Block Stair=でっぱった砂岩ブロックの階段 +Sandstone Block Slab=砂岩ブロックのハーフブロック +Desert Sandstone Stair=砂漠の砂岩の階段 +Inner Desert Sandstone Stair=へっこんだ砂漠の砂岩の階段 +Outer Desert Sandstone Stair=でっぱった砂漠の砂岩の階段 +Desert Sandstone Slab=砂漠の砂岩のハーフブロック +Desert Sandstone Brick Stair=砂漠の砂岩レンガの階段 +Inner Desert Sandstone Brick Stair=へっこんだ砂漠の砂岩レンガの階段 +Outer Desert Sandstone Brick Stair=でっぱった砂漠の砂岩レンガの階段 +Desert Sandstone Brick Slab=砂漠の砂岩レンガのハーフブロック +Desert Sandstone Block Stair=砂漠の砂岩ブロックの階段 +Inner Desert Sandstone Block Stair=へっこんだ砂漠の砂岩ブロックの階段 +Outer Desert Sandstone Block Stair=でっぱった砂漠の砂岩ブロックの階段 +Desert Sandstone Block Slab=砂漠の砂岩ブロックのハーフブロック +Silver Sandstone Stair=銀の砂岩の階段 +Inner Silver Sandstone Stair=へっこんだ銀の砂岩の階段 +Outer Silver Sandstone Stair=でっぱった銀の砂岩の階段 +Silver Sandstone Slab=銀の砂岩のハーフブロック +Silver Sandstone Brick Stair=銀の砂岩レンガの階段 +Inner Silver Sandstone Brick Stair=へっこんだ銀の砂岩レンガの階段 +Outer Silver Sandstone Brick Stair=でっぱった銀の砂岩レンガの階段 +Silver Sandstone Brick Slab=銀の砂岩レンガのハーフブロック +Silver Sandstone Block Stair=銀の砂岩ブロックの階段 +Inner Silver Sandstone Block Stair=へっこんだ銀の砂岩ブロックの階段 +Outer Silver Sandstone Block Stair=でっぱった銀の砂岩ブロックの階段 +Silver Sandstone Block Slab=銀の砂岩ブロックのハーフブロック +Obsidian Stair=黒曜石の階段 +Inner Obsidian Stair=へっこんだ黒曜石の階段 +Outer Obsidian Stair=でっぱった黒曜石の階段 +Obsidian Slab=黒曜石のハーフブロック +Obsidian Brick Stair=黒曜石レンガの階段 +Inner Obsidian Brick Stair=へっこんだ黒曜石レンガの階段 +Outer Obsidian Brick Stair=でっぱった黒曜石レンガの階段 +Obsidian Brick Slab=黒曜石レンガのハーフブロック +Obsidian Block Stair=黒曜石ブロックの階段 +Inner Obsidian Block Stair=へっこんだ黒曜石ブロックの階段 +Outer Obsidian Block Stair=でっぱった黒曜石ブロックの階段 +Obsidian Block Slab=黒曜石ブロックのハーフブロック +Brick Stair=レンガの階段 +Inner Brick Stair=へっこんだレンガの階段 +Outer Brick Stair=でっぱったレンガの階段 +Brick Slab=レンガのハーフブロック +Steel Block Stair=鉄ブロックの階段 +Inner Steel Block Stair=へっこんだ鉄ブロックの階段 +Outer Steel Block Stair=でっぱった鉄ブロックの階段 +Steel Block Slab=鉄ブロックのハーフブロック +Tin Block Stair=スズの階段 +Inner Tin Block Stair=へっこんだスズの階段 +Outer Tin Block Stair=でっぱったスズの階段 +Tin Block Slab=スズのハーフブロック +Copper Block Stair=銅ブロックの階段 +Inner Copper Block Stair=へっこんだ銅ブロックの階段 +Outer Copper Block Stair=でっぱった銅ブロックの階段 +Copper Block Slab=銅ブロックのハーフブロック +Bronze Block Stair=青銅ブロックの階段 +Inner Bronze Block Stair=へっこんだ青銅ブロックの階段 +Outer Bronze Block Stair=でっぱった青銅ブロックの階段 +Bronze Block Slab=青銅ブロックのハーフブロック +Gold Block Stair=金ブロックの階段 +Inner Gold Block Stair=へっこんだ金ブロックの階段 +Outer Gold Block Stair=でっぱった金ブロックの階段 +Gold Block Slab=金ブロックのハーフブロック +Ice Stair=氷の階段 +Inner Ice Stair=へっこんだ氷の階段 +Outer Ice Stair=でっぱった氷の階段 +Ice Slab=氷のハーフブロック +Snow Block Stair=雪の階段 +Inner Snow Block Stair=へっこんだ雪の階段 +Outer Snow Block Stair=でっぱった雪の階段 +Snow Block Slab=雪のハーフブロック diff --git a/mods/stairs/locale/stairs.jbo.tr b/mods/stairs/locale/stairs.jbo.tr index 76c3bac7..91d28060 100644 --- a/mods/stairs/locale/stairs.jbo.tr +++ b/mods/stairs/locale/stairs.jbo.tr @@ -8,17 +8,17 @@ Obsidian Glass Slab=lo je'erma'ablaci blaci ke xadba bliku Inner Obsidian Glass Stair=lo zo'i je'erma'ablaci blaci serti Outer Obsidian Glass Stair=lo ze'o je'erma'ablaci blaci serti Wooden Stair=lo mudri serti -Inner Wooden Stair=lo zo'i blaci serti -Outer Wooden Stair=lo ze'o blaci serti +Inner Wooden Stair=lo zo'i mudri serti +Outer Wooden Stair=lo ze'o mudri serti Wooden Slab=lo mudri ke xadba bliku Jungle Wood Stair=lo glatimdemricfoi mudri serti Inner Jungle Wood Stair=lo zo'i glatimdemricfoi mudri serti Outer Jungle Wood Stair=lo ze'o glatimdemricfoi mudri serti Jungle Wood Slab=lo glatimdemricfoi mudri ke xadba bliku -Pine Wood Stair=lo ckunu mudri serti -Inner Pine Wood Stair=lo zo'i ckunu mudri serti -Outer Pine Wood Stair=lo ze'o ckunu mudri serti -Pine Wood Slab=lo ckunu mudri ke xadba bliku +Pine Wood Stair=lo ku'urmudri serti +Inner Pine Wood Stair=lo zo'i ku'urmudri serti +Outer Pine Wood Stair=lo ze'o ku'urmudri serti +Pine Wood Slab=lo ku'urmudri ke xadba bliku Acacia Wood Stair=lo atkaci,ia mudri serti Inner Acacia Wood Stair=lo zo'i atkaci,ia mudri serti Outer Acacia Wood Stair=lo ze'o atkaci,ia mudri serti diff --git a/mods/stairs/locale/stairs.pl.tr b/mods/stairs/locale/stairs.pl.tr new file mode 100644 index 00000000..14eed7b9 --- /dev/null +++ b/mods/stairs/locale/stairs.pl.tr @@ -0,0 +1,145 @@ +# textdomain: stairs +Glass Stair=Schody ze szkła +Glass Slab=Półblok ze szkła +Inner Glass Stair=Wewnętrzne schody ze szkła +Outer Glass Stair=Zewnętrzne schody ze szkła +Obsidian Glass Stair=Schody z obsydianowego szkła +Obsidian Glass Slab=Półblok z obsydianowego szkła +Inner Obsidian Glass Stair=Wewnętrzne schody z obsydianowego szkła +Outer Obsidian Glass Stair=Zewnętrzne schody z obsydianowego szkła +Wooden Stair=Schody z drewna +Inner Wooden Stair=Wewnętrzne schody z drewna +Outer Wooden Stair=Zewnętrzne schody z drewna +Wooden Slab=Półblok z drewna +Jungle Wood Stair=Schody z dżunglowego drewna +Inner Jungle Wood Stair=Wewnętrzne schody z dżunglowego drewna +Outer Jungle Wood Stair=Zewnętrzne schody z dżunglowego drewna +Jungle Wood Slab=Półblok z dżunglowego drewna +Pine Wood Stair=Schody z sosnowego drzewa +Inner Pine Wood Stair=Wewnętrzne schody z sosnowego drewna +Outer Pine Wood Stair=Zewnętrzne schody z sosnowego drewna +Pine Wood Slab=Półblok z sosnowego drewna +Acacia Wood Stair=Schody z akacjowego drewna +Inner Acacia Wood Stair=Wewnętrzne schody z akacjowego drewna +Outer Acacia Wood Stair=Zewnętrzne schody z akacjowego drewna +Acacia Wood Slab=Półblok z akacjowego drewna +Aspen Wood Stair=Schody z brzozowego drewna +Inner Aspen Wood Stair=Wewnętrzne schody z brzozowego drewna +Outer Aspen Wood Stair=Zewnętrzne schody z brzozowego drewna +Aspen Wood Slab=Półblok z brzozowego drewna +Stone Stair=Schody z kamienia +Inner Stone Stair=Wewnętrzne schody z kamienia +Outer Stone Stair=Zewnętrzne schody z kamienia +Stone Slab=Półblok z kamienia +Cobblestone Stair=Schody z bruku +Inner Cobblestone Stair=Wewnętrzne schody z bruku +Outer Cobblestone Stair=Zewnętrzne schody z bruku +Cobblestone Slab=Półblok z bruku +Mossy Cobblestone Stair=Schody z bruku z mchem +Inner Mossy Cobblestone Stair=Wewnętrzne schody z bruku z mchem +Outer Mossy Cobblestone Stair=Zewnętrzne schody z bruku z mchem +Mossy Cobblestone Slab=Półblok z bruku z mchem +Stone Brick Stair=Schody z kamiennych cegieł +Inner Stone Brick Stair=Wewnętrzne schody z kamiennych cegieł +Outer Stone Brick Stair=Zewnętrzne schody z kamiennych cegieł +Stone Brick Slab=Półblok z kamiennych cegieł +Stone Block Stair=Schody z kamiennego bloku +Inner Stone Block Stair=Wewnętrzne schody z kamiennego bloku +Outer Stone Block Stair=Zewnętrzne schody z kamiennego bloku +Stone Block Slab=Półblok z kamiennego bloku +Desert Stone Stair=Schody z pustynnego kamienia +Inner Desert Stone Stair=Wewnętrzne schody z pustynnego kamienia +Outer Desert Stone Stair=Zewnętrzne schody z pustynnego kamienia +Desert Stone Slab=Półblok z pustynnego kamienia +Desert Cobblestone Stair=Schody z pustynnego bruku +Inner Desert Cobblestone Stair=Wewnętrzne schody z pustynnego bruku +Outer Desert Cobblestone Stair=Zewnętrzne schody z pustynnego bruku +Desert Cobblestone Slab=Półblok z pustynnego bruku +Desert Stone Brick Stair=Schody z pustynnych kamiennych cegieł +Inner Desert Stone Brick Stair=Wewnętrzne schody z pustynnych kamiennych cegieł +Outer Desert Stone Brick Stair=Zewnętrzne schody z pustynnych kamiennych cegieł +Desert Stone Brick Slab=Półblok z pustynnych kamiennych cegieł +Desert Stone Block Stair=Schody z pustynnego kamiennego bloku +Inner Desert Stone Block Stair=Wewnętrzne schody z pustynnego kamiennego bloku +Outer Desert Stone Block Stair=Zewnętrzne schody z pustynnego kamiennego bloku +Desert Stone Block Slab=Półblok z pustynnego kamiennego bloku +Sandstone Stair=Schody z piaskowca +Inner Sandstone Stair=Wewnętrzne schody z piaskowca +Outer Sandstone Stair=Zewnętrzne schody z piaskowca +Sandstone Slab=Półblok z piaskowca +Sandstone Brick Stair=Schody z piaskowcowych cegieł +Inner Sandstone Brick Stair=Wewnętrzne schody z piaskowcowych cegieł +Outer Sandstone Brick Stair=Zewnętrzne schody z piaskowcowych cegieł +Sandstone Brick Slab=Półblok z piaskowcowych cegieł +Sandstone Block Stair=Schody z piaskowcowego bloku +Inner Sandstone Block Stair=Wewnętrzne schody z piaskowcowego bloku +Outer Sandstone Block Stair=Zewnętrzne schody z piaskowcowego bloku +Sandstone Block Slab=Półblok z piaskowcowego bloku +Desert Sandstone Stair=Schody z pustynnego piaskowca +Inner Desert Sandstone Stair=Wewnętrzne schody z pustynnego piaskowca +Outer Desert Sandstone Stair=Zewnętrzne schody z pustynnego piaskowca +Desert Sandstone Slab=Półblok z pustynnego piaskowca +Desert Sandstone Brick Stair=Schody z pustynnych piaskowcowych cegieł +Inner Desert Sandstone Brick Stair=Wewnętrzne schody z pustynnych piaskowcowych cegieł +Outer Desert Sandstone Brick Stair=Zewnętrzne schody z pustynnych piaskowcowych cegieł +Desert Sandstone Brick Slab=Półblok z pustynnych piaskowcowych cegieł +Desert Sandstone Block Stair=Schody z pustynnego piaskowcowego bloku +Inner Desert Sandstone Block Stair=Wewnętrzne schody z pustynnego piaskowcowego bloku +Outer Desert Sandstone Block Stair=Zewnętrzne schody z pustynnego piaskowcowego bloku +Desert Sandstone Block Slab=Półblok z pustynnego piaskowcowego bloku +Silver Sandstone Stair=Schody z srebrnego piaskowca +Inner Silver Sandstone Stair=Wewnętrzne schody z srebrnego piaskowca +Outer Silver Sandstone Stair=Zewnętrzne schody z srebrnego piaskowca +Silver Sandstone Slab=Półblok z srebrnego piaskowca +Silver Sandstone Brick Stair=Schody z srebrnych piaskowcowych cegieł +Inner Silver Sandstone Brick Stair=Wewnętrzne schody z srebrnych piaskowcowych cegieł +Outer Silver Sandstone Brick Stair=Zewnętrzne schody z srebrnych piaskowcowych cegieł +Silver Sandstone Brick Slab=Półblok z srebrnych piaskowcowych cegieł +Silver Sandstone Block Stair=Schody z srebrnego piaskowcowego bloku +Inner Silver Sandstone Block Stair=Wewnętrzne schody z srebrnego piaskowcowego bloku +Outer Silver Sandstone Block Stair=Zewnętrzne schody z srebrnego piaskowcowego bloku +Silver Sandstone Block Slab=Półblok z srebrnego piaskowcowego bloku +Obsidian Stair=Schody z obsydianu +Inner Obsidian Stair=Wewnętrzne schody z obsydianu +Outer Obsidian Stair=Zewnętrzne schody z obsydianu +Obsidian Slab=Półblok z obsydianu +Obsidian Brick Stair=Schody z obsydianowych cegieł +Inner Obsidian Brick Stair=Wewnętrzne schody z obsydianowych cegieł +Outer Obsidian Brick Stair=Zewnętrzne schody z obsydianowych cegieł +Obsidian Brick Slab=Półblok z obsydianowych cegieł +Obsidian Block Stair=Schody z obsydianowego bloku +Inner Obsidian Block Stair=Wewnętrzne schody z obsydianowego bloku +Outer Obsidian Block Stair=Zewnętrzne schody z obsydianowego bloku +Obsidian Block Slab=Półblok z obsydianowego bloku +Brick Stair=Schody z cegieł +Inner Brick Stair=Wewnętrzne schody z cegieł +Outer Brick Stair=Zewnętrzne schody z cegieł +Brick Slab=Półblok z cegieł +Steel Block Stair=Schody z bloku stali +Inner Steel Block Stair=Wewnętrzne schody z bloku stali +Outer Steel Block Stair=Zewnętrzne schody z bloku stali +Steel Block Slab=Półblok z bloku stali +Tin Block Stair=Schody z bloku cyny +Inner Tin Block Stair=Wewnętrzne schody z bloku cyny +Outer Tin Block Stair=Zewnętrzne schody z bloku cyny +Tin Block Slab=Półblok z bloku cyny +Copper Block Stair=Schody z bloku miedzi +Inner Copper Block Stair=Wewnętrzne schody z bloku miedzi +Outer Copper Block Stair=Zewnętrzne schody z bloku miedzi +Copper Block Slab=Półblok z bloku miedzi +Bronze Block Stair=Schody z bloku brązu +Inner Bronze Block Stair=Wewnętrnze schody z bloku brązu +Outer Bronze Block Stair=Zewnętrzne schody z bloku brązu +Bronze Block Slab=Półblok z bloku brązu +Gold Block Stair=Schody z bloku złota +Inner Gold Block Stair=Wewnętrzne schody z block złota +Outer Gold Block Stair=Zewnętrzne schody z bloku złota +Gold Block Slab=Półblok z bloku złota +Ice Stair=Schody z lodu +Inner Ice Stair=Wewnętrzne schody z lodu +Outer Ice Stair=Zewnętrzne schody z lodu +Ice Slab=Półblok z lodu +Snow Block Stair=Schody ze śniegu +Inner Snow Block Stair=Wewnętrzne schody ze śniegu +Outer Snow Block Stair=Zewnętrzne schody ze śniegu +Snow Block Slab=Półblok ze śniegu diff --git a/mods/stairs/locale/stairs.se.tr b/mods/stairs/locale/stairs.se.tr deleted file mode 100644 index 3ace06d0..00000000 --- a/mods/stairs/locale/stairs.se.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Glastrappa -Glass Slab=Glasplatta -Inner Glass Stair=Inre glasstrappa -Outer Glass Stair=Yttre glasstrappa -Obsidian Glass Stair=Obsidian Glass Trappa -Obsidian Glass Slab=Obsidian glasplatta -Inner Obsidian Glass Stair=Inre Obsidian Glass Trappa -Outer Obsidian Glass Stair=Yttre Obsidian Glass Trappa -Wooden Stair=Trätrappa -Inner Wooden Stair=Inre trätrappa -Outer Wooden Stair=Yttre trätrappa -Wooden Slab=Träplatta -Jungle Wood Stair=Jungle Wood Stair -Inner Jungle Wood Stair=Inre Jungle Wood Stair -Outer Jungle Wood Stair=Ytter Jungle Wood Stair -Jungle Wood Slab=Jungle Wood Platta -Pine Wood Stair=Pine Wood Stair -Inner Pine Wood Stair=Inre tall trä trappa -Outer Pine Wood Stair=Ytter tall Trätrappa -Pine Wood Slab=Tallskiva -Acacia Wood Stair=Acacia Wood Stair -Inner Acacia Wood Stair=Inre Acacia Trätrappa -Outer Acacia Wood Stair=Yttre Acacia Trätrappa -Acacia Wood Slab=Acacia träplatta -Aspen Wood Stair=Asp Trä Stair -Inner Aspen Wood Stair=Inre Aspen Trätrappa -Outer Aspen Wood Stair=Yttre Aspen Trätrappa -Aspen Wood Slab=Asp Trä Platta -Stone Stair=Stentrappa -Inner Stone Stair=Inre stentrappa -Outer Stone Stair=Yttre stentrappa -Stone Slab=Stenplatta -Cobblestone Stair=Kullersten trappa -Inner Cobblestone Stair=Inre kullerstensTrappa -Outer Cobblestone Stair=Yttre kullerstensTrappa -Cobblestone Slab=Kullerstenplatta -Mossy Cobblestone Stair=Mossig kullerstensTrappa -Inner Mossy Cobblestone Stair=Inre mossiga kullerstensTrappa -Outer Mossy Cobblestone Stair=Yttre mossiga kullerstensTrappa -Mossy Cobblestone Slab=Mossig kullerstenplatta -Stone Brick Stair=Sten Brick Trappa -Inner Stone Brick Stair=Inre sten tegel trappa -Outer Stone Brick Stair=Yttre sten tegel trappa -Stone Brick Slab=Sten tegelplatta -Stone Block Stair=Sten Block Trappa -Inner Stone Block Stair=Inre stenblock trappa -Outer Stone Block Stair=Yttre stenblock trappa -Stone Block Slab=Stenblockplatta -Desert Stone Stair=Öken Sten Trappa -Inner Desert Stone Stair=Inre Öken Sten Stair -Outer Desert Stone Stair=Outer Öken Sten Stair -Desert Stone Slab=Öken Sten Platta -Desert Cobblestone Stair=Öken Kullersten Trappa -Inner Desert Cobblestone Stair=Inre Öken Kullersten Trappa -Outer Desert Cobblestone Stair=Outer Öken Kullersten Trappa -Desert Cobblestone Slab=Öken Kullersten Platta -Desert Stone Brick Stair=Öken Sten Brick Trappa -Inner Desert Stone Brick Stair=Inre Öken Sten Brick Trappa -Outer Desert Stone Brick Stair=Outer Öken Sten Brick Trappa -Desert Stone Brick Slab=Öken Sten tegelplatta -Desert Stone Block Stair=Öken Sten Block Trappa -Inner Desert Stone Block Stair=Inre Öken Sten Block Stair -Outer Desert Stone Block Stair=Outer Öken Sten Block Trappa -Desert Stone Block Slab=Öken Sten Block Platta -Sandstone Stair=Sandstenstrappa -Inner Sandstone Stair=Inre Sandstenstrappa -Outer Sandstone Stair=Yttre Sandstenstrappa -Sandstone Slab=Sandstenplatta -Sandstone Brick Stair=Sandsten tegel trappa -Inner Sandstone Brick Stair=Inre Sandsten tegel trappa -Outer Sandstone Brick Stair=Yttre Sandsten tegel trappa -Sandstone Brick Slab=Sandsten tegelplatta -Sandstone Block Stair=Sandsten block trappa -Inner Sandstone Block Stair=Inre Sandsten block trappa -Outer Sandstone Block Stair=Yttre Sandsten block trappa -Sandstone Block Slab=Sandsten Block Platta -Desert Sandstone Stair=Öken Sandsten Trappa -Inner Desert Sandstone Stair=Inre Öken Sandsten Trappa -Outer Desert Sandstone Stair=Outer Öken Sandsten Trappa -Desert Sandstone Slab=Öken Sandsten Platta -Desert Sandstone Brick Stair=Öken Sandsten Brick Trappa -Inner Desert Sandstone Brick Stair=Inre Öken Sandsten Brick Trappa -Outer Desert Sandstone Brick Stair=Outer Öken Sandsten Brick Trappa -Desert Sandstone Brick Slab=Öken Sandsten Tegelplatta -Desert Sandstone Block Stair=Öken Sandsten Block Trappa -Inner Desert Sandstone Block Stair=Inre Öken Sandsten Block Trappa -Outer Desert Sandstone Block Stair=Outer Öken Sandsten Block Trappa -Desert Sandstone Block Slab=Öken Sandsten Block Platta -Silver Sandstone Stair=Silver Sandsten trappa -Inner Silver Sandstone Stair=Inre silver Sandsten trappa -Outer Silver Sandstone Stair=Yttre silver Sandsten trappa -Silver Sandstone Slab=Silver Sandsten platta -Silver Sandstone Brick Stair=Silver Sandsten tegel trappa -Inner Silver Sandstone Brick Stair=Inre silver Sandsten tegel trappa -Outer Silver Sandstone Brick Stair=Yttre silver Sandsten tegel trappa -Silver Sandstone Brick Slab=Silver Sandsten tegelplatta -Silver Sandstone Block Stair=Silver Sandsten block trappa -Inner Silver Sandstone Block Stair=Inre silver Sandsten block trappa -Outer Silver Sandstone Block Stair=Yttre silver Sandsten block trappa -Silver Sandstone Block Slab=Silver Sandsten block platta -Obsidian Stair=Obsidian Trappa -Inner Obsidian Stair=Inre Obsidian Trappa -Outer Obsidian Stair=Yttre Obsidian Trappa -Obsidian Slab=Obsidian Platta -Obsidian Brick Stair=Obsidian Brick Stair -Inner Obsidian Brick Stair=Inre Obsidian Brick Trappa -Outer Obsidian Brick Stair=Yttre Obsidian Brick Trappa -Obsidian Brick Slab=Obsidian tegelplatta -Obsidian Block Stair=Obsidian Block Stair -Inner Obsidian Block Stair=Inre Obsidian Block Trappa -Outer Obsidian Block Stair=Yttre Obsidian Block Trappa -Obsidian Block Slab=Obsidian Block Slab -Brick Stair=Tegel trappa -Inner Brick Stair=Inre tegel trappa -Outer Brick Stair=Yttre tegel trappa -Brick Slab=Tegelplatta -Steel Block Stair=Stålblock trappa -Inner Steel Block Stair=Inre stålblock trappa -Outer Steel Block Stair=Yttre stålblocktrappa -Steel Block Slab=Stålblockplatta -Tin Block Stair=Tinn Block Trappa -Inner Tin Block Stair=Inre tennblock trappa -Outer Tin Block Stair=Yttre tennblock trappa -Tin Block Slab=Tennblockplatta -Copper Block Stair=Kopparblock trappa -Inner Copper Block Stair=Inre kopparblock trappa -Outer Copper Block Stair=Yttre kopparblock trappa -Copper Block Slab=Kopparblockplatta -Bronze Block Stair=Bronze Block Trappa -Inner Bronze Block Stair=Inre bronsblock trappa -Outer Bronze Block Stair=Yttre bronsblock trappa -Bronze Block Slab=Bronsblockplatta -Gold Block Stair=Guldblockstrappa -Inner Gold Block Stair=Inre guldblock trappa -Outer Gold Block Stair=Yttre guldblock trappa -Gold Block Slab=Guldblockplatta -Ice Stair=Ice Stair -Inner Ice Stair=Inre istrappa -Outer Ice Stair=Yttre istrappa -Ice Slab=Isplatta -Snow Block Stair=Snow Block Stair -Inner Snow Block Stair=Inre snöblock trappa -Outer Snow Block Stair=Yttre snöblock trappa -Snow Block Slab= diff --git a/mods/stairs/locale/stairs.sv.tr b/mods/stairs/locale/stairs.sv.tr new file mode 100644 index 00000000..8044af81 --- /dev/null +++ b/mods/stairs/locale/stairs.sv.tr @@ -0,0 +1,145 @@ +# textdomain: stairs +Glass Stair=Glastrappa +Glass Slab=Glasplatta +Inner Glass Stair=Inre glasstrappa +Outer Glass Stair=Yttre glasstrappa +Obsidian Glass Stair=Obsidianglasstrappa +Obsidian Glass Slab=Obsidianglasplatta +Inner Obsidian Glass Stair=Inre obsidianglastrappa +Outer Obsidian Glass Stair=Yttre obsidianglastrappa +Wooden Stair=Trätrappa +Inner Wooden Stair=Inre trätrappa +Outer Wooden Stair=Yttre trätrappa +Wooden Slab=Träplatta +Jungle Wood Stair=Djungelträtrappa +Inner Jungle Wood Stair=Inre djungelträtrappa +Outer Jungle Wood Stair=Ytter djungelträtrappa +Jungle Wood Slab=Djungelträplatta +Pine Wood Stair=Tallträplatta +Inner Pine Wood Stair=Inre tallträplatta +Outer Pine Wood Stair=Ytter tallträplatta +Pine Wood Slab=Tallskiva +Acacia Wood Stair=Acaciatrappa +Inner Acacia Wood Stair=Inre acaciatrappa +Outer Acacia Wood Stair=Yttre acaciatrappa +Acacia Wood Slab=Acaciaplatta +Aspen Wood Stair=Aspträtrappa +Inner Aspen Wood Stair=Inre aspträtrappa +Outer Aspen Wood Stair=Yttre aspträtrappa +Aspen Wood Slab=Aspträplatta +Stone Stair=Stentrappa +Inner Stone Stair=Inre stentrappa +Outer Stone Stair=Yttre stentrappa +Stone Slab=Stenplatta +Cobblestone Stair=Kullerstenstrappa +Inner Cobblestone Stair=Inre kullerstenstrappa +Outer Cobblestone Stair=Yttre kullerstenstrappa +Cobblestone Slab=Kullerstenplatta +Mossy Cobblestone Stair=Mossig kullerstenstrappa +Inner Mossy Cobblestone Stair=Inre mossig kullerstenstrappa +Outer Mossy Cobblestone Stair=Yttre mossig kullerstenstrappa +Mossy Cobblestone Slab=Mossig kullerstenplatta +Stone Brick Stair=Stentegeltrappa +Inner Stone Brick Stair=Inre stentegeltrappa +Outer Stone Brick Stair=Yttre stentegeltrappa +Stone Brick Slab=Stentegelplatta +Stone Block Stair=Stenblockstrappa +Inner Stone Block Stair=Inre stenblockstrappa +Outer Stone Block Stair=Yttre stenblockstrappa +Stone Block Slab=Stenblocksplatta +Desert Stone Stair=Ökenstentrappa +Inner Desert Stone Stair=Inre ökenstentrappa +Outer Desert Stone Stair=Yttre ökenstentrappa +Desert Stone Slab=Ökenstenplatta +Desert Cobblestone Stair=Ökenkullerstenstrappa +Inner Desert Cobblestone Stair=Inre ökenkullerstenstrappa +Outer Desert Cobblestone Stair=Yttre ökenkullerstenstrappa +Desert Cobblestone Slab=Ökenkullerstensplatta +Desert Stone Brick Stair=Ökentegelstenstrappa +Inner Desert Stone Brick Stair=Inre Ökentegelstenstrappa +Outer Desert Stone Brick Stair=Yttre Ökentegelstenstrappa +Desert Stone Brick Slab=Ökentegelstensplatta +Desert Stone Block Stair=Ökenstenblockstrappa +Inner Desert Stone Block Stair=Inre ökenstenblockstrappa +Outer Desert Stone Block Stair=Yttre ökenstenblockstrappa +Desert Stone Block Slab=Ökenstenblocksplatta +Sandstone Stair=Sandstenstrappa +Inner Sandstone Stair=Inre Sandstenstrappa +Outer Sandstone Stair=Yttre Sandstenstrappa +Sandstone Slab=Sandstenplatta +Sandstone Brick Stair=Sandstentegeltrappa +Inner Sandstone Brick Stair=Inre Sandstentegeltrappa +Outer Sandstone Brick Stair=Yttre Sandstentegeltrappa +Sandstone Brick Slab=Sandstentegelplatta +Sandstone Block Stair=Sandstenblockstrappa +Inner Sandstone Block Stair=Inre Sandstenblockstrappa +Outer Sandstone Block Stair=Yttre Sandstenblockstrappa +Sandstone Block Slab=Sandstenblocksplatta +Desert Sandstone Stair=Ökensandstenstrappa +Inner Desert Sandstone Stair=Inre ökensandstenstrappa +Outer Desert Sandstone Stair=Yttre ökensandstenstrappa +Desert Sandstone Slab=Ökensandstensplatta +Desert Sandstone Brick Stair=Ökensandstentegeltrappa +Inner Desert Sandstone Brick Stair=Inre ökensandstentegeltrappa +Outer Desert Sandstone Brick Stair=Yttre ökensandstentegeltrappa +Desert Sandstone Brick Slab=Ökensandstentegelplatta +Desert Sandstone Block Stair=Ökensandstentegeltrappa +Inner Desert Sandstone Block Stair=Inre ökensandstentegeltrappa +Outer Desert Sandstone Block Stair=Yttre ökensandstentegeltrappa +Desert Sandstone Block Slab=Ökensandstentegelplatta +Silver Sandstone Stair=Silversandstenstrappa +Inner Silver Sandstone Stair=Inre silversandstenstrappa +Outer Silver Sandstone Stair=Yttre silversandstenstrappa +Silver Sandstone Slab=Silversandstenstrappa +Silver Sandstone Brick Stair=Silversandstenstegeltrappa +Inner Silver Sandstone Brick Stair=Inre silversandstenstegeltrappa +Outer Silver Sandstone Brick Stair=Yttre silversandstenstegeltrappa +Silver Sandstone Brick Slab=Silversandstenstegelplatta +Silver Sandstone Block Stair=Silversandstenblockstrappa +Inner Silver Sandstone Block Stair=Inre silversandstenblockstrappa +Outer Silver Sandstone Block Stair=Yttre silversandstenblockstrappa +Silver Sandstone Block Slab=Silversandstenblocksplatta +Obsidian Stair=Obsidiantrappa +Inner Obsidian Stair=Inre obsidiantrappa +Outer Obsidian Stair=Yttre obsidiantrappa +Obsidian Slab=Obsidianplatta +Obsidian Brick Stair=Obsidiantegeltrappa +Inner Obsidian Brick Stair=Inre obsidiantegeltrappa +Outer Obsidian Brick Stair=Yttre obsidiantegeltrappa +Obsidian Brick Slab=Obsidiantegelplatta +Obsidian Block Stair=Obsidianblocktrappa +Inner Obsidian Block Stair=Inre Obsidianblocktrappa +Outer Obsidian Block Stair=Yttre Obsidianblocktrappa +Obsidian Block Slab=Obsidianblockplatta +Brick Stair=Tegeltrappa +Inner Brick Stair=Inre tegeltrappa +Outer Brick Stair=Yttre tegeltrappa +Brick Slab=Tegelplatta +Steel Block Stair=Ståltrappa +Inner Steel Block Stair=Inre ståltrappa +Outer Steel Block Stair=Yttre ståltrappa +Steel Block Slab=Stålplatta +Tin Block Stair=Tenntrappa +Inner Tin Block Stair=Inre tenntrappa +Outer Tin Block Stair=Yttre tenntrappa +Tin Block Slab=Tennplatta +Copper Block Stair=Koppartrappa +Inner Copper Block Stair=Inre koppartrappa +Outer Copper Block Stair=Yttre koppartrappa +Copper Block Slab=Kopparplatta +Bronze Block Stair=Bronstrappa +Inner Bronze Block Stair=Inre bronstrappa +Outer Bronze Block Stair=Yttre bronstrappa +Bronze Block Slab=Bronsplatta +Gold Block Stair=Guldtrappa +Inner Gold Block Stair=Inre guldtrappa +Outer Gold Block Stair=Yttre guldtrappa +Gold Block Slab=Guldplatta +Ice Stair=Istrappa +Inner Ice Stair=Inre istrappa +Outer Ice Stair=Yttre istrappa +Ice Slab=Isplatta +Snow Block Stair=Snöblockstrappa +Inner Snow Block Stair=Inre snöblockstrappa +Outer Snow Block Stair=Yttre snöblockstrappa +Snow Block Slab=Snöblocksplatta diff --git a/mods/stairs/locale/stairs.uk.tr b/mods/stairs/locale/stairs.uk.tr new file mode 100644 index 00000000..f501b5eb --- /dev/null +++ b/mods/stairs/locale/stairs.uk.tr @@ -0,0 +1,145 @@ +# textdomain: stairs +Glass Stair=Скляна Сходинка +Glass Slab=Скляна Плита +Inner Glass Stair=Кутова Скляна Сходинка (Внутрішній Кут) +Outer Glass Stair=Кутова Скляна Сходинка (Зовнішній Кут) +Obsidian Glass Stair=Скляна Сходинка З Обсидіану +Obsidian Glass Slab=Скляна Плита З Обсидіану +Inner Obsidian Glass Stair=Кутова Скляна Сходинка З Обсидіану (Внутрішній Кут) +Outer Obsidian Glass Stair=Кутова Скляна Сходинка З Обсидіану (Зовнішній Кут) +Wooden Stair=Яблунева Дерев'яна Сходинка +Inner Wooden Stair=Кутова Яблунева Дерев'яна Сходинка (Внутрішній Кут) +Outer Wooden Stair=Кутова Яблунева Дерев'яна Сходинка (Внутрішній Кут) +Wooden Slab=Яблунева Дерев'яна Плита +Jungle Wood Stair=Дерев'яна Сходинка З Тропічного Дерева +Inner Jungle Wood Stair=Кутова Дерев'яна Сходинка З Тропічного Дерева (Внутрішній Кут) +Outer Jungle Wood Stair=Кутова Дерев'яна Сходинка З Тропічного Дерева (Зовнішній Кут) +Jungle Wood Slab=Дерев'яна Плита З Тропічного Дерева +Pine Wood Stair=Дерев'яна Сходинка З Сосни +Inner Pine Wood Stair=Кутова Дерев'яна Сходинка З Сосни (Внутрішній Кут) +Outer Pine Wood Stair=Кутова Дерев'яна Сходинка З Сосни (Зовнішній Кут) +Pine Wood Slab=Дерев'яна Плита З Сосни +Acacia Wood Stair=Дерев'яна Сходинка З Акації +Inner Acacia Wood Stair=Кутова Дерев'яна Сходинка З Акації (Внутрішній Кут) +Outer Acacia Wood Stair=Кутова Дерев'яна Сходинка З Акації (Зовнішній Кут) +Acacia Wood Slab=Дерев'яна Плита З Акації +Aspen Wood Stair=Дерев'яна Сходинка З Осики +Inner Aspen Wood Stair=Кутова Дерев'яна Сходинка З Осики (Внутрішній Кут) +Outer Aspen Wood Stair=Кутова Дерев'яна Сходинка З Осики (Зовнішній Кут) +Aspen Wood Slab=Дерев'яна Плита З Осики +Stone Stair=Кам'яна Сходинка +Inner Stone Stair=Кутова Кам'яна Сходинка (Внутрішній Кут) +Outer Stone Stair=Кутова Кам'яна Сходинка (Зовнішній Кут) +Stone Slab=Кам'яна Плита +Cobblestone Stair=Сходинка З Кругляку +Inner Cobblestone Stair=Кутова Сходинка З Кругляку (Внутрішній Кут) +Outer Cobblestone Stair=Кутова Сходинка З Кругляку (Зовнішній Кут) +Cobblestone Slab=Плита З Кругляку +Mossy Cobblestone Stair=Мохова Сходинка З Кругляку +Inner Mossy Cobblestone Stair=Кутова Мохова Сходинка З Кругляку (Внутрішній Кут) +Outer Mossy Cobblestone Stair=Кутова Мохова Сходинка З Кругляку (Зовнішній Кут) +Mossy Cobblestone Slab=Мохова Плита З Кругляку +Stone Brick Stair=Сходинка З Кам'яної Цегли +Inner Stone Brick Stair=Кутова Сходинка З Кам'яної Цегли (Внутрішній Кут) +Outer Stone Brick Stair=Кутова Сходинка З Кам'яної Цегли (Зовнішній Кут) +Stone Brick Slab=Плита З Кам'яної Цегли +Stone Block Stair=Сходинка З Кам'яного Блоку +Inner Stone Block Stair=Кутова Сходинка З Кам'яного Блоку (Внутрішній Кут) +Outer Stone Block Stair=Кутова Сходинка З Кам'яного Блоку (Зовнішній Кут) +Stone Block Slab=Плита З Кам'яного Блоку +Desert Stone Stair=Сходинка З Пустельного Каменю +Inner Desert Stone Stair=Кутова Сходинка З Пустельного Каменю (Внутрішній Кут) +Outer Desert Stone Stair=Кутова Сходинка З Пустельного Каменю (Зовнішній Кут) +Desert Stone Slab=Плита З Пустельного Каменю +Desert Cobblestone Stair=Сходинка З Пустельного Кругляку +Inner Desert Cobblestone Stair=Кутова Сходинка З Пустельного Кругляку (Внутрішній Кут) +Outer Desert Cobblestone Stair=Кутова Сходинка З Пустельного Кругляку (Зовнішній Кут) +Desert Cobblestone Slab=Плита З Пустельного Каменю +Desert Stone Brick Stair=Сходинка З Цегли Із Пустельного Каменю +Inner Desert Stone Brick Stair=Кутова Сходинка З Цегли Із Пустельного Каменю (Внутрішній Кут) +Outer Desert Stone Brick Stair=Кутова Сходинка З Цегли Із Пустельного Каменю (Зовнішній Кут) +Desert Stone Brick Slab=Плита З Цегли Із Пустельного Каменю +Desert Stone Block Stair=Сходинка З Пустельного Кам'яного Блоку +Inner Desert Stone Block Stair=Кутова Сходинка З Пустельного Кам'яного Блоку (Внутрішній Кут) +Outer Desert Stone Block Stair=Кутова Сходинка З Пустельного Кам'яного Блоку (Зовнішній Кут) +Desert Stone Block Slab=Плита З Пустельного Кам'яного Блоку +Sandstone Stair=Сходинка З Піщанику +Inner Sandstone Stair=Кутова Сходинка З Піщанику (Внутрішній Кут) +Outer Sandstone Stair=Кутова Сходинка З Піщанику (Зовнішній Кут) +Sandstone Slab=Плита З Піщанику +Sandstone Brick Stair=Сходинка З Цегли Із Піщанику +Inner Sandstone Brick Stair=Кутова Сходинка З Цегли Із Піщанику (Внутрішній Кут) +Outer Sandstone Brick Stair=Кутова Сходинка З Цегли Із Піщанику (Зовнішній Кут) +Sandstone Brick Slab=Плита З Цегли Із Піщанику +Sandstone Block Stair=Сходинка З Блоку Із Піщанику +Inner Sandstone Block Stair=Кутова Сходинка З Блоку Із Піщанику (Внутрішній Кут) +Outer Sandstone Block Stair=Кутова Сходинка З Блоку Із Піщанику (Зовнішній Кут) +Sandstone Block Slab=Плита З Блоку Із Піщанику +Desert Sandstone Stair=Сходинка З Пустельного Піщанику +Inner Desert Sandstone Stair=Кутова Сходинка З Пустельного Піщанику (Внутрішній Кут) +Outer Desert Sandstone Stair=Кутова Сходинка З Пустельного Піщанику (Зовнішній Кут) +Desert Sandstone Slab=Плита З Пустельного Піщанику +Desert Sandstone Brick Stair=Сходинка З Цегли Із Пустельного Піщанику +Inner Desert Sandstone Brick Stair=Кутова Сходинка З Цегли Із Пустельного Піщанику (Внутрішній Кут) +Outer Desert Sandstone Brick Stair=Кутова Сходинка З Цегли Із Пустельного Піщанику (Зовнішній Кут) +Desert Sandstone Brick Slab=Плита З Цегли Із Пустельного Піщанику +Desert Sandstone Block Stair=Сходинка З Блоку Із Пустельного Піщанику +Inner Desert Sandstone Block Stair=Кутова Сходинка З Блоку Із Пустельного Піщанику (Внутрішній Кут) +Outer Desert Sandstone Block Stair=Кутова Сходинка З Блоку Із Пустельного Піщанику (Зовнішній Кут) +Desert Sandstone Block Slab=Плита З Блоку Із Пустельного Піщанику +Silver Sandstone Stair=Сходинка З Срібного Піщанику +Inner Silver Sandstone Stair=Кутова Сходинка З Срібного Піщанику (Внутрішній Кут) +Outer Silver Sandstone Stair=Кутова Сходинка З Срібного Піщанику (Зовнішній Кут) +Silver Sandstone Slab=Плита З Срібного Піщанику +Silver Sandstone Brick Stair=Сходинка З Цегли Із Срібного Піщанику +Inner Silver Sandstone Brick Stair=Кутова Сходинка З Цегли Із Срібного Піщанику (Внутрішній Кут) +Outer Silver Sandstone Brick Stair=Кутова Сходинка З Цегли Із Срібного Піщанику (Зовнішній Кут) +Silver Sandstone Brick Slab=Плита З Цегли Із Срібного Піщанику +Silver Sandstone Block Stair=Сходинка З Блоку Із Срібного Піщанику +Inner Silver Sandstone Block Stair=Кутова Сходинка З Блоку Із Срібного Піщанику (Внутрішній Кут) +Outer Silver Sandstone Block Stair=Кутова Сходинка З Блоку Із Срібного Піщанику (Зовнішній Кут) +Silver Sandstone Block Slab=Плита З Блоку Із Срібного Піщанику +Obsidian Stair=Обсидіанова Сходинка +Inner Obsidian Stair=Кутова Обсидіанова Сходинка (Внутрішній Кут) +Outer Obsidian Stair=Кутова Обсидіанова Сходинка (Зовнішній Кут) +Obsidian Slab=Обсидіанова Плита +Obsidian Brick Stair=Сходинка З Обсидіанової Цегли +Inner Obsidian Brick Stair=Кутова Сходинка З Обсидіанової Цегли (Внутрішній Кут) +Outer Obsidian Brick Stair=Кутова Сходинка З Обсидіанової Цегли (Зовнішній Кут) +Obsidian Brick Slab=Плита З Обсидіанової Цегли +Obsidian Block Stair=Сходинка З Обсидіанового Блоку +Inner Obsidian Block Stair=Кутова Сходинка З Обсидіанового Блоку (Внутрішній Кут) +Outer Obsidian Block Stair=Кутова Сходинка З Обсидіанового Блоку (Зовнішній Кут) +Obsidian Block Slab=Плита З Обсидіанового Блоку +Brick Stair=Сходинка З Цегли +Inner Brick Stair=Кутова Сходинка З Цегли (Внутрішній Кут) +Outer Brick Stair=Кутова Сходинка З Цегли (Зовнішній Кут) +Brick Slab=Плита З Цегли +Steel Block Stair=Сходинка Із Сталевого Блоку +Inner Steel Block Stair=Кутова Сходинка Із Сталевого Блоку (Внутрішній Кут) +Outer Steel Block Stair=Кутова Сходинка Із Сталевого Блоку (Зовнішній Кут) +Steel Block Slab=Плита Із Сталевого Блоку +Tin Block Stair=Сходинка З Олов'яного Блоку +Inner Tin Block Stair=Кутова Сходинка З Олов'яного Блоку (Внутрішній Кут) +Outer Tin Block Stair=Кутова Сходинка З Олов'яного Блоку (Зовнішній Кут) +Tin Block Slab=Плита З Олов'яного Блоку +Copper Block Stair=Сходинка З Мідного Блоку +Inner Copper Block Stair=Кутова Сходинка З Мідного Блоку (Внутрішній Кут) +Outer Copper Block Stair=Кутова Сходинка З Мідного Блоку (Зовнішній Кут) +Copper Block Slab=Плита З Мідного Блоку +Bronze Block Stair=Сходинка З Бронзового Блоку +Inner Bronze Block Stair=Кутова Сходинка З Бронзового Блоку (Внутрішній Кут) +Outer Bronze Block Stair=Кутова Сходинка З Бронзового Блоку (Зовнішній Кут) +Bronze Block Slab=Плита З Бронзового Блоку +Gold Block Stair=Сходинка З Золотого Блоку +Inner Gold Block Stair=Сходинка З Золотого Блоку (Внутрішній Кут) +Outer Gold Block Stair=Сходинка З Золотого Блоку (Зовнішній Кут) +Gold Block Slab=Плита З Золотого Блоку +Ice Stair=Крижана Сходинка +Inner Ice Stair=Кутова Крижана Сходинка (Внутрішній Кут) +Outer Ice Stair=Кутова Крижана Сходинка (Зовнішній Кут) +Ice Slab=Крижана Плита +Snow Block Stair=Ступінь З Крижаного Блоку +Inner Snow Block Stair=Кутова Ступінь З Крижаного Блоку (Внутрішній Кут) +Outer Snow Block Stair=Кутова Ступінь З Крижаного Блоку (Зовнішній Кут) +Snow Block Slab=Плита З Крижаного Блоку diff --git a/mods/stairs/locale/stairs.zh_CN.tr b/mods/stairs/locale/stairs.zh_CN.tr index 85646657..e37ebcbb 100644 --- a/mods/stairs/locale/stairs.zh_CN.tr +++ b/mods/stairs/locale/stairs.zh_CN.tr @@ -7,10 +7,10 @@ Obsidian Glass Stair=黑曜石玻璃楼梯 Obsidian Glass Slab=黑曜石玻璃台阶 Inner Obsidian Glass Stair=黑曜石玻璃楼梯(内) Outer Obsidian Glass Stair=黑曜石玻璃楼梯(外) -Wooden Stair=木制楼梯 +Wooden Stair=木楼梯 Inner Wooden Stair=木楼梯(内) Outer Wooden Stair=木楼梯(外) -Wooden Slab=木制台阶 +Wooden Slab=木台阶 Jungle Wood Stair=丛林木楼梯 Inner Jungle Wood Stair=丛林木楼梯(内) Outer Jungle Wood Stair=丛林木楼梯(外) @@ -31,14 +31,14 @@ Stone Stair=石楼梯 Inner Stone Stair=石楼梯(内) Outer Stone Stair=石楼梯(外) Stone Slab=石台阶 -Cobblestone Stair=圆石楼梯 -Inner Cobblestone Stair=圆石楼梯(内) -Outer Cobblestone Stair=圆石楼梯(外) -Cobblestone Slab=圆石台阶 -Mossy Cobblestone Stair=苔石楼梯 -Inner Mossy Cobblestone Stair=苔石楼梯(内) -Outer Mossy Cobblestone Stair=苔石楼梯(外) -Mossy Cobblestone Slab=苔石台阶 +Cobblestone Stair=鹅卵石楼梯 +Inner Cobblestone Stair=鹅卵石楼梯(内) +Outer Cobblestone Stair=鹅卵石楼梯(外) +Cobblestone Slab=鹅卵石台阶 +Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯 +Inner Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯(内) +Outer Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯(外) +Mossy Cobblestone Slab=苔藓覆盖的鹅卵石台阶 Stone Brick Stair=石砖楼梯 Inner Stone Brick Stair=石砖楼梯(内) Outer Stone Brick Stair=石砖楼梯(外) @@ -51,10 +51,10 @@ Desert Stone Stair=沙漠石楼梯 Inner Desert Stone Stair=沙漠石楼梯(内) Outer Desert Stone Stair=沙漠石楼梯(外) Desert Stone Slab=沙漠石台阶 -Desert Cobblestone Stair=沙漠圆石楼梯 -Inner Desert Cobblestone Stair=沙漠圆石楼梯(内) -Outer Desert Cobblestone Stair=沙漠圆石楼梯(外) -Desert Cobblestone Slab=沙漠圆石台阶 +Desert Cobblestone Stair=沙漠鹅卵石楼梯 +Inner Desert Cobblestone Stair=沙漠鹅卵石楼梯(内) +Outer Desert Cobblestone Stair=沙漠鹅卵石楼梯(外) +Desert Cobblestone Slab=沙漠鹅卵石台阶 Desert Stone Brick Stair=沙漠石砖楼梯 Inner Desert Stone Brick Stair=沙漠石砖楼梯(内) Outer Desert Stone Brick Stair=沙漠石砖楼梯(外) @@ -114,7 +114,7 @@ Obsidian Block Slab=黑曜石块台阶 Brick Stair=砖楼梯 Inner Brick Stair=砖楼梯(内) Outer Brick Stair=砖楼梯(外) -Brick Slab=砖制台阶 +Brick Slab=砖台阶 Steel Block Stair=铁块楼梯 Inner Steel Block Stair=铁块楼梯(内) Outer Steel Block Stair=铁块楼梯(外) @@ -135,7 +135,7 @@ Gold Block Stair=金块楼梯 Inner Gold Block Stair=金块楼梯(内) Outer Gold Block Stair=金块楼梯(外) Gold Block Slab=金块台阶 -Ice Stair=冰阶梯 +Ice Stair=冰楼梯 Inner Ice Stair=冰块楼梯(内) Outer Ice Stair=冰块楼梯(外) Ice Slab=冰台阶 diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index fd1f9e42..c59363a5 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -243,9 +243,9 @@ local function add_effects(pos, radius, drops) local def = minetest.registered_nodes[name] if def then node = { name = name } - end - if def and def.tiles and def.tiles[1] then - texture = def.tiles[1] + if def.tiles and type(def.tiles[1]) == "string" then + texture = def.tiles[1] + end end end end @@ -279,7 +279,7 @@ function tnt.burn(pos, nodename) def.on_ignite(pos) elseif minetest.get_item_group(name, "tnt") > 0 then minetest.swap_node(pos, {name = name .. "_burning"}) - minetest.sound_play("tnt_ignite", {pos = pos}, true) + minetest.sound_play("tnt_ignite", {pos = pos, gain = 1.0}, true) minetest.get_node_timer(pos):start(1) end end @@ -297,7 +297,8 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne local c_tnt local c_tnt_burning = minetest.get_content_id("tnt:tnt_burning") local c_tnt_boom = minetest.get_content_id("tnt:boom") - local c_air = minetest.get_content_id("air") + local c_air = minetest.CONTENT_AIR + local c_ignore = minetest.CONTENT_IGNORE if enable_tnt then c_tnt = minetest.get_content_id("tnt:tnt") else @@ -351,7 +352,7 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne if (radius * radius) / (r * r) >= (pr:next(80, 125) / 100) then local cid = data[vi] local p = {x = pos.x + x, y = pos.y + y, z = pos.z + z} - if cid ~= c_air then + if cid ~= c_air and cid ~= c_ignore then data[vi] = destroy(drops, p, cid, c_air, c_fire, on_blast_queue, on_construct_queue, ignore_protection, ignore_on_blast, owner) @@ -465,9 +466,7 @@ minetest.register_node("tnt:gunpowder", { on_punch = function(pos, node, puncher) if puncher:get_wielded_item():get_name() == "default:torch" then minetest.set_node(pos, {name = "tnt:gunpowder_burning"}) - minetest.log("action", puncher:get_player_name() .. - " ignites tnt:gunpowder at " .. - minetest.pos_to_string(pos)) + default.log_player_action(puncher, "ignites tnt:gunpowder at", pos) end end, on_blast = function(pos, intensity) @@ -555,7 +554,7 @@ minetest.register_node("tnt:gunpowder_burning", { on_blast = function() end, on_construct = function(pos) minetest.sound_play("tnt_gunpowder_burning", {pos = pos, - gain = 2}, true) + gain = 1.0}, true) minetest.get_node_timer(pos):start(1) end, }) @@ -635,9 +634,7 @@ function tnt.register_tnt(def) if puncher:get_wielded_item():get_name() == "default:torch" then minetest.swap_node(pos, {name = name .. "_burning"}) minetest.registered_nodes[name .. "_burning"].on_construct(pos) - minetest.log("action", puncher:get_player_name() .. - " ignites " .. node.name .. " at " .. - minetest.pos_to_string(pos)) + default.log_player_action(puncher, "ignites", node.name, "at", pos) end end, on_blast = function(pos, intensity) diff --git a/mods/tnt/locale/tnt.ja.tr b/mods/tnt/locale/tnt.ja.tr new file mode 100644 index 00000000..d7af9f58 --- /dev/null +++ b/mods/tnt/locale/tnt.ja.tr @@ -0,0 +1,4 @@ +# textdomain: tnt +Gun Powder=火薬 +TNT Stick=ダイナマイト +TNT=TNT diff --git a/mods/tnt/locale/tnt.pl.tr b/mods/tnt/locale/tnt.pl.tr new file mode 100644 index 00000000..1ede267d --- /dev/null +++ b/mods/tnt/locale/tnt.pl.tr @@ -0,0 +1,4 @@ +# textdomain: tnt +Gun Powder=Proch strzelniczy +TNT Stick=Dynamit +TNT=TNT diff --git a/mods/tnt/locale/tnt.se.tr b/mods/tnt/locale/tnt.sv.tr similarity index 100% rename from mods/tnt/locale/tnt.se.tr rename to mods/tnt/locale/tnt.sv.tr diff --git a/mods/tnt/locale/tnt.uk.tr b/mods/tnt/locale/tnt.uk.tr new file mode 100644 index 00000000..684466d5 --- /dev/null +++ b/mods/tnt/locale/tnt.uk.tr @@ -0,0 +1,4 @@ +# textdomain: tnt +Gun Powder=Порох +TNT Stick=Тротилова Паличка +TNT=Тротил diff --git a/mods/tnt/locale/tnt.zh_CN.tr b/mods/tnt/locale/tnt.zh_CN.tr index 0a3294e5..4cb2e949 100644 --- a/mods/tnt/locale/tnt.zh_CN.tr +++ b/mods/tnt/locale/tnt.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: tnt Gun Powder=火药粉 -TNT Stick=炸药棒 -TNT=炸药包 +TNT Stick=三硝基甲苯棒 +TNT=三硝基甲苯 diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua index 71a06893..4bd0fb4d 100644 --- a/mods/vessels/init.lua +++ b/mods/vessels/init.lua @@ -49,7 +49,7 @@ local function update_vessels_shelf(pos) end end -minetest.register_node("vessels:shelf", { +local vessels_shelf_def = { description = S("Vessels Shelf"), tiles = {"default_wood.png", "default_wood.png", "default_wood.png", "default_wood.png", "vessels_shelf.png", "vessels_shelf.png"}, @@ -74,21 +74,6 @@ minetest.register_node("vessels:shelf", { end return 0 end, - on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name() .. - " moves stuff in vessels shelf at ".. minetest.pos_to_string(pos)) - update_vessels_shelf(pos) - end, - on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name() .. - " moves stuff to vessels shelf at ".. minetest.pos_to_string(pos)) - update_vessels_shelf(pos) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name() .. - " takes stuff from vessels shelf at ".. minetest.pos_to_string(pos)) - update_vessels_shelf(pos) - end, on_blast = function(pos) local drops = {} default.get_inventory_drops(pos, "vessels", drops) @@ -96,7 +81,9 @@ minetest.register_node("vessels:shelf", { minetest.remove_node(pos) return drops end, -}) +} +default.set_inventory_action_loggers(vessels_shelf_def, "vessels shelf") +minetest.register_node("vessels:shelf", vessels_shelf_def) minetest.register_craft({ output = "vessels:shelf", diff --git a/mods/vessels/locale/vessels.eo.tr b/mods/vessels/locale/vessels.eo.tr index c6f9af75..c4a84ce5 100644 --- a/mods/vessels/locale/vessels.eo.tr +++ b/mods/vessels/locale/vessels.eo.tr @@ -3,6 +3,6 @@ Empty Vessels Shelf=Malplena Vaza Plataĵo Vessels Shelf (@1 items)=Vaza Plataĵo (@1 objektoj) Vessels Shelf=Vaza Plataĵo Empty Glass Bottle=Malplena Vitra Botelo -Empty Drinking Glass=Malplena Glaso por Trinkado +Empty Drinking Glass=Malplena Glaso Empty Heavy Steel Bottle=Malplena Peza Ŝtala Botelo -Glass Fragments=Vitra Eroj +Glass Fragments=Vitraj Eroj diff --git a/mods/vessels/locale/vessels.ja.tr b/mods/vessels/locale/vessels.ja.tr new file mode 100644 index 00000000..451489a5 --- /dev/null +++ b/mods/vessels/locale/vessels.ja.tr @@ -0,0 +1,8 @@ +# textdomain: vessels +Empty Vessels Shelf=空の瓶の棚 +Vessels Shelf (@1 items)=瓶の棚(@1 本) +Vessels Shelf=瓶の棚 +Empty Glass Bottle=空のガラス瓶 +Empty Drinking Glass=空のガラスコップ +Empty Heavy Steel Bottle=空の重い鉄瓶 +Glass Fragments=ガラスの破片 diff --git a/mods/vessels/locale/vessels.pl.tr b/mods/vessels/locale/vessels.pl.tr new file mode 100644 index 00000000..5e91da9f --- /dev/null +++ b/mods/vessels/locale/vessels.pl.tr @@ -0,0 +1,8 @@ +# textdomain: vessels +Empty Vessels Shelf=Pusta półka na naczynia +Vessels Shelf (@1 items)=Półka na naczynia (@1 przedmiotów) +Vessels Shelf=Półka na naczynia +Empty Glass Bottle=Pusta szklana butelka +Empty Drinking Glass=Pusta butelka do picia +Empty Heavy Steel Bottle=Pusta stalowa butelka +Glass Fragments=Odłamki szkła diff --git a/mods/vessels/locale/vessels.ru.tr b/mods/vessels/locale/vessels.ru.tr index 070d884b..196d842d 100644 --- a/mods/vessels/locale/vessels.ru.tr +++ b/mods/vessels/locale/vessels.ru.tr @@ -3,6 +3,6 @@ Empty Vessels Shelf=Полка с Пустыми Сосудами Vessels Shelf (@1 items)=Полка с Сосудами (@1 предметы) Vessels Shelf=Полка с Сосудами Empty Glass Bottle=Пустая Стеклянная Бутылка -Empty Drinking Glass=Пустая Питьевая Бутылка +Empty Drinking Glass=Пустой Стакан Empty Heavy Steel Bottle=Пустая Стальная Бутылка Glass Fragments=Стеклянные Осколки diff --git a/mods/vessels/locale/vessels.se.tr b/mods/vessels/locale/vessels.se.tr deleted file mode 100644 index a7c3a989..00000000 --- a/mods/vessels/locale/vessels.se.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Tom Fartygshylla -Vessels Shelf (@1 items)=Fartygshylla (@1 saker) -Vessels Shelf=Fartygshylla -Empty Glass Bottle=Tom Glasflska -Empty Drinking Glass=Tom Drycksflaska -Empty Heavy Steel Bottle=Tom Tung Stål Flaska -Glass Fragments=Glasbitar diff --git a/mods/vessels/locale/vessels.sv.tr b/mods/vessels/locale/vessels.sv.tr new file mode 100644 index 00000000..48e76e29 --- /dev/null +++ b/mods/vessels/locale/vessels.sv.tr @@ -0,0 +1,8 @@ +# textdomain: vessels +Empty Vessels Shelf=Tom kärlhylla +Vessels Shelf (@1 items)=Kärlhylla (@1 saker) +Vessels Shelf=Kärlhylla +Empty Glass Bottle=Tom glasflaska +Empty Drinking Glass=Tom drycksflaska +Empty Heavy Steel Bottle=Tom tungstålsflaska +Glass Fragments=Glasbitar diff --git a/mods/vessels/locale/vessels.uk.tr b/mods/vessels/locale/vessels.uk.tr new file mode 100644 index 00000000..50258358 --- /dev/null +++ b/mods/vessels/locale/vessels.uk.tr @@ -0,0 +1,8 @@ +# textdomain: vessels +Empty Vessels Shelf=Полиця з Пустим Посудом +Vessels Shelf (@1 items)=Полиця з Посудом (@1 предмета) +Vessels Shelf=Полиця з Посудом +Empty Glass Bottle=Порожня Скляна Пляшка +Empty Drinking Glass=Порожня Склянка +Empty Heavy Steel Bottle=Порожня Сталева Пляшка +Glass Fragments=Скляні Уламки diff --git a/mods/walls/locale/walls.ja.tr b/mods/walls/locale/walls.ja.tr new file mode 100644 index 00000000..66e497d0 --- /dev/null +++ b/mods/walls/locale/walls.ja.tr @@ -0,0 +1,4 @@ +# textdomain: walls +Cobblestone Wall=丸石の壁 +Mossy Cobblestone Wall=苔むした丸石の壁 +Desert Cobblestone Wall=砂漠の丸石の壁 diff --git a/mods/walls/locale/walls.pl.tr b/mods/walls/locale/walls.pl.tr new file mode 100644 index 00000000..ff544e20 --- /dev/null +++ b/mods/walls/locale/walls.pl.tr @@ -0,0 +1,4 @@ +# textdomain: walls +Cobblestone Wall=Brukowa ściana +Mossy Cobblestone Wall=Brukowa ściana z mchem +Desert Cobblestone Wall=Pustynno-brukowa ściana diff --git a/mods/walls/locale/walls.se.tr b/mods/walls/locale/walls.se.tr deleted file mode 100644 index 32589464..00000000 --- a/mods/walls/locale/walls.se.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Kullerstens Vägg -Mossy Cobblestone Wall=Mossig Kullerstens Vägg -Desert Cobblestone Wall=Öken Kullerstens Vägg diff --git a/mods/walls/locale/walls.sv.tr b/mods/walls/locale/walls.sv.tr new file mode 100644 index 00000000..1ad4a29e --- /dev/null +++ b/mods/walls/locale/walls.sv.tr @@ -0,0 +1,4 @@ +# textdomain: walls +Cobblestone Wall=Kullerstensvägg +Mossy Cobblestone Wall=Mossig kullerstensvägg +Desert Cobblestone Wall=Ökenkullerstensvägg diff --git a/mods/walls/locale/walls.uk.tr b/mods/walls/locale/walls.uk.tr new file mode 100644 index 00000000..f92d7cc4 --- /dev/null +++ b/mods/walls/locale/walls.uk.tr @@ -0,0 +1,4 @@ +# textdomain: walls +Cobblestone Wall=Паркан З Кругляку +Mossy Cobblestone Wall=Паркан З Мохового Кругляку +Desert Cobblestone Wall=Паркан З Пустельного Кругляку diff --git a/mods/weather/init.lua b/mods/weather/init.lua index 9e10d893..0214af27 100644 --- a/mods/weather/init.lua +++ b/mods/weather/init.lua @@ -1,11 +1,18 @@ -- Disable by mapgen or setting local mg_name = minetest.get_mapgen_setting("mg_name") -if mg_name == "v6" or mg_name == "singlenode" or - minetest.settings:get_bool("enable_weather") == false then +if minetest.settings:get_bool("enable_weather") == false then return end +if mg_name == "v6" or mg_name == "singlenode" then + -- set a default shadow intensity for mgv6 and singlenode + minetest.register_on_joinplayer(function(player) + player:set_lighting({ shadows = { intensity = 0.33 } }) + end) + + return +end -- Parameters @@ -96,15 +103,18 @@ local function update_clouds() -- density_max = 0.8 at humid = 50. -- density_max = 1.35 at humid = 100. local density_max = 0.8 + ((humid - 50) / 50) * 0.55 + local density = rangelim(density_max, 0.2, 1.0) * n_density player:set_clouds({ -- Range limit density_max to always have occasional -- small scattered clouds at extreme low humidity. - density = rangelim(density_max, 0.2, 1.0) * n_density, + density = density, thickness = math.max(math.floor( rangelim(32 * humid / 100, 8, 32) * n_thickness ), 2), speed = {x = n_speedx * 4, z = n_speedz * 4}, }) + -- now adjust the shadow intensity + player:set_lighting({ shadows = { intensity = 0.7 * (1 - density) } }) end end diff --git a/mods/wool/locale/wool.eo.tr b/mods/wool/locale/wool.eo.tr index 582ea2a9..16e3e004 100644 --- a/mods/wool/locale/wool.eo.tr +++ b/mods/wool/locale/wool.eo.tr @@ -3,14 +3,14 @@ White Wool=Blanka Lano Grey Wool=Griza Lano Dark Grey Wool=Malhela Griza Lano Black Wool=Nigra Lano -Violet Wool=Viola Lano +Violet Wool=Violkolora Lano Blue Wool=Blua Lano Cyan Wool=Bluverda Lano Dark Green Wool=Malhela Verda Lano Green Wool=Verda Lano Yellow Wool=Flava Lano Brown Wool=Bruna Lano -Orange Wool=Oranĝa Lano +Orange Wool=Oranĝkolora Lano Red Wool=Ruĝa Lano Magenta Wool=Fuksina Lano -Pink Wool=Roza Lano +Pink Wool=Rozkolora Lano diff --git a/mods/wool/locale/wool.ja.tr b/mods/wool/locale/wool.ja.tr new file mode 100644 index 00000000..5051f9e7 --- /dev/null +++ b/mods/wool/locale/wool.ja.tr @@ -0,0 +1,16 @@ +# textdomain: wool +White Wool=白色の羊毛 +Grey Wool=灰色の羊毛 +Dark Grey Wool=濃灰色の羊毛 +Black Wool=黒色の羊毛 +Violet Wool=紫色の羊毛 +Blue Wool=青色の羊毛 +Cyan Wool=青緑色の羊毛 +Dark Green Wool=濃緑色の羊毛 +Green Wool=緑色の羊毛 +Yellow Wool=黄色の羊毛 +Brown Wool=茶色の羊毛 +Orange Wool=橙色の羊毛 +Red Wool=赤色の羊毛 +Magenta Wool=赤紫色の羊毛 +Pink Wool=桃色の羊毛 diff --git a/mods/wool/locale/wool.pl.tr b/mods/wool/locale/wool.pl.tr new file mode 100644 index 00000000..9c411c81 --- /dev/null +++ b/mods/wool/locale/wool.pl.tr @@ -0,0 +1,16 @@ +# textdomain: wool +White Wool=Biała wełna +Grey Wool=Szara wełna +Dark Grey Wool=Ciemnoszara wełna +Black Wool=Czarna wełna +Violet Wool=Fioletowa wełna +Blue Wool=Niebieska wełna +Cyan Wool=Cyjanowa wełna +Dark Green Wool=Ciemnozielona wełna +Green Wool=Zielona wełna +Yellow Wool=Żółta wełna +Brown Wool=Brązowa wełna +Orange Wool=Pomarańczowa wełna +Red Wool=Czerwona wełna +Magenta Wool=Karmazynowa wełna +Pink Wool=Różowa wełna diff --git a/mods/wool/locale/wool.se.tr b/mods/wool/locale/wool.se.tr deleted file mode 100644 index e026ac4c..00000000 --- a/mods/wool/locale/wool.se.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Vit Ull -Grey Wool=Grå Ull -Dark Grey Wool=Mörk Grå Ull -Black Wool=Svart Ull -Violet Wool=Violett Ull -Blue Wool=Blå Ull -Cyan Wool=Cyan Ull -Dark Green Wool=Mörk Grön Ull -Green Wool=Grön Ull -Yellow Wool=Gul Ull -Brown Wool=Brun Ull -Orange Wool=Orange Ull -Red Wool=Röd Ull -Magenta Wool=Magenta Ull -Pink Wool=Rosa Ull diff --git a/mods/wool/locale/wool.sv.tr b/mods/wool/locale/wool.sv.tr new file mode 100644 index 00000000..bfce2140 --- /dev/null +++ b/mods/wool/locale/wool.sv.tr @@ -0,0 +1,16 @@ +# textdomain: wool +White Wool=Vit ull +Grey Wool=Grå ull +Dark Grey Wool=Mörkgrå ull +Black Wool=Svart ull +Violet Wool=Violett ull +Blue Wool=Blå ull +Cyan Wool=Cyan ull +Dark Green Wool=Mörkgrön ull +Green Wool=Grön ull +Yellow Wool=Gul ull +Brown Wool=Brun ull +Orange Wool=Orange ull +Red Wool=Röd ull +Magenta Wool=Magenta ull +Pink Wool=Rosa ull diff --git a/mods/wool/locale/wool.uk.tr b/mods/wool/locale/wool.uk.tr new file mode 100644 index 00000000..b9a3f7a1 --- /dev/null +++ b/mods/wool/locale/wool.uk.tr @@ -0,0 +1,16 @@ +# textdomain: wool +White Wool=Біла Шерсть +Grey Wool=Сіра Шерсть +Dark Grey Wool=Темно-Сіра Шерсть +Black Wool=Чорна Шерсть +Violet Wool=Фіолетова Шерсть +Blue Wool=Синя Шерсть +Cyan Wool=Голуба Шерсть +Dark Green Wool=Темно-Зелена Шерсть +Green Wool=Зелена Шерсть +Yellow Wool=Жовта Шерсть +Brown Wool=Коричнева Шерсть +Orange Wool=Оранжева Шерсть +Red Wool=Червона Шерсть +Magenta Wool=Пурпурна Шерсть +Pink Wool=Рожева Шерсть diff --git a/mods/xpanes/init.lua b/mods/xpanes/init.lua index a2398dab..a02dbfe4 100644 --- a/mods/xpanes/init.lua +++ b/mods/xpanes/init.lua @@ -227,6 +227,8 @@ if minetest.get_modpath("doors") then sounds = default.node_sound_metal_defaults(), sound_open = "xpanes_steel_bar_door_open", sound_close = "xpanes_steel_bar_door_close", + gain_open = 0.15, + gain_close = 0.13, recipe = { {"xpanes:bar_flat", "xpanes:bar_flat"}, {"xpanes:bar_flat", "xpanes:bar_flat"}, @@ -245,6 +247,8 @@ if minetest.get_modpath("doors") then sounds = default.node_sound_metal_defaults(), sound_open = "xpanes_steel_bar_door_open", sound_close = "xpanes_steel_bar_door_close", + gain_open = 0.15, + gain_close = 0.13, }) minetest.register_craft({ diff --git a/mods/xpanes/locale/xpanes.eo.tr b/mods/xpanes/locale/xpanes.eo.tr index 5acbb1bf..0051b7ea 100644 --- a/mods/xpanes/locale/xpanes.eo.tr +++ b/mods/xpanes/locale/xpanes.eo.tr @@ -1,6 +1,6 @@ # textdomain: xpanes Glass Pane=Vitra Vitraĵo Obsidian Glass Pane=Obsidiana Vitra Vitraĵo -Steel Bars=Ŝtala Baraĵoj +Steel Bars=Ŝtalaj Baraĵoj Steel Bar Door=Ŝtala Baraĵa Pordo Steel Bar Trapdoor=Ŝtala Baraĵa Plankpordo diff --git a/mods/xpanes/locale/xpanes.ja.tr b/mods/xpanes/locale/xpanes.ja.tr new file mode 100644 index 00000000..06e0bed5 --- /dev/null +++ b/mods/xpanes/locale/xpanes.ja.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=板ガラス +Obsidian Glass Pane=黒曜石の板ガラス +Steel Bars=鉄棒の柵 +Steel Bar Door=鉄棒のドア +Steel Bar Trapdoor=鉄棒のトラップドア diff --git a/mods/xpanes/locale/xpanes.pl.tr b/mods/xpanes/locale/xpanes.pl.tr new file mode 100644 index 00000000..0ebb386e --- /dev/null +++ b/mods/xpanes/locale/xpanes.pl.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Szyba +Obsidian Glass Pane=Obsydianowa szyba +Steel Bars=Stalowe kraty +Steel Bar Door=Drzwi ze stalowych krat +Steel Bar Trapdoor=Właz ze stalowych krat diff --git a/mods/xpanes/locale/xpanes.se.tr b/mods/xpanes/locale/xpanes.se.tr deleted file mode 100644 index ff01d2a4..00000000 --- a/mods/xpanes/locale/xpanes.se.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Glasruta -Obsidian Glass Pane=Obsidian Glasruta -Steel Bars=Stålgaller -Steel Bar Door=Stålgallers Dörr -Steel Bar Trapdoor=Stålgallers Fallucka diff --git a/mods/xpanes/locale/xpanes.sv.tr b/mods/xpanes/locale/xpanes.sv.tr new file mode 100644 index 00000000..7b615dd3 --- /dev/null +++ b/mods/xpanes/locale/xpanes.sv.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Glasruta +Obsidian Glass Pane=Obsidianglasruta +Steel Bars=Stålgaller +Steel Bar Door=Stålgallerdörr +Steel Bar Trapdoor=Stålgallerfallucka diff --git a/mods/xpanes/locale/xpanes.uk.tr b/mods/xpanes/locale/xpanes.uk.tr new file mode 100644 index 00000000..d4b4b5c8 --- /dev/null +++ b/mods/xpanes/locale/xpanes.uk.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Скляна Панель +Obsidian Glass Pane=Скляна Панель З Обсидіану +Steel Bars=Сталева Решітка +Steel Bar Door=Сталеві Двері З Решіткою +Steel Bar Trapdoor=Сталевий Люк З Решіткою diff --git a/settingtypes.txt b/settingtypes.txt index eff1e902..445510ff 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -72,6 +72,9 @@ engine_spawn (Use engine spawn search) bool false # Helps rivers create more sound, especially on level sections. river_source_sounds (River source node sounds) bool false -# Enable cloud variation by the 'weather' mod. +# Enable cloud and shadow intensity variation by the 'weather' mod. # Non-functional in V6 or Singlenode mapgens. enable_weather (Enable weather) bool true + +# If enabled, non-player actions are logged +log_non_player_actions (Log non-player action) bool false