From a6f3b895963e3a4feba035ca0578c18aa86a645d Mon Sep 17 00:00:00 2001 From: Lars Mueller Date: Sun, 13 Mar 2022 00:00:28 +0100 Subject: [PATCH 01/28] player_api: Fix crash for players without model --- mods/player_api/api.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index b3e3f5ee..a80cecb9 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -182,7 +182,7 @@ minetest.register_globalstep(function() for _, player in pairs(minetest.get_connected_players()) do local name = player:get_player_name() local player_data = players[name] - local model = models[player_data.model] + 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 From f66538201792fa64441e00efda2ed48da649a1cf Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Mon, 7 Feb 2022 11:44:02 -0800 Subject: [PATCH 02/28] Allow mods to override animation globalstep --- mods/player_api/api.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index a80cecb9..12d23bcb 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -178,8 +178,8 @@ 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 player_data = players[name] local model = player_data and models[player_data.model] @@ -208,6 +208,11 @@ 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(players, ...) end) for _, api_function in pairs({"get_animation", "set_animation", "set_model", "set_textures"}) do From 268a8844b614b08ea5c05188379c9cc6182269cd Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Mon, 7 Feb 2022 11:47:25 -0800 Subject: [PATCH 03/28] Use a local for the globalstep function --- mods/player_api/api.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index 12d23bcb..8517d58a 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -211,8 +211,11 @@ function player_api.globalstep() end -- Mods can modify the globalstep by overriding player_api.globalstep + +-- local for speed +local player_api_globalstep = player_api.globalstep minetest.register_globalstep(function(...) - player_api.globalstep(players, ...) + player_api_globalstep(players, ...) end) for _, api_function in pairs({"get_animation", "set_animation", "set_model", "set_textures"}) do From 0110e01826329dc2f4757eed84f697a8fae5d900 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Mon, 7 Feb 2022 12:32:49 -0800 Subject: [PATCH 04/28] Fix bug and globalize `players` table --- mods/player_api/api.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index 8517d58a..13a3aa41 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -50,9 +50,12 @@ end -- Player stats and animations -- model, textures, animation -local players = {} +player_api.players = {} player_api.player_attached = {} +-- Local for speed. +local players = player_api.players + local function get_player_data(player) return assert(players[player:get_player_name()]) end @@ -211,11 +214,8 @@ function player_api.globalstep() end -- Mods can modify the globalstep by overriding player_api.globalstep - --- local for speed -local player_api_globalstep = player_api.globalstep minetest.register_globalstep(function(...) - player_api_globalstep(players, ...) + player_api.globalstep(...) end) for _, api_function in pairs({"get_animation", "set_animation", "set_model", "set_textures"}) do From ce82241ab207b2957099d5c18bbb15e9f3c565c8 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Mon, 7 Feb 2022 12:36:47 -0800 Subject: [PATCH 05/28] Undo globalization --- mods/player_api/api.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index 13a3aa41..e39847db 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -50,12 +50,9 @@ end -- Player stats and animations -- model, textures, animation -player_api.players = {} +local players = {} player_api.player_attached = {} --- Local for speed. -local players = player_api.players - local function get_player_data(player) return assert(players[player:get_player_name()]) end From 659895c3ed253dcbede45216bc8e8861341fb1a9 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Mon, 7 Feb 2022 18:17:07 -0800 Subject: [PATCH 06/28] Update game_api.txt --- game_api.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/game_api.txt b/game_api.txt index ab68aa9a..f6231e5a 100644 --- a/game_api.txt +++ b/game_api.txt @@ -440,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 From 638099c9999e46b9a7204858b2a7c7a1efb2f94c Mon Sep 17 00:00:00 2001 From: Lars Mueller Date: Sat, 26 Mar 2022 19:55:12 +0100 Subject: [PATCH 07/28] Fix incorrectly negated comparisons --- mods/carts/cart_entity.lua | 2 +- mods/doors/init.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/carts/cart_entity.lua b/mods/carts/cart_entity.lua index 8008bcfb..b3b4ae41 100644 --- a/mods/carts/cart_entity.lua +++ b/mods/carts/cart_entity.lua @@ -398,7 +398,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/doors/init.lua b/mods/doors/init.lua index 403ad5ab..0c0f0896 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -260,7 +260,7 @@ 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 From 9528c0f8b93d6934930e99c3c116df275fb0e4bc Mon Sep 17 00:00:00 2001 From: lhofhansl Date: Sat, 2 Apr 2022 00:35:36 -0700 Subject: [PATCH 08/28] Adjust shadow intensity based on cloud density (#2938) --- minetest.conf.example | 2 +- mods/weather/init.lua | 16 +++++++++++++--- settingtypes.txt | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/minetest.conf.example b/minetest.conf.example index 86eba660..24033063 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -72,6 +72,6 @@ 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 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/settingtypes.txt b/settingtypes.txt index eff1e902..a597fc7e 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -72,6 +72,6 @@ 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 From edd033b708488472c6bd688b14d8a5f59ef5b218 Mon Sep 17 00:00:00 2001 From: Lars Mueller Date: Sun, 24 Apr 2022 12:30:16 +0200 Subject: [PATCH 09/28] TNT node drop particles: Only pick string tiles as fallback --- mods/tnt/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index 19fe330c..1c4ead33 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 From 0c2ee1e41d71899f0d5e1da603a6d125a7cda9e9 Mon Sep 17 00:00:00 2001 From: nixnoxus <87639406+nixnoxus@users.noreply.github.com> Date: Fri, 6 May 2022 20:04:55 +0200 Subject: [PATCH 10/28] Deduplicate player action logging, silence fake player actions (#2941) --- game_api.txt | 30 ++++++++++++++++++++++++++++ minetest.conf.example | 3 +++ mods/default/chests.lua | 16 +-------------- mods/default/functions.lua | 41 ++++++++++++++++++++++++++++++++++++++ mods/default/nodes.lua | 32 +++++++++-------------------- mods/default/trees.lua | 3 +-- mods/farming/api.lua | 3 +-- mods/tnt/init.lua | 8 ++------ mods/vessels/init.lua | 21 ++++--------------- settingtypes.txt | 3 +++ 10 files changed, 95 insertions(+), 65 deletions(-) diff --git a/game_api.txt b/game_api.txt index f6231e5a..c8b4cec3 100644 --- a/game_api.txt +++ b/game_api.txt @@ -1115,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 24033063..bb6eb644 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -75,3 +75,6 @@ default:torch 99,default:cobble 99 # 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/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/functions.lua b/mods/default/functions.lua index 4d89a384..0afd97ed 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -715,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/nodes.lua b/mods/default/nodes.lua index a2974517..269c578c 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) 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/farming/api.lua b/mods/farming/api.lua index 15d126e2..c892a779 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -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/tnt/init.lua b/mods/tnt/init.lua index 1c4ead33..f4d4681b 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -465,9 +465,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) @@ -635,9 +633,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/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/settingtypes.txt b/settingtypes.txt index a597fc7e..445510ff 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -75,3 +75,6 @@ river_source_sounds (River source node sounds) bool false # 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 From 38307da22a6c74b45f021ad627b21b73672dfe14 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Mon, 9 May 2022 20:44:06 +0200 Subject: [PATCH 11/28] Carts: Improve movement behaviour (#2951) Backported various changes from boost_cart Improved direction handling and code cleanup Smoothed-out 'end of rail' animation --- mods/carts/cart_entity.lua | 63 +++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/mods/carts/cart_entity.lua b/mods/carts/cart_entity.lua index b3b4ae41..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) From 33650c8c2e2507fe54f651ed9ee9a51851c5517e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Tue, 24 May 2022 14:55:10 +0200 Subject: [PATCH 12/28] `game.conf`: Use title instead of deprecated name --- game.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game.conf b/game.conf index 02b585cd..1e48ae96 100644 --- a/game.conf +++ b/game.conf @@ -1,3 +1,3 @@ -name = Minetest Game +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. From b0cf06136013aa1cd9cee92747071c4dd4ac17fd Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 24 May 2022 14:59:17 +0200 Subject: [PATCH 13/28] Fix TNT blowing up ignore nodes --- mods/tnt/init.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index f4d4681b..c59363a5 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -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) From b57700a75bfba55409dd62a49a357eda79b1ee28 Mon Sep 17 00:00:00 2001 From: mrkubax10 Date: Sun, 29 May 2022 16:20:42 +0200 Subject: [PATCH 14/28] Add polish translation (#2926) --- mods/beds/locale/beds.pl.tr | 10 + mods/binoculars/locale/binoculars.pl.tr | 3 + mods/boats/locale/boats.pl.tr | 4 + mods/bones/locale/bones.pl.tr | 8 + mods/bucket/locale/bucket.pl.tr | 5 + mods/butterflies/locale/butterflies.pl.tr | 4 + mods/carts/locale/carts.pl.tr | 6 + mods/creative/locale/creative.pl.tr | 10 + mods/default/locale/default.pl.tr | 214 ++++++++++++++++++ mods/doors/locale/doors.pl.tr | 18 ++ mods/dye/locale/dye.pl.tr | 16 ++ mods/farming/locale/farming.pl.tr | 28 +++ mods/fire/locale/fire.pl.tr | 4 + mods/fireflies/locale/fireflies.pl.tr | 5 + mods/flowers/locale/flowers.pl.tr | 12 + mods/game_commands/locale/game_commands.pl.tr | 4 + mods/keys/locale/keys.pl.tr | 5 + mods/map/locale/map.pl.tr | 3 + .../locale/mtg_craftguide.pl.tr | 53 +++++ mods/screwdriver/locale/screwdriver.pl.tr | 3 + mods/sethome/locale/sethome.pl.tr | 8 + mods/sfinv/locale/sfinv.pl.tr | 2 + mods/stairs/locale/stairs.pl.tr | 145 ++++++++++++ mods/tnt/locale/tnt.pl.tr | 4 + mods/vessels/locale/vessels.pl.tr | 8 + mods/walls/locale/walls.pl.tr | 4 + mods/wool/locale/wool.pl.tr | 16 ++ mods/xpanes/locale/xpanes.pl.tr | 6 + 28 files changed, 608 insertions(+) create mode 100644 mods/beds/locale/beds.pl.tr create mode 100644 mods/binoculars/locale/binoculars.pl.tr create mode 100644 mods/boats/locale/boats.pl.tr create mode 100644 mods/bones/locale/bones.pl.tr create mode 100644 mods/bucket/locale/bucket.pl.tr create mode 100644 mods/butterflies/locale/butterflies.pl.tr create mode 100644 mods/carts/locale/carts.pl.tr create mode 100644 mods/creative/locale/creative.pl.tr create mode 100644 mods/default/locale/default.pl.tr create mode 100644 mods/doors/locale/doors.pl.tr create mode 100644 mods/dye/locale/dye.pl.tr create mode 100644 mods/farming/locale/farming.pl.tr create mode 100644 mods/fire/locale/fire.pl.tr create mode 100644 mods/fireflies/locale/fireflies.pl.tr create mode 100644 mods/flowers/locale/flowers.pl.tr create mode 100644 mods/game_commands/locale/game_commands.pl.tr create mode 100644 mods/keys/locale/keys.pl.tr create mode 100644 mods/map/locale/map.pl.tr create mode 100644 mods/mtg_craftguide/locale/mtg_craftguide.pl.tr create mode 100644 mods/screwdriver/locale/screwdriver.pl.tr create mode 100644 mods/sethome/locale/sethome.pl.tr create mode 100644 mods/sfinv/locale/sfinv.pl.tr create mode 100644 mods/stairs/locale/stairs.pl.tr create mode 100644 mods/tnt/locale/tnt.pl.tr create mode 100644 mods/vessels/locale/vessels.pl.tr create mode 100644 mods/walls/locale/walls.pl.tr create mode 100644 mods/wool/locale/wool.pl.tr create mode 100644 mods/xpanes/locale/xpanes.pl.tr 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/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/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/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/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/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/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/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/default/locale/default.pl.tr b/mods/default/locale/default.pl.tr new file mode 100644 index 00000000..ccc9458c --- /dev/null +++ b/mods/default/locale/default.pl.tr @@ -0,0 +1,214 @@ +# 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 +"@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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 From 54dc58ef1f9ef9a1aa5992e623585fd1dbe1cc49 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 29 May 2022 19:16:23 +0000 Subject: [PATCH 15/28] Fix furnace fire sound stopping too late (#2955) Cleans fire sound IDs after a few seconds --- mods/default/furnace.lua | 44 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua index e6b90b82..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 @@ -253,8 +267,29 @@ local function furnace_node_timer(pos, elapsed) -- 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.25}, true) + 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 @@ -265,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 @@ -369,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, From b4392aeb1f73bb7e4fe71e7b910a69ae1f660262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Wed, 1 Jun 2022 20:54:16 +0200 Subject: [PATCH 16/28] Fix book duplication: Remember wield index (#2957) --- mods/default/craftitems.lua | 33 ++++++++++++++++++++++++++++---- mods/default/locale/template.txt | 1 + 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index 46d78049..d2e827f4 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -42,6 +42,12 @@ local function formspec_string(lpp, page, lines, string) 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) @@ -90,6 +96,8 @@ local function book_on_use(itemstack, user) end 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 @@ -97,10 +105,23 @@ 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 local title = data.title or "" @@ -127,9 +148,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) 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 stack:get_name() ~= "default:book_written" then + if not written then local count = stack:get_count() if count == 1 then stack:set_name("default:book_written") @@ -193,7 +218,7 @@ 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) diff --git a/mods/default/locale/template.txt b/mods/default/locale/template.txt index 13808e9d..f214d837 100644 --- a/mods/default/locale/template.txt +++ b/mods/default/locale/template.txt @@ -161,6 +161,7 @@ Empty Bookshelf= Bookshelf (@1 written, @2 empty books)= Bookshelf= Text too long= +The book you were writing to mysteriously disappeared.= "@1"= Wooden Sign= Steel Sign= From d7dd15782c2fc6b83704fa25d9db535a74d03e53 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 4 Jun 2022 16:43:21 +0000 Subject: [PATCH 17/28] Use add_wear_by_uses to fix incorrect uses counts (#2959) --- mods/farming/api.lua | 2 +- mods/fire/init.lua | 2 +- mods/fireflies/init.lua | 2 +- mods/screwdriver/init.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/farming/api.lua b/mods/farming/api.lua index c892a779..414ebc0f 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -66,7 +66,7 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses) 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, diff --git a/mods/fire/init.lua b/mods/fire/init.lua index 030b604d..3069aa80 100644 --- a/mods/fire/init.lua +++ b/mods/fire/init.lua @@ -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/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/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 From 986b65775f3d7a89959f569c516af8c44b4bc7e3 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 13 Jun 2022 20:02:08 +0200 Subject: [PATCH 18/28] Update engine feature checks --- mods/default/init.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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") From 79d38078a55818f516d7ddf6bf9c6fa198096064 Mon Sep 17 00:00:00 2001 From: fluxionary <25628292+fluxionary@users.noreply.github.com> Date: Sat, 2 Jul 2022 02:58:01 -0700 Subject: [PATCH 19/28] Remove paramtype2="glasslikeliquidlevel" from glass nodes (#2963) --- mods/default/nodes.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 269c578c..41d50199 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -2796,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}, @@ -2809,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(), From b64868ef929cc13f3169bd409507278697da112a Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 22 Jul 2022 09:31:26 +0200 Subject: [PATCH 20/28] Move Japanese key translations to keys mod --- mods/default/locale/default.ja.tr | 3 --- mods/keys/locale/keys.ja.tr | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 mods/keys/locale/keys.ja.tr diff --git a/mods/default/locale/default.ja.tr b/mods/default/locale/default.ja.tr index 07443c74..8b1a84d7 100644 --- a/mods/default/locale/default.ja.tr +++ b/mods/default/locale/default.ja.tr @@ -12,8 +12,6 @@ Save=保存 by @1=@1著 Page @1 of @2=@1 / @2 ページ "@1" by @2=@2著「@1」 -Skeleton Key=スケルトンの鍵 -Key to @1's @2=@1の@2への鍵 Blueberries=ブルーベリー Book=本 Book with Text=テキストが書かれた本 @@ -212,6 +210,5 @@ Bronze Sword=青銅の剣 Steel Sword=鉄の剣 Mese Sword=メセの剣 Diamond Sword=ダイヤモンドの剣 -Key=鍵 Torch=松明 @1 will intersect protection on growth.=@1は成長するとき保護と交差します。 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=スケルトンの鍵 From 350c52319ea47e0c00ea0cf44fc862cac9b4d41d Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 22 Jul 2022 09:32:26 +0200 Subject: [PATCH 21/28] Update translation templates --- mods/default/locale/default.de.tr | 1 + mods/default/locale/default.eo.tr | 1 + mods/default/locale/default.es.tr | 1 + mods/default/locale/default.fr.tr | 1 + mods/default/locale/default.id.tr | 1 + mods/default/locale/default.it.tr | 1 + mods/default/locale/default.ja.tr | 1 + mods/default/locale/default.jbo.tr | 1 + mods/default/locale/default.ms.tr | 1 + mods/default/locale/default.pl.tr | 1 + mods/default/locale/default.pt_BR.tr | 1 + mods/default/locale/default.ru.tr | 1 + mods/default/locale/default.sk.tr | 1 + mods/default/locale/default.sv.tr | 4 +--- mods/default/locale/default.uk.tr | 1 + mods/default/locale/default.zh_CN.tr | 1 + mods/default/locale/default.zh_TW.tr | 1 + mods/default/locale/template.txt | 2 +- 18 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mods/default/locale/default.de.tr b/mods/default/locale/default.de.tr index 1abe24f8..57d63757 100644 --- a/mods/default/locale/default.de.tr +++ b/mods/default/locale/default.de.tr @@ -11,6 +11,7 @@ Contents:=Inhalt: Save=Speichern by @1=von @1 Page @1 of @2=Seite @1 von @2 +The book you were writing to mysteriously disappeared.= "@1" by @2=„@1“ von @2 Blueberries=Blaubeeren Book=Buch diff --git a/mods/default/locale/default.eo.tr b/mods/default/locale/default.eo.tr index 83496566..de6ce052 100644 --- a/mods/default/locale/default.eo.tr +++ b/mods/default/locale/default.eo.tr @@ -11,6 +11,7 @@ Contents:=Entenaĵo Save=Konservu by @1=per @1 Page @1 of @2=Paĝo @1 el @2 +The book you were writing to mysteriously disappeared.= "@1" by @2="@1" per @2 Blueberries=Mirteloj Book=Libro diff --git a/mods/default/locale/default.es.tr b/mods/default/locale/default.es.tr index da160dc3..d08c2d2e 100644 --- a/mods/default/locale/default.es.tr +++ b/mods/default/locale/default.es.tr @@ -11,6 +11,7 @@ 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 Blueberries=Arándanos Book=Libro diff --git a/mods/default/locale/default.fr.tr b/mods/default/locale/default.fr.tr index 8e2cd67b..c5e5bf04 100644 --- a/mods/default/locale/default.fr.tr +++ b/mods/default/locale/default.fr.tr @@ -11,6 +11,7 @@ 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 Blueberries=Myrtille Book=Livre diff --git a/mods/default/locale/default.id.tr b/mods/default/locale/default.id.tr index 91a901e6..fbeec327 100644 --- a/mods/default/locale/default.id.tr +++ b/mods/default/locale/default.id.tr @@ -11,6 +11,7 @@ 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 Blueberries=Blueberry Book=Buku diff --git a/mods/default/locale/default.it.tr b/mods/default/locale/default.it.tr index dcb5fd48..39406659 100644 --- a/mods/default/locale/default.it.tr +++ b/mods/default/locale/default.it.tr @@ -11,6 +11,7 @@ Contents:= Save= by @1= Page @1 of @2= +The book you were writing to mysteriously disappeared.= "@1" by @2="@1" di @2 Blueberries=Mirtilli Book=Libro diff --git a/mods/default/locale/default.ja.tr b/mods/default/locale/default.ja.tr index 8b1a84d7..e6249d93 100644 --- a/mods/default/locale/default.ja.tr +++ b/mods/default/locale/default.ja.tr @@ -11,6 +11,7 @@ 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=本 diff --git a/mods/default/locale/default.jbo.tr b/mods/default/locale/default.jbo.tr index 22954d3c..f1241f22 100644 --- a/mods/default/locale/default.jbo.tr +++ b/mods/default/locale/default.jbo.tr @@ -11,6 +11,7 @@ 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 +The book you were writing to mysteriously disappeared.= "@1" by @2=lo cukta be la'o gy.@1.gy. bei la'o zo'i.@2.zo'i Blueberries=lo blajba Book=lo cukta diff --git a/mods/default/locale/default.ms.tr b/mods/default/locale/default.ms.tr index cb0f4d21..35d66d20 100644 --- a/mods/default/locale/default.ms.tr +++ b/mods/default/locale/default.ms.tr @@ -11,6 +11,7 @@ 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 Blueberries=Beri Biru Book=Buku diff --git a/mods/default/locale/default.pl.tr b/mods/default/locale/default.pl.tr index ccc9458c..dd08b841 100644 --- a/mods/default/locale/default.pl.tr +++ b/mods/default/locale/default.pl.tr @@ -11,6 +11,7 @@ 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 diff --git a/mods/default/locale/default.pt_BR.tr b/mods/default/locale/default.pt_BR.tr index 1c2049fd..124e1fa0 100644 --- a/mods/default/locale/default.pt_BR.tr +++ b/mods/default/locale/default.pt_BR.tr @@ -11,6 +11,7 @@ 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 Blueberries=Mirtilo Book=Livro diff --git a/mods/default/locale/default.ru.tr b/mods/default/locale/default.ru.tr index 507841e0..fc9f12cd 100644 --- a/mods/default/locale/default.ru.tr +++ b/mods/default/locale/default.ru.tr @@ -11,6 +11,7 @@ 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=Книга diff --git a/mods/default/locale/default.sk.tr b/mods/default/locale/default.sk.tr index d85f714b..337ebcfb 100644 --- a/mods/default/locale/default.sk.tr +++ b/mods/default/locale/default.sk.tr @@ -11,6 +11,7 @@ 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 Blueberries=Čučoriedky Book=Kniha diff --git a/mods/default/locale/default.sv.tr b/mods/default/locale/default.sv.tr index 4cfbde0c..90df6c3c 100644 --- a/mods/default/locale/default.sv.tr +++ b/mods/default/locale/default.sv.tr @@ -11,9 +11,8 @@ 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 -Skeleton Key=Skelettnyckel -Key to @1's @2=Nyckel till @1s @2 Blueberries=Blåbär Book=Bok Book with Text=Bok med text @@ -212,6 +211,5 @@ Bronze Sword=Bronssvärd Steel Sword=Stålsvärd Mese Sword=Mesesvärd Diamond Sword=Diamantsvärd -Key=Nyckel Torch=Fackla @1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt. diff --git a/mods/default/locale/default.uk.tr b/mods/default/locale/default.uk.tr index 6f8a4890..c3263522 100644 --- a/mods/default/locale/default.uk.tr +++ b/mods/default/locale/default.uk.tr @@ -11,6 +11,7 @@ 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=Книга diff --git a/mods/default/locale/default.zh_CN.tr b/mods/default/locale/default.zh_CN.tr index 56b1c5e6..e4ef9463 100644 --- a/mods/default/locale/default.zh_CN.tr +++ b/mods/default/locale/default.zh_CN.tr @@ -11,6 +11,7 @@ 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 Blueberries=蓝莓 Book=书 diff --git a/mods/default/locale/default.zh_TW.tr b/mods/default/locale/default.zh_TW.tr index 94d5e183..8fcbd60b 100644 --- a/mods/default/locale/default.zh_TW.tr +++ b/mods/default/locale/default.zh_TW.tr @@ -11,6 +11,7 @@ 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 Blueberries=藍莓 Book=書 diff --git a/mods/default/locale/template.txt b/mods/default/locale/template.txt index f214d837..815c29c5 100644 --- a/mods/default/locale/template.txt +++ b/mods/default/locale/template.txt @@ -11,6 +11,7 @@ Contents:= Save= by @1= Page @1 of @2= +The book you were writing to mysteriously disappeared.= "@1" by @2= Blueberries= Book= @@ -161,7 +162,6 @@ Empty Bookshelf= Bookshelf (@1 written, @2 empty books)= Bookshelf= Text too long= -The book you were writing to mysteriously disappeared.= "@1"= Wooden Sign= Steel Sign= From e229236bc2b2bfd373a5e5eb3686334612b9b17b Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 22 Jul 2022 09:33:14 +0200 Subject: [PATCH 22/28] Update German translation --- mods/default/locale/default.de.tr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/default/locale/default.de.tr b/mods/default/locale/default.de.tr index 57d63757..9bee6b8a 100644 --- a/mods/default/locale/default.de.tr +++ b/mods/default/locale/default.de.tr @@ -11,7 +11,7 @@ Contents:=Inhalt: Save=Speichern by @1=von @1 Page @1 of @2=Seite @1 von @2 -The book you were writing to mysteriously disappeared.= +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 Blueberries=Blaubeeren Book=Buch From 697b028e430a4c92f06960e4a62abe791cc82629 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 22 Jul 2022 16:26:14 +0200 Subject: [PATCH 23/28] Update Lojban translation --- mods/default/locale/default.jbo.tr | 40 +++++++++++++++--------------- mods/doors/locale/doors.jbo.tr | 4 +-- mods/farming/locale/farming.jbo.tr | 2 +- mods/flowers/locale/flowers.jbo.tr | 2 +- mods/sethome/locale/sethome.jbo.tr | 14 +++++------ mods/stairs/locale/stairs.jbo.tr | 12 ++++----- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/mods/default/locale/default.jbo.tr b/mods/default/locale/default.jbo.tr index f1241f22..5ae97224 100644 --- a/mods/default/locale/default.jbo.tr +++ b/mods/default/locale/default.jbo.tr @@ -4,14 +4,14 @@ Locked Chest (owned by @1)=.i ti selstela gairvau po la'o zo'i.@1.zo'i You do not own this chest.=.i do na ponse lo ti gairvau a locked chest=lo selstela gairvau Chest=lo gairvau -Write= -Read= +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 -The book you were writing to mysteriously disappeared.= +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 Blueberries=lo blajba Book=lo cukta @@ -59,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 @@ -74,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 @@ -87,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 @@ -98,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 @@ -167,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 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/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/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/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/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 From 06daee4c6df87b6bacb4403be6b0e88aacc326c0 Mon Sep 17 00:00:00 2001 From: Romain Date: Mon, 25 Jul 2022 13:26:49 +0200 Subject: [PATCH 24/28] Correct some Esperanto translations (#2910) --- mods/beds/locale/beds.eo.tr | 12 +- mods/binoculars/locale/binoculars.eo.tr | 4 +- mods/bones/locale/bones.eo.tr | 8 +- mods/butterflies/locale/butterflies.eo.tr | 2 +- mods/carts/locale/carts.eo.tr | 2 +- mods/creative/locale/creative.eo.tr | 10 +- mods/default/locale/default.eo.tr | 116 +++++++++--------- mods/doors/locale/doors.eo.tr | 6 +- mods/dye/locale/dye.eo.tr | 6 +- mods/farming/locale/farming.eo.tr | 2 +- mods/fireflies/locale/fireflies.eo.tr | 8 +- mods/flowers/locale/flowers.eo.tr | 2 +- mods/game_commands/locale/game_commands.eo.tr | 4 +- mods/map/locale/map.eo.tr | 2 +- .../locale/mtg_craftguide.eo.tr | 48 ++++---- mods/screwdriver/locale/screwdriver.eo.tr | 2 +- mods/sethome/locale/sethome.eo.tr | 10 +- mods/stairs/locale/stairs.eo.tr | 8 +- mods/vessels/locale/vessels.eo.tr | 4 +- mods/wool/locale/wool.eo.tr | 6 +- mods/xpanes/locale/xpanes.eo.tr | 2 +- 21 files changed, 132 insertions(+), 132 deletions(-) diff --git a/mods/beds/locale/beds.eo.tr b/mods/beds/locale/beds.eo.tr index 0cbd4806..6acb83d8 100644 --- a/mods/beds/locale/beds.eo.tr +++ b/mods/beds/locale/beds.eo.tr @@ -1,10 +1,10 @@ # textdomain: beds Fancy Bed=Luksa Lito Simple Bed=Simpla Lito -This bed is already occupied!= -You have to stop moving before going to bed!= +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=Devigu nokta salton -You can only sleep at night.=Vi povas nur dormi en la nokto. -Leave Bed=Ellitiĝu +@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/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/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/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/carts/locale/carts.eo.tr b/mods/carts/locale/carts.eo.tr index 805cc683..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)=(Ŝteliru+Alklaku por reprini) +(Sneak+Click to pick up)=(Ŝteliri+Alklaki por reprini) Rail=Relo Powered Rail=Elektra Relo Brake Rail=Bremsa Relo diff --git a/mods/creative/locale/creative.eo.tr b/mods/creative/locale/creative.eo.tr index 8df41525..1bb4fdc0 100644 --- a/mods/creative/locale/creative.eo.tr +++ b/mods/creative/locale/creative.eo.tr @@ -1,9 +1,9 @@ # textdomain: creative -Allow player to use creative inventory=Permesu la ludanto uzi la krea stoko -Search=Serĉu -Reset=Rekomencigu -Previous page=Pasinta paĝo -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 diff --git a/mods/default/locale/default.eo.tr b/mods/default/locale/default.eo.tr index de6ce052..d50f3b43 100644 --- a/mods/default/locale/default.eo.tr +++ b/mods/default/locale/default.eo.tr @@ -1,17 +1,17 @@ # textdomain: default Locked Chest=Ŝlosita Kesto Locked Chest (owned by @1)=Ŝlosita Kesto (de @1) -You do not own this chest.=Vi ne posedas ĉi tiu keston. +You do not own this chest.=Vi ne posedas ĉi tiun keston. a locked chest=ŝlosita kesto Chest=Kesto -Write= -Read= -Title:=Titolo -Contents:=Entenaĵo -Save=Konservu +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.= +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 @@ -36,9 +36,9 @@ Stick=Bastono Tin Ingot=Stana Ingoto Tin Lump=Stana Bulo Furnace is empty=Forno estas malplena -100% (output full)=100% (eligo estas plena) +100% (output full)=100% (plena eligo) @1%=@1% -Not cookable=Ne povas kuiri +Not cookable=Nekuirebla Empty=Malplena Furnace active=Forno laboras Furnace inactive=Forno ne laboras @@ -47,31 +47,31 @@ 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 @@ -83,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 @@ -134,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 @@ -159,10 +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 -"@1"="@1" +Text too long=Tro longa teksto Wooden Sign=Ligna Signo Steel Sign=Ŝtala Signo Wooden Ladder=Ligna Ŝtupetaro @@ -179,13 +178,13 @@ 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 -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=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 Wooden Pickaxe=Ligna Pioĉo Stone Pickaxe=Ŝtona Pioĉo @@ -212,9 +211,10 @@ Steel Sword=Ŝtala Glavo Mese Sword=Mesea Glavo Diamond Sword=Diamanta Glavo Torch=Torĉo -@1 will intersect protection on growth.=@1 sekcos protekto ĉe vegeto. +@1 will intersect protection on growth.=@1 sekcos protekton dum kresko. ##### not used anymore ##### Mese Post Light=Mesea Fosta Lampo + 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/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/farming/locale/farming.eo.tr b/mods/farming/locale/farming.eo.tr index 1da4304d..6ccef7d8 100644 --- a/mods/farming/locale/farming.eo.tr +++ b/mods/farming/locale/farming.eo.tr @@ -25,4 +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 +Wild Cotton=Sovaĝa Kotonujo 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/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/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/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/mtg_craftguide/locale/mtg_craftguide.eo.tr b/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr index 7201deb5..6e0f028c 100644 --- a/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr +++ b/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr @@ -5,50 +5,50 @@ Any sand=Ajna sablo Any wool=Ajna lano Any stick=Ajna bastono Any vessel=Ajna vazo -Any wood planks=Ajna ligna tabulo -Any kind of stone block=Ia ŝtona ŝtipo +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 orange flower=Ajna oranĝa floro -Any violet flower=Ajna viola floro +Any orange flower=Ajna oranĝkolora floro +Any violet flower=Ajna violkolora floro Any yellow flower=Ajna flava floro Any red dye=Ajna ruĝa tinkturo Any blue dye=Ajna blua tinkturo Any cyan dye=Ajna bluverda tinkturo -Any grey dye=Ajna graja tinkturo -Any pink dye=Ajna rosa 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ĝa tinkturo -Any violet dye=Ajna viola 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 graja tinkturo +Any dark grey dye=Ajna malhela griza tinkturo Any dark green dye=Ajna malhela verda tinkturo # Label for group ingredients G=A -Any item belonging to the group(s): @1=Ajna objekto de la aro(j) -Unknown Item=Obskura Objekto +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=Utilo @1 el @2 +Usage @1 of @2=Uzo @1 el @2 Recipe @1 of @2=Recepto @1 el @2 -Previous recipe=Pasinta recepto -Next recipe=Sekvinta recepto -Recipe is too big to be displayed.=La recepto estas tro granda por prezenti +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 Cooking time: @1=Tempo por kuirado: @1 -Search=Ŝerĉu -Reset=Rekomincigu -Previous page=Pasinta paĝo -Next page=Sekvinta paĝo -No items to show.=Ne estas objektoj por prezenti -No usages.=Ne estas utiloj -Click again to show recipes.=Anklaku ankoraŭ por prezenti receptojn -No recipes.=Ne estas receptoj -Click again to show usages.=Anklaku ankoraŭ por prezenti utiloj +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/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/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/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/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/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/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 From c744829ce5e8b8a67439e5e33571569a25a3ad47 Mon Sep 17 00:00:00 2001 From: Richard Try Date: Fri, 29 Jul 2022 16:10:24 +0300 Subject: [PATCH 25/28] Update Russian translation for mtg_craftguide (#2873) --- .../locale/mtg_craftguide.ru.tr | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr b/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr index 8c74106d..dde5f120 100644 --- a/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr +++ b/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr @@ -4,8 +4,8 @@ Any sand=Любой песок Any wool=Любая шерсть Any stick=Любая палка Any vessel=Любой сосуд -Any wood planks=Любые деревянные палки -Any kind of stone block=Любой каменный блок +Any wood planks=Любые доски +Any kind of stone block=Любой вид каменного блока Any red flower=Любой красный цветок Any blue flower=Любой синий цветок Any black flower=Любой чёрный цветок @@ -16,11 +16,11 @@ Any violet flower=Любой фиолетовый цветок Any yellow flower=Любой жёлтый цветок Any red dye=Любая красная краска Any blue dye=Любая синяя краска -Any cyan dye=Любая сине-зелёная краска +Any cyan dye=Любая голубая краска Any grey dye=Любая серая краска Any pink dye=Любая розовая краска Any black dye=Любая чёрная краска -Any brown dye=Любая коричневая краска +Any brown dye=Любая бурая краска Any green dye=Любая зелёная краска Any white dye=Любая белая краска Any orange dye=Любая оранжевая краска @@ -30,24 +30,24 @@ 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=Неизвествый предмет +G=Г +Any item belonging to the group(s): @1=Любой предмет принадлежащий группам: @1 +Unknown Item=Неизвестный предмет Fuel=Топливо -Usage @1 of @2= -Recipe @1 of @2= +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 +Recipe is too big to be displayed.=Рецепт слишком большой для отображения. +Shapeless=Формонезависимый +Cooking time: @1=Время приготовления: @1 Search=Поиск -Reset=Сбросить +Reset=Сброс Previous page=Предыдущая страница Next page=Следующая страница -No items to show.=Нет элементов для отображения. -No usages.= -Click again to show recipes.=Нажмите снова для отображения рецептов. +No items to show.=Нет предметов для отображения. +No usages.=Нет использований. +Click again to show recipes.=Кликните снова чтобы увидеть рецепты. No recipes.=Нет рецептов. -Click again to show usages.= +Click again to show usages.=Кликните снова чтобы увидеть использования. Recipes=Рецепты From 2bdc7c8c7d9eb35185c9f90c371f65f105ab112a Mon Sep 17 00:00:00 2001 From: Richard Try Date: Fri, 29 Jul 2022 22:43:37 +0300 Subject: [PATCH 26/28] Update Russian translation --- mods/default/locale/default.ru.tr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/default/locale/default.ru.tr b/mods/default/locale/default.ru.tr index fc9f12cd..d6d5ac3f 100644 --- a/mods/default/locale/default.ru.tr +++ b/mods/default/locale/default.ru.tr @@ -4,14 +4,14 @@ Locked Chest (owned by @1)=Заблокированный Сундук (влад You do not own this chest.=Вы не владелец этого сундука. a locked chest=заблокированный сундук Chest=Сундук -Write= -Read= +Write=Писать +Read=Читать Title:=Заголовок: Contents:=Содержимое: Save=Сохранить by @1=@1 Page @1 of @2=Страница @1 из @2 -The book you were writing to mysteriously disappeared.= +The book you were writing to mysteriously disappeared.=Книга, в которую вы писали, загадочно исчезла. "@1" by @2="@1" @2 Blueberries=Черника Book=Книга From e903b1f6d0c9507543cb2970470319ca52a80921 Mon Sep 17 00:00:00 2001 From: ROllerozxa Date: Wed, 17 Aug 2022 16:05:48 +0200 Subject: [PATCH 27/28] Make default an optional dependency for the creative mod --- mods/creative/mod.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/creative/mod.conf b/mods/creative/mod.conf index 0b3f745d..8f3fcd9f 100644 --- a/mods/creative/mod.conf +++ b/mods/creative/mod.conf @@ -1,3 +1,4 @@ name = creative description = Minetest Game mod: creative -depends = default, sfinv +depends = sfinv +optional_depends = default From aff9c28eed5536ac886734d41c33a84bac5fcbaf Mon Sep 17 00:00:00 2001 From: VitaliyShar <111154840+VitaliyShar@users.noreply.github.com> Date: Thu, 18 Aug 2022 12:02:24 +0300 Subject: [PATCH 28/28] Improve stair placement rotation for bridging (#2979) Co-authored-by: sfan5 --- mods/stairs/init.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index 4ba854fa..fabd9642 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -32,7 +32,13 @@ local function rotate_and_place(itemstack, placer, pointed_thing) if placer then local placer_pos = placer:get_pos() if placer_pos then - param2 = minetest.dir_to_facedir(vector.subtract(p1, placer_pos)) + local diff = vector.subtract(p1, placer_pos) + param2 = minetest.dir_to_facedir(diff) + -- The player places a node on the side face of the node he is standing on + if p0.y == p1.y and math.abs(diff.x) <= 0.5 and math.abs(diff.z) <= 0.5 and diff.y < 0 then + -- reverse node direction + param2 = (param2 + 2) % 4 + end end local finepos = minetest.pointed_thing_to_face_pos(placer, pointed_thing)