diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml deleted file mode 100644 index 08712a7c..00000000 --- a/.github/workflows/luacheck.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: luacheck -on: [push, pull_request] - -jobs: - luacheck: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Luacheck - uses: lunarmodules/luacheck@master - with: - args: mods diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 19864e43..00000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Test -on: [push, pull_request] - -jobs: - test: - runs-on: ubuntu-latest - timeout-minutes: 5 - strategy: - matrix: - cfg: - - { image: 'ghcr.io/minetest/minetest:5.9.0' } - - { image: 'ghcr.io/minetest/minetest:5.10.0' } - - { image: 'ghcr.io/luanti-org/luanti:master' } # latest git - steps: - - uses: actions/checkout@v4 - - - run: ./utils/test/run.sh - env: - DOCKER_IMAGE: "${{ matrix.cfg.image }}" diff --git a/.luacheckrc b/.luacheckrc index 98aa2a60..2be56e80 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,13 +1,8 @@ unused_args = false allow_defined_top = true -globals = { - "default" -} - read_globals = { "DIR_DELIM", - "core", "minetest", "dump", "vector", @@ -19,10 +14,7 @@ read_globals = { -- Silence errors about custom table methods. table = { fields = { "copy", "indexof" } }, -- Silence warnings about accessing undefined fields of global 'math' - math = { fields = { "sign" } }, - -- Mod support - "player_monoids", - "pova", + math = { fields = { "sign" } } } -- Overwrites minetest.handle_node_drops diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..a367215f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: generic +addons: + apt: + packages: + - luarocks +before_install: + - luarocks install --local luacheck +script: +- $HOME/.luarocks/bin/luacheck ./mods +notifications: + email: false diff --git a/README.md b/README.md index 5ecaec9f..a88d83c7 100644 --- a/README.md +++ b/README.md @@ -1,45 +1,34 @@ # Minetest Game -[![ContentDB](https://content.luanti.org/packages/Minetest/minetest_game/shields/title/)](https://content.luanti.org/packages/Minetest/minetest_game/) +The default game bundled in the Minetest engine. -Minetest Game (abbreviated MTG) is a simple and peaceful sandbox game, with no -real goals or built-in enemy mobs. - -While it provides a basic gameplay experience out of the box, it is best played -with mods. - -Minetest Game is in perpetual maintenance-only mode, meaning it will not see new -gameplay features or anything else that breaks compatibility (see -[#2710](https://github.com/minetest/minetest_game/issues/2710)). +For further information, check +[this forum topic](https://forum.minetest.net/viewtopic.php?f=15&t=9724). +Also see the [Minetest Wiki](https://wiki.minetest.net/Subgames/Minetest_Game) +for more information. ## Installation -### ContentDB +- Unzip the archive, rename the folder to minetest_game and +place it in .. minetest/games/ -* Content > Browse Online Content -* Search for "[Minetest Game](https://content.luanti.org/packages/Minetest/minetest_game/)" -* Click Install +- GNU/Linux: If you use a system-wide installation place + it in ~/.minetest/games/. -### Manually +The Minetest engine can be found at [GitHub](https://github.com/minetest/minetest). -- Unzip the archive, rename the folder to `minetest_game` and -place it in `.../minetest/games/` - -- GNU/Linux: If you use a system-wide installation place it in `~/.minetest/games/`. - -The Luanti engine can be found at [GitHub](https://github.com/minetest/minetest). - -For further information or help, see: [Installing Mods](https://wiki.luanti.org/Installing_Mods). +For further information or help, see: +https://wiki.minetest.net/Installing_Mods ## Compatibility -As of January 2024 Minetest Game follows a **rolling release** model with new changes being automatically -published on ContentDB every day. +The Minetest Game GitHub master HEAD is generally compatible with the GitHub +master HEAD of the Minetest engine. +Additionally, when the Minetest engine is tagged to be a certain version (e.g. +0.4.10), Minetest Game is tagged with the version too. -There are no stable releases or tags, all existing ones are considered legacy. - -Minetest Game is always compatible to the latest stable release of the engine. -Older releases may be supported too depending on circumstances. +When stable releases are made, Minetest Game and the Minetest engine is packaged +and made available at [www.minetest.net](https://www.minetest.net/downloads/). ## Licensing diff --git a/game.conf b/game.conf index e9c3f85f..5c968825 100644 --- a/game.conf +++ b/game.conf @@ -1,3 +1,3 @@ -title = Minetest Game -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 Luanti core developers. -min_minetest_version = 5.8 +name = Minetest Game +author = Minetest +description = Bundled by default with Minetest, and aims to be lightweight, moddable, and fairly playable without mods. diff --git a/game_api.txt b/game_api.txt index 081979ac..3f311336 100644 --- a/game_api.txt +++ b/game_api.txt @@ -6,12 +6,12 @@ GitHub Repo: https://github.com/minetest/minetest_game Introduction ------------ -The Minetest Game game offers multiple new possibilities in addition to the Luanti engine's built-in API, +The Minetest Game game offers multiple new possibilities in addition to the Minetest engine's built-in API, allowing you to add new plants to farming mod, buckets for new liquids, new stairs and custom panes. -For information on the Luanti API, visit https://github.com/minetest/minetest/blob/master/doc/lua_api.txt +For information on the Minetest API, visit https://github.com/minetest/minetest/blob/master/doc/lua_api.txt Please note: - * [XYZ] refers to a section the Luanti API + * [XYZ] refers to a section the Minetest API * [#ABC] refers to a section in this document * [pos] refers to a position table `{x = -5, y = 0, z = 200}` @@ -35,7 +35,6 @@ The bucket API allows registering new types of buckets for non-default liquids. The filled bucket item is returned to the player that uses an empty bucket pointing to the given liquid source. When punching with an empty bucket pointing to an entity or a non-liquid node, the on_punch of the entity or node will be triggered. -The bucket API also allows registering buckets in other namespace using colon-prefixed itemname (i.e. ":cows:bucket_milk"). Beds API @@ -50,8 +49,6 @@ Beds API * `beds.read_spawns() ` Returns a table containing players respawn positions * `beds.kick_players()` Forces all players to leave bed * `beds.skip_night()` Sets world time to morning and saves respawn position of all players currently sleeping - * `beds.day_interval` Is a table with keys "start" and "finish". Allows you - to set the period of the day (timeofday format). Default: `{ start = 0.2, finish = 0.805 }`. ### Bed definition @@ -221,8 +218,6 @@ The doors mod allows modders to register custom doors and trapdoors. description = "Door description", inventory_image = "mod_door_inv.png", groups = {choppy = 2}, - model = "mod_door", -- (optional) - -- Model name without a suffix ("big_door" not "big_door_a.obj", "big_door_b.obj") tiles = {"mod_door.png"}, -- UV map. -- The front and back of the door must be identical in appearence as they swap on -- open/close. @@ -230,20 +225,14 @@ The doors mod allows modders to register custom doors and trapdoors. sounds = default.node_sound_wood_defaults(), -- optional sound_open = sound play for open door, -- optional sound_close = sound play for close door, -- optional - gain_open = 0.3, -- optional, defaults to 0.3 - gain_close = 0.3, -- optional, defaults to 0.3 protected = false, -- If true, only placer can open the door (locked for others) - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing), + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) -- optional function containing the on_rightclick callback, defaults to a doors.door_toggle-wrapper - use_texture_alpha = "clip", ### Trapdoor definition description = "Trapdoor description", inventory_image = "mod_trapdoor_inv.png", - nodebox_closed = {} -- Nodebox for closed model - nodebox_opened = {} -- Nodebox for opened model - -- (optional) both nodeboxes must be used, not one only groups = {choppy = 2}, tile_front = "doors_trapdoor.png", -- the texture for the front and back of the trapdoor tile_side = "doors_trapdoor_side.png", @@ -255,12 +244,11 @@ The doors mod allows modders to register custom doors and trapdoors. sounds = default.node_sound_wood_defaults(), -- optional sound_open = sound play for open door, -- optional sound_close = sound play for close door, -- optional - gain_open = 0.3, -- optional, defaults to 0.3 - gain_close = 0.3, -- optional, defaults to 0.3 protected = false, -- If true, only placer can open the door (locked for others) - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) , + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + -- function containing the on_rightclick callback + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) -- function containing the on_rightclick callback - use_texture_alpha = "clip", ### Fence gate definition @@ -270,7 +258,7 @@ The doors mod allows modders to register custom doors and trapdoors. material = "default:wood", groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults(), -- optional - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) -- function containing the on_rightclick callback @@ -325,7 +313,7 @@ Allows creation of new fences with "fencelike" drawtype. name = "default:fence_wood", description = "Wooden Fence", texture = "default_wood.png", - material = "default:wood", -- `nil` if you don't want the recipe + material = "default:wood", groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults(), @@ -342,12 +330,6 @@ walls.register(name, desc, texture, mat, sounds) ^ mat = "default:stone". Used to auto-generate crafting recipe. ^ sounds = sounds: see [#Default sounds] -All walls will be connected to any nodes with one of the following groups: - * `wall` - * `stone` - * `fence` - * `wall_connected` - Farming API ----------- @@ -389,8 +371,6 @@ The farming API allows you to easily register plants and hoes. -- ^ Always provide a plant texture for each step, format: modname_plantname_i.png (i = stepnumber) minlight = 13, -- Minimum light to grow maxlight = default.LIGHT_MAX -- Maximum light to grow - can_grow = function(pos) -- Сalled every growth tick to check if the plant can grow, returns bool - -- (optional, checks for wet soil by default) } @@ -446,83 +426,63 @@ Give Initial Stuff API ^ Adds items to the list of items to be given -Player API ----------- +Players 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 + * name: model filename such as "character.x", "foo.b3d", etc. + * def: See [#Model definition] + * saved to player_api.registered_models -* `player_api.registered_models[name]` - * Get a model's definition - * `name`: model filename - * See [#Model definition] +* `player_api.registered_player_models[name]` + * Get a model's definition + * see [#Model definition] * `player_api.set_model(player, model_name)` * Change a player's model * `player`: PlayerRef - * `model_name`: model registered with `player_api.register_model` + * `model_name`: model registered with player_api.register_model() -* `player_api.set_animation(player, anim_name, speed)` - * Applies an animation to a player if speed or anim_name differ from the currently playing animation - * `player`: PlayerRef - * `anim_name`: name of the animation - * `speed`: keyframes per second. If nil, the default from the model def is used +* `player_api.set_animation(player, anim_name [, speed])` + * Applies an animation to a player + * anim_name: name of the animation. + * speed: frames per second. If nil, default from the model is used * `player_api.set_textures(player, textures)` * Sets player textures * `player`: PlayerRef - * `textures`: array of textures. If nil, the default from the model def is used - -* `player_api.set_textures(player, index, texture)` - * Sets one of the player textures - * `player`: PlayerRef - * `index`: Index into array of all textures - * `texture`: the texture string + * `textures`: array of textures, If `textures` is nil the default + textures from the model def are used * `player_api.get_animation(player)` - * Returns a table containing fields `model`, `textures` and `animation` - * Any of the fields of the returned table may be nil - * `player`: PlayerRef + * Returns a table containing fields `model`, `textures` and `animation`. + * Any of the fields of the returned table may be nil. + * player: PlayerRef * `player_api.player_attached` - * A table that maps a player name to a boolean - * If the value for a given player is set to true, the default player animations - (walking, digging, ...) will no longer be updated, and knockback from damage is - prevented for that player - * Example of usage: A mod sets a player's value to true when attached to a vehicle + * A table that maps a player name to a boolean. + * If the value for a given player is set to true, the default player + animations (walking, digging, ...) will no longer be updated. + Knockback from damage is also prevented for that player. ### Model Definition { - animation_speed = 30, -- Default animation speed, in keyframes per second - textures = {"character.png"}, -- Default array of textures + animation_speed = 30, -- Default animation speed, in FPS. + textures = {"character.png", }, -- Default array of textures. + visual_size = {x = 1, y = 1}, -- Used to scale the model. animations = { - -- [anim_name] = { - -- x = , - -- y = , - -- collisionbox = , -- (optional) - -- eye_height = , -- (optional) - -- -- suspend client side animations while this one is active (optional) - -- override_local = - -- }, - stand = ..., lay = ..., walk = ..., mine = ..., walk_mine = ..., -- required animations - sit = ... -- used by boats and other MTG mods + -- = {x = , y = }, + foo = {x = 0, y = 19}, + bar = {x = 20, y = 39}, + -- ... }, - -- Default object properties, see lua_api.txt - visual_size = {x = 1, y = 1}, - collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, - stepheight = 0.6, - eye_height = 1.47 + collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, -- In nodes from feet position + stepheight = 0.6, -- In nodes + eye_height = 1.47, -- In nodes above feet position } @@ -600,18 +560,6 @@ Both nodedefs and entitydefs can provide an `on_blast()` callback * `drops` - a list of drops, e.g. {"wool:red"} -Node drops: - -When a node is detonated it is removed according to the following rules. -1. If `on_blast` is defined, that is called. -2. Else if the node has group `flammable` it is replaced with a fire node. -3. Else the dropped items are retrieved and it is replaced with air. - -The parameter `_tnt_loss` in any item definition can be set to a number to -effect that "one in X" of these drops will be lost during an explosion. -For example `_tnt_loss = 2` would cause 50% of items to disappear. -The default is to not lose any items, which is equivalent to `_tnt_loss = 0`. - Screwdriver API --------------- @@ -653,34 +601,6 @@ set a players home position and teleport a player to home position. * `name` Player you wish to teleport to their home position * return value: false if player cannot be sent home, otherwise true -Spawn API ---------- - -The spawn mod takes care of deciding the position of new and respawning players -in the world and has an API to modify its behavior. - -`spawn.get_default_pos()` -* Gets the default spawn position as decided by a biome-dependent algorithm. -* This is not influenced by settings like "static_spawnpoint" or "engine_spawn". -* return value: a vector or `nil` on failure - -`spawn.add_suitable_biome(biome)`: -* Adds a biome to the list of allowed biomes for the above algorithm. -* `biome`: Name of a registered biome - -`spawn.register_on_spawn(func)`: -* Registers a callback to be called when a player (re-)spawns. This can be used - to intercept the normal logic to e.g. respawn a player at his bed. -* `func`: `function(player, is_new)` with arguments - - `player`: ObjectRef - - `is_new`: true if the player is joining the server for the first time - - return value: true to skip all other spawn logic, false or nil otherwise - -When a player (re-)spawns the following order is executed: -1. All spawn callbacks in order of registration. -2. If no result, teleport player to `spawn.get_default_pos()`. -3. If that fails, spawning is left up to engine. - Sfinv API --------- @@ -797,12 +717,6 @@ Stairs API The stairs API lets you register stairs and slabs and ensures that they are registered the same way as those delivered with Minetest Game, to keep them compatible with other mods. -The following node attributes are sourced from the recipeitem: - * use_texture_alpha - * sunlight_propagates - * light_source - * If the recipeitem is a fuel, the stair/slab is also registered as a fuel of proportionate burntime. - `stairs.register_stair(subname, recipeitem, groups, images, description, sounds, worldaligntex)` * Registers a stair @@ -849,18 +763,12 @@ The following node attributes are sourced from the recipeitem: * `worldaligntex`: A bool to set all textures world-aligned. Default false. See [Tile definition] * `full_description`: Overrides the description, bypassing string concatenation. This is useful for translation. (optional) -``` -stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, - sounds, worldaligntex, desc_stair_inner, desc_stair_outer) -``` +`stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds, worldaligntex)` * A wrapper for stairs.register_stair, stairs.register_slab, stairs.register_stair_inner, stairs.register_stair_outer * Uses almost the same arguments as stairs.register_stair - * `desc_stair`: Description for stair nodes. For corner stairs 'Inner' or 'Outer' will be prefixed unless - `desc_stair_inner` or `desc_stair_outer` are specified, which are used instead. + * `desc_stair`: Description for stair nodes. For corner stairs 'Inner' or 'Outer' will be prefixed * `desc_slab`: Description for slab node - * `desc_stair_inner`: Description for inner stair node - * `desc_stair_outer`: Description for outer stair node Xpanes API @@ -1077,27 +985,6 @@ Trees * `default.grow_blueberry_bush(pos)` * Grows a blueberry bush at pos - * `default.on_grow_failed(pos)` - * Reset the node timer to 300 seconds, used as default callback when the growth of a sapling fails - - * `default.sapling_growth_defs` - * Table that contains all the definitions for the growable saplings, see `default.register_sapling_growth` - - * `default.register_sapling_growth(name, def)` - * Register a new sapling growth configuration. Useful to add custom sapling and trees to the game in a compact way. - default.register_sapling_growth( - "default:sapling", -- Name of the sapling - { - can_grow = default.can_grow, -- Function called to determine whether the sapling can grow, should return a boolean - on_grow_failed = default.on_grow_failed, -- Function called when the growth fails - grow = function(pos) -- Function called when the growth has success. This should replace the sapling with a tree. - } - ) - - * `default.grow_sapling(pos)` - * Attempt to grow a sapling at the given position. Useful as on_timer callback. - - Carts ----- @@ -1187,60 +1074,3 @@ 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)` - - * hooks the callbacks `on_metadata_inventory_move`, - `on_metadata_inventory_put` and `on_metadata_inventory_take` - that log corresponding actions - * after logging the action, the original callback (if any) is called - * `def` See [Node definition] - * `name` Description of the node in the log message - - -Weather API ------------ - -The weather mod will constantly adjust weather effects seen by the player -(that is: cloud parameters, shadow intensity, bloom and volumetric lighting). -These can be influenced using this API. - -#### `weather.get = function(player)` - -* Returns the current weather effects seen by the player. - It returns a table with two keys: - * `clouds`: A table (or `nil`) with cloud data following the same format as used for `player:set_clouds()`. - * `lighting`: A table (or `nil`) with lighting data following the same format as used for `player:set_lighting()`. -* `player`: ObjectRef of the relevant player -* You can override this function to change the weather effects by simply returning different values. - Setting `clouds` or `lighting` in the result table to `nil` will *prevent* those from changing. - -Utilities ---------- - -`default.dig_up(pos, node, digger, max_height)` - - * Find all nodes above `pos` that is the same, then dig them all - * `max_height` Maximum number of nodes to iterate. Default: 100 diff --git a/menu/header.png b/menu/header.png index b24122ff..2ecda837 100644 Binary files a/menu/header.png and b/menu/header.png differ diff --git a/minetest.conf.example b/minetest.conf.example index 6b392e8a..86eba660 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -72,10 +72,6 @@ default:torch 99,default:cobble 99 # Helps rivers create more sound, especially on level sections. #river_source_sounds = false -# If enabled, the 'weather' mod will control cloud parameters, shadow intensity, -# bloom and volumetric lighting. +# Enable cloud variation by the 'weather' mod. # Non-functional in V6 or Singlenode mapgens. #enable_weather = true - -# If enabled, non-player actions are logged -#log_non_player_actions = false diff --git a/mods/beds/README.txt b/mods/beds/README.txt index 5c452da8..7b35e141 100644 --- a/mods/beds/README.txt +++ b/mods/beds/README.txt @@ -5,7 +5,7 @@ See license.txt for license information. Authors of source code ---------------------- Originally by BlockMen (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) --------------------------- @@ -15,7 +15,7 @@ BlockMen (CC BY-SA 3.0) TumeniNodes (CC BY-SA 3.0) beds_bed_under.png -This mod adds a bed which allows players to skip the night. +This mod adds a bed to Minetest which allows players to skip the night. To sleep, right click on the bed. If playing in singleplayer mode the night gets skipped immediately. If playing multiplayer you get shown how many other players are in bed too, if all players are sleeping the night gets skipped. The night skip can be forced if more diff --git a/mods/beds/api.lua b/mods/beds/api.lua index 2214465b..cab2def5 100644 --- a/mods/beds/api.lua +++ b/mods/beds/api.lua @@ -1,41 +1,27 @@ --- Removes a node without calling on on_destruct() --- We use this to mess with bed nodes without causing unwanted recursion. -local function remove_no_destruct(pos) - minetest.swap_node(pos, {name = "air"}) - minetest.remove_node(pos) -- Now clear the meta - minetest.check_for_falling(pos) -end ---- returns the position of the other bed half (or nil on failure) -local function get_other_bed_pos(pos, n) - local node = core.get_node(pos) - local dir = core.facedir_to_dir(node.param2) - if not dir then - return -- There are 255 possible param2 values. Ignore bad ones. - end - local other - if n == 2 then - other = vector.subtract(pos, dir) - elseif n == 1 then - other = vector.add(pos, dir) - else - return nil - end - - local onode = core.get_node(other) - if onode.param2 == node.param2 and core.get_item_group(onode.name, "bed") ~= 0 then - return other - end - return nil -end +local reverse = true local function destruct_bed(pos, n) - local other = get_other_bed_pos(pos, n) - if other then - remove_no_destruct(other) - beds.remove_spawns_at(other) + local node = minetest.get_node(pos) + local other + + if n == 2 then + local dir = minetest.facedir_to_dir(node.param2) + other = vector.subtract(pos, dir) + elseif n == 1 then + local dir = minetest.facedir_to_dir(node.param2) + other = vector.add(pos, dir) + end + + if reverse then + reverse = not reverse + minetest.remove_node(other) + minetest.check_for_falling(other) + beds.remove_spawns_at(pos) + beds.remove_spawns_at(other) + else + reverse = not reverse end - beds.remove_spawns_at(pos) end function beds.register_bed(name, def) @@ -45,7 +31,6 @@ function beds.register_bed(name, def) wield_image = def.wield_image, drawtype = "nodebox", tiles = def.tiles.bottom, - use_texture_alpha = "clip", paramtype = "light", paramtype2 = "facedir", is_ground_content = false, @@ -110,7 +95,8 @@ function beds.register_bed(name, def) minetest.set_node(pos, {name = name .. "_bottom", param2 = dir}) minetest.set_node(botpos, {name = name .. "_top", param2 = dir}) - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(player_name)) then itemstack:take_item() end return itemstack @@ -127,14 +113,10 @@ function beds.register_bed(name, def) on_rotate = function(pos, node, user, _, new_param2) local dir = minetest.facedir_to_dir(node.param2) - if not dir then - return false - end - -- old position of the top node local p = vector.add(pos, dir) local node2 = minetest.get_node_or_nil(p) - if not node2 or minetest.get_item_group(node2.name, "bed") ~= 2 or - node.param2 ~= node2.param2 then + if not node2 or not minetest.get_item_group(node2.name, "bed") == 2 or + not node.param2 == node2.param2 then return false end if minetest.is_protected(p, user:get_player_name()) then @@ -144,7 +126,6 @@ function beds.register_bed(name, def) if new_param2 % 32 > 3 then return false end - -- new position of the top node local newp = vector.add(pos, minetest.facedir_to_dir(new_param2)) local node3 = minetest.get_node_or_nil(newp) local node_def = node3 and minetest.registered_nodes[node3.name] @@ -156,7 +137,8 @@ function beds.register_bed(name, def) return false end node.param2 = new_param2 - remove_no_destruct(p) + -- do not remove_node here - it will trigger destroy_bed() + minetest.set_node(p, {name = "air"}) minetest.set_node(pos, node) minetest.set_node(newp, {name = name .. "_top", param2 = new_param2}) return true @@ -169,29 +151,25 @@ function beds.register_bed(name, def) minetest.register_node(name .. "_top", { drawtype = "nodebox", tiles = def.tiles.top, - use_texture_alpha = "clip", paramtype = "light", paramtype2 = "facedir", is_ground_content = false, - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2, - not_in_creative_inventory = 1}, + pointable = false, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2}, sounds = def.sounds or default.node_sound_wood_defaults(), - drop = "", + drop = name .. "_bottom", node_box = { type = "fixed", fixed = def.nodebox.top, }, - selection_box = { - type = "fixed", - -- Small selection box to allow digging stray top nodes - fixed = {-0.3, -0.3, -0.3, 0.3, -0.1, 0.3}, - }, on_destruct = function(pos) destruct_bed(pos, 2) end, can_dig = function(pos, player) - local other = get_other_bed_pos(pos, 2) - return (not other) or beds.can_dig(other) + local node = minetest.get_node(pos) + local dir = minetest.facedir_to_dir(node.param2) + local p = vector.add(pos, dir) + return beds.can_dig(p) end, }) diff --git a/mods/beds/beds.lua b/mods/beds/beds.lua index e9051076..dc044a35 100644 --- a/mods/beds/beds.lua +++ b/mods/beds/beds.lua @@ -65,17 +65,17 @@ beds.register_bed("beds:bed", { "beds_bed_top_bottom.png^[transformR90", "beds_bed_under.png", "beds_bed_side_bottom_r.png", - "beds_bed_side_bottom_r.png^[transformFX", - "blank.png", + "beds_bed_side_bottom_r.png^[transformfx", + "beds_transparent.png", "beds_bed_side_bottom.png" }, top = { "beds_bed_top_top.png^[transformR90", "beds_bed_under.png", "beds_bed_side_top_r.png", - "beds_bed_side_top_r.png^[transformFX", + "beds_bed_side_top_r.png^[transformfx", "beds_bed_side_top.png", - "blank.png", + "beds_transparent.png", } }, nodebox = { diff --git a/mods/beds/functions.lua b/mods/beds/functions.lua index 5fb5cd06..019c123a 100644 --- a/mods/beds/functions.lua +++ b/mods/beds/functions.lua @@ -5,16 +5,6 @@ if enable_respawn == nil then enable_respawn = true end --- Physics override management mods (shadow the global variable) -local player_monoids = core.get_modpath("player_monoids") and player_monoids -local pova = core.get_modpath("pova") and pova - -if player_monoids and not player_monoids.speed.checkout_branch then - -- This function exists since 2025-05-17 - core.log("warning", "[beds] player_monoids is too old, thus not supported.") - player_monoids = nil -end - -- support for MT game translation. local S = beds.get_translator @@ -60,51 +50,6 @@ local function check_in_beds(players) return #players > 0 end -local function set_physics_override(player, put_to_bed) - local IDENTIFIER = "beds:lie" - local OVERRIDES = {speed = 0, jump = 0, gravity = 0} - - local name = player:get_player_name() - local pdata = beds.player[name] - - if put_to_bed then -- Freeze player - if player_monoids then - for k, v in pairs(OVERRIDES) do - local monoid = player_monoids[k] - pdata["monoid_branch_" .. k] = monoid:get_active_branch(player) - -- Change the "context" of the physics overrides - local branch = monoid:checkout_branch(player, IDENTIFIER) - branch:add_change(player, v) - end - elseif pova then - pova.add_override(name, "force", OVERRIDES) - pova.do_override(player) - else - -- Directly use engine API. May conflict with other mods. - pdata.physics_override = player:get_physics_override() - player:set_physics_override(OVERRIDES) - end - else -- Unfreeze player - if player_monoids then - for k, _ in pairs(OVERRIDES) do - local monoid = player_monoids[k] - monoid:checkout_branch(player, pdata["monoid_branch_" .. k]) - monoid:get_branch(IDENTIFIER):delete(player) - end - elseif pova then - pova.del_override(name, "force") - pova.do_override(player) - else - -- Restore the changed fields - player:set_physics_override({ - speed = pdata.physics_override.speed, - jump = pdata.physics_override.jump, - gravity = pdata.physics_override.gravity - }) - end - end -end - local function lay_down(player, pos, bed_pos, state, skip) local name = player:get_player_name() local hud_flags = player:hud_get_flags() @@ -115,57 +60,33 @@ local function lay_down(player, pos, bed_pos, state, skip) -- stand up if state ~= nil and not state then - if not beds.player[name] then - -- player not in bed, do nothing - return false - end + local p = beds.pos[name] or nil + beds.player[name] = nil beds.bed_position[name] = nil -- skip here to prevent sending player specific changes (used for leaving players) if skip then return end - player:set_pos(beds.pos[name]) + if p then + player:set_pos(p) + end -- physics, eye_offset, etc - set_physics_override(player, false) - beds.player[name] = nil player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0}) player:set_look_horizontal(math.random(1, 180) / 100) player_api.player_attached[name] = false + player:set_physics_override(1, 1, 1) hud_flags.wielditem = true player_api.set_animation(player, "stand" , 30) -- lay down else - - -- Check if bed is occupied - for _, other_pos in pairs(beds.bed_position) do - if vector.distance(bed_pos, other_pos) < 0.1 then - minetest.chat_send_player(name, S("This bed is already occupied!")) - return false - end - end - - -- Check if player is moving - if vector.length(player:get_velocity()) > 0.05 then - minetest.chat_send_player(name, S("You have to stop moving before going to bed!")) - return false - end - - -- Check if player is attached to an object - if player:get_attach() then - return false - end - - if beds.player[name] then - -- player already in bed, do nothing - return false - end - - beds.player[name] = {} beds.pos[name] = pos beds.bed_position[name] = bed_pos + beds.player[name] = 1 + -- physics, eye_offset, etc + player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0}) local yaw, param2 = get_look_yaw(bed_pos) player:set_look_horizontal(yaw) local dir = minetest.facedir_to_dir(param2) @@ -176,7 +97,7 @@ local function lay_down(player, pos, bed_pos, state, skip) y = bed_pos.y + 0.07, z = bed_pos.z + dir.z / 2 } - set_physics_override(player, true) + player:set_physics_override(0, 0, 0) player:set_pos(p) player_api.player_attached[name] = true hud_flags.wielditem = false @@ -231,32 +152,12 @@ function beds.skip_night() minetest.set_timeofday(0.23) end -local update_scheduled = false -local function schedule_update() - if update_scheduled then - -- there already is an update scheduled; don't schedule more to prevent races - return - end - update_scheduled = true - minetest.after(2, function() - update_scheduled = false - if not is_sp then - update_formspecs(is_night_skip_enabled()) - end - if is_night_skip_enabled() then - -- skip the night and let all players stand up - beds.skip_night() - beds.kick_players() - end - end) -end - function beds.on_rightclick(pos, player) local name = player:get_player_name() local ppos = player:get_pos() local tod = minetest.get_timeofday() - if tod > beds.day_interval.start and tod < beds.day_interval.finish then + if tod > 0.2 and tod < 0.805 then if beds.player[name] then lay_down(player, nil, nil, false) end @@ -276,8 +177,17 @@ function beds.on_rightclick(pos, player) update_formspecs(false) end + -- skip the night and let all players stand up if check_in_beds() then - schedule_update() + minetest.after(2, function() + if not is_sp then + update_formspecs(is_night_skip_enabled()) + end + if is_night_skip_enabled() then + beds.skip_night() + beds.kick_players() + end + end) end end @@ -294,9 +204,10 @@ end -- Callbacks -- Only register respawn callback if respawn enabled if enable_respawn then - -- Respawn player at bed if valid position is found - spawn.register_on_spawn(function(player, is_new) - local pos = beds.spawn[player:get_player_name()] + -- respawn player at bed if enabled and valid position is found + minetest.register_on_respawnplayer(function(player) + local name = player:get_player_name() + local pos = beds.spawn[name] if pos then player:set_pos(pos) return true @@ -309,20 +220,13 @@ minetest.register_on_leaveplayer(function(player) lay_down(player, nil, nil, false, true) beds.player[name] = nil if check_in_beds() then - schedule_update() - end -end) - -minetest.register_on_dieplayer(function(player) - local name = player:get_player_name() - local in_bed = beds.player - local pos = player:get_pos() - local yaw = get_look_yaw(pos) - - if in_bed[name] then - lay_down(player, nil, pos, false) - player:set_look_horizontal(yaw) - player:set_pos(pos) + minetest.after(2, function() + update_formspecs(is_night_skip_enabled()) + if is_night_skip_enabled() then + beds.skip_night() + beds.kick_players() + end + end) end end) diff --git a/mods/beds/init.lua b/mods/beds/init.lua index 14ced8ba..a1a46ce9 100644 --- a/mods/beds/init.lua +++ b/mods/beds/init.lua @@ -16,11 +16,6 @@ beds.formspec = "size[8,11;true]" .. "bgcolor[#080808BB;true]" .. "button_exit[2,10;4,0.75;leave;" .. esc(S("Leave Bed")) .. "]" -beds.day_interval = { - start = 0.2, - finish = 0.805, -} - local modpath = minetest.get_modpath("beds") -- Load files diff --git a/mods/beds/license.txt b/mods/beds/license.txt index 383047d1..f3c517f9 100644 --- a/mods/beds/license.txt +++ b/mods/beds/license.txt @@ -3,7 +3,7 @@ License of source code The MIT License (MIT) Copyright (C) 2014-2016 BlockMen -Copyright (C) 2014-2016 Various Minetest Game developers and contributors +Copyright (C) 2014-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/beds/locale/beds.bg.tr b/mods/beds/locale/beds.bg.tr deleted file mode 100755 index ac34959a..00000000 --- a/mods/beds/locale/beds.bg.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Модерно легло -Simple Bed=Обикновено легло -This bed is already occupied!=Това легло вече е заето! -You have to stop moving before going to bed!=За да легнете трябва да спрете да се движите! -Good morning.=Добро утро! -@1 of @2 players are in bed=@1 от @2 играчи са легнали -Force night skip=Прескачане на нощта -You can only sleep at night.=Може да спите само през нощта. -Leave Bed=Ставане от леглото diff --git a/mods/beds/locale/beds.de.tr b/mods/beds/locale/beds.de.tr index 3f2c959e..e77f654c 100644 --- a/mods/beds/locale/beds.de.tr +++ b/mods/beds/locale/beds.de.tr @@ -1,10 +1,8 @@ # textdomain: beds Fancy Bed=Schickes Bett Simple Bed=Schlichtes Bett -This bed is already occupied!=Dieses Bett ist bereits belegt! -You have to stop moving before going to bed!=Sie müssen stehen bleiben, bevor Sie zu Bett gehen können! +Leave Bed=Bett verlassen Good morning.=Guten Morgen. @1 of @2 players are in bed=@1 von @2 Spielern sind im Bett Force night skip=Überspringen der Nacht erzwingen You can only sleep at night.=Sie können nur nachts schlafen. -Leave Bed=Bett verlassen diff --git a/mods/beds/locale/beds.eo.tr b/mods/beds/locale/beds.eo.tr deleted file mode 100644 index 3a4ad2f8..00000000 --- a/mods/beds/locale/beds.eo.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Luksa lito -Simple Bed=Simpla lito -This bed is already occupied!=Tiu lito jam estas okupata! -You have to stop moving before going to bed!=Vi ĉesu moviĝi por enlitiĝi! -Good morning.=Bonan matenon. -@1 of @2 players are in bed=@1 el @2 ludantoj estas en lito -Force night skip=Devigi noktan salton -You can only sleep at night.=Vi povas dormi nur nokte. -Leave Bed=Ellitiĝi diff --git a/mods/beds/locale/beds.es.tr b/mods/beds/locale/beds.es.tr index 8ef0db73..0543e7fc 100644 --- a/mods/beds/locale/beds.es.tr +++ b/mods/beds/locale/beds.es.tr @@ -1,10 +1,8 @@ # textdomain: beds Fancy Bed=Cama de lujo Simple Bed=Cama sencilla -This bed is already occupied!=Esta cama esta ocupada -You have to stop moving before going to bed!=Deja de moverte o no podras acostarte +Leave Bed=Abandonar cama Good morning.=Buenos días. -@1 of @2 players are in bed=@1 de @2 jugadores están durmiendo -Force night skip=Forzar hacer de dia +@1 of @2 players are in bed=@1 de @2 jugadores están en cama +Force night skip=Forzar evitar noche You can only sleep at night.=Sólo puedes dormir por la noche. -Leave Bed=Levantarse diff --git a/mods/beds/locale/beds.eu.tr b/mods/beds/locale/beds.eu.tr deleted file mode 100644 index ef0e25e2..00000000 --- a/mods/beds/locale/beds.eu.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Luxuzko ohea -Simple Bed=Ohe arrunta -This bed is already occupied!=Ohe hau okupatuta dago -You have to stop moving before going to bed!=Utzi mugitzeari edo ezingo zara oheratu! -Good morning.=Egun on. -@1 of @2 players are in bed=@2 jokalaritik @1 lo daude -Force night skip=Behartu egunez egitera -You can only sleep at night.=Gauez bakarrik egin dezakezu lo. -Leave Bed=Jaiki diff --git a/mods/beds/locale/beds.fr.tr b/mods/beds/locale/beds.fr.tr index 43c06e3c..bddf9b59 100644 --- a/mods/beds/locale/beds.fr.tr +++ b/mods/beds/locale/beds.fr.tr @@ -1,10 +1,8 @@ # textdomain: beds Fancy Bed=Lit chic Simple Bed=Lit simple -This bed is already occupied!=Ce lit est déjà occupé ! -You have to stop moving before going to bed!=Vous devez arrêter de bouger avant de vous coucher ! +Leave Bed=Se lever du lit Good morning.=Bonjour. @1 of @2 players are in bed=@1 joueur(s) sur @2 sont au lit Force night skip=Forcer le passage de la nuit You can only sleep at night.=Vous ne pouvez dormir que la nuit. -Leave Bed=Se lever du lit diff --git a/mods/beds/locale/beds.id.tr b/mods/beds/locale/beds.id.tr index d87c933c..401a1622 100644 --- a/mods/beds/locale/beds.id.tr +++ b/mods/beds/locale/beds.id.tr @@ -1,10 +1,8 @@ # textdomain: beds -Fancy Bed=Ranjang Mewah -Simple Bed=Ranjang Sederhana -This bed is already occupied!=Ranjang telah terisi! -You have to stop moving before going to bed!=Anda harus diam untuk tidur! +Leave Bed=Tinggalkan Dipan Good morning.=Selamat pagi. @1 of @2 players are in bed=@1 dari @2 pemain sedang tidur Force night skip=Paksa lewati malam -You can only sleep at night.=Anda hanya bisa tidur pada waktu malam. -Leave Bed=Tinggalkan Ranjang +You can only sleep at night.=Anda hanya boleh tidur pada waktu malam. +Fancy Bed=Dipan Mewah +Simple Bed=Dipan Sederhana diff --git a/mods/beds/locale/beds.it.tr b/mods/beds/locale/beds.it.tr index 8f4e14ea..3dbc70cc 100644 --- a/mods/beds/locale/beds.it.tr +++ b/mods/beds/locale/beds.it.tr @@ -1,10 +1,4 @@ -# textdomain: beds -Fancy Bed=Letto decorato -Simple Bed=Letto semplice -This bed is already occupied!= -You have to stop moving before going to bed!= -Good morning.= -@1 of @2 players are in bed= -Force night skip= -You can only sleep at night.= -Leave Bed=Alzati dal letto +# textdomain: beds +Fancy Bed=Letto decorato +Simple Bed=Letto semplice +Leave Bed=Alzati dal letto \ No newline at end of file diff --git a/mods/beds/locale/beds.ja.tr b/mods/beds/locale/beds.ja.tr deleted file mode 100644 index 50344566..00000000 --- a/mods/beds/locale/beds.ja.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=ファンシーなベッド -Simple Bed=シンプルなベッド -This bed is already occupied!=ベッドはすでに使われています! -You have to stop moving before going to bed!=寝るときは動かないでください! -Good morning.=おはようございます。 -@1 of @2 players are in bed=ベッドに@1 / @2人います -Force night skip=強制的に夜をスキップします -You can only sleep at night.=夜しか寝れません。 -Leave Bed=ベッドから出ます diff --git a/mods/beds/locale/beds.jbo.tr b/mods/beds/locale/beds.jbo.tr deleted file mode 100644 index a72f686c..00000000 --- a/mods/beds/locale/beds.jbo.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=lo selja'i ckana -Simple Bed=lo sampu ckana -This bed is already occupied!=.i lo ti ckana cu canlu -You have to stop moving before going to bed!=lo nu do cando cu sarcu lo nu do sipna -Good morning.=.i .uise'inai cerni -@1 of @2 players are in bed=.i @1 cmima be lu'i @2 le pilno cu vreta lo ckana -Force night skip=bapli le nu co'u nicte -You can only sleep at night.=.i steci le ka nicte kei fa le ka do kakne le ka sipna ca pa ckaji be ce'u -Leave Bed=cliva lo ckana diff --git a/mods/beds/locale/beds.lv.tr b/mods/beds/locale/beds.lv.tr deleted file mode 100644 index cea63ffb..00000000 --- a/mods/beds/locale/beds.lv.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Skaista gulta -Simple Bed=Gulta -This bed is already occupied!=Šī gulta jau ir aizņemta! -You have to stop moving before going to bed!=Jums jāapstājas lai gulētu! -Good morning.=Labrīt. -@1 of @2 players are in bed=@1 no @2 spēlētājiem guļ gultās -Force night skip=Izlaist nakti -You can only sleep at night.=Jūs variet gulēt tikai naktī. -Leave Bed=Celties no gultas diff --git a/mods/beds/locale/beds.ms.tr b/mods/beds/locale/beds.ms.tr index b197b636..797e3a65 100644 --- a/mods/beds/locale/beds.ms.tr +++ b/mods/beds/locale/beds.ms.tr @@ -1,10 +1,8 @@ # textdomain: beds Fancy Bed=Katil Beragam Simple Bed=Katil Biasa -This bed is already occupied!=Katil ini sudah diduduki! -You have to stop moving before going to bed!=Anda perlu berhenti bergerak sebelum tidur! +Leave Bed=Bangun Good morning.=Selamat pagi. @1 of @2 players are in bed=@1 daripada @2 pemain sedang tidur Force night skip=Paksa langkau malam You can only sleep at night.=Anda hanya boleh tidur pada waktu malam. -Leave Bed=Tinggalkan Katil diff --git a/mods/beds/locale/beds.pl.tr b/mods/beds/locale/beds.pl.tr deleted file mode 100644 index 2bc03c61..00000000 --- a/mods/beds/locale/beds.pl.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Fantazyjne łóżko -Simple Bed=Proste łóżko -This bed is already occupied!=To łóżko jest już zajęte! -You have to stop moving before going to bed!=Musisz się zatrzymać aby wejść do łóżka -Good morning.=Dzień dobry. -@1 of @2 players are in bed=@1 z @2 graczy śpią -Force night skip=Wymuś pominięcie nocy -You can only sleep at night.=Możesz spać tylko w nocy. -Leave Bed=Opuść łóżko diff --git a/mods/beds/locale/beds.pt_BR.tr b/mods/beds/locale/beds.pt_BR.tr deleted file mode 100644 index 47fb1b93..00000000 --- a/mods/beds/locale/beds.pt_BR.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Cama Bonita -Simple Bed=Cama Simples -This bed is already occupied!=Esta cama já está ocupada! -You have to stop moving before going to bed!=Você precisa parar de se mover antes de ir para cama! -Good morning.=Bom dia. -@1 of @2 players are in bed=@1 de @2 jogadores estão na cama -Force night skip=Forçar o amanhecer -You can only sleep at night.=Você só pode dormir à noite -Leave Bed=Sair da Cama diff --git a/mods/beds/locale/beds.ru.tr b/mods/beds/locale/beds.ru.tr index 7c1b5368..1974b3d7 100644 --- a/mods/beds/locale/beds.ru.tr +++ b/mods/beds/locale/beds.ru.tr @@ -1,10 +1,8 @@ # textdomain: beds -Fancy Bed=Красивая кровать -Simple Bed=Простая кровать -This bed is already occupied!=Эта кровать уже занята! -You have to stop moving before going to bed!=Вам нужно перестать двигаться чтобы лечь! +Fancy Bed=Детализированная Кровать +Simple Bed=Обычная Кровать +Leave Bed=Встать с кровати Good morning.=Доброе утро. @1 of @2 players are in bed=@1 из @2 игроков в кровати Force night skip=Пропустить ночь You can only sleep at night.=Вы можете спать только ночью. -Leave Bed=Встать с кровати diff --git a/mods/beds/locale/beds.se.tr b/mods/beds/locale/beds.se.tr new file mode 100644 index 00000000..53f4f2dd --- /dev/null +++ b/mods/beds/locale/beds.se.tr @@ -0,0 +1,8 @@ +# textdomain: beds +Fancy Bed=Fin säng +Simple Bed=Enkel Säng +Leave Bed=Lämna Säng +Good morning.= God morgon. +@1 of @2 players are in bed=@1 av @2 spelar försöker sover. +Force night skip=Tvinga över natten +You can only sleep at night.=Du kan bara sova på natten. diff --git a/mods/beds/locale/beds.sk.tr b/mods/beds/locale/beds.sk.tr deleted file mode 100644 index 5f31f0fd..00000000 --- a/mods/beds/locale/beds.sk.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Pekná posteľ -Simple Bed=Jednoduchá posteľ -This bed is already occupied!=Táto posteľ je už obsadená -You have to stop moving before going to bed!=Predtým ako si ľahneš do postele, sa musíš prestať pohybovať! -Good morning.=Dobré ráno. -@1 of @2 players are in bed=@1 z @2 hráčov sú v posteli -Force night skip=Nútene preskočiť noc -You can only sleep at night.=Môžeš spať len v noci. -Leave Bed=Opusti posteľ diff --git a/mods/beds/locale/beds.sv.tr b/mods/beds/locale/beds.sv.tr deleted file mode 100644 index 3b737b46..00000000 --- a/mods/beds/locale/beds.sv.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Fin säng -Simple Bed=Enkel säng -This bed is already occupied!=Den här sängen används redan! -You have to stop moving before going to bed!=Du måste stanna innan du kan lägga dig! -Good morning.=God morgon. -@1 of @2 players are in bed=@1 av @2 spelare försöker sova. -Force night skip=Tvinga att hoppa över natt -You can only sleep at night.=Du kan bara sova på natten. -Leave Bed=Lämna säng diff --git a/mods/beds/locale/beds.uk.tr b/mods/beds/locale/beds.uk.tr deleted file mode 100644 index c9db693f..00000000 --- a/mods/beds/locale/beds.uk.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Гарне ліжко -Simple Bed=Просте ліжко -This bed is already occupied!=Це ліжко вже зайняте! -You have to stop moving before going to bed!=Зупиніться перед тим як лягти! -Good morning.=Доброго ранку. -@1 of @2 players are in bed=@1 з @2 гравців(-я) у ліжку -Force night skip=Пропустити ніч -You can only sleep at night.=Ви можете спати лише вночі. -Leave Bed=Встати з ліжка diff --git a/mods/beds/locale/beds.zh_CN.tr b/mods/beds/locale/beds.zh_CN.tr index 7e6cfc7a..609524d9 100644 --- a/mods/beds/locale/beds.zh_CN.tr +++ b/mods/beds/locale/beds.zh_CN.tr @@ -1,10 +1,8 @@ # textdomain: beds Fancy Bed=花式床 Simple Bed=简易床 -This bed is already occupied!=床上已有人! -You have to stop moving before going to bed!=上床前要停止移动! +Leave Bed=离开床 Good morning.=早安! @1 of @2 players are in bed=@2位玩家中的@1位在床上 Force night skip=强制跳过夜晚 You can only sleep at night.=你只能在晚上睡觉。 -Leave Bed=离开床 diff --git a/mods/beds/locale/beds.zh_TW.tr b/mods/beds/locale/beds.zh_TW.tr index a0428b4e..4e7d6875 100644 --- a/mods/beds/locale/beds.zh_TW.tr +++ b/mods/beds/locale/beds.zh_TW.tr @@ -1,10 +1,9 @@ # textdomain: beds Fancy Bed=花式床 Simple Bed=簡易床 -This bed is already occupied!=這個床已經被占據了! -You have to stop moving before going to bed!=你必須在上床前停止移動! +Leave Bed=離開床 Good morning.=早安! @1 of @2 players are in bed=@2位玩家中的@1位在床上 Force night skip=強制跳過夜晚 You can only sleep at night.=你只能在晚上睡覺。 -Leave Bed=離開床 + diff --git a/mods/beds/locale/template.txt b/mods/beds/locale/template.txt index a965787b..9dd9c5cd 100644 --- a/mods/beds/locale/template.txt +++ b/mods/beds/locale/template.txt @@ -1,10 +1,8 @@ # textdomain: beds -Fancy Bed= -Simple Bed= -This bed is already occupied!= -You have to stop moving before going to bed!= +Leave Bed= Good morning.= @1 of @2 players are in bed= Force night skip= You can only sleep at night.= -Leave Bed= +Fancy Bed= +Simple Bed= diff --git a/mods/beds/mod.conf b/mods/beds/mod.conf index 9113230f..450ec138 100644 --- a/mods/beds/mod.conf +++ b/mods/beds/mod.conf @@ -1,4 +1,3 @@ name = beds description = Minetest Game mod: beds -depends = default, wool, spawn -optional_depends = player_monoids, pova +depends = default, wool diff --git a/mods/beds/textures/beds_bed.png b/mods/beds/textures/beds_bed.png index d4b02e77..5c0054c6 100644 Binary files a/mods/beds/textures/beds_bed.png and b/mods/beds/textures/beds_bed.png differ diff --git a/mods/beds/textures/beds_bed_fancy.png b/mods/beds/textures/beds_bed_fancy.png index 1c9fde9a..4f9e8a74 100644 Binary files a/mods/beds/textures/beds_bed_fancy.png and b/mods/beds/textures/beds_bed_fancy.png differ diff --git a/mods/beds/textures/beds_bed_foot.png b/mods/beds/textures/beds_bed_foot.png index af510bb6..74d84c86 100644 Binary files a/mods/beds/textures/beds_bed_foot.png and b/mods/beds/textures/beds_bed_foot.png differ diff --git a/mods/beds/textures/beds_bed_head.png b/mods/beds/textures/beds_bed_head.png index b98b1104..763f5e14 100644 Binary files a/mods/beds/textures/beds_bed_head.png and b/mods/beds/textures/beds_bed_head.png differ diff --git a/mods/beds/textures/beds_bed_side1.png b/mods/beds/textures/beds_bed_side1.png index 8ded54fd..1ed8158e 100644 Binary files a/mods/beds/textures/beds_bed_side1.png and b/mods/beds/textures/beds_bed_side1.png differ diff --git a/mods/beds/textures/beds_bed_side2.png b/mods/beds/textures/beds_bed_side2.png index a6bdb99d..9d1384d4 100644 Binary files a/mods/beds/textures/beds_bed_side2.png and b/mods/beds/textures/beds_bed_side2.png differ diff --git a/mods/beds/textures/beds_bed_side_bottom.png b/mods/beds/textures/beds_bed_side_bottom.png index ed80f752..99ff309f 100644 Binary files a/mods/beds/textures/beds_bed_side_bottom.png and b/mods/beds/textures/beds_bed_side_bottom.png differ diff --git a/mods/beds/textures/beds_bed_side_bottom_r.png b/mods/beds/textures/beds_bed_side_bottom_r.png index 2d86532d..6f870e80 100644 Binary files a/mods/beds/textures/beds_bed_side_bottom_r.png and b/mods/beds/textures/beds_bed_side_bottom_r.png differ diff --git a/mods/beds/textures/beds_bed_side_top.png b/mods/beds/textures/beds_bed_side_top.png index 04b2ba1e..b2807c5f 100644 Binary files a/mods/beds/textures/beds_bed_side_top.png and b/mods/beds/textures/beds_bed_side_top.png differ diff --git a/mods/beds/textures/beds_bed_side_top_r.png b/mods/beds/textures/beds_bed_side_top_r.png index c3c07b1b..429ad7db 100644 Binary files a/mods/beds/textures/beds_bed_side_top_r.png and b/mods/beds/textures/beds_bed_side_top_r.png differ diff --git a/mods/beds/textures/beds_bed_top1.png b/mods/beds/textures/beds_bed_top1.png index 2b3ae8dc..b6fcc2c5 100644 Binary files a/mods/beds/textures/beds_bed_top1.png and b/mods/beds/textures/beds_bed_top1.png differ diff --git a/mods/beds/textures/beds_bed_top2.png b/mods/beds/textures/beds_bed_top2.png index b80353cb..2fe5bf2b 100644 Binary files a/mods/beds/textures/beds_bed_top2.png and b/mods/beds/textures/beds_bed_top2.png differ diff --git a/mods/beds/textures/beds_bed_top_bottom.png b/mods/beds/textures/beds_bed_top_bottom.png index 43dcc649..9b78be63 100644 Binary files a/mods/beds/textures/beds_bed_top_bottom.png and b/mods/beds/textures/beds_bed_top_bottom.png differ diff --git a/mods/beds/textures/beds_bed_top_top.png b/mods/beds/textures/beds_bed_top_top.png index 9b3d08fa..e877c808 100644 Binary files a/mods/beds/textures/beds_bed_top_top.png and b/mods/beds/textures/beds_bed_top_top.png differ diff --git a/mods/beds/textures/beds_bed_under.png b/mods/beds/textures/beds_bed_under.png index 1a67367d..a9301156 100644 Binary files a/mods/beds/textures/beds_bed_under.png and b/mods/beds/textures/beds_bed_under.png differ diff --git a/mods/beds/textures/beds_transparent.png b/mods/beds/textures/beds_transparent.png new file mode 100644 index 00000000..2dc0e3dc Binary files /dev/null and b/mods/beds/textures/beds_transparent.png differ diff --git a/mods/binoculars/init.lua b/mods/binoculars/init.lua index 914a8611..76858977 100644 --- a/mods/binoculars/init.lua +++ b/mods/binoculars/init.lua @@ -8,16 +8,25 @@ binoculars = {} local S = minetest.get_translator("binoculars") +-- Detect creative mod +local creative_mod = minetest.get_modpath("creative") +-- Cache creative mode setting as fallback if creative mod not present +local creative_mode_cache = minetest.settings:get_bool("creative_mode") + + -- Update player property -- Global to allow overriding function binoculars.update_player_property(player) + local creative_enabled = + (creative_mod and creative.is_enabled_for(player:get_player_name())) or + creative_mode_cache local new_zoom_fov = 0 if player:get_inventory():contains_item( "main", "binoculars:binoculars") then new_zoom_fov = 10 - elseif minetest.is_creative_enabled(player:get_player_name()) then + elseif creative_enabled then new_zoom_fov = 15 end @@ -53,7 +62,6 @@ minetest.register_craftitem("binoculars:binoculars", { description = S("Binoculars") .. "\n" .. S("Use with 'Zoom' key"), inventory_image = "binoculars_binoculars.png", stack_max = 1, - groups = {tool = 1}, on_use = function(itemstack, user, pointed_thing) binoculars.update_player_property(user) diff --git a/mods/binoculars/locale/binoculars.bg.tr b/mods/binoculars/locale/binoculars.bg.tr deleted file mode 100755 index 3f5e74eb..00000000 --- a/mods/binoculars/locale/binoculars.bg.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Бинокъл -Use with 'Zoom' key=Използвайте с клавиша „Мащабиране“ diff --git a/mods/binoculars/locale/binoculars.eo.tr b/mods/binoculars/locale/binoculars.eo.tr deleted file mode 100644 index bec8dc14..00000000 --- a/mods/binoculars/locale/binoculars.eo.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Binoklo -Use with 'Zoom' key=Uzi per 'Zomo' klavo diff --git a/mods/binoculars/locale/binoculars.eu.tr b/mods/binoculars/locale/binoculars.eu.tr deleted file mode 100644 index b8012ad2..00000000 --- a/mods/binoculars/locale/binoculars.eu.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Prismatikoak -Use with 'Zoom' key='Zoom' teklarekin erabili diff --git a/mods/binoculars/locale/binoculars.id.tr b/mods/binoculars/locale/binoculars.id.tr index 59ba2cd3..b1eb6d51 100644 --- a/mods/binoculars/locale/binoculars.id.tr +++ b/mods/binoculars/locale/binoculars.id.tr @@ -1,3 +1,3 @@ # textdomain: binoculars -Binoculars=Teropong -Use with 'Zoom' key=Gunakan dengan tombol 'Zum' +Binoculars=Binokular +Use with 'Zoom' key=Pakai dengan tombol 'Zum' diff --git a/mods/binoculars/locale/binoculars.it.tr b/mods/binoculars/locale/binoculars.it.tr index 97c7b860..f8e98d6e 100644 --- a/mods/binoculars/locale/binoculars.it.tr +++ b/mods/binoculars/locale/binoculars.it.tr @@ -1,3 +1,3 @@ -# textdomain: binoculars -Binoculars=Binocolo -Use with 'Zoom' key=Usalo col tasto 'Ingrandimento' +# textdomain: binoculars +Binoculars=Binocolo +Use with 'Zoom' key=Usalo col tasto 'Ingrandimento' \ No newline at end of file diff --git a/mods/binoculars/locale/binoculars.ja.tr b/mods/binoculars/locale/binoculars.ja.tr deleted file mode 100644 index 9766f461..00000000 --- a/mods/binoculars/locale/binoculars.ja.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=双眼鏡 -Use with 'Zoom' key=ズームキーで使います diff --git a/mods/binoculars/locale/binoculars.jbo.tr b/mods/binoculars/locale/binoculars.jbo.tr deleted file mode 100644 index e1465696..00000000 --- a/mods/binoculars/locale/binoculars.jbo.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=lo reldarvistci -Use with 'Zoom' key=.i tu'a le jvinu banro batke cu tadji lo nu pilno diff --git a/mods/binoculars/locale/binoculars.lv.tr b/mods/binoculars/locale/binoculars.lv.tr deleted file mode 100644 index 0713a03e..00000000 --- a/mods/binoculars/locale/binoculars.lv.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Binoklis -Use with 'Zoom' key=Lietojiet ar 'Pietuvināt' pogu diff --git a/mods/binoculars/locale/binoculars.pl.tr b/mods/binoculars/locale/binoculars.pl.tr deleted file mode 100644 index 9fbd9032..00000000 --- a/mods/binoculars/locale/binoculars.pl.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Lornetka -Use with 'Zoom' key=Aby użyć naciśnij 'Zoom' diff --git a/mods/binoculars/locale/binoculars.pt_BR.tr b/mods/binoculars/locale/binoculars.pt_BR.tr deleted file mode 100644 index 4aabfeff..00000000 --- a/mods/binoculars/locale/binoculars.pt_BR.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Binóculos -Use with 'Zoom' key=Use com a tecla de 'Zoom' diff --git a/mods/binoculars/locale/binoculars.ru.tr b/mods/binoculars/locale/binoculars.ru.tr index 6825f27f..6b3aa9e8 100644 --- a/mods/binoculars/locale/binoculars.ru.tr +++ b/mods/binoculars/locale/binoculars.ru.tr @@ -1,3 +1,3 @@ # textdomain: binoculars Binoculars=Бинокль -Use with 'Zoom' key=Используется клавишей 'Приближение' +Use with 'Zoom' key=Используется с привилегией 'Zoom' diff --git a/mods/binoculars/locale/binoculars.se.tr b/mods/binoculars/locale/binoculars.se.tr new file mode 100644 index 00000000..291afd53 --- /dev/null +++ b/mods/binoculars/locale/binoculars.se.tr @@ -0,0 +1,3 @@ +# textdomain: binoculars +Binoculars=Kikare +Use with 'Zoom' key=Används med 'Zoom' knappen \ No newline at end of file diff --git a/mods/binoculars/locale/binoculars.sk.tr b/mods/binoculars/locale/binoculars.sk.tr deleted file mode 100644 index 50083113..00000000 --- a/mods/binoculars/locale/binoculars.sk.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Ďalekohľad -Use with 'Zoom' key=Použi s klávesou "Priblíž" diff --git a/mods/binoculars/locale/binoculars.sv.tr b/mods/binoculars/locale/binoculars.sv.tr deleted file mode 100644 index f8a01db2..00000000 --- a/mods/binoculars/locale/binoculars.sv.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Kikare -Use with 'Zoom' key=Använd med 'Zoom'-knappen diff --git a/mods/binoculars/locale/binoculars.uk.tr b/mods/binoculars/locale/binoculars.uk.tr deleted file mode 100644 index cec1e2f8..00000000 --- a/mods/binoculars/locale/binoculars.uk.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Бінокль -Use with 'Zoom' key=Використовується клавішею 'Наближення' diff --git a/mods/binoculars/mod.conf b/mods/binoculars/mod.conf index 4a64ce52..7d737415 100644 --- a/mods/binoculars/mod.conf +++ b/mods/binoculars/mod.conf @@ -1,3 +1,4 @@ name = binoculars description = Minetest Game mod: binoculars depends = default +optional_depends = creative diff --git a/mods/boats/README.txt b/mods/boats/README.txt index 26b1b6f8..a2ccb485 100644 --- a/mods/boats/README.txt +++ b/mods/boats/README.txt @@ -5,7 +5,7 @@ See license.txt for license information. Authors of source code ---------------------- Originally by PilzAdam (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures and model) ------------------------------------- diff --git a/mods/boats/init.lua b/mods/boats/init.lua index 52360be4..f9ae8e06 100644 --- a/mods/boats/init.lua +++ b/mods/boats/init.lua @@ -53,24 +53,31 @@ function boat.on_rightclick(self, clicker) end local name = clicker:get_player_name() if self.driver and name == self.driver then - -- Cleanup happens in boat.on_detach_child + self.driver = nil + self.auto = false clicker:set_detach() - - player_api.set_animation(clicker, "stand", 30) + player_api.player_attached[name] = false + player_api.set_animation(clicker, "stand" , 30) local pos = clicker:get_pos() pos = {x = pos.x, y = pos.y + 0.2, z = pos.z} minetest.after(0.1, function() clicker:set_pos(pos) end) elseif not self.driver then + local attach = clicker:get_attach() + if attach and attach:get_luaentity() then + local luaentity = attach:get_luaentity() + if luaentity.driver then + luaentity.driver = nil + end + clicker:set_detach() + end + self.driver = name clicker:set_attach(self.object, "", {x = 0.5, y = 1, z = -3}, {x = 0, y = 0, z = 0}) - - self.driver = name player_api.player_attached[name] = true - minetest.after(0.2, function() - player_api.set_animation(clicker, "sit", 30) + player_api.set_animation(clicker, "sit" , 30) end) clicker:set_look_horizontal(self.object:get_yaw()) end @@ -79,12 +86,8 @@ end -- If driver leaves server while driving boat function boat.on_detach_child(self, child) - if child and child:get_player_name() == self.driver then - player_api.player_attached[child:get_player_name()] = false - - self.driver = nil - self.auto = false - end + self.driver = nil + self.auto = false end @@ -116,7 +119,8 @@ function boat.on_punch(self, puncher) if not self.driver then self.removed = true local inv = puncher:get_inventory() - if not minetest.is_creative_enabled(name) + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(name)) or not inv:contains_item("main", "boats:boat") then local leftover = inv:add_item("main", "boats:boat") -- if no room in inventory add a replacement boat to the world @@ -168,8 +172,7 @@ function boat.on_step(self, dtime) end end local velo = self.object:get_velocity() - if not self.driver and - self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then + if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then self.object:set_pos(self.object:get_pos()) return end @@ -265,7 +268,8 @@ minetest.register_craftitem("boats:boat", { boat:set_yaw(placer:get_look_horizontal()) end local player_name = placer and placer:get_player_name() or "" - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for and + creative.is_enabled_for(player_name)) then itemstack:take_item() end end diff --git a/mods/boats/license.txt b/mods/boats/license.txt index d816be54..d4afe75f 100644 --- a/mods/boats/license.txt +++ b/mods/boats/license.txt @@ -3,7 +3,7 @@ License of source code The MIT License (MIT) Copyright (C) 2012-2016 PilzAdam -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/boats/locale/boats.bg.tr b/mods/boats/locale/boats.bg.tr deleted file mode 100755 index 1ae1d31f..00000000 --- a/mods/boats/locale/boats.bg.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=Круизен режим включен -Boat cruise mode off=Круизен режим изключен -Boat=Лотка diff --git a/mods/boats/locale/boats.eo.tr b/mods/boats/locale/boats.eo.tr deleted file mode 100644 index 7d02e2f7..00000000 --- a/mods/boats/locale/boats.eo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=La kroza maniero de la boato estas ŝaltita. -Boat cruise mode off=La kroza maniero de la boato estas malŝaltita. -Boat=Boato diff --git a/mods/boats/locale/boats.eu.tr b/mods/boats/locale/boats.eu.tr deleted file mode 100644 index 59dc9caa..00000000 --- a/mods/boats/locale/boats.eu.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=Gurutzaldi-abiadura gaituta -Boat cruise mode off=Gurutzaldi-abiadura desgaituta -Boat=Ontzia diff --git a/mods/boats/locale/boats.it.tr b/mods/boats/locale/boats.it.tr index 4a878354..5bd71255 100644 --- a/mods/boats/locale/boats.it.tr +++ b/mods/boats/locale/boats.it.tr @@ -1,4 +1,4 @@ -# textdomain: boats -Boat cruise mode on=Modalità movimento automatico barca attivata -Boat cruise mode off=Modalità movimento automatico barca disattivata -Boat=Barca +# textdomain: boats +Boat cruise mode on=Modalità movimento automatico barca attivata +Boat cruise mode off=Modalità movimento automatico barca disattivata +Boat=Barca \ No newline at end of file diff --git a/mods/boats/locale/boats.ja.tr b/mods/boats/locale/boats.ja.tr deleted file mode 100644 index ee2d0863..00000000 --- a/mods/boats/locale/boats.ja.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=クルージングモード・オン -Boat cruise mode off=クルージングモード・オフ -Boat=ボート diff --git a/mods/boats/locale/boats.jbo.tr b/mods/boats/locale/boats.jbo.tr deleted file mode 100644 index c7d534f9..00000000 --- a/mods/boats/locale/boats.jbo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=.i lo bloti cu zmiku le ka klama -Boat cruise mode off=.i lo bloti cu macnu le ka klama -Boat=lo bloti diff --git a/mods/boats/locale/boats.lv.tr b/mods/boats/locale/boats.lv.tr deleted file mode 100644 index 8d78fa6e..00000000 --- a/mods/boats/locale/boats.lv.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=Autopilots ieslēgts -Boat cruise mode off=Autopilots izslēgts -Boat=Laiva diff --git a/mods/boats/locale/boats.ms.tr b/mods/boats/locale/boats.ms.tr index df42bc33..d11a68be 100644 --- a/mods/boats/locale/boats.ms.tr +++ b/mods/boats/locale/boats.ms.tr @@ -1,4 +1,4 @@ # textdomain: boats -Boat cruise mode on=Mod jelajah bot dihidupkan -Boat cruise mode off=Mod jelajah bot dimatikan +Boat cruise mode on=Mod bot layar makan angin dibolehkan +Boat cruise mode off=Mod bot layar makan angin dilumpuhkan Boat=Bot diff --git a/mods/boats/locale/boats.pl.tr b/mods/boats/locale/boats.pl.tr deleted file mode 100644 index ce43286a..00000000 --- a/mods/boats/locale/boats.pl.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=Tryb rejsu łodką włączony -Boat cruise mode off=Tryb rejsu łodką wyłączony -Boat=Łódka diff --git a/mods/boats/locale/boats.pt_BR.tr b/mods/boats/locale/boats.pt_BR.tr deleted file mode 100644 index 1992fdfd..00000000 --- a/mods/boats/locale/boats.pt_BR.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=Modo de cruseiro do barco ligado -Boat cruise mode off=Modo de cruseiro do barco desligado -Boat=Barco diff --git a/mods/boats/locale/boats.ru.tr b/mods/boats/locale/boats.ru.tr index 972bfb07..43270984 100644 --- a/mods/boats/locale/boats.ru.tr +++ b/mods/boats/locale/boats.ru.tr @@ -1,4 +1,4 @@ # textdomain: boats -Boat cruise mode on=Автоход лодки включен -Boat cruise mode off=Автоход лодки выключен +Boat cruise mode on=Режим путешествия на лодке включен +Boat cruise mode off=Режим путешествия на лодке выключен Boat=Лодка diff --git a/mods/boats/locale/boats.sv.tr b/mods/boats/locale/boats.se.tr similarity index 91% rename from mods/boats/locale/boats.sv.tr rename to mods/boats/locale/boats.se.tr index 248b0889..4ca7c807 100644 --- a/mods/boats/locale/boats.sv.tr +++ b/mods/boats/locale/boats.se.tr @@ -1,4 +1,4 @@ # textdomain: boats Boat cruise mode on=Båtkryssningsläge på Boat cruise mode off=Båtkryssningsläge av -Boat=Båt +Boat=Båt \ No newline at end of file diff --git a/mods/boats/locale/boats.sk.tr b/mods/boats/locale/boats.sk.tr deleted file mode 100644 index 4d313cdf..00000000 --- a/mods/boats/locale/boats.sk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=Cestovný režim loďky je zapnutý -Boat cruise mode off=Cestovný režim loďky je vypnutý -Boat=Loďka diff --git a/mods/boats/locale/boats.uk.tr b/mods/boats/locale/boats.uk.tr deleted file mode 100644 index 662ba6fc..00000000 --- a/mods/boats/locale/boats.uk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: boats -Boat cruise mode on=Режим мандрування на човні увімкнено -Boat cruise mode off=Режим мандрування на човні вимкнено -Boat=Човен diff --git a/mods/bones/README.txt b/mods/bones/README.txt index 219cc30d..91bcd109 100644 --- a/mods/bones/README.txt +++ b/mods/bones/README.txt @@ -5,7 +5,7 @@ See license.txt for license information. Authors of source code ---------------------- Originally by PilzAdam (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) --------------------------- diff --git a/mods/bones/init.lua b/mods/bones/init.lua index 797224c8..5e542593 100644 --- a/mods/bones/init.lua +++ b/mods/bones/init.lua @@ -1,6 +1,6 @@ -- bones/init.lua --- Minetest Game mod: bones +-- Minetest 0.4 mod: bones -- See README.txt for licensing and other information. -- Load support for MT game translation. @@ -16,27 +16,6 @@ local function is_owner(pos, name) return false end -local function drop(pos, itemstack) - local obj = minetest.add_item(pos, itemstack:take_item(itemstack:get_count())) - if obj then - obj:set_velocity({ - x = math.random(-10, 10) / 9, - y = 5, - z = math.random(-10, 10) / 9, - }) - end -end - -local function drop_contents(pos) - local inv = minetest.get_meta(pos):get_inventory() - - for i = 1, inv:get_size("main") do - local stk = inv:get_stack("main", i) - drop(pos, stk) - end - minetest.remove_node(pos) -end - local bones_formspec = "size[8,9]" .. "list[current_name;main;0,0.3;8,4;]" .. @@ -49,7 +28,7 @@ local bones_formspec = local share_bones_time = tonumber(minetest.settings:get("share_bones_time")) or 1200 local share_bones_time_early = tonumber(minetest.settings:get("share_bones_time_early")) or share_bones_time / 4 -local bones_def = { +minetest.register_node("bones:bones", { description = S("Bones"), tiles = { "bones_top.png^[transform2", @@ -108,11 +87,6 @@ local bones_def = { return end - if not player:is_player() then - drop_contents(pos) - return - end - if minetest.get_meta(pos):get_string("infotext") == "" then return end @@ -156,11 +130,7 @@ local bones_def = { end, on_blast = function(pos) end, -} - -default.set_inventory_action_loggers(bones_def, "bones") - -minetest.register_node("bones:bones", bones_def) +}) local function may_replace(pos, player) local node_name = minetest.get_node(pos).name @@ -171,18 +141,8 @@ local function may_replace(pos, player) return false end - -- allow replacing air - if node_name == "air" then - return true - end - - -- don't replace nodes inside protections - if minetest.is_protected(pos, player:get_player_name()) then - return false - end - - -- allow replacing liquids - if node_definition.liquidtype ~= "none" then + -- allow replacing air and liquids + if node_name == "air" or node_definition.liquidtype ~= "none" then return true end @@ -194,7 +154,19 @@ local function may_replace(pos, player) -- default to each nodes buildable_to; if a placed block would replace it, why shouldn't bones? -- flowers being squished by bones are more realistical than a squished stone, too - return node_definition.buildable_to + -- exception are of course any protected buildable_to + return node_definition.buildable_to and not minetest.is_protected(pos, player:get_player_name()) +end + +local drop = function(pos, itemstack) + local obj = minetest.add_item(pos, itemstack:take_item(itemstack:get_count())) + if obj then + obj:set_velocity({ + x = math.random(-10, 10) / 9, + y = 5, + z = math.random(-10, 10) / 9, + }) + end end local player_inventory_lists = { "main", "craft" } @@ -210,6 +182,7 @@ local function is_all_empty(player_inv) end minetest.register_on_dieplayer(function(player) + local bones_mode = minetest.settings:get("bones_mode") or "bones" if bones_mode ~= "bones" and bones_mode ~= "drop" and bones_mode ~= "keep" then bones_mode = "bones" @@ -221,7 +194,8 @@ minetest.register_on_dieplayer(function(player) local pos_string = minetest.pos_to_string(pos) -- return if keep inventory set or in creative mode - if bones_mode == "keep" or minetest.is_creative_enabled(player_name) then + if bones_mode == "keep" or (creative and creative.is_enabled_for + and creative.is_enabled_for(player:get_player_name())) then minetest.log("action", player_name .. " dies at " .. pos_string .. ". No bones placed") if bones_position_message then @@ -243,7 +217,7 @@ minetest.register_on_dieplayer(function(player) -- check if it's possible to place bones, if not find space near player if bones_mode == "bones" and not may_replace(pos, player) then local air = minetest.find_node_near(pos, 1, {"air"}) - if air then + if air and not minetest.is_protected(air, player_name) then pos = air else bones_mode = "drop" diff --git a/mods/bones/license.txt b/mods/bones/license.txt index 5c20a9c9..fe525841 100644 --- a/mods/bones/license.txt +++ b/mods/bones/license.txt @@ -3,7 +3,7 @@ License of source code The MIT License (MIT) Copyright (C) 2012-2016 PilzAdam -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/bones/locale/bones.bg.tr b/mods/bones/locale/bones.bg.tr deleted file mode 100755 index 0ce5cb61..00000000 --- a/mods/bones/locale/bones.bg.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=Кости -@1's old bones=Старите кости на @1 -@1 died at @2.=@1 са загинали в @2. -@1 died at @2, and dropped their inventory.=@1 са загинали в @2 и са хвърлили техния инвентар. -@1 died at @2, and bones were placed.=@1 са загинали в @2 и костите са погребани. -@1's fresh bones=Пресните кости на @1 -@1's bones=Костите на @1 diff --git a/mods/bones/locale/bones.eo.tr b/mods/bones/locale/bones.eo.tr deleted file mode 100644 index d8028f14..00000000 --- a/mods/bones/locale/bones.eo.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=Ostoj -@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 delasis sian stokon. -@1 died at @2, and bones were placed.=@1 mortis ĉe @2, kaj ostoj estas demetitaj. -@1's fresh bones=La freŝaj ostoj de @1 -@1's bones=La ostoj de @1 diff --git a/mods/bones/locale/bones.eu.tr b/mods/bones/locale/bones.eu.tr deleted file mode 100644 index eae7d5ed..00000000 --- a/mods/bones/locale/bones.eu.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=Hezurrak -@1's old bones=@1-en hezur zaharrak -@1 died at @2.=@1 @2-n hil da. -@1 died at @2, and dropped their inventory.=@1 @2-n hil da, inbentarioa bertan utziz. -@1 died at @2, and bones were placed.=@1 @2-n hil da, eta hezurrak bertan geratu dira. -@1's fresh bones= @1-en hezur freskoak -@1's bones=@1-en hezurrak diff --git a/mods/bones/locale/bones.it.tr b/mods/bones/locale/bones.it.tr index ea3094e9..486b6d38 100644 --- a/mods/bones/locale/bones.it.tr +++ b/mods/bones/locale/bones.it.tr @@ -1,8 +1,8 @@ -# textdomain: bones -Bones=Ossa -@1's old bones=Ossa vecchie di @1 -@1 died at @2.=@1 è morto alla posizione @2. -@1 died at @2, and dropped their inventory.=@1 è morto alla posizione @2, e ha lasciato a terra il contenuto del suo inventario. -@1 died at @2, and bones were placed.=@1 è morto alla posizione @2, e vi sono state posizionate delle ossa. -@1's fresh bones=Ossa fresche di @1 -@1's bones=Ossa di @1 +# textdomain: bones +Bones=Ossa +@1's old bones=Ossa vecchie di @1 +@1 died at @2.=@1 è morto alla posizione @2. +@1 died at @2, and dropped their inventory.=@1 è morto alla posizione @2, e ha lasciato a terra il contenuto del suo inventario. +@1 died at @2, and bones were placed.=@1 è morto alla posizione @2, e vi sono state posizionate delle ossa. +@1's fresh bones=Ossa fresche di @1 +@1's bones=Ossa di @1 \ No newline at end of file diff --git a/mods/bones/locale/bones.ja.tr b/mods/bones/locale/bones.ja.tr deleted file mode 100644 index 8c3f7328..00000000 --- a/mods/bones/locale/bones.ja.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=骨 -@1's old bones=@1の古い骨 -@1 died at @2.=@1は@2で死亡しました。 -@1 died at @2, and dropped their inventory.=@1は@2で死亡して持ち物を落としました。 -@1 died at @2, and bones were placed.=@1は@2で死亡して骨が残されました。 -@1's fresh bones=@1の新鮮な骨 -@1's bones=@1の骨 diff --git a/mods/bones/locale/bones.jbo.tr b/mods/bones/locale/bones.jbo.tr deleted file mode 100644 index cbb476e7..00000000 --- a/mods/bones/locale/bones.jbo.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=lo bongu gunma -@1's old bones=.i ti tolci'o ke bongu gunma po'a la'o zo'i.@1.zo'i -@1 died at @2.=.i la'o zo'i.@1.zo'i pu morsi di'o lo me zoi pos.@2.pos. -@1 died at @2, and dropped their inventory.=.i la'o zo'i.@1.zo'i goi ly. pu morsi di'o lo me zoi pos.@2.pos. .ije ly. te farlu lo me le dacti liste po ly. -@1 died at @2, and bones were placed.=.i la'o zo'i.@1.zo'i goi ly. pu morsi di'o lo me zoi pos.@2.pos. .ije lo bongu gunma pu se punji -@1's fresh bones=.i ti cnino ke bongu gunma po'a la'o zo'i.@1.zo'i -@1's bones=.i ti bongu gunma po'a la'o zo'i.@1.zo'i diff --git a/mods/bones/locale/bones.lv.tr b/mods/bones/locale/bones.lv.tr deleted file mode 100644 index eb2fce2b..00000000 --- a/mods/bones/locale/bones.lv.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=Kauli -@1's old bones=@1 vecie kauli -@1 died at @2.=@1 nomira @2. -@1 died at @2, and dropped their inventory.=@1 nomira @2 pazaudēja inventāru. -@1 died at @2, and bones were placed.=@1 nomira @2, un kauli nolikti. -@1's fresh bones=@1 jaunie kauli -@1's bones=@1 kauli diff --git a/mods/bones/locale/bones.pl.tr b/mods/bones/locale/bones.pl.tr deleted file mode 100644 index be48a0c9..00000000 --- a/mods/bones/locale/bones.pl.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=Kości -@1's old bones=Stare kości @1 -@1 died at @2.=@1 umarł w @2. -@1 died at @2, and dropped their inventory.=@1 umarł w @2, i upuścił swój ekwipunek. -@1 died at @2, and bones were placed.=@1 umarł w @2, kości zostały położone. -@1's fresh bones=Świeże kości @1 -@1's bones=Kości @1 diff --git a/mods/bones/locale/bones.pt_BR.tr b/mods/bones/locale/bones.pt_BR.tr deleted file mode 100644 index 31339af7..00000000 --- a/mods/bones/locale/bones.pt_BR.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=Ossos -@1's old bones=Ossos antigos de @1 -@1 died at @2.=@1 morreu em @2. -@1 died at @2, and dropped their inventory.=@1 morreu em @2, e seu inventário foi derrubado. -@1 died at @2, and bones were placed.=@1 morreu em @2, e os ossos foram colocados. -@1's fresh bones=Ossos recentes de @1 -@1's bones=Ossos de @1 diff --git a/mods/bones/locale/bones.ru.tr b/mods/bones/locale/bones.ru.tr index 0bc5eaf2..98691c53 100644 --- a/mods/bones/locale/bones.ru.tr +++ b/mods/bones/locale/bones.ru.tr @@ -1,8 +1,8 @@ # textdomain: bones Bones=Кости @1's old bones=Старые кости @1 -@1 died at @2.=Игрок @1 умер в @2. -@1 died at @2, and dropped their inventory.=Игрок @1 умер в @2 и потерял содержимое своего инвентаря. -@1 died at @2, and bones were placed.=Игрок @1 умер в @2, кости размещены. -@1's fresh bones=Новые кости @1 -@1's bones=Кости @1 +@1 died at @2.=@1 умер в @2. +@1 died at @2, and dropped their inventory.=@1 умер в @2 и потерял содержимое своего инвентаря. +@1 died at @2, and bones were placed.=@1 умер в @2, помещены кости. +@1's fresh bones=новые кости @1 +@1's bones=кости @1 diff --git a/mods/bones/locale/bones.sv.tr b/mods/bones/locale/bones.se.tr similarity index 69% rename from mods/bones/locale/bones.sv.tr rename to mods/bones/locale/bones.se.tr index 9df9b0f0..1323c590 100644 --- a/mods/bones/locale/bones.sv.tr +++ b/mods/bones/locale/bones.se.tr @@ -1,8 +1,8 @@ # textdomain: bones Bones=Ben @1's old bones=@1s Gamla ben -@1 died at @2.=@1 dog på @2. -@1 died at @2, and dropped their inventory.=@1 dog på @2, och tappade deras saker. +@1 died at @2.=@1 dog på @a. +@1 died at @2, and dropped their inventory.=@1 dog på @a, och tappade deras saker. @1 died at @2, and bones were placed.=@1 dog på @2, och deras ben var placerade. @1's fresh bones=@1s färska ben @1's bones=@1s ben diff --git a/mods/bones/locale/bones.sk.tr b/mods/bones/locale/bones.sk.tr deleted file mode 100644 index a32c17de..00000000 --- a/mods/bones/locale/bones.sk.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=Kosti -@1's old bones=Staré kosti hráča @1 -@1 died at @2.=@1 zomrel na pozícií @2. -@1 died at @2, and dropped their inventory.=@1 zomrel na pozícií @2 a vysypal svoj inventár. -@1 died at @2, and bones were placed.=@1 zomrel na pozícií @2 a ostali po ňom kosti. -@1's fresh bones=Čerstvé kosti hráča @1 -@1's bones=Kosti hráča @1 diff --git a/mods/bones/locale/bones.uk.tr b/mods/bones/locale/bones.uk.tr deleted file mode 100644 index 00b4ff4e..00000000 --- a/mods/bones/locale/bones.uk.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: bones -Bones=Кістки -@1's old bones=Старі кістки @1 -@1 died at @2.=@1 загинув на координатах @2. -@1 died at @2, and dropped their inventory.=@1 загинув на координатах @2 та втратив вміст свого інвентарю. -@1 died at @2, and bones were placed.=@1 загинув на координатах @2, було розміщено кістки. -@1's fresh bones=Свіжі кістки @1 -@1's bones=Кістки @1 diff --git a/mods/bones/locale/bones.zh_CN.tr b/mods/bones/locale/bones.zh_CN.tr index 7911e37c..dadf55ef 100644 --- a/mods/bones/locale/bones.zh_CN.tr +++ b/mods/bones/locale/bones.zh_CN.tr @@ -2,7 +2,7 @@ Bones=骨骸 @1's old bones=@1的旧骨骸 @1 died at @2.=@1在@2死亡。 -@1 died at @2, and dropped their inventory.=@1在@2死亡,丢掉了所有物品。 -@1 died at @2, and bones were placed.=@1在@2死亡,已放置骨骸。 +@1 died at @2, and dropped their inventory.=@1在@2死亡,丢掉了物品栏。 +@1 died at @2, and bones were placed.=@1在@2死亡,骨骸被放置。 @1's fresh bones=@1的新鲜骨骸 @1's bones=@1的骨骸 diff --git a/mods/bones/textures/bones_bottom.png b/mods/bones/textures/bones_bottom.png index d3d5d322..859c6bbe 100644 Binary files a/mods/bones/textures/bones_bottom.png and b/mods/bones/textures/bones_bottom.png differ diff --git a/mods/bones/textures/bones_front.png b/mods/bones/textures/bones_front.png index 1617d8f7..1e524370 100644 Binary files a/mods/bones/textures/bones_front.png and b/mods/bones/textures/bones_front.png differ diff --git a/mods/bones/textures/bones_rear.png b/mods/bones/textures/bones_rear.png index 05ee2a12..4cfe236d 100644 Binary files a/mods/bones/textures/bones_rear.png and b/mods/bones/textures/bones_rear.png differ diff --git a/mods/bones/textures/bones_side.png b/mods/bones/textures/bones_side.png index c8ac5053..a07595f4 100644 Binary files a/mods/bones/textures/bones_side.png and b/mods/bones/textures/bones_side.png differ diff --git a/mods/bones/textures/bones_top.png b/mods/bones/textures/bones_top.png index 63786da7..198a8a2d 100644 Binary files a/mods/bones/textures/bones_top.png and b/mods/bones/textures/bones_top.png differ diff --git a/mods/bucket/README.txt b/mods/bucket/README.txt index d19f8732..58997b26 100644 --- a/mods/bucket/README.txt +++ b/mods/bucket/README.txt @@ -6,7 +6,7 @@ Authors of source code ---------------------- Kahrl (LGPLv2.1+) celeron55, Perttu Ahola (LGPLv2.1+) -Various Minetest Game developers and contributors (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) Authors of media (textures) --------------------------- diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua index a10e962a..ebdf2e74 100644 --- a/mods/bucket/init.lua +++ b/mods/bucket/init.lua @@ -1,4 +1,4 @@ --- Minetest Game mod: bucket +-- Minetest 0.4 mod: bucket -- See README.txt for licensing and other information. -- Load support for MT game translation. @@ -33,11 +33,6 @@ local function check_protection(pos, name, text) return false end -local function log_action(pos, name, action) - minetest.log("action", (name ~= "" and name or "A mod") - .. " " .. action .. " at " .. minetest.pos_to_string(pos) .. " with a bucket") -end - -- Register a new liquid -- source = name of the source node -- flowing = name of the flowing node @@ -51,8 +46,6 @@ end -- This function can be called from any mod (that depends on bucket). function bucket.register_liquid(source, flowing, itemname, inventory_image, name, groups, force_renew) - local itemname_raw = itemname - itemname = itemname and itemname:match("^:(.+)") or itemname bucket.liquids[source] = { source = source, flowing = flowing, @@ -62,7 +55,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name bucket.liquids[flowing] = bucket.liquids[source] if itemname ~= nil then - minetest.register_craftitem(itemname_raw, { + minetest.register_craftitem(itemname, { description = name, inventory_image = inventory_image, stack_max = 1, @@ -108,13 +101,13 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name end end - local pname = user and user:get_player_name() or "" - if check_protection(lpos, pname, "place "..source) then + if check_protection(lpos, user + and user:get_player_name() + or "", "place "..source) then return end minetest.set_node(lpos, {name = source}) - log_action(lpos, pname, "placed " .. source) return ItemStack("bucket:bucket_empty") end }) @@ -135,16 +128,16 @@ minetest.register_craftitem("bucket:bucket_empty", { return end -- Check if pointing to a liquid source - local pos = pointed_thing.under - local node = minetest.get_node(pos) + local node = minetest.get_node(pointed_thing.under) local liquiddef = bucket.liquids[node.name] local item_count = user:get_wielded_item():get_count() if liquiddef ~= nil and liquiddef.itemname ~= nil and node.name == liquiddef.source then - local pname = user:get_player_name() - if check_protection(pos, pname, "take ".. node.name) then + if check_protection(pointed_thing.under, + user:get_player_name(), + "take ".. node.name) then return end @@ -159,9 +152,9 @@ minetest.register_craftitem("bucket:bucket_empty", { if inv:room_for_item("main", {name=liquiddef.itemname}) then inv:add_item("main", liquiddef.itemname) else - local upos = user:get_pos() - upos.y = math.floor(upos.y + 0.5) - minetest.add_item(upos, liquiddef.itemname) + local pos = user:get_pos() + pos.y = math.floor(pos.y + 0.5) + minetest.add_item(pos, liquiddef.itemname) end -- set to return empty buckets minus 1 @@ -173,13 +166,10 @@ minetest.register_craftitem("bucket:bucket_empty", { local source_neighbor = false if liquiddef.force_renew then source_neighbor = - minetest.find_node_near(pos, 1, liquiddef.source) + minetest.find_node_near(pointed_thing.under, 1, liquiddef.source) end - if source_neighbor and liquiddef.force_renew then - log_action(pos, pname, "picked up " .. liquiddef.source .. " (force renewed)") - else - minetest.add_node(pos, {name = "air"}) - log_action(pos, pname, "picked up " .. liquiddef.source) + if not (source_neighbor and liquiddef.force_renew) then + minetest.add_node(pointed_thing.under, {name = "air"}) end return ItemStack(giving_back) @@ -187,7 +177,7 @@ minetest.register_craftitem("bucket:bucket_empty", { -- non-liquid nodes will have their on_punch triggered local node_def = minetest.registered_nodes[node.name] if node_def then - node_def.on_punch(pos, node, user, pointed_thing) + node_def.on_punch(pointed_thing.under, node, user, pointed_thing) end return user:get_wielded_item() end diff --git a/mods/bucket/license.txt b/mods/bucket/license.txt index 6245d646..a5156ae6 100644 --- a/mods/bucket/license.txt +++ b/mods/bucket/license.txt @@ -4,7 +4,7 @@ License of source code GNU Lesser General Public License, version 2.1 Copyright (C) 2011-2016 Kahrl Copyright (C) 2011-2016 celeron55, Perttu Ahola -Copyright (C) 2011-2016 Various Minetest Game developers and contributors +Copyright (C) 2011-2016 Various Minetest developers and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; diff --git a/mods/bucket/locale/bucket.bg.tr b/mods/bucket/locale/bucket.bg.tr deleted file mode 100755 index 721a732b..00000000 --- a/mods/bucket/locale/bucket.bg.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Празна кофа -Water Bucket=Кофа с вода -River Water Bucket=Кофа с речна вода -Lava Bucket=Кофа с лава diff --git a/mods/bucket/locale/bucket.eo.tr b/mods/bucket/locale/bucket.eo.tr deleted file mode 100644 index 65d8ec88..00000000 --- a/mods/bucket/locale/bucket.eo.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Malplena sitelo -Water Bucket=Sitelo da akvo -River Water Bucket=Sitelo da rivera akvo -Lava Bucket=Sitelo da lafo diff --git a/mods/bucket/locale/bucket.eu.tr b/mods/bucket/locale/bucket.eu.tr deleted file mode 100644 index c0ef5fd0..00000000 --- a/mods/bucket/locale/bucket.eu.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Ontzi hutsa -Water Bucket=Ura duen ontzia -River Water Bucket=Ibai-ura duen ontzia -Lava Bucket=Labadun ontzia diff --git a/mods/bucket/locale/bucket.it.tr b/mods/bucket/locale/bucket.it.tr index beca28c7..a9a13358 100644 --- a/mods/bucket/locale/bucket.it.tr +++ b/mods/bucket/locale/bucket.it.tr @@ -1,5 +1,5 @@ -# textdomain: bucket -Empty Bucket=Secchio vuoto -Water Bucket=Secchio d'acqua -River Water Bucket=Secchio d'acqua di fiume -Lava Bucket=Secchio di lava +# textdomain: bucket +Empty Bucket=Secchio vuoto +Water Bucket=Secchio d'acqua +River Water Bucket=Secchio d'acqua di fiume +Lava Bucket=Secchio di lava \ No newline at end of file diff --git a/mods/bucket/locale/bucket.ja.tr b/mods/bucket/locale/bucket.ja.tr deleted file mode 100644 index 06a401ab..00000000 --- a/mods/bucket/locale/bucket.ja.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=空のバケツ -Water Bucket=水入りバケツ -River Water Bucket=河川水入りバケツ -Lava Bucket=溶岩入りバケツ diff --git a/mods/bucket/locale/bucket.jbo.tr b/mods/bucket/locale/bucket.jbo.tr deleted file mode 100644 index e40d2b92..00000000 --- a/mods/bucket/locale/bucket.jbo.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=lo baktu be no da -Water Bucket=lo baktu be lo djacu -River Water Bucket=lo baktu be lo rirxe djacu -Lava Bucket=lo baktu be lo likro'i diff --git a/mods/bucket/locale/bucket.lv.tr b/mods/bucket/locale/bucket.lv.tr deleted file mode 100644 index 5d6e2c48..00000000 --- a/mods/bucket/locale/bucket.lv.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Tukšs spainis -Water Bucket=Spainis ar ūdeni -River Water Bucket=Spainis ar upes ūdeni -Lava Bucket=Spainis ar lavu diff --git a/mods/bucket/locale/bucket.pl.tr b/mods/bucket/locale/bucket.pl.tr deleted file mode 100644 index 31600f1b..00000000 --- a/mods/bucket/locale/bucket.pl.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Puste wiadro -Water Bucket=Wiadro z wodą -River Water Bucket=Wiadro z rzeczną wodą -Lava Bucket=Wiadro z lawą diff --git a/mods/bucket/locale/bucket.pt_BR.tr b/mods/bucket/locale/bucket.pt_BR.tr deleted file mode 100644 index 429acac0..00000000 --- a/mods/bucket/locale/bucket.pt_BR.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Balde Vazio -Water Bucket=Balde de Água -River Water Bucket=Balde de Água do Rio -Lava Bucket=Balde de Lava diff --git a/mods/bucket/locale/bucket.ru.tr b/mods/bucket/locale/bucket.ru.tr index 080ebfc5..8ede2804 100644 --- a/mods/bucket/locale/bucket.ru.tr +++ b/mods/bucket/locale/bucket.ru.tr @@ -1,5 +1,5 @@ # textdomain: bucket -Empty Bucket=Пустое ведро -Water Bucket=Ведро с водой -River Water Bucket=Ведро с речной водой -Lava Bucket=Ведро с лавой +Empty Bucket=Пустое Ведро +Water Bucket=Ведро с Водой +River Water Bucket=Ведро с Речной Водой +Lava Bucket=Ведро с Лавой diff --git a/mods/bucket/locale/bucket.se.tr b/mods/bucket/locale/bucket.se.tr new file mode 100644 index 00000000..06e9ea32 --- /dev/null +++ b/mods/bucket/locale/bucket.se.tr @@ -0,0 +1,5 @@ +# textdomain: bucket +Empty Bucket=Tom hink +Water Bucket=Vatten hink +River Water Bucket=Flodvatten hink +Lava Bucket=Lava hink \ No newline at end of file diff --git a/mods/bucket/locale/bucket.sk.tr b/mods/bucket/locale/bucket.sk.tr deleted file mode 100644 index 0327b20c..00000000 --- a/mods/bucket/locale/bucket.sk.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Prázdne vedro -Water Bucket=Vedro s vodou -River Water Bucket=Vedro s vodou z rieky -Lava Bucket=Vedro s lávou diff --git a/mods/bucket/locale/bucket.sv.tr b/mods/bucket/locale/bucket.sv.tr deleted file mode 100644 index 59ee62df..00000000 --- a/mods/bucket/locale/bucket.sv.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Tom hink -Water Bucket=Vattenhink -River Water Bucket=Flodvattenshink -Lava Bucket=Lavahink diff --git a/mods/bucket/locale/bucket.uk.tr b/mods/bucket/locale/bucket.uk.tr deleted file mode 100644 index 3486d1ea..00000000 --- a/mods/bucket/locale/bucket.uk.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Порожнє відро -Water Bucket=Відро з водою -River Water Bucket=Відро з річковою водою -Lava Bucket=Відро з лавою diff --git a/mods/butterflies/init.lua b/mods/butterflies/init.lua index ad3c79fe..650e7da9 100644 --- a/mods/butterflies/init.lua +++ b/mods/butterflies/init.lua @@ -3,9 +3,6 @@ -- Load support for MT game translation. local S = minetest.get_translator("butterflies") --- Legacy compatibility, when pointabilities don't exist, pointable is set to true. -local pointable_compat = not minetest.features.item_specific_pointabilities - -- register butterflies local butter_list = { {"white", S("White Butterfly")}, @@ -36,15 +33,24 @@ for i in ipairs (butter_list) do sunlight_propagates = true, buildable_to = true, walkable = false, - pointable = pointable_compat, groups = {catchable = 1}, selection_box = { type = "fixed", fixed = {-0.1, -0.1, -0.1, 0.1, 0.1, 0.1}, }, floodable = true, - on_construct = function(pos) - minetest.get_node_timer(pos):start(1) + on_place = function(itemstack, placer, pointed_thing) + local player_name = placer:get_player_name() + local pos = pointed_thing.above + + if not minetest.is_protected(pos, player_name) and + not minetest.is_protected(pointed_thing.under, player_name) and + minetest.get_node(pos).name == "air" then + minetest.set_node(pos, {name = "butterflies:butterfly_"..name}) + minetest.get_node_timer(pos):start(1) + itemstack:take_item() + end + return itemstack end, on_timer = function(pos, elapsed) if minetest.get_node_light(pos) < 11 then @@ -56,8 +62,8 @@ for i in ipairs (butter_list) do minetest.register_node("butterflies:hidden_butterfly_"..name, { drawtype = "airlike", - inventory_image = "butterflies_butterfly_"..name..".png^default_invisible_node_overlay.png", - wield_image = "butterflies_butterfly_"..name..".png^default_invisible_node_overlay.png", + inventory_image = "butterflies_butterfly_"..name..".png", + wield_image = "butterflies_butterfly_"..name..".png", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -66,8 +72,18 @@ for i in ipairs (butter_list) do drop = "", groups = {not_in_creative_inventory = 1}, floodable = true, - on_construct = function(pos) - minetest.get_node_timer(pos):start(1) + on_place = function(itemstack, placer, pointed_thing) + local player_name = placer:get_player_name() + local pos = pointed_thing.above + + if not minetest.is_protected(pos, player_name) and + not minetest.is_protected(pointed_thing.under, player_name) and + minetest.get_node(pos).name == "air" then + minetest.set_node(pos, {name = "butterflies:hidden_butterfly_"..name}) + minetest.get_node_timer(pos):start(1) + itemstack:take_item() + end + return itemstack end, on_timer = function(pos, elapsed) if minetest.get_node_light(pos) >= 11 then diff --git a/mods/butterflies/locale/butterflies.bg.tr b/mods/butterflies/locale/butterflies.bg.tr deleted file mode 100755 index 07efd82d..00000000 --- a/mods/butterflies/locale/butterflies.bg.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Бяла пеперуда -Red Butterfly=Червена пеперуда -Violet Butterfly=Лилава пеперуда diff --git a/mods/butterflies/locale/butterflies.eo.tr b/mods/butterflies/locale/butterflies.eo.tr deleted file mode 100644 index be09eb74..00000000 --- a/mods/butterflies/locale/butterflies.eo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Blanka papilio -Red Butterfly=Ruĝa papilio -Violet Butterfly=Violkolora papilio diff --git a/mods/butterflies/locale/butterflies.eu.tr b/mods/butterflies/locale/butterflies.eu.tr deleted file mode 100644 index 8b89d088..00000000 --- a/mods/butterflies/locale/butterflies.eu.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Tximeleta zuria -Red Butterfly=Tximeleta gorria -Violet Butterfly=Tximeleta morea diff --git a/mods/butterflies/locale/butterflies.it.tr b/mods/butterflies/locale/butterflies.it.tr index ec65da68..104ec880 100644 --- a/mods/butterflies/locale/butterflies.it.tr +++ b/mods/butterflies/locale/butterflies.it.tr @@ -1,4 +1,4 @@ -# textdomain: butterflies -White Butterfly=Farfalla bianca -Red Butterfly=Farfalla rossa -Violet Butterfly=Farfalla viola +# textdomain: butterflies +White Butterfly=Farfalla bianca +Red Butterfly=Farfalla rossa +Violet Butterfly=Farfalla viola \ No newline at end of file diff --git a/mods/butterflies/locale/butterflies.ja.tr b/mods/butterflies/locale/butterflies.ja.tr deleted file mode 100644 index 5a22d6bf..00000000 --- a/mods/butterflies/locale/butterflies.ja.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=白色の蝶 -Red Butterfly=赤色の蝶 -Violet Butterfly=紫色の蝶 diff --git a/mods/butterflies/locale/butterflies.jbo.tr b/mods/butterflies/locale/butterflies.jbo.tr deleted file mode 100644 index f003e004..00000000 --- a/mods/butterflies/locale/butterflies.jbo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=lo blabi toldi -Red Butterfly=lo xunre toldi -Violet Butterfly=lo zirpu toldi diff --git a/mods/butterflies/locale/butterflies.lv.tr b/mods/butterflies/locale/butterflies.lv.tr deleted file mode 100644 index d17eb6c4..00000000 --- a/mods/butterflies/locale/butterflies.lv.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Balts taurenis -Red Butterfly=Sarkans taurenis -Violet Butterfly=Violets taurenis diff --git a/mods/butterflies/locale/butterflies.pl.tr b/mods/butterflies/locale/butterflies.pl.tr deleted file mode 100644 index 577f0b88..00000000 --- a/mods/butterflies/locale/butterflies.pl.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Biały motyl -Red Butterfly=Czerwony motyl -Violet Butterfly=Fioletowy motyl diff --git a/mods/butterflies/locale/butterflies.pt_BR.tr b/mods/butterflies/locale/butterflies.pt_BR.tr deleted file mode 100644 index af3539e1..00000000 --- a/mods/butterflies/locale/butterflies.pt_BR.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Borboleta Branca -Red Butterfly=Borboleta Vermelha -Violet Butterfly=Borboleta Violeta diff --git a/mods/butterflies/locale/butterflies.ru.tr b/mods/butterflies/locale/butterflies.ru.tr index 6881f1c4..7a79ed83 100644 --- a/mods/butterflies/locale/butterflies.ru.tr +++ b/mods/butterflies/locale/butterflies.ru.tr @@ -1,4 +1,4 @@ # textdomain: butterflies -White Butterfly=Белая бабочка -Red Butterfly=Красная бабочка -Violet Butterfly=Фиолетовая бабочка +White Butterfly=Белая Бабочка +Red Butterfly=Красная Бабочка +Violet Butterfly=Фиолетовая Бабочка diff --git a/mods/butterflies/locale/butterflies.sv.tr b/mods/butterflies/locale/butterflies.se.tr similarity index 71% rename from mods/butterflies/locale/butterflies.sv.tr rename to mods/butterflies/locale/butterflies.se.tr index 77bfb340..08cb94c4 100644 --- a/mods/butterflies/locale/butterflies.sv.tr +++ b/mods/butterflies/locale/butterflies.se.tr @@ -1,4 +1,4 @@ # textdomain: butterflies White Butterfly=Vit fjäril Red Butterfly=Röd fjäril -Violet Butterfly=Violett fjäril +Violet Butterfly=Violett fjäril \ No newline at end of file diff --git a/mods/butterflies/locale/butterflies.sk.tr b/mods/butterflies/locale/butterflies.sk.tr deleted file mode 100644 index c3086e7f..00000000 --- a/mods/butterflies/locale/butterflies.sk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Biely motýlik -Red Butterfly=Červený motýlik -Violet Butterfly=Fialový motýlik diff --git a/mods/butterflies/locale/butterflies.uk.tr b/mods/butterflies/locale/butterflies.uk.tr deleted file mode 100644 index 8779b000..00000000 --- a/mods/butterflies/locale/butterflies.uk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Білий метелик -Red Butterfly=Червоний метелик -Violet Butterfly=Фіолетовий метелик diff --git a/mods/carts/cart_entity.lua b/mods/carts/cart_entity.lua index 3dfebe1d..efa1769f 100644 --- a/mods/carts/cart_entity.lua +++ b/mods/carts/cart_entity.lua @@ -29,10 +29,15 @@ function cart_entity:on_rightclick(clicker) end local player_name = clicker:get_player_name() if self.driver and player_name == self.driver then + self.driver = nil carts:manage_attachment(clicker, nil) elseif not self.driver then - carts:manage_attachment(clicker, self.object) self.driver = player_name + carts:manage_attachment(clicker, self.object) + + -- player_api does not update the animation + -- when the player is attached, reset to default animation + player_api.set_animation(clicker, "stand") end end @@ -46,7 +51,9 @@ function cart_entity:on_activate(staticdata, dtime_s) return end self.railtype = data.railtype - self.old_dir = data.old_dir or self.old_dir + if data.old_dir then + self.old_dir = data.old_dir + end end function cart_entity:get_staticdata() @@ -59,9 +66,8 @@ end -- 0.5.x and later: When the driver leaves function cart_entity:on_detach_child(child) if child and child:get_player_name() == self.driver then - -- Clean up eye height - carts:manage_attachment(child, nil) self.driver = nil + carts:manage_attachment(child, nil) end end @@ -102,7 +108,8 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities, end -- Pick up cart local inv = puncher:get_inventory() - if not minetest.is_creative_enabled(puncher:get_player_name()) + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(puncher:get_player_name())) or not inv:contains_item("main", "carts:cart") then local leftover = inv:add_item("main", "carts:cart") -- If no room in inventory add a replacement cart to the world @@ -128,8 +135,7 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities, end local punch_interval = 1 - -- Faulty tool registrations may cause the interval to be set to 0 ! - if tool_capabilities and (tool_capabilities.full_punch_interval or 0) > 0 then + if tool_capabilities and tool_capabilities.full_punch_interval then punch_interval = tool_capabilities.full_punch_interval end time_from_last_punch = math.min(time_from_last_punch or punch_interval, punch_interval) @@ -190,11 +196,11 @@ local function rail_on_step(self, dtime) end local pos = self.object:get_pos() - local dir = carts:velocity_to_dir(vel) - local dir_changed = not vector.equals(dir, self.old_dir) + local cart_dir = carts:velocity_to_dir(vel) + local same_dir = vector.equals(cart_dir, self.old_dir) local update = {} - if self.old_pos and not self.punched and not dir_changed then + if self.old_pos and not self.punched and same_dir then local flo_pos = vector.round(pos) local flo_old = vector.round(self.old_pos) if vector.equals(flo_pos, flo_old) then @@ -214,7 +220,7 @@ local function rail_on_step(self, dtime) end local stop_wiggle = false - if self.old_pos and not dir_changed then + if self.old_pos and same_dir 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() @@ -229,7 +235,7 @@ local function rail_on_step(self, dtime) -- No rail found: set to the expected position pos = new_pos update.pos = true - dir = new_dir + cart_dir = new_dir end elseif self.old_pos and self.old_dir.y ~= 1 and not self.punched then -- Stop wiggle @@ -239,27 +245,21 @@ local function rail_on_step(self, dtime) local railparams -- dir: New moving direction of the cart - -- 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 + -- 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 ) - dir_changed = not vector.equals(dir, self.old_dir) + local dir_changed = not vector.equals(dir, self.old_dir) - local acc = 0 + local new_acc = {x=0, y=0, z=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 @@ -286,7 +286,7 @@ local function rail_on_step(self, dtime) end -- Slow down or speed up.. - acc = dir.y * -4.0 + local acc = dir.y * -4.0 -- Get rail for corrected position railparams = get_railparams(pos) @@ -304,22 +304,25 @@ local function rail_on_step(self, dtime) acc = acc - 0.4 end end + + new_acc = vector.multiply(dir, acc) 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 + -- 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 end - self.object:set_acceleration(vector.multiply(dir, acc)) - + self.object:set_acceleration(new_acc) self.old_pos = vector.round(pos) - self.old_dir = vector.new(dir) + 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_switch = switch_keys if self.punched then @@ -345,11 +348,11 @@ local function rail_on_step(self, dtime) end local yaw = 0 - if dir.x < 0 then + if self.old_dir.x < 0 then yaw = 0.5 - elseif dir.x > 0 then + elseif self.old_dir.x > 0 then yaw = 1.5 - elseif dir.z < 0 then + elseif self.old_dir.z < 0 then yaw = 1 end self.object:set_yaw(yaw * math.pi) @@ -387,7 +390,7 @@ minetest.register_entity("carts:cart", cart_entity) minetest.register_craftitem("carts:cart", { description = S("Cart") .. "\n" .. S("(Sneak+Click to pick up)"), inventory_image = minetest.inventorycube("carts_cart_top.png", "carts_cart_front.png", "carts_cart_side.png"), - wield_image = "carts_cart_front.png", + wield_image = "carts_cart_side.png", on_place = function(itemstack, placer, pointed_thing) local under = pointed_thing.under local node = minetest.get_node(under) @@ -399,7 +402,7 @@ minetest.register_craftitem("carts:cart", { pointed_thing) or itemstack end - if pointed_thing.type ~= "node" then + if not pointed_thing.type == "node" then return end if carts:is_rail(pointed_thing.under) then @@ -413,8 +416,8 @@ minetest.register_craftitem("carts:cart", { minetest.sound_play({name = "default_place_node_metal", gain = 0.5}, {pos = pointed_thing.above}, true) - local player_name = placer and placer:get_player_name() or "" - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(placer:get_player_name())) then itemstack:take_item() end return itemstack diff --git a/mods/carts/functions.lua b/mods/carts/functions.lua index 1b74b7d4..a54b5948 100644 --- a/mods/carts/functions.lua +++ b/mods/carts/functions.lua @@ -12,7 +12,7 @@ function carts:manage_attachment(player, obj) end local status = obj ~= nil local player_name = player:get_player_name() - if obj and player:get_attach() == obj then + if player_api.player_attached[player_name] == status then return end player_api.player_attached[player_name] = status @@ -20,10 +20,6 @@ function carts:manage_attachment(player, obj) if status then player:set_attach(obj, "", {x=0, y=-4.5, z=0}, {x=0, y=0, z=0}) player:set_eye_offset({x=0, y=-4, z=0},{x=0, y=-4, z=0}) - - -- player_api does not update the animation - -- when the player is attached, reset to default animation - player_api.set_animation(player, "stand") else player:set_detach() player:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0}) @@ -41,9 +37,15 @@ end function carts:is_rail(pos, railtype) local node = minetest.get_node(pos).name if node == "ignore" then - -- we really need to know, so load it - minetest.load_area(pos) - node = minetest.get_node(pos).name + local vm = minetest.get_voxel_manip() + local emin, emax = vm:read_from_map(pos, pos) + local area = VoxelArea:new{ + MinEdge = emin, + MaxEdge = emax, + } + local data = vm:get_data() + local vi = area:indexp(pos) + node = minetest.get_name_from_content_id(data[vi]) end if minetest.get_item_group(node, "rail") == 0 then return false diff --git a/mods/carts/license.txt b/mods/carts/license.txt index e2781aca..6c5beb47 100644 --- a/mods/carts/license.txt +++ b/mods/carts/license.txt @@ -5,7 +5,7 @@ License of source code The MIT License (MIT) Copyright (C) 2012-2016 PilzAdam Copyright (C) 2014-2016 SmallJoker -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/mods/carts/locale/carts.bg.tr b/mods/carts/locale/carts.bg.tr deleted file mode 100755 index 87997e9a..00000000 --- a/mods/carts/locale/carts.bg.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=Вагон -(Sneak+Click to pick up)=(Промъкване+Click, за да вземете) -Rail=Релса -Powered Rail=Контактна релса -Brake Rail=Спирачна релса diff --git a/mods/carts/locale/carts.eo.tr b/mods/carts/locale/carts.eo.tr deleted file mode 100644 index 22b5280a..00000000 --- a/mods/carts/locale/carts.eo.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=Ĉaro -(Sneak+Click to pick up)=(Ŝteliri+Alklaki por reprini) -Rail=Relo -Powered Rail=Elektra relo -Brake Rail=Bremsa relo diff --git a/mods/carts/locale/carts.eu.tr b/mods/carts/locale/carts.eu.tr deleted file mode 100644 index 9a0521ea..00000000 --- a/mods/carts/locale/carts.eu.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=Bagoneta -(Sneak+Click to pick up)=(Makurtzea + Klik jasotzeko) -Rail=Erraila -Powered Rail=Errail energizatua -Brake Rail=Balaztatze-erraila diff --git a/mods/carts/locale/carts.id.tr b/mods/carts/locale/carts.id.tr index ce0db926..17edc807 100644 --- a/mods/carts/locale/carts.id.tr +++ b/mods/carts/locale/carts.id.tr @@ -1,6 +1,6 @@ # textdomain: carts -Cart=Kereta -(Sneak+Click to pick up)=(Menyelinap + Klik untuk ambil) Rail=Rel Powered Rail=Rel Bertenaga Brake Rail=Rel Rem +Cart=Kereta +(Sneak+Click to pick up)=(selinap + klik untuk ambil) diff --git a/mods/carts/locale/carts.it.tr b/mods/carts/locale/carts.it.tr index c28e403e..546471c8 100644 --- a/mods/carts/locale/carts.it.tr +++ b/mods/carts/locale/carts.it.tr @@ -1,6 +1,6 @@ -# textdomain: carts -Cart=Vagone -(Sneak+Click to pick up)=(Strisciare+Click per raccoglierlo) -Rail=Binario -Powered Rail=Binario alimentato -Brake Rail=Binario freno +# textdomain: carts +Cart=Vagone +(Sneak+Click to pick up)=(Strisciare+Click per raccoglierlo) +Rail=Binario +Powered Rail=Binario alimentato +Brake Rail=Binario freno \ No newline at end of file diff --git a/mods/carts/locale/carts.ja.tr b/mods/carts/locale/carts.ja.tr deleted file mode 100644 index 30c14ce2..00000000 --- a/mods/carts/locale/carts.ja.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=トロッコ -(Sneak+Click to pick up)=(スニークキーとクリックで乗ります) -Rail=レール -Powered Rail=パワードレール -Brake Rail=ブレーキレール diff --git a/mods/carts/locale/carts.jbo.tr b/mods/carts/locale/carts.jbo.tr deleted file mode 100644 index b48c5423..00000000 --- a/mods/carts/locale/carts.jbo.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=lo carce -(Sneak+Click to pick up)=to lo nu dzibi'o je cu samxa'e te cabra cu tadji lo nu lebna toi -Rail=lo teryre'e -Powered Rail=lo se dikca teryre'e -Brake Rail=lo terjabre teryre'e diff --git a/mods/carts/locale/carts.lv.tr b/mods/carts/locale/carts.lv.tr deleted file mode 100644 index 91fc6631..00000000 --- a/mods/carts/locale/carts.lv.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=Vagons -(Sneak+Click to pick up)=(Lavieties un klikšķiniet, lai paceltu) -Rail=Sliedes -Powered Rail=Elektrizētas sliedes -Brake Rail=Bremžu sliedes diff --git a/mods/carts/locale/carts.pl.tr b/mods/carts/locale/carts.pl.tr deleted file mode 100644 index d0cb8792..00000000 --- a/mods/carts/locale/carts.pl.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=Wagonik -(Sneak+Click to pick up)=(Skradanie+Naciśnij aby zebrać) -Rail=Tory -Powered Rail=Napędzane tory -Brake Rail=Hamujące tory diff --git a/mods/carts/locale/carts.pt_BR.tr b/mods/carts/locale/carts.pt_BR.tr deleted file mode 100644 index b92f91ea..00000000 --- a/mods/carts/locale/carts.pt_BR.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=Carrinho -(Sneak+Click to pick up)=(Esgueirar + Clique para pegar) -Rail=Trilho -Powered Rail=Trilho Energizado -Brake Rail=Trilho de Freio diff --git a/mods/carts/locale/carts.ru.tr b/mods/carts/locale/carts.ru.tr index cd683be4..6ff5be63 100644 --- a/mods/carts/locale/carts.ru.tr +++ b/mods/carts/locale/carts.ru.tr @@ -1,6 +1,6 @@ # textdomain: carts Cart=Вагонетка (Sneak+Click to pick up)=(Пригнитесь и кликните по вагонетке, чтобы забрать) -Rail=Рельсы -Powered Rail=Ускоряющие рельсы -Brake Rail=Тормозящие рельсы +Rail=Рельса +Powered Rail=Механизированная Рельса +Brake Rail=Рельса с тормозом diff --git a/mods/carts/locale/carts.sv.tr b/mods/carts/locale/carts.se.tr similarity index 85% rename from mods/carts/locale/carts.sv.tr rename to mods/carts/locale/carts.se.tr index 0521ca85..e40f8ca0 100644 --- a/mods/carts/locale/carts.sv.tr +++ b/mods/carts/locale/carts.se.tr @@ -3,4 +3,4 @@ Cart=Vagn (Sneak+Click to pick up)=(Shift+Klicka för att plocka upp) Rail=Räls Powered Rail=Aktiverad räls -Brake Rail=Bromsräls +Brake Rail=Broms räls \ No newline at end of file diff --git a/mods/carts/locale/carts.sk.tr b/mods/carts/locale/carts.sk.tr deleted file mode 100644 index 6303a49b..00000000 --- a/mods/carts/locale/carts.sk.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=Vozík -(Sneak+Click to pick up)=(Zakrádanie sa + Klik pre zdvihnutie) -Rail=Koľajnica -Powered Rail=Koľajnica s pohonom -Brake Rail=Brzdná koľajnica diff --git a/mods/carts/locale/carts.uk.tr b/mods/carts/locale/carts.uk.tr deleted file mode 100644 index 3e16c722..00000000 --- a/mods/carts/locale/carts.uk.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: carts -Cart=Вагонетка -(Sneak+Click to pick up)=(Пригніться та натисніть, щоби підібрати) -Rail=Рейки -Powered Rail=Електричні рейки -Brake Rail=Гальмівні рейки diff --git a/mods/carts/locale/template.txt b/mods/carts/locale/template.txt index a67d95fd..d7fd9f45 100644 --- a/mods/carts/locale/template.txt +++ b/mods/carts/locale/template.txt @@ -1,6 +1,6 @@ # textdomain: carts -Cart= -(Sneak+Click to pick up)= Rail= Powered Rail= Brake Rail= +Cart= +(Sneak+Click to pick up)= diff --git a/mods/carts/models/carts_cart.b3d b/mods/carts/models/carts_cart.b3d index b8b7c3a1..4e7eba36 100644 Binary files a/mods/carts/models/carts_cart.b3d and b/mods/carts/models/carts_cart.b3d differ diff --git a/mods/carts/models/carts_cart.blend b/mods/carts/models/carts_cart.blend index 3446fb15..7d2515eb 100644 Binary files a/mods/carts/models/carts_cart.blend and b/mods/carts/models/carts_cart.blend differ diff --git a/mods/carts/textures/carts_cart.png b/mods/carts/textures/carts_cart.png index dd6c88cc..965347c0 100644 Binary files a/mods/carts/textures/carts_cart.png and b/mods/carts/textures/carts_cart.png differ diff --git a/mods/carts/textures/carts_cart_front.png b/mods/carts/textures/carts_cart_front.png index 0b3015be..38955b25 100644 Binary files a/mods/carts/textures/carts_cart_front.png and b/mods/carts/textures/carts_cart_front.png differ diff --git a/mods/carts/textures/carts_cart_side.png b/mods/carts/textures/carts_cart_side.png index 69b7fdd2..f53808c6 100644 Binary files a/mods/carts/textures/carts_cart_side.png and b/mods/carts/textures/carts_cart_side.png differ diff --git a/mods/carts/textures/carts_cart_top.png b/mods/carts/textures/carts_cart_top.png index 89594837..d9a31a9d 100644 Binary files a/mods/carts/textures/carts_cart_top.png and b/mods/carts/textures/carts_cart_top.png differ diff --git a/mods/carts/textures/carts_rail_crossing.png b/mods/carts/textures/carts_rail_crossing.png index 99dab9e4..e10f3b1f 100644 Binary files a/mods/carts/textures/carts_rail_crossing.png and b/mods/carts/textures/carts_rail_crossing.png differ diff --git a/mods/carts/textures/carts_rail_crossing_brk.png b/mods/carts/textures/carts_rail_crossing_brk.png index ae71d7e4..14d4e1a9 100644 Binary files a/mods/carts/textures/carts_rail_crossing_brk.png and b/mods/carts/textures/carts_rail_crossing_brk.png differ diff --git a/mods/carts/textures/carts_rail_crossing_pwr.png b/mods/carts/textures/carts_rail_crossing_pwr.png index fc57b08a..d763d508 100644 Binary files a/mods/carts/textures/carts_rail_crossing_pwr.png and b/mods/carts/textures/carts_rail_crossing_pwr.png differ diff --git a/mods/carts/textures/carts_rail_curved.png b/mods/carts/textures/carts_rail_curved.png index cb1beac2..b320f0da 100644 Binary files a/mods/carts/textures/carts_rail_curved.png and b/mods/carts/textures/carts_rail_curved.png differ diff --git a/mods/carts/textures/carts_rail_curved_brk.png b/mods/carts/textures/carts_rail_curved_brk.png index cff2a30c..c5affd80 100644 Binary files a/mods/carts/textures/carts_rail_curved_brk.png and b/mods/carts/textures/carts_rail_curved_brk.png differ diff --git a/mods/carts/textures/carts_rail_curved_pwr.png b/mods/carts/textures/carts_rail_curved_pwr.png index 2cd0770f..781bbd0a 100644 Binary files a/mods/carts/textures/carts_rail_curved_pwr.png and b/mods/carts/textures/carts_rail_curved_pwr.png differ diff --git a/mods/carts/textures/carts_rail_straight.png b/mods/carts/textures/carts_rail_straight.png index 764333b7..30dcafe8 100644 Binary files a/mods/carts/textures/carts_rail_straight.png and b/mods/carts/textures/carts_rail_straight.png differ diff --git a/mods/carts/textures/carts_rail_straight_brk.png b/mods/carts/textures/carts_rail_straight_brk.png index cea7b1b3..7853ac89 100644 Binary files a/mods/carts/textures/carts_rail_straight_brk.png and b/mods/carts/textures/carts_rail_straight_brk.png differ diff --git a/mods/carts/textures/carts_rail_straight_pwr.png b/mods/carts/textures/carts_rail_straight_pwr.png index 764fa611..e067ff1d 100644 Binary files a/mods/carts/textures/carts_rail_straight_pwr.png and b/mods/carts/textures/carts_rail_straight_pwr.png differ diff --git a/mods/carts/textures/carts_rail_t_junction.png b/mods/carts/textures/carts_rail_t_junction.png index 0f3fd25a..8b1b9462 100644 Binary files a/mods/carts/textures/carts_rail_t_junction.png and b/mods/carts/textures/carts_rail_t_junction.png differ diff --git a/mods/carts/textures/carts_rail_t_junction_brk.png b/mods/carts/textures/carts_rail_t_junction_brk.png index 5905d011..8e3f6201 100644 Binary files a/mods/carts/textures/carts_rail_t_junction_brk.png and b/mods/carts/textures/carts_rail_t_junction_brk.png differ diff --git a/mods/carts/textures/carts_rail_t_junction_pwr.png b/mods/carts/textures/carts_rail_t_junction_pwr.png index 56565553..dd0eede2 100644 Binary files a/mods/carts/textures/carts_rail_t_junction_pwr.png and b/mods/carts/textures/carts_rail_t_junction_pwr.png differ diff --git a/mods/creative/init.lua b/mods/creative/init.lua index f345697e..31af37c0 100644 --- a/mods/creative/init.lua +++ b/mods/creative/init.lua @@ -46,42 +46,40 @@ end dofile(minetest.get_modpath("creative") .. "/inventory.lua") if minetest.is_creative_enabled("") then - minetest.register_on_mods_loaded(function() - -- Dig time is modified according to difference (leveldiff) between tool - -- 'maxlevel' and node 'level'. Digtime is divided by the larger of - -- leveldiff and 1. - -- To speed up digging in creative, hand 'maxlevel' and 'digtime' have been - -- increased such that nodes of differing levels have an insignificant - -- effect on digtime. - local digtime = 42 - local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 256} + -- Dig time is modified according to difference (leveldiff) between tool + -- 'maxlevel' and node 'level'. Digtime is divided by the larger of + -- leveldiff and 1. + -- To speed up digging in creative, hand 'maxlevel' and 'digtime' have been + -- increased such that nodes of differing levels have an insignificant + -- effect on digtime. + local digtime = 42 + local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 256} - -- Override the hand tool - minetest.override_item("", { - range = 10, - tool_capabilities = { - full_punch_interval = 0.5, - max_drop_level = 3, - groupcaps = { - crumbly = caps, - cracky = caps, - snappy = caps, - choppy = caps, - oddly_breakable_by_hand = caps, - -- dig_immediate group doesn't use value 1. Value 3 is instant dig - dig_immediate = - {times = {[2] = digtime, [3] = 0}, uses = 0, maxlevel = 256}, - }, - damage_groups = {fleshy = 10}, - } - }) - end) + -- Override the hand tool + minetest.override_item("", { + range = 10, + tool_capabilities = { + full_punch_interval = 0.5, + max_drop_level = 3, + groupcaps = { + crumbly = caps, + cracky = caps, + snappy = caps, + choppy = caps, + oddly_breakable_by_hand = caps, + -- dig_immediate group doesn't use value 1. Value 3 is instant dig + dig_immediate = + {times = {[2] = digtime, [3] = 0}, uses = 0, maxlevel = 256}, + }, + damage_groups = {fleshy = 10}, + } + }) end -- Unlimited node placement minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack) if placer and placer:is_player() then - return minetest.is_creative_enabled(placer:get_player_name()) + return creative.is_enabled_for(placer:get_player_name()) end end) @@ -89,7 +87,7 @@ end) local old_handle_node_drops = minetest.handle_node_drops function minetest.handle_node_drops(pos, drops, digger) if not digger or not digger:is_player() or - not minetest.is_creative_enabled(digger:get_player_name()) then + not creative.is_enabled_for(digger:get_player_name()) then return old_handle_node_drops(pos, drops, digger) end local inv = digger:get_inventory() diff --git a/mods/creative/inventory.lua b/mods/creative/inventory.lua index f52e6187..e22cfc17 100644 --- a/mods/creative/inventory.lua +++ b/mods/creative/inventory.lua @@ -33,7 +33,7 @@ function creative.init_creative_inventory(player) minetest.create_detached_inventory("creative_" .. player_name, { allow_move = function(inv, from_list, from_index, to_list, to_index, count, player2) local name = player2 and player2:get_player_name() or "" - if not minetest.is_creative_enabled(name) or + if not creative.is_enabled_for(name) or to_list == "main" then return 0 end @@ -44,7 +44,7 @@ function creative.init_creative_inventory(player) end, allow_take = function(inv, listname, index, stack, player2) local name = player2 and player2:get_player_name() or "" - if not minetest.is_creative_enabled(name) then + if not creative.is_enabled_for(name) then return 0 end return -1 @@ -124,13 +124,8 @@ function creative.update_creative_inventory(player_name, tab_content) inv.size = #creative_list end -minetest.register_on_leaveplayer(function(player) - local name = player:get_player_name() - player_inventory[name] = nil -end) - -- Create the trash field -local trash = minetest.create_detached_inventory("trash", { +local trash = minetest.create_detached_inventory("creative_trash", { -- Allow the stack to be placed and remove it in on_put() -- This allows the creative inventory to restore the stack allow_put = function(inv, listname, index, stack, player) @@ -148,25 +143,24 @@ function creative.register_tab(name, title, items) sfinv.register_page("creative:" .. name, { title = title, is_in_nav = function(self, player, context) - return minetest.is_creative_enabled(player:get_player_name()) + return creative.is_enabled_for(player:get_player_name()) end, get = function(self, player, context) local player_name = player:get_player_name() creative.update_creative_inventory(player_name, items) local inv = player_inventory[player_name] local pagenum = math.floor(inv.start_i / (4*8) + 1) - local pagemax = math.max(math.ceil(inv.size / (4*8)), 1) + local pagemax = math.ceil(inv.size / (4*8)) local esc = minetest.formspec_escape return sfinv.make_formspec(player, context, - (inv.size == 0 and ("label[3,2;"..esc(S("No items to show.")).."]") or "") .. "label[5.8,4.15;" .. minetest.colorize("#FFFF00", tostring(pagenum)) .. " / " .. tostring(pagemax) .. "]" .. [[ image[4.08,4.2;0.8,0.8;creative_trash_icon.png] listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] - list[detached:trash;main;4.02,4.1;1,1;] + list[detached:creative_trash;main;4.02,4.1;1,1;] listring[] image_button[5,4.05;0.8,0.8;creative_prev_icon.png;creative_prev;] - image_button[7.25,4.05;0.8,0.8;creative_next_icon.png;creative_next;] + image_button[7.2,4.05;0.8,0.8;creative_next_icon.png;creative_next;] image_button[2.63,4.05;0.8,0.8;creative_search_icon.png;creative_search;] image_button[3.25,4.05;0.8,0.8;creative_clear_icon.png;creative_clear;] ]] .. @@ -175,7 +169,6 @@ function creative.register_tab(name, title, items) "tooltip[creative_prev;" .. esc(S("Previous page")) .. "]" .. "tooltip[creative_next;" .. esc(S("Next page")) .. "]" .. "listring[current_player;main]" .. - "field_enter_after_edit[creative_filter;true]" .. "field_close_on_enter[creative_filter;false]" .. "field[0.3,4.2;2.8,1.2;creative_filter;;" .. esc(inv.filter) .. "]" .. "listring[detached:creative_" .. player_name .. ";main]" .. @@ -198,13 +191,10 @@ function creative.register_tab(name, title, items) inv.start_i = 0 inv.filter = "" sfinv.set_player_inventory_formspec(player, context) - elseif (fields.creative_search or - fields.key_enter_field == "creative_filter") - and fields.creative_filter then + elseif fields.creative_search or + fields.key_enter_field == "creative_filter" then inv.start_i = 0 - inv.filter = fields.creative_filter:sub(1, 128) -- truncate to a sane length - :gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n) - :lower() -- search is case insensitive + inv.filter = fields.creative_filter:lower() sfinv.set_player_inventory_formspec(player, context) elseif not fields.quit then local start_i = inv.start_i or 0 @@ -258,7 +248,7 @@ creative.register_tab("craftitems", S("Items"), registered_craftitems) local old_homepage_name = sfinv.get_homepage_name function sfinv.get_homepage_name(player) - if minetest.is_creative_enabled(player:get_player_name()) then + if creative.is_enabled_for(player:get_player_name()) then return "creative:all" else return old_homepage_name(player) diff --git a/mods/creative/locale/creative.bg.tr b/mods/creative/locale/creative.bg.tr deleted file mode 100755 index bfdaa943..00000000 --- a/mods/creative/locale/creative.bg.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Дава възможност на играча да използва творчески инвентар -No items to show.=Няма предмети. -Search=Търсене -Reset=Нулиране -Previous page=Предишна страница -Next page=Следваща страница -All=Всички -Nodes=Възли -Tools=Инструменти -Items=Предмети diff --git a/mods/creative/locale/creative.de.tr b/mods/creative/locale/creative.de.tr index ddd88ddc..02b02777 100644 --- a/mods/creative/locale/creative.de.tr +++ b/mods/creative/locale/creative.de.tr @@ -1,6 +1,5 @@ # textdomain: creative Allow player to use creative inventory=Spieler erlauben, das Kreativinventar zu benutzen -No items to show.=Keine Gegenstände vorhanden. Search=Suchen Reset=Zurücksetzen Previous page=Vorherige Seite diff --git a/mods/creative/locale/creative.eo.tr b/mods/creative/locale/creative.eo.tr deleted file mode 100644 index 8142baf6..00000000 --- a/mods/creative/locale/creative.eo.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Permesi ke la ludanto uzu la kreeman stokon -No items to show.= -Search=Serĉi -Reset=Rekomencigi -Previous page=Antaŭa paĝo -Next page=Sekva paĝo -All=Ĉio -Nodes=Nodoj -Tools=Iloj -Items=Objektoj diff --git a/mods/creative/locale/creative.es.tr b/mods/creative/locale/creative.es.tr index ceeb32fc..f4e39a70 100644 --- a/mods/creative/locale/creative.es.tr +++ b/mods/creative/locale/creative.es.tr @@ -1,8 +1,7 @@ # textdomain: creative Allow player to use creative inventory=Permitir al jugador usar el inventario creativo -No items to show.=Sin artículos que mostrar. Search=Buscar -Reset=Reiniciar +Reset=Resetear Previous page=Pág. siguiente Next page=Pág. anterior All=Todos diff --git a/mods/creative/locale/creative.eu.tr b/mods/creative/locale/creative.eu.tr deleted file mode 100644 index e8c9b20f..00000000 --- a/mods/creative/locale/creative.eu.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Jokalariari sormen-inbentarioa erabiltzen utzi -No items to show.=Erakusteko objekturik ez. -Search=Bilatu -Reset=Berriz hasi -Previous page=Aurreko orria -Next page=Hurrengo orria -All=Guztiak -Nodes=Nodoak -Tools=Tresnak -Items=Objektuak diff --git a/mods/creative/locale/creative.fr.tr b/mods/creative/locale/creative.fr.tr index 89a42226..695c0a19 100644 --- a/mods/creative/locale/creative.fr.tr +++ b/mods/creative/locale/creative.fr.tr @@ -1,6 +1,5 @@ # textdomain: creative Allow player to use creative inventory=Permettre aux joueurs d'utiliser l'inventaire du mode créatif -No items to show.= Search=Rechercher Reset=Réinitialiser Previous page=Page précédente diff --git a/mods/creative/locale/creative.id.tr b/mods/creative/locale/creative.id.tr index 5b859c4e..eaf34051 100644 --- a/mods/creative/locale/creative.id.tr +++ b/mods/creative/locale/creative.id.tr @@ -1,6 +1,4 @@ # textdomain: creative -Allow player to use creative inventory=Bolehkan pemain menggunakan inventaris kreatif -No items to show.=Tiada barang untuk ditampilkan. Search=Cari Reset=Atur ulang Previous page=Halaman sebelumnya @@ -9,3 +7,4 @@ All=Semua Nodes=Nodus Tools=Perkakas Items=Barang +Allow player to use creative inventory=Bolehkan pemain memakai inventaris kreatif diff --git a/mods/creative/locale/creative.it.tr b/mods/creative/locale/creative.it.tr index 736bc941..1c821892 100644 --- a/mods/creative/locale/creative.it.tr +++ b/mods/creative/locale/creative.it.tr @@ -1,11 +1,10 @@ -# textdomain: creative -Allow player to use creative inventory=Permette al giocatore di usare l'inventario creativo -No items to show.= -Search=Cerca -Reset=Azzera -Previous page=Pagina precedente -Next page=Pagina successiva -All=Tutto -Nodes=Nodi -Tools=Strumenti -Items=Oggetti +# textdomain: creative +Allow player to use creative inventory=Permette al giocatore di usare l'inventario creativo +Search=Cerca +Reset=Azzera +Previous page=Pagina precedente +Next page=Pagina successiva +All=Tutto +Nodes=Nodi +Tools=Strumenti +Items=Oggetti \ No newline at end of file diff --git a/mods/creative/locale/creative.ja.tr b/mods/creative/locale/creative.ja.tr deleted file mode 100644 index 2d734e52..00000000 --- a/mods/creative/locale/creative.ja.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=プレーヤーにクリエイティブ インベントリーの使用を許可する -No items to show.= -Search=検索 -Reset=リセット -Previous page=前のページ -Next page=次のページ -All=すべて -Nodes=ブロック -Tools=道具 -Items=アイテム diff --git a/mods/creative/locale/creative.jbo.tr b/mods/creative/locale/creative.jbo.tr deleted file mode 100644 index d8640b18..00000000 --- a/mods/creative/locale/creative.jbo.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=zifre le ka pilno le finti ke dacti liste -No items to show.= -Search=sisku -Reset=kraga'igau -Previous page=lidne -Next page=selyli'e -All=ro dacti -Nodes=bliku -Tools=tutci -Items=dacti diff --git a/mods/creative/locale/creative.lv.tr b/mods/creative/locale/creative.lv.tr deleted file mode 100644 index de8662ee..00000000 --- a/mods/creative/locale/creative.lv.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Atļaut spēlētājam izmantot radošo inventāru -No items to show.=Nav priekšmetu ko paradīt. -Search=Meklēt -Reset=Nodzēst -Previous page=Iepriekšējā lappuse -Next page=Nākošā lappuse -All=Viss -Nodes=Bloki -Tools=Rīki -Items=Priekšmeti diff --git a/mods/creative/locale/creative.ms.tr b/mods/creative/locale/creative.ms.tr index 98178f15..a2aef801 100644 --- a/mods/creative/locale/creative.ms.tr +++ b/mods/creative/locale/creative.ms.tr @@ -1,8 +1,7 @@ # textdomain: creative Allow player to use creative inventory=Benarkan pemain menggunakan inventori kreatif -No items to show.=Tiada item untuk ditunjukkan. Search=Cari -Reset=Tetap semula +Reset=Set semula Previous page=Halaman sebelumnya Next page=Halaman seterusnya All=Semua diff --git a/mods/creative/locale/creative.pl.tr b/mods/creative/locale/creative.pl.tr deleted file mode 100644 index 1fe78572..00000000 --- a/mods/creative/locale/creative.pl.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Zezwól graczom na używanie kreatywnego ekwipunku -No items to show.= -Search=Wyszukaj -Reset=Zresetuj -Previous page=Poprzednia strona -Next page=Następna strona -All=Wszystko -Nodes=Bloki -Tools=Narzędzia -Items=Przedmioty diff --git a/mods/creative/locale/creative.pt_BR.tr b/mods/creative/locale/creative.pt_BR.tr deleted file mode 100644 index b66edcc9..00000000 --- a/mods/creative/locale/creative.pt_BR.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Permitir o jogador usar o inventário criativo -No items to show.= -Search=Pesquisar -Reset=Redefinir -Previous page=Página anterior -Next page=Próxima página -All=Todos -Nodes=Blocos -Tools=Ferramentas -Items=Itens diff --git a/mods/creative/locale/creative.ru.tr b/mods/creative/locale/creative.ru.tr index b0bb7577..f649dbc6 100644 --- a/mods/creative/locale/creative.ru.tr +++ b/mods/creative/locale/creative.ru.tr @@ -1,6 +1,5 @@ # textdomain: creative Allow player to use creative inventory=Разрешить игроку использовать творческий инвентарь -No items to show.=Нет предметов. Search=Поиск Reset=Сброс Previous page=Предыдущая страница diff --git a/mods/creative/locale/creative.se.tr b/mods/creative/locale/creative.se.tr new file mode 100644 index 00000000..e78bc2ce --- /dev/null +++ b/mods/creative/locale/creative.se.tr @@ -0,0 +1,10 @@ +# textdomain: creative +Allow player to use creative inventory=Tilllåt spelare att används kreativa saker +Search=Sök +Reset=Återställ +Previous page=Förra sidan +Next page=Nästa sidan +All=Alla +Nodes=Noder +Tools=Verktyg +Items=Saker \ No newline at end of file diff --git a/mods/creative/locale/creative.sk.tr b/mods/creative/locale/creative.sk.tr deleted file mode 100644 index 0aa8d0e4..00000000 --- a/mods/creative/locale/creative.sk.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Povolí hráčovi použivať kreatívny inventár -No items to show.= -Search=Hľadaj -Reset=Vrátiť späť -Previous page=Predchádzajúca stránka -Next page=Nasledujúca stránka -All=Všetko -Nodes=Kocky -Tools=Nástroje -Items=Veci diff --git a/mods/creative/locale/creative.sv.tr b/mods/creative/locale/creative.sv.tr deleted file mode 100644 index ddba02d8..00000000 --- a/mods/creative/locale/creative.sv.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Tillåt spelare att använda kreativa saker -No items to show.= -Search=Sök -Reset=Återställ -Previous page=Förra sida -Next page=Nästa sida -All=Alla -Nodes=Noder -Tools=Verktyg -Items=Saker diff --git a/mods/creative/locale/creative.uk.tr b/mods/creative/locale/creative.uk.tr deleted file mode 100644 index c0a817c9..00000000 --- a/mods/creative/locale/creative.uk.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Дозволити гравцю використовувати творчий інвентар -No items to show.=Немає результатів. -Search=Пошук -Reset=Скинути -Previous page=Попередня сторінка -Next page=Наступна сторінка -All=Все -Nodes=Ноди -Tools=Інструменти -Items=Предмети diff --git a/mods/creative/locale/creative.zh_CN.tr b/mods/creative/locale/creative.zh_CN.tr index 27d3e868..1ca424e5 100644 --- a/mods/creative/locale/creative.zh_CN.tr +++ b/mods/creative/locale/creative.zh_CN.tr @@ -1,6 +1,5 @@ # textdomain: creative Allow player to use creative inventory=允许玩家使用创造模式物品栏 -No items to show.= Search=搜索 Reset=重置 Previous page=上一页 diff --git a/mods/creative/locale/creative.zh_TW.tr b/mods/creative/locale/creative.zh_TW.tr index ae9b1565..c5746d40 100644 --- a/mods/creative/locale/creative.zh_TW.tr +++ b/mods/creative/locale/creative.zh_TW.tr @@ -1,6 +1,5 @@ # textdomain: creative Allow player to use creative inventory=允許玩家使用創造模式物品欄 -No items to show.= Search=搜索 Reset=重置 Previous page=上一頁 diff --git a/mods/creative/locale/template.txt b/mods/creative/locale/template.txt index ee593fe9..356102da 100644 --- a/mods/creative/locale/template.txt +++ b/mods/creative/locale/template.txt @@ -1,6 +1,4 @@ # textdomain: creative -Allow player to use creative inventory= -No items to show.= Search= Reset= Previous page= @@ -9,3 +7,4 @@ All= Nodes= Tools= Items= +Allow player to use creative inventory= diff --git a/mods/creative/mod.conf b/mods/creative/mod.conf index 37d0d67e..0b3f745d 100644 --- a/mods/creative/mod.conf +++ b/mods/creative/mod.conf @@ -1,3 +1,3 @@ name = creative description = Minetest Game mod: creative -depends = sfinv +depends = default, sfinv diff --git a/mods/creative/textures/creative_clear_icon.png b/mods/creative/textures/creative_clear_icon.png index ab421d98..9244264a 100644 Binary files a/mods/creative/textures/creative_clear_icon.png and b/mods/creative/textures/creative_clear_icon.png differ diff --git a/mods/creative/textures/creative_next_icon.png b/mods/creative/textures/creative_next_icon.png index 4a3637dc..82cf3d36 100644 Binary files a/mods/creative/textures/creative_next_icon.png and b/mods/creative/textures/creative_next_icon.png differ diff --git a/mods/creative/textures/creative_prev_icon.png b/mods/creative/textures/creative_prev_icon.png index d5e3c27a..b26cd157 100644 Binary files a/mods/creative/textures/creative_prev_icon.png and b/mods/creative/textures/creative_prev_icon.png differ diff --git a/mods/creative/textures/creative_search_icon.png b/mods/creative/textures/creative_search_icon.png index 421b833e..aace8044 100644 Binary files a/mods/creative/textures/creative_search_icon.png and b/mods/creative/textures/creative_search_icon.png differ diff --git a/mods/creative/textures/creative_trash_icon.png b/mods/creative/textures/creative_trash_icon.png index a0f6d237..7d7a0a62 100644 Binary files a/mods/creative/textures/creative_trash_icon.png and b/mods/creative/textures/creative_trash_icon.png differ diff --git a/mods/default/README.txt b/mods/default/README.txt index e8b78a75..be8cbf14 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -5,7 +5,7 @@ See license.txt for license information. Authors of source code ---------------------- Originally by celeron55, Perttu Ahola (LGPLv2.1+) -Various Minetest Game developers and contributors (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) The torch code was derived by sofar from the 'torches' mod by BlockMen (LGPLv2.1+) @@ -178,7 +178,7 @@ Gambit (CC BY-SA 3.0): default_iron_lump.png default_gold_lump.png default_clay_lump.png - default_coal_lump.png + default_coal.png default_grass_*.png default_paper.png default_diamond_block.png @@ -188,6 +188,8 @@ Gambit (CC BY-SA 3.0): default_snow.png default_snow_side.png default_snowball.png + default_key.png + default_key_skeleton.png default_book.png asl97 (CC BY-SA 3.0): @@ -262,17 +264,32 @@ Glass breaking sounds (CC BY 3.0): 3: http://www.freesound.org/people/lsprice/sounds/88808/ Mito551 (sounds) (CC BY-SA 3.0): - default_dig_crumbly.*.ogg + default_dig_choppy.ogg + default_dig_cracky.ogg + default_dig_crumbly.1.ogg + default_dig_crumbly.2.ogg default_dig_dig_immediate.ogg default_dig_oddly_breakable_by_hand.ogg - default_dug_node.*.ogg + default_dug_node.1.ogg + default_dug_node.2.ogg default_grass_footstep.1.ogg default_grass_footstep.2.ogg default_grass_footstep.3.ogg - default_gravel_footstep.*.ogg - default_place_node.*.ogg - default_place_node_hard.*.ogg - default_glass_footstep.ogg + default_gravel_footstep.1.ogg + default_gravel_footstep.2.ogg + default_gravel_footstep.3.ogg + default_gravel_footstep.4.ogg + default_grass_footstep.1.ogg + default_place_node.1.ogg + default_place_node.2.ogg + default_place_node.3.ogg + default_place_node_hard.1.ogg + default_place_node_hard.2.ogg + default_hard_footstep.1.ogg + default_hard_footstep.2.ogg + default_hard_footstep.3.ogg + default_sand_footstep.1.ogg + default_sand_footstep.2.ogg default_wood_footstep.1.ogg default_wood_footstep.2.ogg default_dirt_footstep.1.ogg @@ -284,8 +301,8 @@ Metal sounds: - https://www.freesound.org/people/yadronoff/sounds/320397/ default_dug_metal.*.ogg - Iwan Gabovitch - qubodup - CC0 - http://opengameart.org/users/qubodup - default_metal_footstep.*.ogg - (CC0 1.0) - CC0 1.0 - - https://freesound.org/people/mypantsfelldown/sounds/398937/ + default_metal_footstep.*.ogg - Ottomaani138 - CC0 + - https://www.freesound.org/people/Ottomaani138/sounds/232692/ default_place_node_metal.*.ogg - Ogrebane - CC0 - http://opengameart.org/content/wood-and-metal-sound-effects-volume-2 @@ -297,6 +314,7 @@ https://www.freesound.org/people/AGFX/packs/1253/ default_water_footstep.1.ogg default_water_footstep.2.ogg default_water_footstep.3.ogg +(default_water_footstep.4.ogg is silent) blukotek (CC0 1.0): https://www.freesound.org/people/blukotek/sounds/251660/ @@ -322,43 +340,6 @@ sonictechtonic (CC BY 3.0): https://www.freesound.org/people/sonictechtonic/sounds/241872/ player_damage.ogg -Sheyvan (CC0 1.0): -https://freesound.org/people/Sheyvan/sounds/476113/ - default_dig_choppy.*.ogg - -lolamadeus (CC0 1.0): -https://freesound.org/people/lolamadeus/sounds/179341/ - default_gravel_dig.*.ogg - default_gravel_dug.*.ogg - -Benboncan (CC BY 3.0): -https://freesound.org/people/Benboncan/sounds/71823/ - default_dig_cracky.*.ogg - -Erdie (CC BY 3.0): -https://freesound.org/people/Erdie/sounds/41579/ - default_hard_footstep.*.ogg - -worthahep88 (CC0 1.0): -https://freesound.org/people/worthahep88/sounds/319224/ - default_sand_footstep.*.ogg - -dheming (CC BY 3.0): -https://freesound.org/people/dheming/sounds/268023/ - default_ice_dig.*.ogg - -InspectorJ (CC BY 3.0): -https://freesound.org/people/InspectorJ/sounds/416967/ - default_ice_footstep.*.ogg - -Angel_Perez_Grandi (CC BY 3.0): -https://freesound.org/people/Angel_Perez_Grandi/sounds/49190/ - default_ice_dug.ogg - -iankath (CC0 1.0) -https://freesound.org/people/iankath/sounds/173991/ - default_furnace_active.ogg - Models ------ diff --git a/mods/default/chests.lua b/mods/default/chests.lua index 1d9b150a..f4462ae7 100644 --- a/mods/default/chests.lua +++ b/mods/default/chests.lua @@ -38,44 +38,34 @@ function default.chest.chest_lid_close(pn) default.chest.open_chests[pn] = nil for k, v in pairs(default.chest.open_chests) do - if vector.equals(v.pos, pos) then - -- another player is also looking at the chest + if v.pos.x == pos.x and v.pos.y == pos.y and v.pos.z == pos.z then return true end end local node = minetest.get_node(pos) - minetest.after(0.2, function() - local current_node = minetest.get_node(pos) - if current_node.name ~= swap .. "_open" then - -- the chest has already been replaced, don't try to replace what's there. - return - end - minetest.swap_node(pos, {name = swap, param2 = node.param2}) - minetest.sound_play(sound, {gain = 0.3, pos = pos, - max_hear_distance = 10}, true) - end) + minetest.after(0.2, minetest.swap_node, pos, { name = swap, + param2 = node.param2 }) + minetest.sound_play(sound, {gain = 0.3, pos = pos, + max_hear_distance = 10}, true) end default.chest.open_chests = {} minetest.register_on_player_receive_fields(function(player, formname, fields) - local pn = player:get_player_name() - if formname ~= "default:chest" then - if default.chest.open_chests[pn] then - default.chest.chest_lid_close(pn) - end - return end + if not player or not fields.quit then + return + end + local pn = player:get_player_name() - if not (fields.quit and default.chest.open_chests[pn]) then + if not default.chest.open_chests[pn] then return end default.chest.chest_lid_close(pn) - return true end) @@ -139,12 +129,6 @@ function default.chest.register_chest(prefixed_name, d) return itemstack end - local cn = clicker:get_player_name() - - if default.chest.open_chests[cn] then - default.chest.chest_lid_close(cn) - end - minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos, max_hear_distance = 10}, true) if not default.chest.chest_lid_obstructed(pos) then @@ -152,9 +136,10 @@ function default.chest.register_chest(prefixed_name, d) { name = name .. "_open", param2 = node.param2 }) end - minetest.after(0.2, minetest.show_formspec, cn, + minetest.after(0.2, minetest.show_formspec, + clicker:get_player_name(), "default:chest", default.chest.get_chest_formspec(pos)) - default.chest.open_chests[cn] = { pos = pos, + default.chest.open_chests[clicker:get_player_name()] = { pos = pos, sound = def.sound_close, swap = name } end def.on_blast = function() end @@ -163,12 +148,12 @@ function default.chest.register_chest(prefixed_name, d) local itemstack = player:get_wielded_item() local key_meta = itemstack:get_meta() - if itemstack:get_meta():get_string("") == "" then + if itemstack:get_metadata() == "" then return end if key_meta:get_string("secret") == "" then - key_meta:set_string("secret", minetest.parse_json(itemstack:get_meta():get_string("")).secret) + key_meta:set_string("secret", minetest.parse_json(itemstack:get_metadata()).secret) itemstack:set_metadata("") end @@ -215,12 +200,6 @@ function default.chest.register_chest(prefixed_name, d) return inv:is_empty("main") end def.on_rightclick = function(pos, node, clicker) - local cn = clicker:get_player_name() - - if default.chest.open_chests[cn] then - default.chest.chest_lid_close(cn) - end - minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos, max_hear_distance = 10}, true) if not default.chest.chest_lid_obstructed(pos) then @@ -229,9 +208,9 @@ function default.chest.register_chest(prefixed_name, d) param2 = node.param2 }) end minetest.after(0.2, minetest.show_formspec, - cn, + clicker:get_player_name(), "default:chest", default.chest.get_chest_formspec(pos)) - default.chest.open_chests[cn] = { pos = pos, + default.chest.open_chests[clicker:get_player_name()] = { pos = pos, sound = def.sound_close, swap = name } end def.on_blast = function(pos) @@ -243,7 +222,21 @@ function default.chest.register_chest(prefixed_name, d) end end - default.set_inventory_action_loggers(def, "chest") + 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 local def_opened = table.copy(def) local def_closed = table.copy(def) @@ -284,7 +277,7 @@ function default.chest.register_chest(prefixed_name, d) nodenames = {name}, action = function(pos, node) local meta = minetest.get_meta(pos) - meta:set_string("formspec", "") + meta:set_string("formspec", nil) local inv = meta:get_inventory() local list = inv:get_list("default:chest") if list then @@ -295,19 +288,6 @@ function default.chest.register_chest(prefixed_name, d) end }) end - - -- close opened chests on load - local modname, chestname = prefixed_name:match("^(:?.-):(.*)$") - minetest.register_lbm({ - label = "close opened chests on load", - name = modname .. ":close_" .. chestname .. "_open", - nodenames = {prefixed_name .. "_open"}, - run_at_every_load = true, - action = function(pos, node) - node.name = prefixed_name - minetest.swap_node(pos, node) - end - }) end default.chest.register_chest("default:chest", { diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index ecbe9d12..bc436fc5 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -300,6 +300,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "default:mese_post_light 3", + recipe = { + {"", "default:glass", ""}, + {"default:mese_crystal", "default:mese_crystal", "default:mese_crystal"}, + {"", "group:wood", ""}, + } +}) + minetest.register_craft({ output = "default:obsidian", recipe = { diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index 4cc5f8d8..923d754f 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -3,52 +3,6 @@ -- support for MT game translation. local S = default.get_translator -local esc = minetest.formspec_escape -local formspec_size = "size[8,8]" - -local function formspec_core(tab) - if tab == nil then tab = 1 else tab = tostring(tab) end - return "tabheader[0,0;book_header;" .. - esc(S("Write")) .. "," .. - esc(S("Read")) .. ";" .. - tab .. ";false;false]" -end - -local function formspec_write(title, text) - return "field[0.5,1;7.5,0;title;" .. esc(S("Title:")) .. ";" .. - esc(title) .. "]" .. - "textarea[0.5,1.5;7.5,7;text;" .. esc(S("Contents:")) .. ";" .. - esc(text) .. "]" .. - "button_exit[2.5,7.5;3,1;save;" .. esc(S("Save")) .. "]" -end - -local function formspec_read(owner, title, string, text, page, page_max) - return "label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" .. - "tablecolumns[color;text]" .. - "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" .. - "textarea[0.5,1.5;7.5,7;;" .. - esc(string ~= "" and string or text) .. ";]" .. - "button[2.4,7.6;0.8,0.8;book_prev;<]" .. - "label[3.2,7.7;" .. esc(S("Page @1 of @2", page, page_max)) .. "]" .. - "button[4.9,7.6;0.8,0.8;book_next;>]" -end - -local function formspec_string(lpp, page, lines, string) - for i = ((lpp * page) - lpp) + 1, lpp * page do - if not lines[i] then break end - string = string .. lines[i] .. "\n" - end - return string -end - -local book_writers = {} - -minetest.register_on_leaveplayer(function(player) - book_writers[player:get_player_name()] = nil -end) - -local tab_number local lpp = 14 -- Lines per book's page local function book_on_use(itemstack, user) local player_name = user:get_player_name() @@ -57,7 +11,7 @@ local function book_on_use(itemstack, user) local page, page_max, lines, string = 1, 1, {}, "" -- Backwards compatibility - local old_data = minetest.deserialize(itemstack:get_meta():get_string("")) + local old_data = minetest.deserialize(itemstack:get_metadata()) if old_data then meta:from_table({ fields = old_data }) end @@ -65,8 +19,8 @@ local function book_on_use(itemstack, user) local data = meta:to_table().fields if data.owner then - title = data.title or "" - text = data.text or "" + title = data.title + text = data.text owner = data.owner for str in (text .. "\n"):gmatch("([^\n]*)[\n]") do @@ -76,28 +30,37 @@ local function book_on_use(itemstack, user) if data.page then page = data.page page_max = data.page_max - string = formspec_string(lpp, page, lines, string) + + for i = ((lpp * page) - lpp) + 1, lpp * page do + if not lines[i] then break end + string = string .. lines[i] .. "\n" + end end end local formspec - if title == "" and text == "" then - formspec = formspec_write(title, text) - elseif owner == player_name then - local tab = tab_number or 1 - if tab == 2 then - formspec = formspec_core(tab) .. - formspec_read(owner, title, string, text, page, page_max) - else - formspec = formspec_core(tab) .. formspec_write(title, text) - end + local esc = minetest.formspec_escape + if owner == player_name then + formspec = "size[8,8]" .. + "field[0.5,1;7.5,0;title;" .. esc(S("Title:")) .. ";" .. + esc(title) .. "]" .. + "textarea[0.5,1.5;7.5,7;text;" .. esc(S("Contents:")) .. ";" .. + esc(text) .. "]" .. + "button_exit[2.5,7.5;3,1;save;" .. esc(S("Save")) .. "]" else - formspec = formspec_read(owner, title, string, text, page, page_max) + formspec = "size[8,8]" .. + "label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" .. + "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" .. + "textarea[0.5,1.5;7.5,7;;" .. + minetest.formspec_escape(string ~= "" and string or text) .. ";]" .. + "button[2.4,7.6;0.8,0.8;book_prev;<]" .. + "label[3.2,7.7;" .. esc(S("Page @1 of @2", page, page_max)) .. "]" .. + "button[4.9,7.6;0.8,0.8;book_next;>]" 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()} + minetest.show_formspec(player_name, "default:book", formspec) return itemstack end @@ -105,58 +68,14 @@ 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 - local player_name = player:get_player_name() + if formname ~= "default:book" then return end local inv = player:get_inventory() - 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 stack = player:get_wielded_item() - local title = data.title or "" - local text = data.text or "" - - if fields.book_header ~= nil and data.owner == player_name then - local contents - local tab = tonumber(fields.book_header) - if tab == 1 then - contents = formspec_core(tab) .. - formspec_write(title, text) - elseif tab == 2 then - local lines, string = {}, "" - for str in (text .. "\n"):gmatch("([^\n]*)[\n]") do - lines[#lines+1] = str - end - string = formspec_string(lpp, data.page, lines, string) - contents = formspec_read(player_name, title, string, - text, data.page, data.page_max) - else - return -- malicious data - end - tab_number = tab - local formspec = formspec_size .. formspec_core(tab) .. contents - minetest.show_formspec(player_name, "default:book", formspec) - return - end - - if fields.quit then - book_writers[player_name] = nil - end - - if fields.save and fields.title and fields.text then - local new_stack - if not written then + if fields.save and fields.title and fields.text + and fields.title ~= "" and fields.text ~= "" then + local new_stack, data + if stack:get_name() ~= "default:book_written" then local count = stack:get_count() if count == 1 then stack:set_name("default:book_written") @@ -164,9 +83,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) stack:set_count(count - 1) new_stack = ItemStack("default:book_written") end + else + data = stack:get_meta():to_table().fields end - if data.owner ~= player_name and title ~= "" and text ~= "" then + if data and data.owner and data.owner ~= player:get_player_name() then return end @@ -181,7 +102,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) data.description = S("\"@1\" by @2", short_title, data.owner) data.text = fields.text:sub(1, max_text_size) data.text = data.text:gsub("\r\n", "\n"):gsub("\r", "\n") - data.text = data.text:gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n) data.page = 1 data.page_max = math.ceil((#data.text:gsub("[^\n]", "") + 1) / lpp) @@ -197,7 +117,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end elseif fields.book_next or fields.book_prev then - if not data.page then + local data = stack:get_meta():to_table().fields + if not data or not data.page then return end @@ -221,9 +142,63 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end -- Update stack - inv:set_stack(wield_list, wield_index, stack) + player:set_wielded_item(stack) end) +minetest.register_craftitem("default:skeleton_key", { + description = S("Skeleton Key"), + inventory_image = "default_key_skeleton.png", + on_use = function(itemstack, user, pointed_thing) + if pointed_thing.type ~= "node" then + return itemstack + end + + local pos = pointed_thing.under + local node = minetest.get_node(pos) + + if not node then + return itemstack + end + + local on_skeleton_key_use = minetest.registered_nodes[node.name].on_skeleton_key_use + if not on_skeleton_key_use then + return itemstack + end + + -- make a new key secret in case the node callback needs it + local random = math.random + local newsecret = string.format( + "%04x%04x%04x%04x", + random(2^16) - 1, random(2^16) - 1, + random(2^16) - 1, random(2^16) - 1) + + local secret, _, _ = on_skeleton_key_use(pos, user, newsecret) + + if secret then + local inv = minetest.get_inventory({type="player", name=user:get_player_name()}) + + -- update original itemstack + itemstack:take_item() + + -- finish and return the new key + local new_stack = ItemStack("default:key") + local meta = new_stack:get_meta() + meta:set_string("secret", secret) + meta:set_string("description", S("Key to @1's @2", user:get_player_name(), + minetest.registered_nodes[node.name].description)) + + if itemstack:get_count() == 0 then + itemstack = new_stack + else + if inv:add_item("main", new_stack):get_count() > 0 then + minetest.add_item(user:get_pos(), new_stack) + end -- else: added to inventory successfully + end + + return itemstack + end + end +}) -- -- Craftitem registry @@ -452,6 +427,13 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "default:skeleton_key", + recipe = { + {"default:gold_ingot"}, + } +}) + minetest.register_craft({ output = "default:steel_ingot 9", recipe = { @@ -495,6 +477,19 @@ minetest.register_craft({ recipe = "default:gold_lump", }) +minetest.register_craft({ + type = "cooking", + output = "default:gold_ingot", + recipe = "default:key", + cooktime = 5, +}) + +minetest.register_craft({ + type = "cooking", + output = "default:gold_ingot", + recipe = "default:skeleton_key", + cooktime = 5, +}) minetest.register_craft({ type = "cooking", diff --git a/mods/default/functions.lua b/mods/default/functions.lua index 9d164b4b..3dd7a008 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -2,149 +2,131 @@ -- Sounds -- -function default.node_sound_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or +function default.node_sound_defaults(table) + table = table or {} + table.footstep = table.footstep or {name = "", gain = 1.0} - tbl.dug = tbl.dug or + table.dug = table.dug or {name = "default_dug_node", gain = 0.25} - tbl.place = tbl.place or + table.place = table.place or {name = "default_place_node_hard", gain = 1.0} - return tbl + return table end -function default.node_sound_stone_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or - {name = "default_hard_footstep", gain = 0.2} - tbl.dug = tbl.dug or +function default.node_sound_stone_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_hard_footstep", gain = 0.3} + table.dug = table.dug or {name = "default_hard_footstep", gain = 1.0} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_dirt_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or - {name = "default_dirt_footstep", gain = 0.25} - tbl.dig = tbl.dig or - {name = "default_dig_crumbly", gain = 0.4} - tbl.dug = tbl.dug or +function default.node_sound_dirt_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_dirt_footstep", gain = 0.4} + table.dug = table.dug or {name = "default_dirt_footstep", gain = 1.0} - tbl.place = tbl.place or + table.place = table.place or {name = "default_place_node", gain = 1.0} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_sand_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or - {name = "default_sand_footstep", gain = 0.05} - tbl.dug = tbl.dug or - {name = "default_sand_footstep", gain = 0.15} - tbl.place = tbl.place or +function default.node_sound_sand_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_sand_footstep", gain = 0.12} + table.dug = table.dug or + {name = "default_sand_footstep", gain = 0.24} + table.place = table.place or {name = "default_place_node", gain = 1.0} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_gravel_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or - {name = "default_gravel_footstep", gain = 0.25} - tbl.dig = tbl.dig or - {name = "default_gravel_dig", gain = 0.35} - tbl.dug = tbl.dug or - {name = "default_gravel_dug", gain = 1.0} - tbl.place = tbl.place or +function default.node_sound_gravel_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_gravel_footstep", gain = 0.4} + table.dug = table.dug or + {name = "default_gravel_footstep", gain = 1.0} + table.place = table.place or {name = "default_place_node", gain = 1.0} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_wood_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or - {name = "default_wood_footstep", gain = 0.15} - tbl.dig = tbl.dig or - {name = "default_dig_choppy", gain = 0.4} - tbl.dug = tbl.dug or +function default.node_sound_wood_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_wood_footstep", gain = 0.3} + table.dug = table.dug or {name = "default_wood_footstep", gain = 1.0} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_leaves_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or +function default.node_sound_leaves_defaults(table) + table = table or {} + table.footstep = table.footstep or {name = "default_grass_footstep", gain = 0.45} - tbl.dug = tbl.dug or + table.dug = table.dug or {name = "default_grass_footstep", gain = 0.7} - tbl.place = tbl.place or + table.place = table.place or {name = "default_place_node", gain = 1.0} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_glass_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or +function default.node_sound_glass_defaults(table) + table = table or {} + table.footstep = table.footstep or {name = "default_glass_footstep", gain = 0.3} - tbl.dig = tbl.dig or + table.dig = table.dig or {name = "default_glass_footstep", gain = 0.5} - tbl.dug = tbl.dug or + table.dug = table.dug or {name = "default_break_glass", gain = 1.0} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_ice_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or - {name = "default_ice_footstep", gain = 0.15} - tbl.dig = tbl.dig or - {name = "default_ice_dig", gain = 0.5} - tbl.dug = tbl.dug or - {name = "default_ice_dug", gain = 0.5} - default.node_sound_defaults(tbl) - return tbl -end - -function default.node_sound_metal_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or - {name = "default_metal_footstep", gain = 0.2} - tbl.dig = tbl.dig or +function default.node_sound_metal_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_metal_footstep", gain = 0.4} + table.dig = table.dig or {name = "default_dig_metal", gain = 0.5} - tbl.dug = tbl.dug or + table.dug = table.dug or {name = "default_dug_metal", gain = 0.5} - tbl.place = tbl.place or + table.place = table.place or {name = "default_place_node_metal", gain = 0.5} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_water_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or +function default.node_sound_water_defaults(table) + table = table or {} + table.footstep = table.footstep or {name = "default_water_footstep", gain = 0.2} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end -function default.node_sound_snow_defaults(tbl) - tbl = tbl or {} - tbl.footstep = tbl.footstep or +function default.node_sound_snow_defaults(table) + table = table or {} + table.footstep = table.footstep or {name = "default_snow_footstep", gain = 0.2} - tbl.dig = tbl.dig or + table.dig = table.dig or {name = "default_snow_footstep", gain = 0.3} - tbl.dug = tbl.dug or + table.dug = table.dug or {name = "default_snow_footstep", gain = 0.3} - tbl.place = tbl.place or + table.place = table.place or {name = "default_place_node", gain = 1.0} - default.node_sound_defaults(tbl) - return tbl + default.node_sound_defaults(table) + return table end @@ -159,7 +141,7 @@ default.cool_lava = function(pos, node) minetest.set_node(pos, {name = "default:stone"}) end minetest.sound_play("default_cool_lava", - {pos = pos, max_hear_distance = 16, gain = 0.2}, true) + {pos = pos, max_hear_distance = 16, gain = 0.25}, true) end if minetest.settings:get_bool("enable_lavacooling") ~= false then @@ -293,32 +275,15 @@ minetest.register_abm({ -- Dig upwards -- -local in_dig_up = false - -function default.dig_up(pos, node, digger, max_height) - if in_dig_up then return end -- Do not recurse +function default.dig_up(pos, node, digger) if digger == nil then return end - max_height = max_height or 100 - - in_dig_up = true - for y = 1, max_height do - local up_pos = vector.offset(pos, 0, y, 0) - local up_node = minetest.get_node(up_pos) - if up_node.name ~= node.name then - break - end - if not minetest.node_dig(up_pos, up_node, digger) then - break - end + local np = {x = pos.x, y = pos.y + 1, z = pos.z} + local nn = minetest.get_node(np) + if nn.name == node.name then + minetest.node_dig(np, nn, digger) end - in_dig_up = false end --- errors are hard to handle, instead we rely on resetting this value the next step -minetest.register_globalstep(function() - in_dig_up = false -end) - -- -- Fence registration helper @@ -326,6 +291,14 @@ end) local fence_collision_extra = minetest.settings:get_bool("enable_fence_tall") and 3/8 or 0 function default.register_fence(name, def) + minetest.register_craft({ + output = name .. " 4", + recipe = { + { def.material, 'group:stick', def.material }, + { def.material, 'group:stick', def.material }, + } + }) + local fence_texture = "default_fence_overlay.png^" .. def.texture .. "^default_fence_overlay.png^[makealpha:255,126,126" -- Allow almost everything to be overridden @@ -373,22 +346,10 @@ function default.register_fence(name, def) -- Always add to the fence group, even if no group provided def.groups.fence = 1 - local material = def.material def.texture = nil def.material = nil minetest.register_node(name, def) - - -- Register crafting recipe, trim away starting colon if any - if not material then return end - name = string.gsub(name, "^:", "") - minetest.register_craft({ - output = name .. " 4", - recipe = { - { material, 'group:stick', material }, - { material, 'group:stick', material }, - } - }) end @@ -397,6 +358,15 @@ end -- function default.register_fence_rail(name, def) + minetest.register_craft({ + output = name .. " 16", + recipe = { + { def.material, def.material }, + { "", ""}, + { def.material, def.material }, + } + }) + local fence_rail_texture = "default_fence_rail_overlay.png^" .. def.texture .. "^default_fence_rail_overlay.png^[makealpha:255,126,126" -- Allow almost everything to be overridden @@ -445,75 +415,12 @@ function default.register_fence_rail(name, def) -- Always add to the fence group, even if no group provided def.groups.fence = 1 - local material = def.material def.texture = nil def.material = nil minetest.register_node(name, def) - - -- Register crafting recipe, trim away starting colon if any - if not material then return end - name = string.gsub(name, "^:", "") - minetest.register_craft({ - output = name .. " 16", - recipe = { - { material, material }, - { "", ""}, - { material, material }, - } - }) end --- --- Mese post registration helper --- - -function default.register_mesepost(name, def) - local post_texture = def.texture .. "^default_mese_post_light_side.png^[makealpha:0,0,0" - local post_texture_dark = def.texture .. "^default_mese_post_light_side_dark.png^[makealpha:0,0,0" - -- Allow almost everything to be overridden - local default_fields = { - wield_image = post_texture, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-2 / 16, -8 / 16, -2 / 16, 2 / 16, 8 / 16, 2 / 16}, - }, - }, - paramtype = "light", - tiles = {def.texture, def.texture, post_texture_dark, post_texture_dark, post_texture, post_texture}, - use_texture_alpha = "opaque", - light_source = default.LIGHT_MAX, - sunlight_propagates = true, - is_ground_content = false, - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = default.node_sound_wood_defaults(), - } - for k, v in pairs(default_fields) do - if def[k] == nil then - def[k] = v - end - end - - local material = def.material - def.texture = nil - def.material = nil - - minetest.register_node(name, def) - - -- Register crafting recipe, trim away starting colon if any - if not material then return end - name = string.gsub(name, "^:", "") - minetest.register_craft({ - output = name .. " 4", - recipe = { - {'', 'default:glass', ''}, - {'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'}, - {'', material, ''}, - } - }) -end -- -- Leafdecay @@ -645,11 +552,10 @@ minetest.register_abm({ -- Snow check is cheapest, so comes first if name == "default:snow" then minetest.set_node(pos, {name = "default:dirt_with_snow"}) - -- The group grass is also present in dry grass, so check dry grass first - elseif minetest.get_item_group(name, "dry_grass") ~= 0 then - minetest.set_node(pos, {name = "default:dirt_with_dry_grass"}) elseif minetest.get_item_group(name, "grass") ~= 0 then minetest.set_node(pos, {name = "default:dirt_with_grass"}) + elseif minetest.get_item_group(name, "dry_grass") ~= 0 then + minetest.set_node(pos, {name = "default:dirt_with_dry_grass"}) end end }) @@ -745,54 +651,6 @@ 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 - -local nop = function() end -function default.set_inventory_action_loggers(def, name) - local on_move = def.on_metadata_inventory_move or nop - 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) - return on_move(pos, from_list, from_index, to_list, to_index, count, player) - end - local on_put = def.on_metadata_inventory_put or nop - def.on_metadata_inventory_put = function(pos, listname, index, stack, player) - default.log_player_action(player, "moves", stack:get_name(), stack:get_count(), "to", name, "at", pos) - return on_put(pos, listname, index, stack, player) - end - local on_take = def.on_metadata_inventory_take or nop - def.on_metadata_inventory_take = function(pos, listname, index, stack, player) - default.log_player_action(player, "takes", stack:get_name(), stack:get_count(), "from", name, "at", pos) - return on_take(pos, listname, index, stack, player) - end -end -- -- NOTICE: This method is not an official part of the API yet. @@ -821,7 +679,7 @@ function default.can_interact_with_node(player, pos) local key_meta = item:get_meta() if key_meta:get_string("secret") == "" then - local key_oldmeta = item:get_meta():get_string("") + local key_oldmeta = item:get_metadata() if key_oldmeta == "" or not minetest.parse_json(key_oldmeta) then return false end diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua index 530fd5fe..3c4ac9c8 100644 --- a/mods/default/furnace.lua +++ b/mods/default/furnace.lua @@ -3,9 +3,6 @@ -- support for MT game translation. local S = default.get_translator --- List of sound handles for active furnace -local furnace_fire_sounds = {} - -- -- Formspecs -- @@ -94,17 +91,6 @@ 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 @@ -127,14 +113,10 @@ local function furnace_node_timer(pos, elapsed) local srclist, fuellist local dst_full = false - local timer_elapsed = meta:get_int("timer_elapsed") or 0 - meta:set_int("timer_elapsed", timer_elapsed + 1) - local cookable, cooked local fuel local update = true - local items_smelt = 0 while elapsed > 0 and update do update = false @@ -172,7 +154,6 @@ local function furnace_node_timer(pos, elapsed) else dst_full = true end - items_smelt = items_smelt + 1 else -- Item could not be cooked: probably missing fuel update = true @@ -190,15 +171,8 @@ local function furnace_node_timer(pos, elapsed) fuel_totaltime = 0 src_time = 0 else - -- prevent blocking of fuel inventory (for automatization mods) - local is_fuel = minetest.get_craft_result({method = "fuel", width = 1, items = {afterfuel.items[1]:to_string()}}) - if is_fuel.time == 0 then - table.insert(fuel.replacements, afterfuel.items[1]) - inv:set_stack("fuel", 1, "") - else - -- Take fuel from fuel list - inv:set_stack("fuel", 1, afterfuel.items[1]) - end + -- Take fuel from fuel list + inv:set_stack("fuel", 1, afterfuel.items[1]) -- Put replacements in dst list or drop them on the furnace. local replacements = fuel.replacements if replacements[1] then @@ -223,11 +197,6 @@ local function furnace_node_timer(pos, elapsed) elapsed = elapsed - el end - if items_smelt > 0 then - -- Play cooling sound - minetest.sound_play("default_cool_lava", - { pos = pos, max_hear_distance = 16, gain = 0.07 * math.min(items_smelt, 7) }, true) - end if fuel and fuel_totaltime > fuel.time then fuel_totaltime = fuel.time end @@ -268,33 +237,6 @@ local function furnace_node_timer(pos, elapsed) swap_node(pos, "default:furnace_active") -- make sure timer restarts automatically result = true - - -- Play sound every 5 seconds while the furnace is active - if timer_elapsed == 0 or (timer_elapsed + 1) % 5 == 0 then - local sound_id = minetest.sound_play("default_furnace_active", - {pos = pos, max_hear_distance = 16, gain = 0.25}) - local hash = minetest.hash_node_position(pos) - furnace_fire_sounds[hash] = furnace_fire_sounds[hash] or {} - table.insert(furnace_fire_sounds[hash], sound_id) - -- Only remember the 3 last sound handles - if #furnace_fire_sounds[hash] > 3 then - table.remove(furnace_fire_sounds[hash], 1) - end - -- Remove the sound ID automatically from table after 11 seconds - minetest.after(11, function() - if not furnace_fire_sounds[hash] then - return - end - for f=#furnace_fire_sounds[hash], 1, -1 do - if furnace_fire_sounds[hash][f] == sound_id then - table.remove(furnace_fire_sounds[hash], f) - end - end - if #furnace_fire_sounds[hash] == 0 then - furnace_fire_sounds[hash] = nil - end - end) - end else if fuellist and not fuellist[1]:is_empty() then fuel_state = S("@1%", 0) @@ -303,9 +245,6 @@ local function furnace_node_timer(pos, elapsed) swap_node(pos, "default:furnace") -- stop timer on the inactive furnace minetest.get_node_timer(pos):stop() - meta:set_int("timer_elapsed", 0) - - stop_furnace_sound(pos) end @@ -333,12 +272,7 @@ end -- Node definitions -- -local function apply_logger(def) - default.set_inventory_action_loggers(def, "furnace") - return def -end - -minetest.register_node("default:furnace", apply_logger({ +minetest.register_node("default:furnace", { description = S("Furnace"), tiles = { "default_furnace_top.png", "default_furnace_bottom.png", @@ -371,10 +305,6 @@ minetest.register_node("default:furnace", apply_logger({ -- start timer function, it will sort out whether furnace can burn or not. minetest.get_node_timer(pos):start(1.0) end, - on_metadata_inventory_take = function(pos) - -- check whether the furnace is empty or not. - minetest.get_node_timer(pos):start(1.0) - end, on_blast = function(pos) local drops = {} default.get_inventory_drops(pos, "src", drops) @@ -388,16 +318,16 @@ minetest.register_node("default:furnace", apply_logger({ allow_metadata_inventory_put = allow_metadata_inventory_put, allow_metadata_inventory_move = allow_metadata_inventory_move, allow_metadata_inventory_take = allow_metadata_inventory_take, -})) +}) -minetest.register_node("default:furnace_active", apply_logger({ +minetest.register_node("default:furnace_active", { description = S("Furnace"), tiles = { "default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png", { - name = "default_furnace_front_active.png", + image = "default_furnace_front_active.png", backface_culling = false, animation = { type = "vertical_frames", @@ -415,16 +345,13 @@ minetest.register_node("default:furnace_active", apply_logger({ 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, allow_metadata_inventory_put = allow_metadata_inventory_put, allow_metadata_inventory_move = allow_metadata_inventory_move, allow_metadata_inventory_take = allow_metadata_inventory_take, -})) +}) minetest.register_craft({ output = "default:furnace", diff --git a/mods/default/init.lua b/mods/default/init.lua index 649b5c00..d4388e5f 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -1,4 +1,4 @@ --- Minetest Game mod: default +-- Minetest 0.4 mod: default -- See README.txt for licensing and other information. -- The API documentation in here was moved into game_api.txt @@ -12,17 +12,6 @@ default = {} default.LIGHT_MAX = 14 default.get_translator = S --- Check for engine features required by MTG --- This provides clear error behaviour when MTG is newer than the installed engine --- and avoids obscure, hard to debug runtime errors. --- This section should be updated before release and older checks can be dropped --- when newer ones are introduced. -if 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") -end - -- GUI related stuff minetest.register_on_joinplayer(function(player) -- Set formspec prepend @@ -77,19 +66,3 @@ dofile(default_path.."/crafting.lua") dofile(default_path.."/mapgen.lua") dofile(default_path.."/aliases.lua") dofile(default_path.."/legacy.lua") - --- Smoke test that is run via ./util/test/run.sh -if minetest.settings:get_bool("minetest_game_smoke_test") then - minetest.after(0, function() - minetest.emerge_area(vector.new(0, 0, 0), vector.new(32, 32, 32)) - local pos = vector.new(9, 9, 9) - local function check() - if minetest.get_node(pos).name ~= "ignore" then - minetest.request_shutdown() - return - end - minetest.after(0, check) - end - check() - end) -end diff --git a/mods/default/item_entity.lua b/mods/default/item_entity.lua index 824f0f0d..d9bf7b19 100644 --- a/mods/default/item_entity.lua +++ b/mods/default/item_entity.lua @@ -2,38 +2,9 @@ local builtin_item = minetest.registered_entities["__builtin:item"] --- strictly speaking none of this is part of the API, so do some checks --- and if it looks wrong skip the modifications -if not builtin_item or type(builtin_item.set_item) ~= "function" or type(builtin_item.on_step) ~= "function" then - minetest.log("warning", "Builtin item entity does not look as expected, skipping overrides.") - return -end - -local smoke_particles = { - amount = 3, - time = 0.1, - minpos = vector.new(-0.1, -0.1, -0.1), - maxpos = vector.new(0.1, 0.1, 0.1), - minvel = vector.new(0, 2.5, 0), - maxvel = vector.new(0, 2.5, 0), - minacc = vector.new(-0.15, -0.02, -0.15), - maxacc = vector.new(0.15, -0.01, 0.15), - minexptime = 4, - maxexptime = 6, - minsize = 5, - maxsize = 5, - collisiondetection = true, - texture = { - name = "default_item_smoke.png" - } -} -if minetest.features.particle_blend_clip then - smoke_particles.texture.blend = "clip" -end - local item = { - set_item = function(self, itemstring, ...) - builtin_item.set_item(self, itemstring, ...) + set_item = function(self, itemstring) + builtin_item.set_item(self, itemstring) local stack = ItemStack(itemstring) local itemdef = minetest.registered_items[stack:get_name()] @@ -48,13 +19,24 @@ local item = { self.object:remove() minetest.sound_play("default_item_smoke", { pos = p, - gain = 1.0, max_hear_distance = 8, }, true) - local ps = table.copy(smoke_particles) - ps.minpos = vector.add(ps.minpos, p) - ps.maxpos = vector.add(ps.maxpos, p) - minetest.add_particlespawner(ps) + minetest.add_particlespawner({ + amount = 3, + time = 0.1, + minpos = {x = p.x - 0.1, y = p.y + 0.1, z = p.z - 0.1 }, + maxpos = {x = p.x + 0.1, y = p.y + 0.2, z = p.z + 0.1 }, + minvel = {x = 0, y = 2.5, z = 0}, + maxvel = {x = 0, y = 2.5, z = 0}, + minacc = {x = -0.15, y = -0.02, z = -0.15}, + maxacc = {x = 0.15, y = -0.01, z = 0.15}, + minexptime = 4, + maxexptime = 6, + minsize = 5, + maxsize = 5, + collisiondetection = true, + texture = "default_item_smoke.png" + }) end, on_step = function(self, dtime, ...) @@ -92,5 +74,5 @@ local item = { } -- set defined item as new __builtin:item, with the old one as fallback table -setmetatable(item, { __index = builtin_item }) +setmetatable(item, builtin_item) minetest.register_entity(":__builtin:item", item) diff --git a/mods/default/license.txt b/mods/default/license.txt index 625f0f86..3c95c1b4 100644 --- a/mods/default/license.txt +++ b/mods/default/license.txt @@ -3,7 +3,7 @@ License of source code GNU Lesser General Public License, version 2.1 Copyright (C) 2011-2018 celeron55, Perttu Ahola -Copyright (C) 2011-2018 Various Minetest Game developers and contributors +Copyright (C) 2011-2018 Various Minetest developers and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; @@ -19,7 +19,7 @@ Licenses of media (textures, models and sounds) ----------------------------------------------- Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2010-2023: +Copyright (C) 2010-2018: celeron55, Perttu Ahola Cisoun @@ -52,7 +52,6 @@ Copyright (C) 2010-2023: random-geek Extex101 An0n3m0us - Lopano You are free to: Share — copy and redistribute the material in any medium or format. diff --git a/mods/default/locale/default.bg.tr b/mods/default/locale/default.bg.tr deleted file mode 100755 index 12598158..00000000 --- a/mods/default/locale/default.bg.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=Заключен сандък -Locked Chest (owned by @1)=Заключен сандък (собственост на @1) -You do not own this chest.=Не притежавате този сандък. -a locked chest=заключен сандък -Chest=Сандък -Write=Четене -Read=Писане -Title:=Заглавие: -Contents:=Съдържание: -Save=Запазване -by @1=от @1 -Page @1 of @2=Страница @1 от @2 -The book you were writing to mysteriously disappeared.=Книгата, в която пишехте мистериозно изчезна. -"@1" by @2=„@1“ от @2 -Blueberries=Боровинки -Book=Книга -Book with Text=Книга с текстове -Bronze Ingot=Бронзово кюлче -Clay Brick=Калена тухла -Clay Lump=Купчина глина -Coal Lump=Купчина въглища -Copper Ingot=Медно кюлче -Copper Lump=Купчина мед -Diamond=Диамант -Flint=Кремък -Gold Ingot=Златно кюлче -Gold Lump=Купчина злато -Iron Lump=Желязно кюлче -Mese Crystal=Кристал месе -Mese Crystal Fragment=Парче от кристал месе -Obsidian Shard=Късче обсидиан -Paper=Хартия -Steel Ingot=Стоманено кюлче -Stick=Пръчка -Tin Ingot=Калаено кюлче -Tin Lump=Купчина калай -Furnace is empty=Фурната е празна -100% (output full)=100% (изходът е пълен) -@1%=@1% -Not cookable=Това не се готви -Empty=Празно -Furnace active=Фурната работи -Furnace inactive=Фурната не работи -(Item: @1; Fuel: @2)=(Предмет: @1; гориво: @2) -Furnace=Фурна -Stone=Камък -Cobblestone=Паваж -Stone Brick=Каменна тухла -Stone Block=Каменно блокче -Mossy Cobblestone=Паваж покрит с мъх -Desert Stone=Пустинен камък -Desert Cobblestone=Пустинен паваж -Desert Stone Brick=Тухла от пустинен камък -Desert Stone Block=Блокче от пустинен камък -Sandstone=Пясъчник -Sandstone Brick=Тухла от пясъчник -Sandstone Block=Блокче от пясъчник -Desert Sandstone=Пустинен пясъчник -Desert Sandstone Brick=Тухла от пустинен пясъчник -Desert Sandstone Block=Блокче от пустинен пясъчник -Silver Sandstone=Сребърен пясъчник -Silver Sandstone Brick=Тухла от сребърен пясъчник -Silver Sandstone Block=Блокче от сребърен пясъчник -Obsidian=Обсидиан -Obsidian Brick=Тухла от обсидиан -Obsidian Block=Блокче от обсидиан -Dirt=Почва -Dirt with Grass=Почва с трева -Dirt with Grass and Footsteps=Почва с трева и стъпки -Dirt with Savanna Grass=Почва с трева от саваната -Dirt with Snow=Почва със сняг -Dirt with Rainforest Litter=Почва с растителна маса от тропическа гора -Dirt with Coniferous Litter=Почва с растителна маса от иглолистна гора -Savanna Dirt=Почва от саваната -Savanna Dirt with Savanna Grass=Почва от саваната с трева от саваната -Permafrost=Вечно замръзнала почва -Permafrost with Stones=Вечно замръзнала почва с камъни -Permafrost with Moss=Вечно замръзнала почва с мъх -Sand=Пясък -Desert Sand=Пустинен пясък -Silver Sand=Сребърен пясък -Gravel=Чакъл -Clay=Глина -Snow=Сняг -Snow Block=Блокче сняг -Ice=Лед -Cave Ice=Блокче лед -Apple Tree=Ябълково дърво -Apple Wood Planks=Дъски от ябълково дърво -Apple Tree Sapling=Фиданка от ябълково дърво -Apple Tree Leaves=Листа на ябълково дърво -Apple=Ябълка -Apple Marker=Маркер на ябълка -Jungle Tree=Боабаб -Jungle Wood Planks=Дъски от боабаб -Jungle Tree Leaves=Листа на боабаб -Jungle Tree Sapling=Фиданка от боабаб -Emergent Jungle Tree Sapling=Покълнала фиданка от боабаб -Pine Tree=Борово дърво -Pine Wood Planks=Дъски от борово дърво -Pine Needles=Борови иглички -Pine Tree Sapling=Фиданка от борово дърво -Acacia Tree=Акациево дърво -Acacia Wood Planks=Дъски от акациево дърво -Acacia Tree Leaves=Листа на акациево дърво -Acacia Tree Sapling=Фиданка от акациево дърво -Aspen Tree=Трепетликово дърво -Aspen Wood Planks=Дъски от трепетликово дърво -Aspen Tree Leaves=Листа на трепетликово дърво -Aspen Tree Sapling=Фиданка от трепетликово дърво -Coal Ore=Въглищна руда -Coal Block=Блокче въглища -Iron Ore=Желязна руда -Steel Block=Стеманено блокче -Copper Ore=Медна руда -Copper Block=Медно блокче -Tin Ore=Калаена руда -Tin Block=Калаено блокче -Bronze Block=Бронзово блокче -Mese Ore=Руда за месе -Mese Block=Блокче от месе -Gold Ore=Златна руда -Gold Block=Златно блокче -Diamond Ore=Диамантена руда -Diamond Block=Диамантено блокче -Cactus=Кактус -Large Cactus Seedling=Семена на голям кактус -Papyrus=Папирус -Dry Shrub=Сух храст -Jungle Grass=Трева от джунглата -Grass=Трева -Savanna Grass=Трева от саваната -Fern=Папрат -Marram Grass=Пясъчна трева -Bush Stem=Ствол на храст -Bush Leaves=Листа на храст -Bush Sapling=Фиданка на храст -Blueberry Bush Leaves with Berries=Листа на боровинков храст с боровинки -Blueberry Bush Leaves=Листа на боровинков храст -Blueberry Bush Sapling=Фиданка на боровинков храст -Acacia Bush Stem=Ствол на акациев храст -Acacia Bush Leaves=Листа на акациев храст -Acacia Bush Sapling=Фиданка на акациев храст -Pine Bush Stem=Ствол на боров храст -Pine Bush Needles=Бодлички на боров храст -Pine Bush Sapling=Фиданка на борох храст -Kelp=Водорасли -Green Coral=Зелен корал -Pink Coral=Розов корал -Cyan Coral=Син корал -Brown Coral=Кафяв корал -Orange Coral=Оранжев корал -Coral Skeleton=Скелет на корал -Water Source=Източник на вода -Flowing Water=Течаща вода -River Water Source=Източник на речна вода -Flowing River Water=Течаща речна вода -Lava Source=Източник на лава -Flowing Lava=Течаща лава -Empty Bookshelf=Празна библиотека -Bookshelf (@1 written, @2 empty books)=Библиотека (@1 написани, @2 празни книги) -Bookshelf=Библиотека -Text too long=Текстът е двърде дълъг -"@1"=„@1“ -Wooden Sign=Дървен знак -Steel Sign=Стоманен знак -Wooden Ladder=Дървена стълба -Steel Ladder=Стоманена стълба -Apple Wood Fence=Ограда от ябълково дърво -Acacia Wood Fence=Ограда от акациево дърво -Jungle Wood Fence=Ограда от боабаб -Pine Wood Fence=Ограда от борово дърво -Aspen Wood Fence=Ограда от трепетликово дърво -Apple Wood Fence Rail=Парапет от ябълково дърво -Acacia Wood Fence Rail=Парапет от акациево дърво -Jungle Wood Fence Rail=Парапет от боабаб -Pine Wood Fence Rail=Парапет от борово дърво -Aspen Wood Fence Rail=Парапет от трепетликово дърво -Glass=Стъкло -Obsidian Glass=Обсидианово стъкло -Brick Block=Блокче от тухли -Mese Lamp=Лампа от кристал месе -Apple Wood Mese Post Light=Поставка за лампа с месе от ябълково дърво -Acacia Wood Mese Post Light=Поставка за лампа с месе от акациево дърво -Jungle Wood Mese Post Light=Поставка за лампа с месе от боабаб -Pine Wood Mese Post Light=Поставка за лампа с месе от борово дърво -Aspen Wood Mese Post Light=Поставка за лампа с месе от трепетликово дърво -Cloud=Облак -Wooden Pickaxe=Дървена кирка -Stone Pickaxe=Каменна кирка -Bronze Pickaxe=Бронзова кирка -Steel Pickaxe=Стоманена кирка -Mese Pickaxe=Кирка от кристала месе -Diamond Pickaxe=Диамантена кирка -Wooden Shovel=Дървена лопата -Stone Shovel=Каменна лопата -Bronze Shovel=Бронзова лопата -Steel Shovel=Стоманена лопата -Mese Shovel=Лопата от кристала месе -Diamond Shovel=Диамантена лопата -Wooden Axe=Дървена брадва -Stone Axe=Каменна брадва -Bronze Axe=Бронзова брадва -Steel Axe=Стоманена брадва -Mese Axe=Брадва от кристала месе -Diamond Axe=Диамантена брадва -Wooden Sword=Дървен меч -Stone Sword=Каменен меч -Bronze Sword=Бронзов меч -Steel Sword=Стоманен меч -Mese Sword=Меч от кристала месе -Diamond Sword=Диамантен меч -Torch=Факел -@1 will intersect protection on growth.=@1 ще наруши защитата при израстване. diff --git a/mods/default/locale/default.de.tr b/mods/default/locale/default.de.tr index cb0ec1eb..9a3b8bdb 100644 --- a/mods/default/locale/default.de.tr +++ b/mods/default/locale/default.de.tr @@ -4,42 +4,36 @@ Locked Chest (owned by @1)=Abgeschlossene Truhe (Eigentum von @1) You do not own this chest.=Ihnen gehört diese Truhe nicht. a locked chest=eine abgeschlossene Truhe Chest=Truhe -Write=Schreiben -Read=Lesen -Title:=Titel: -Contents:=Inhalt: -Save=Speichern -by @1=von @1 -Page @1 of @2=Seite @1 von @2 -The book you were writing to mysteriously disappeared.=Das Buch, an dem Sie geschrieben haben, ist auf mysteriöse Weise verschwunden. +Stick=Stock +Paper=Papier "@1" by @2=„@1“ von @2 -Blueberries=Blaubeeren Book=Buch Book with Text=Buch mit Text -Bronze Ingot=Bronzebarren -Clay Brick=Tonziegel -Clay Lump=Tonklumpen +Skeleton Key=Skelettschlüssel +Key to @1's @2=Schlüssel für @2 von @1 Coal Lump=Kohleklumpen -Copper Ingot=Kupferbarren -Copper Lump=Kupferklumpen -Diamond=Diamant -Flint=Feuerstein -Gold Ingot=Goldbarren -Gold Lump=Goldklumpen Iron Lump=Eisenklumpen -Mese Crystal=Mesekristall -Mese Crystal Fragment=Mesekristallfragment -Obsidian Shard=Obsidianscherbe -Paper=Papier -Steel Ingot=Stahlbarren -Stick=Stock -Tin Ingot=Zinnbarren +Copper Lump=Kupferklumpen Tin Lump=Zinnklumpen +Mese Crystal=Mesekristall +Gold Lump=Goldklumpen +Diamond=Diamant +Clay Lump=Tonklumpen +Steel Ingot=Stahlbarren +Copper Ingot=Kupferbarren +Tin Ingot=Zinnbarren +Bronze Ingot=Bronzebarren +Gold Ingot=Goldbarren +Mese Crystal Fragment=Mesekristallfragment +Clay Brick=Tonziegel +Obsidian Shard=Obsidianscherbe +Flint=Feuerstein +Blueberries=Blaubeeren Furnace is empty=Ofen ist leer 100% (output full)=100% (Ausgabe voll) @1%=@1% -Not cookable=Nicht kochbar Empty=Leer +Not cookable=Nicht kochbar Furnace active=Ofen aktiv Furnace inactive=Ofen inaktiv (Item: @1; Fuel: @2)=(Gegenstand: @1; Brennstoff: @2) @@ -48,7 +42,7 @@ Stone=Stein Cobblestone=Kopfsteinpflaster Stone Brick=Steinziegel Stone Block=Steinblock -Mossy Cobblestone=Moosiges Kopfsteinpflaster +Mossy Cobblestone=Mosiges Kopfsteinpflaster Desert Stone=Wüstenstein Desert Cobblestone=Wüstenkopfsteinpflaster Desert Stone Brick=Wüstensteinziegel @@ -108,7 +102,7 @@ Acacia Tree Sapling=Akazienbaumsetzling Aspen Tree=Espenbaum Aspen Wood Planks=Espenholzplanken Aspen Tree Leaves=Espenbaumblätter -Aspen Tree Sapling=Espenbaumsetzling +Aspen Tree Sapling=Esepenbaumsetzling Coal Ore=Kohleerz Coal Block=Kohleblock Iron Ore=Eisenerz @@ -162,7 +156,6 @@ Empty Bookshelf=Leeres Bücherregal Bookshelf (@1 written, @2 empty books)=Bücherregal (@1 beschriebene, @2 leere Bücher) Bookshelf=Bücherregal Text too long=Text zu lang -"@1"=„@1“ Wooden Sign=Holzschild Steel Sign=Stahlschild Wooden Ladder=Holzleiter @@ -181,11 +174,7 @@ Glass=Glas Obsidian Glass=Obsidianglas Brick Block=Ziegelblock Mese Lamp=Meselampe -Apple Wood Mese Post Light=Apfelholzmesestandlampe -Acacia Wood Mese Post Light=Akazienholzmesestandlampe -Jungle Wood Mese Post Light=Dschungelholzmesestandlampe -Pine Wood Mese Post Light=Kiefernholzmesestandlampe -Aspen Wood Mese Post Light=Espenholzmesestandlampe +Mese Post Light=Mesestandlampe Cloud=Wolke Wooden Pickaxe=Holzspitzhacke Stone Pickaxe=Steinspitzhacke @@ -211,10 +200,12 @@ Bronze Sword=Bronzeschwert Steel Sword=Stahlschwert Mese Sword=Meseschwert Diamond Sword=Diamantschwert +Key=Schlüssel Torch=Fackel @1 will intersect protection on growth.=@1 wird bei Wachstum mit geschützter Zone überlappen. - - -##### not used anymore ##### - -Mese Post Light=Mesestandlampe +Title:=Titel: +Contents:=Inhalt: +Save=Speichern +by @1=von @1 +Page @1 of @2=Seite @1 von @2 +"@1"=„@1“ diff --git a/mods/default/locale/default.eo.tr b/mods/default/locale/default.eo.tr deleted file mode 100644 index 8454c6dc..00000000 --- a/mods/default/locale/default.eo.tr +++ /dev/null @@ -1,220 +0,0 @@ -# textdomain: default -Locked Chest=Ŝlosita kesto -Locked Chest (owned by @1)=Ŝlosita kesto (de @1) -You do not own this chest.=Vi ne posedas ĉi tiun keston. -a locked chest=ŝlosita kesto -Chest=Kesto -Write=Skribi -Read=Legi -Title:=Titolo: -Contents:=Enhavo: -Save=Konservi -by @1=per @1 -Page @1 of @2=Paĝo @1 el @2 -The book you were writing to mysteriously disappeared.=La libro, kiun vi skribis, mistere malaperis. -"@1" by @2="@1" per @2 -Blueberries=Mirteloj -Book=Libro -Book with Text=Libro kun teksto -Bronze Ingot=Bronza ingoto -Clay Brick=Argila briko -Clay Lump=Argila bulo -Coal Lump=Karba bulo -Copper Ingot=Kupra ingoto -Copper Lump=Kupra bulo -Diamond=Diamanto -Flint=Siliko -Gold Ingot=Ora ingoto -Gold Lump=Ora bulo -Iron Lump=Fera bulo -Mese Crystal=Mesea kristalo -Mese Crystal Fragment=Mesea kristala ero -Obsidian Shard=Obsidiana peceto -Paper=Papero -Steel Ingot=Ŝtala ingoto -Stick=Bastono -Tin Ingot=Stana ingoto -Tin Lump=Stana bulo -Furnace is empty=Forno estas malplena -100% (output full)=100% (plena eligo) -@1%=@1% -Not cookable=Nekuirebla -Empty=Malplena -Furnace active=Forno laboras -Furnace inactive=Forno ne laboras -(Item: @1; Fuel: @2)=(Objekto: @1; Brulaĵo: @2) -Furnace=Forno -Stone=Ŝtono -Cobblestone=Pavimŝtono -Stone Brick=Ŝtona briko -Stone Block=Ŝtona 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 bloko -Sandstone=Sablaŝtono -Sandstone Brick=Sablaŝtono briko -Sandstone Block=Sablaŝtono bloko -Desert Sandstone=Dezerta sablaŝtono -Desert Sandstone Brick=Dezerta sablaŝtono briko -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 bloko -Obsidian=Obsidiano -Obsidian Brick=Obsidiana briko -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 koniferaj folioj -Savanna Dirt=Savana tero -Savanna Dirt with Savanna Grass=Savana tero kun savana herbo -Permafrost=Ĉiamfrosto -Permafrost with Stones=Ĉiamfrosto kun ŝtonoj -Permafrost with Moss=Ĉiamfrosto kun musko -Sand=Sablo -Desert Sand=Dezerta sablo -Silver Sand=Arĝenta sablo -Gravel=Gruzo -Clay=Argilo -Snow=Neĝo -Snow Block=Neĝa bloko -Ice=Glacio -Cave Ice=Kaverna glacio -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=Ĝ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=Pino -Pine Wood Planks=Pinaj lignaj tabuloj -Pine Needles=Pinpingloj -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 bloko -Iron Ore=Fera minaĵo -Steel Block=Ŝtala bloko -Copper Ore=Kupra minaĵo -Copper Block=Kupra bloko -Tin Ore=Stana minaĵo -Tin Block=Stana bloko -Bronze Block=Bronza bloko -Mese Ore=Mesea minaĵo -Mese Block=Mesea bloko -Gold Ore=Ora minaĵo -Gold Block=Ora bloko -Diamond Ore=Diamanta minaĵo -Diamond Block=Diamanta bloko -Cactus=Kakto -Large Cactus Seedling=Granda kakta kreskaĵo -Papyrus=Papiruso -Dry Shrub=Seka arbetaĵo -Jungle Grass=Ĝangala herbo -Grass=Herbo -Savanna Grass=Savana herbo -Fern=Filiko -Marram Grass=Amofilo -Bush Stem=Arbateĵa tubo -Bush Leaves=Arbateĵaj folioj -Bush Sapling=Arbateĵa arbido -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=Akaciaj arbateĵaj folioj -Acacia Bush Sapling=Akacia arbateĵa arbido -Pine Bush Stem=Pina arbateĵa tubo -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ĝkolora koralo -Coral Skeleton=Korala framo -Water Source=Akva fonto -Flowing Water=Flua akvo -River Water Source=Rivera akva fonto -Flowing River Water=Flua rivera akvo -Lava Source=Lafa fonto -Flowing Lava=Flua lafa -Empty Bookshelf=Malplena librobreto -Bookshelf (@1 written, @2 empty books)=Librobreto (@1 skriba(j), @2 malplena(j) libro(j)) -Bookshelf=Librobreto -Text too long=Tro longa teksto -"@1"= -Wooden Sign=Ligna signo -Steel Sign=Ŝtala signo -Wooden Ladder=Ligna ŝtupetaro -Steel Ladder=Ŝtala ŝtupetaro -Apple Wood Fence=Poma ligna barilo -Acacia Wood Fence=Akacia ligna barilo -Jungle Wood Fence=Ĝangala ligna barilo -Pine Wood Fence=Pina ligna barilo -Aspen Wood Fence=Tremola ligna barilo -Apple Wood Fence Rail=Poma ligna barila relo -Acacia Wood Fence Rail=Akacia ligna barila relo -Jungle Wood Fence Rail=Ĝangala ligna barila relo -Pine Wood Fence Rail=Pina ligna barila relo -Aspen Wood Fence Rail=Tremola ligna barila relo -Glass=Vitro -Obsidian Glass=Obsidiana vitro -Brick Block=Brika bloko -Mese Lamp=Mesea lampo -Apple Wood Mese Post Light=Poma ligna mesea fosta lampo -Acacia Wood Mese Post Light=Akacia ligna mesea fosta lampo -Jungle Wood Mese Post Light=Ĝangala ligna mesea fosta lampo -Pine Wood Mese Post Light=Pina ligna mesea fosta lampo -Aspen Wood Mese Post Light=Tremola ligna mesea fosta lampo -Cloud=Nubo -Wooden Pickaxe=Ligna pioĉo -Stone Pickaxe=Ŝtona pioĉo -Bronze Pickaxe=Bronza pioĉo -Steel Pickaxe=Ŝtala pioĉo -Mese Pickaxe=Mesea pioĉo -Diamond Pickaxe=Diamanta pioĉo -Wooden Shovel=Ligna fosilo -Stone Shovel=Ŝtona fosilo -Bronze Shovel=Bronza fosilo -Steel Shovel=Ŝtala fosilo -Mese Shovel=Mesea fosilo -Diamond Shovel=Diamanta fosilo -Wooden Axe=Ligna hakilo -Stone Axe=Ŝtona hakilo -Bronze Axe=Bronza hakilo -Steel Axe=Ŝtala hakilo -Mese Axe=Mesea hakilo -Diamond Axe=Diamanta hakilo -Wooden Sword=Ligna glavo -Stone Sword=Ŝtona glavo -Bronze Sword=Bronza glavo -Steel Sword=Ŝtala glavo -Mese Sword=Mesea glavo -Diamond Sword=Diamanta glavo -Torch=Torĉo -@1 will intersect protection on growth.=@1 sekcos protekton dum kresko. - - -##### not used anymore ##### - -Mese Post Light=Mesea fosta lampo diff --git a/mods/default/locale/default.es.tr b/mods/default/locale/default.es.tr index d08c2d2e..e55c1332 100644 --- a/mods/default/locale/default.es.tr +++ b/mods/default/locale/default.es.tr @@ -4,42 +4,36 @@ Locked Chest (owned by @1)=Cofre cerrado (propiedad de @1) You do not own this chest.=Este cofre no te pertenece. a locked chest=un cofre cerrado Chest=Cofre -Write= -Read= -Title:=Título: -Contents:=Contenidos: -Save=Guardar -by @1=por @1 -Page @1 of @2=Página @1 de @2 -The book you were writing to mysteriously disappeared.= +Stick=Palo +Paper=Papel "@1" by @2="@1" por @2 -Blueberries=Arándanos Book=Libro Book with Text=Libro escrito -Bronze Ingot=Lingote de bronce -Clay Brick=Ladrillo de arcilla -Clay Lump=Bola de arcilla -Coal Lump=Carbón -Copper Ingot=Lingote de cobre -Copper Lump=Pepita de cobre -Diamond=Diamante -Flint=Pedernal -Gold Ingot=Lingote de oro -Gold Lump=Pepita de oro +Skeleton Key=Llave esqueleto +Key to @1's @2=Llave para @2 de @1 +Coal Lump=Fragmento de carbón Iron Lump=Pepita de hierro -Mese Crystal=Cristal de mese -Mese Crystal Fragment=Fragmento de cristal de mese -Obsidian Shard=Esquirla de obsidiana -Paper=Papel -Steel Ingot=Lingote de acero -Stick=Palo -Tin Ingot=Lingote de estaño +Copper Lump=Pepita de cobre Tin Lump=Pepita de estaño +Mese Crystal=Cristal de mese +Gold Lump=Pepita de oro +Diamond=Diamante +Clay Lump=Fragmento de arcilla +Steel Ingot=Lingote de acero +Copper Ingot=Lingote de cobre +Tin Ingot=Lingote de estaño +Bronze Ingot=Lingote de bronce +Gold Ingot=Lingote de oro +Mese Crystal Fragment=Fragmento de cristal de mese +Clay Brick=Ladrillo de arcilla +Obsidian Shard=Esquirla de obsidiana +Flint=Pedernal +Blueberries=Arándanos Furnace is empty=El horno está vacío 100% (output full)=100% (salida completa) @1%=@1% -Not cookable=No se puede cocinar Empty=Vacío +Not cookable=No se puede cocinar Furnace active=Horno activado Furnace inactive=Horno desactivado (Item: @1; Fuel: @2)=(Objeto: @1; Combustible: @2) @@ -68,19 +62,19 @@ Obsidian Block=Bloque de obsidiana Dirt=Tierra Dirt with Grass=Tierra con pasto Dirt with Grass and Footsteps=Tierra con pasto y pisadas -Dirt with Savanna Grass=Tierra con hierba de sabana +Dirt with Dry Grass=Tierra con pasto seco Dirt with Snow=Tierra con nieve Dirt with Rainforest Litter=Tierra con hojarasca de selva tropical Dirt with Coniferous Litter=Tierra con hojarasca de coníferas -Savanna Dirt=Tierra de sabana -Savanna Dirt with Savanna Grass=Tierra de sabana con hierba de sabana +Dry Dirt=Tierra Seca +Dry Dirt with Dry Grass=Tierra seca con pasto seco Permafrost=Permafrost Permafrost with Stones=Permafrost pedregoso Permafrost with Moss=Permafrost musgoso Sand=Arena Desert Sand=Arena desértica Silver Sand=Arena plateada -Gravel=Grava +Gravel=Gravilla Clay=Arcilla Snow=Nieve Snow Block=Bloque de nieve @@ -130,7 +124,7 @@ Papyrus=Papiro Dry Shrub=Arbusto seco Jungle Grass=Pasto de jungla Grass=Pasto -Savanna Grass=Hierba de sabana +Dry Grass=Pasto seco Fern=Helecho Marram Grass=Carrizo Bush Stem=Tallo de arbusto @@ -162,7 +156,6 @@ Empty Bookshelf=Librería vacía Bookshelf (@1 written, @2 empty books)=Librería(@1 escritos, @2 libros en blanco) Bookshelf=Librería Text too long=Texto demasiado largo -"@1"="@1" Wooden Sign=Cartel de madera Steel Sign=Cartel de acero Wooden Ladder=Escalera de madera @@ -181,11 +174,7 @@ Glass=Vidrio Obsidian Glass=Vidrio de obsidiana Brick Block=Bloque de ladrillo Mese Lamp=Lámpara de mese -Apple Wood Mese Post Light=Poste de luz de madera de manzano -Acacia Wood Mese Post Light=Poste de luz de madera de acacia -Jungle Wood Mese Post Light=Poste de luz de madera de jungla -Pine Wood Mese Post Light=Poste de luz de madera de pino -Aspen Wood Mese Post Light=Poste de luz de madera de álamo +Mese Post Light=Poste de luz de mese Cloud=Nube Wooden Pickaxe=Pico de madera Stone Pickaxe=Pico de piedra @@ -211,14 +200,12 @@ Bronze Sword=Espada de bronce Steel Sword=Espada de acero Mese Sword=Espada de mese Diamond Sword=Espada de diamante +Key=Llave Torch=Antorcha @1 will intersect protection on growth.=@1 intersectará con protección cuando crezca. - - -##### not used anymore ##### - -Dirt with Dry Grass=Tierra con pasto seco -Dry Dirt=Tierra Seca -Dry Dirt with Dry Grass=Tierra seca con pasto seco -Dry Grass=Pasto seco -Mese Post Light=Poste de luz de mese +Title:=Título: +Contents:=Contenidos: +Save=Guardar +by @1=por @1 +Page @1 of @2=Página @1 de @2 +"@1"="@1" diff --git a/mods/default/locale/default.eu.tr b/mods/default/locale/default.eu.tr deleted file mode 100644 index e15b722c..00000000 --- a/mods/default/locale/default.eu.tr +++ /dev/null @@ -1,224 +0,0 @@ -# textdomain: default -Locked Chest=Itxitako kutxa -Locked Chest (owned by @1)=Itxitako kutxa (jabea: @1) -You do not own this chest.=Kutxa hau ez da zurea. -a locked chest=kutxa itxi bat -Chest=Kutxa -Write=Idatzi -Read=Irakurri -Title:=Izenburua: -Contents:=Edukiak: -Save=Gorde -by @1=@1 bidez -Page @1 of @2=@2 orritik @1a -The book you were writing to mysteriously disappeared.=Idazten ari zinen liburua modu misteriotsuan desagertu da. -"@1" by @2="@1" @2 bidez -Blueberries=Ahabiak -Book=Liburua -Book with Text=Liburu idatzia -Bronze Ingot=Brontzezko lingotea -Clay Brick=Buztinezko Adreilua -Clay Lump=Buztin zatia -Coal Lump=Ikatz zatia -Copper Ingot=Kobrezko lingotea -Copper Lump=Kobrezko zatia -Diamond=Diamantea -Flint=Suharria -Gold Ingot=Urrezko lingotea -Gold Lump=Urrezko zatia -Iron Lump=Burdinazko zatia -Mese Crystal=Mese kristala -Mese Crystal Fragment=Mese kristalaren zatia -Obsidian Shard=Obsidiana-eskirla -Paper=Papera -Steel Ingot=Altzairuzko lingotea -Stick=Makila -Tin Ingot=Eztainuzko lingotea -Tin Lump=Eztainuzko zatia -Furnace is empty=Labea hutsik dago -100% (output full)=% 100 (irteera osoa) -@1%=%@1 -Not cookable=Ezin da kozinatu -Empty=Hutsa -Furnace active=Labea aktibatuta -Furnace inactive=Labea desaktibatuta -(Item: @1; Fuel: @2)=(Objektua: @1; Erregaia: @2) -Furnace=Labea -Stone=Harria -Cobblestone=Galtzada-harria -Stone Brick=Harrizko Adreilua -Stone Block=Harrizko Blokea -Mossy Cobblestone=Goroldiodun Galtzada-harria -Desert Stone=Basamortuko harria -Desert Cobblestone=Basamortuko galtzada-harria -Desert Stone Brick=Basamortuko harrizko Adreilua -Desert Stone Block=Basamortuko harrizko Blokea -Sandstone=Hareharria -Sandstone Brick=Hareharrizko Adreilua -Sandstone Block=Hareharrizko Blokea -Desert Sandstone=Basamortuko Hareharria -Desert Sandstone Brick=Basamortuko hareharrizko Adreilua -Desert Sandstone Block=Basamortuko hareharrizko Blokea -Silver Sandstone=Zilar-koloreko Hareharria -Silver Sandstone Brick=Zilar koloreko hareharrizko Adreilua -Silver Sandstone Block=Zilar koloreko hareharrizko Blokea -Obsidian=Obsidiana -Obsidian Brick=Obsidianazko Adreilua -Obsidian Block=Obsidiana-Blokea -Dirt=Lurra -Dirt with Grass=Lurra belarrarekin -Dirt with Grass and Footsteps=Lurra belar eta oinatzekin -Dirt with Savanna Grass=Lurra sabana-belarrarekin -Dirt with Snow=Lurra elurrarekin -Dirt with Rainforest Litter=Lurra oihan tropikaleko orbelarekin -Dirt with Coniferous Litter=Lurra koniferoen orbelarekin -Savanna Dirt=Sabana-lurra -Savanna Dirt with Savanna Grass=Sabana-lurra sabana-belarrarekin -Permafrost=Permafrost -Permafrost with Stones=Permafrost harritsua -Permafrost with Moss=Goroldioa duen Permafrosta -Sand=Harea -Desert Sand=Basamortuko harea -Silver Sand=Zilar koloreko harea -Gravel=Legarra -Clay=Buztina -Snow=Elurra -Snow Block=Elur-Blokea -Ice=Izotza -Cave Ice=Haitzuloko Izotza -Apple Tree=Sagarrondo-zura -Apple Wood Planks=Sagarrondo-oholak -Apple Tree Sapling=Sagarrondo-kimua -Apple Tree Leaves=Sagarrondo-hostoak -Apple=Sagarra -Apple Marker=Sagarrondo-markatzailea -Jungle Tree=Zuhaitz tropikaleko egurra -Jungle Wood Planks=Egur tropikaleko oholak -Jungle Tree Leaves=Zuhaitz tropikaleko hostoak -Jungle Tree Sapling=Zuhaitz tropikalaren kimua -Emergent Jungle Tree Sapling=Zuhaitz tropikalaren kimua -Pine Tree=Pinu-zura -Pine Wood Planks=Pinu taulak -Pine Needles=Pinu-orratzak -Pine Tree Sapling=Pinu-kimua -Acacia Tree=Akaziako zura -Acacia Wood Planks=Akazia-taulak -Acacia Tree Leaves=Akazia-hostoak -Acacia Tree Sapling=Akaziazko kimua -Aspen Tree=Makalaren zura -Aspen Wood Planks=Makalaren taulak -Aspen Tree Leaves=Makal-hostoak -Aspen Tree Sapling=Makalaren kimua -Coal Ore=Ikatz-minerala -Coal Block=Ikatz-Blokea -Iron Ore=Burdin minerala -Steel Block=Altzairuzko Blokea -Copper Ore=Kobre-minerala -Copper Block=Kobrezko Blokea -Tin Ore=Eztainuzko minerala -Tin Block=Eztainu-Blokea -Bronze Block=Brontzezko Blokea -Mese Ore=Mineral-minerala -Mese Block=Hileko Blokea -Gold Ore=Urrezko minerala -Gold Block=Urrezko Blokea -Diamond Ore=Diamantezko minerala -Diamond Block=Diamante-Blokea -Cactus=Kaktusa -Large Cactus Seedling=Kaktusen zurtoin handia -Papyrus=Papiroa -Dry Shrub=Zuhaixka lehorra -Jungle Grass=Oihan-belarra -Grass=Belarra -Savanna Grass=Sabana-belarra -Fern=Iratzea -Marram Grass=Lezka -Bush Stem=Zuhaixka-zurtoina -Bush Leaves=Zuhaixka-hostoak -Bush Sapling=Zuhaixka-kimua -Blueberry Bush Leaves with Berries=Ahabizko zuhaixka-hostoak baiekin -Blueberry Bush Leaves=Ahabi-zuhaixkaren hostoak -Blueberry Bush Sapling=Ahabi-zuhaixkaren kimua -Acacia Bush Stem=Akaziako zuhaixka-zurtoina -Acacia Bush Leaves=Akaziazko zuhaixka-hostoak -Acacia Bush Sapling=Akaziazko zuhaixka-kimua -Pine Bush Stem=Pinu-zuhaixkaren zurtoina -Pine Bush Needles=Pinu-zuhaixken orratzak -Pine Bush Sapling=Pinu-zuhaixkaren kimua -Kelp=Itsas alga -Green Coral=Koral berdea -Pink Coral=Koral arrosa -Cyan Coral=Koral ziana -Brown Coral=Kafe-korala -Orange Coral=Koral laranja -Coral Skeleton=Koralezko eskeletoa -Water Source=Ur-iturria -Flowing Water=Ur-fluidoa -River Water Source=Ibaiko ur-iturria -Flowing River Water=Ibai-uraren fluidoa -Lava Source=Laba-iturria -Flowing Lava=Laba-fluidoa -Empty Bookshelf=Liburu-denda hutsik -Bookshelf (@1 written, @2 empty books)=Apalategia(@1 idatziak, @2 liburu zurian) -Bookshelf=Liburutegia -Text too long=Testu luzeegia -"@1"="@1" -Wooden Sign=Egurrezko kartela -Steel Sign=Altzairuzko kartela -Wooden Ladder=Egurrezko eskailera -Steel Ladder=Altzairuzko eskailera -Apple Wood Fence=Sagarrondotik gertu -Acacia Wood Fence=Akaziatik gertu -Jungle Wood Fence=Zur tropikaleko hesia -Pine Wood Fence=Pinutik gertu -Aspen Wood Fence=Alamotik gertu -Apple Wood Fence Rail=Sagarrondo-listoiak hurbilerako -Acacia Wood Fence Rail=Akazia-listoiak hurbilerako -Jungle Wood Fence Rail=Zur tropikaleko listoiak hurbilerako -Pine Wood Fence Rail=Hurbileko pinu-listoiak -Aspen Wood Fence Rail=Alamo-listoiak hurbilerako -Glass=Beira -Obsidian Glass=Obsidianazko beira -Brick Block=Adreiluzko Blokea -Mese Lamp=Su-lanpara -Apple Wood Mese Post Light=Sagarrondo-egurrezko argi-zutoina -Acacia Wood Mese Post Light=Akaziaren egurrezko argi-zutoina -Jungle Wood Mese Post Light=Oihan-egurrezko argi-zutoina -Pine Wood Mese Post Light=Pinu-egurrezko argi-zutoina -Aspen Wood Mese Post Light=Makalaren egurrezko argi-zutoina -Cloud=Hodeia -Wooden Pickaxe=Egurrezko Pikotxa -Stone Pickaxe=Harrizko Pikotxa -Bronze Pickaxe=Brontzezko Pikotxa -Steel Pickaxe=Altzairuzko Pikotxa -Mese Pickaxe=Mese Pikotxa -Diamond Pickaxe=Diamantezko Pikotxa -Wooden Shovel=Egurrezko pala -Stone Shovel=Harrizko pala -Bronze Shovel=Brontzezko pala -Steel Shovel=Altzairuzko pala -Mese Shovel=Mese pala -Diamond Shovel=Diamantezko pala -Wooden Axe=Egurrezko aizkora -Stone Axe=Harrizko aizkora -Bronze Axe=Brontzezko aizkora -Steel Axe=Altzairuzko aizkora -Mese Axe=Mese aizkora -Diamond Axe=Diamantezko aizkora -Wooden Sword=Egurrezko ezpata -Stone Sword=Harrizko ezpata -Bronze Sword=Brontzezko ezpata -Steel Sword=Altzairuzko ezpata -Mese Sword=Hileko ezpata -Diamond Sword=Diamantezko ezpata -Torch=Lastargia -@1 will intersect protection on growth.=@1 hazkundearen babesa gurutzatuko du. - - -##### not used anymore ##### - -Dirt with Dry Grass=Lurra belar lehorrarekin -Dry Dirt=Lur lehorra -Dry Dirt with Dry Grass=Lur lehorra belar lehorrarekin -Dry Grass=Belar lehorra -Mese Post Light=Mese Argi-zutoia diff --git a/mods/default/locale/default.fr.tr b/mods/default/locale/default.fr.tr index 8f694fb3..2214e371 100644 --- a/mods/default/locale/default.fr.tr +++ b/mods/default/locale/default.fr.tr @@ -4,42 +4,36 @@ Locked Chest (owned by @1)=Coffre verrouillé (possédé par @1) You do not own this chest.=Ce coffre ne vous appartient pas. a locked chest=un coffre verrouillé Chest=Coffre -Write=Écrire -Read=Lire -Title:=Titre : -Contents:=Contenu : -Save=Sauvegarder -by @1=de @1 -Page @1 of @2=Page @1 sur @2 -The book you were writing to mysteriously disappeared.= +Stick=Baton +Paper=Papier "@1" by @2=« @1 » de @2 -Blueberries=Myrtille Book=Livre Book with Text=Livre avec du texte -Bronze Ingot=Lingot de bronze -Clay Brick=Brique d'argile -Clay Lump=Morceau d'argile +Skeleton Key=Squelette +Key to @1's @2=Clé pour @2 de @1 Coal Lump=Morceau de charbon -Copper Ingot=Lingot de cuivre -Copper Lump=Morceau de cuivre -Diamond=Diamant -Flint=Silex -Gold Ingot=Lingot d'or -Gold Lump=Morceau d'or Iron Lump=Morceau de fer -Mese Crystal=Cristal de Mese -Mese Crystal Fragment=Fragment de cristal de Mese -Obsidian Shard=Tesson d'obsidienne -Paper=Papier -Steel Ingot=Lingot d'acier -Stick=Baton -Tin Ingot=Lingot d'étain +Copper Lump=Morceau de cuivre Tin Lump=Morceau d'étain +Mese Crystal=Cristal de Mese +Gold Lump=Morceau d'or +Diamond=Diamant +Clay Lump=Morceau d'argile +Steel Ingot=Lingot d'acier +Copper Ingot=Lingot de cuivre +Tin Ingot=Lingot d'étain +Bronze Ingot=Lingot de bronze +Gold Ingot=Lingot d'or +Mese Crystal Fragment=Fragment de cristal de Mese +Clay Brick=Brique d'argile +Obsidian Shard=Tesson d'obsidienne +Flint=Silex +Blueberries=Myrtille Furnace is empty=Le four est vide 100% (output full)=100% (Sortie pleine) @1%=@1% -Not cookable=Ne se cuit pas Empty=Vide +Not cookable=Ne se cuit pas Furnace active=Four actif Furnace inactive=Four inactif (Item: @1; Fuel: @2)=(Article: @1; Carburant: @2) @@ -64,16 +58,16 @@ Silver Sandstone Brick=Brique de grès argenté Silver Sandstone Block=Bloc de grès argenté Obsidian=Obsidienne Obsidian Brick=Brique d'obsidienne -Obsidian Block=Bloc d'obsidienne +Obsidian Block=Block d'obsidienne Dirt=Terre Dirt with Grass=Terre avec de l'herbe Dirt with Grass and Footsteps=Terre avec de l'herbe et des traces de pas -Dirt with Savanna Grass=Terre avec de l'herbe de savane +Dirt with Dry Grass=Terre avec de l'herbe sèche Dirt with Snow=Terre avec de la neige Dirt with Rainforest Litter=Terre avec sol de forêt humide Dirt with Coniferous Litter=Terre avec sol de forêt de conifère -Savanna Dirt=Terre de la savane -Savanna Dirt with Savanna Grass=Terre de la savane avec son herbe +Dry Dirt=Terre sèche +Dry Dirt with Dry Grass=Terre sèche avec de l'herbe sèche Permafrost=Pergélisol Permafrost with Stones=Pergélisol avec de la pierre Permafrost with Moss=Pergélisol avec de la mousse @@ -111,7 +105,7 @@ Aspen Tree Leaves=Feuilles de tremble Aspen Tree Sapling=Pousse de tremble Coal Ore=Minerai de charbon Coal Block=Bloc de charbon -Iron Ore=Minerai de fer +Iron Ore=Bloc de fer Steel Block=Bloc d'acier Copper Ore=Minerai de cuivre Copper Block=Bloc de cuivre @@ -130,7 +124,7 @@ Papyrus=Papyrus Dry Shrub=Arbuste sec Jungle Grass=Herbe de la jungle Grass=Herbe -Savanna Grass=Herbe de la savane +Dry Grass=Herbe sèche Fern=Fougère Marram Grass=Ammophile Bush Stem=Tige de buisson @@ -153,20 +147,19 @@ Brown Coral=Corail marron Orange Coral=Corail orange Coral Skeleton=Squelette de corail Water Source=Source d'eau -Flowing Water=Écoulement d'eau +Flowing Water=Ecoulement d'eau River Water Source=Source d'eau de rivière -Flowing River Water=Écoulement d'eau de rivière +Flowing River Water=Ecoulement d'eau de rivière Lava Source=Source de lave -Flowing Lava=Écoulement de lave +Flowing Lava=Ecoulement de lave Empty Bookshelf=Bibliothèque vide Bookshelf (@1 written, @2 empty books)=Bibliothèque (@1 écrits, @2 livres vides) Bookshelf=Bibliothèque Text too long=Texte trop longue -"@1"=« @1 » Wooden Sign=Panneau en bois Steel Sign=Panneau en acier -Wooden Ladder=Échelle en bois -Steel Ladder=Échelle en acier +Wooden Ladder=Echelle en bois +Steel Ladder=Echelle en acier Apple Wood Fence=Barrière de bois de pommier Acacia Wood Fence=Barrière de bois d'acacia Jungle Wood Fence=Barrière de bois de la jungle @@ -181,11 +174,7 @@ Glass=Verre Obsidian Glass=Verre d'obsidienne Brick Block=Bloc de brique Mese Lamp=Lampe de Mese -Apple Wood Mese Post Light=Réverbère de Mese en bois de pommier -Acacia Wood Mese Post Light=Réverbère de Mese en bois d'acacia -Jungle Wood Mese Post Light=Réverbère de Mese en bois de la jungle -Pine Wood Mese Post Light=Réverbère de Mese en bois de pin -Aspen Wood Mese Post Light=Réverbère de Mese en bois de tremble +Mese Post Light=Réverbère de Mese Cloud=Nuage Wooden Pickaxe=Pioche en bois Stone Pickaxe=Pioche en pierre @@ -206,19 +195,17 @@ Steel Axe=Hache en acier Mese Axe=Hache en Mese Diamond Axe=Hache en diamant Wooden Sword=Epée en bois -Stone Sword=Épée en pierre -Bronze Sword=Épée en bronze -Steel Sword=Épée en acier -Mese Sword=Épée en Mese -Diamond Sword=Épée en diamant +Stone Sword=Epée en pierre +Bronze Sword=Epée en bronze +Steel Sword=Epée en acier +Mese Sword=Epée en Mese +Diamond Sword=Epée en diamant +Key=Clé Torch=Torche @1 will intersect protection on growth.=@1 chevauchera la zone protégée avec la croissance. - - -##### not used anymore ##### - -Dirt with Dry Grass=Terre avec de l'herbe sèche -Dry Dirt=Terre sèche -Dry Dirt with Dry Grass=Terre sèche avec de l'herbe sèche -Dry Grass=Herbe sèche -Mese Post Light=Réverbère de Mese +Title:=Titre : +Contents:=Contenu : +Save=Sauvegarder +by @1=de @1 +Page @1 of @2=Page @1 sur @2 +"@1"=« @1 » diff --git a/mods/default/locale/default.id.tr b/mods/default/locale/default.id.tr index c60b5b08..7a0406c1 100644 --- a/mods/default/locale/default.id.tr +++ b/mods/default/locale/default.id.tr @@ -1,49 +1,4 @@ # textdomain: default -Locked Chest=Peti Terkunci -Locked Chest (owned by @1)=Peti Terkunci (milik @1) -You do not own this chest.=Anda bukan pemilik peti ini. -a locked chest=peti terkunci -Chest=Peti -Write=Tulis -Read=Baca -Title:=Judul: -Contents:=Isi: -Save=Simpan -by @1=oleh @1 -Page @1 of @2=Halaman @1 dari @2 -The book you were writing to mysteriously disappeared.=Buku yang Anda tulis menghilang secara misterius. -"@1" by @2="@1" oleh @2 -Blueberries=Bluberi -Book=Buku -Book with Text=Buku Tertulis -Bronze Ingot=Perunggu Batangan -Clay Brick=Bata -Clay Lump=Bongkahan Tanah Liat -Coal Lump=Bongkahan Batu Bara -Copper Ingot=Tembaga Batangan -Copper Lump=Bongkahan Tembaga -Diamond=Berlian -Flint=Batu Api -Gold Ingot=Emas Batangan -Gold Lump=Bongkahan Emas -Iron Lump=Bongkahan Besi -Mese Crystal=Kristal Mese -Mese Crystal Fragment=Pecahan Kristal Mese -Obsidian Shard=Pecahan Obsidian -Paper=Kertas -Steel Ingot=Baja Batangan -Stick=Tongkat -Tin Ingot=Timah Batangan -Tin Lump=Bongkahan Timah -Furnace is empty=Tungku kosong -100% (output full)=100% (keluaran penuh) -@1%=@1% -Not cookable=Tidak bisa dimasak -Empty=Kosong -Furnace active=Tungku nyala -Furnace inactive=Tungku mati -(Item: @1; Fuel: @2)=(Barang: @1; Bahan Bakar: @2) -Furnace=Tungku Stone=Batu Cobblestone=Bongkahan Batu Stone Brick=Tembok Batu @@ -67,7 +22,7 @@ Obsidian Brick=Tembok Obsidian Obsidian Block=Balok Obsidian Dirt=Tanah Dirt with Grass=Tanah Berumput -Dirt with Grass and Footsteps=Tanah Berumput dengan Jejak Kaki +Dirt with Grass and Footsteps=Tanah Berumput dan Tapak Kaki Dirt with Savanna Grass=Tanah Berumput Sabana Dirt with Snow=Tanah Bersalju Dirt with Rainforest Litter=Tanah Berserasah Hutan Hujan @@ -81,37 +36,37 @@ Sand=Pasir Desert Sand=Pasir Gurun Silver Sand=Pasir Perak Gravel=Kerikil -Clay=Tanah Liat +Clay=Semen Snow=Salju Snow Block=Balok Salju Ice=Es Cave Ice=Es Gua Apple Tree=Pohon Apel Apple Wood Planks=Papan Kayu Pohon Apel -Apple Tree Sapling=Anak Pohon Apel +Apple Tree Sapling=Bibit Apel Apple Tree Leaves=Daun Pohon Apel Apple=Apel Apple Marker=Penanda Apel Jungle Tree=Pohon Hutan Rimba Jungle Wood Planks=Papan Kayu Pohon Rimba Jungle Tree Leaves=Daun Pohon Rimba -Jungle Tree Sapling=Anak Pohon Rimba -Emergent Jungle Tree Sapling=Anak Pohon Rimba Bertumbuh +Jungle Tree Sapling=Bibit Pohon Rimba +Emergent Jungle Tree Sapling=Bibit Bertumbuh Pohon Rimba Pine Tree=Pohon Pinus Pine Wood Planks=Papan Kayu Pinus Pine Needles=Daun Pinus -Pine Tree Sapling=Anak Pohon Pinus +Pine Tree Sapling=Bibit Pinus Acacia Tree=Pohon Akasia Acacia Wood Planks=Papan Kayu Akasia Acacia Tree Leaves=Daun Akasia -Acacia Tree Sapling=Anak Pohon Akasia +Acacia Tree Sapling=Bibit Akasia Aspen Tree=Pohon Aspen Aspen Wood Planks=Papan Kayu Aspen Aspen Tree Leaves=Daun Aspen -Aspen Tree Sapling=Anak Pohon Aspen +Aspen Tree Sapling=Bibit Aspen Coal Ore=Bijih Batu Bara Coal Block=Balok Batu Bara -Iron Ore=Bijih Besi +Iron Ore=Biji Besi Steel Block=Balok Baja Copper Ore=Bijih Tembaga Copper Block=Balok Tembaga @@ -135,10 +90,10 @@ Fern=Pakis Marram Grass=Rumput Pantai Bush Stem=Batang Semak Bush Leaves=Daun Semak -Bush Sapling=Anak Semak -Blueberry Bush Leaves with Berries=Daun Semak Bluberi Berbuah -Blueberry Bush Leaves=Daun Semak Bluberi -Blueberry Bush Sapling=Anak Semak Bluberi +Bush Sapling=Bibit Semak +Blueberry Bush Leaves with Berries=Daun Bluberi Berbuah +Blueberry Bush Leaves=Daun Bluberi +Blueberry Bush Sapling=Bibit Bluberi Acacia Bush Stem=Batang Semak Akasia Acacia Bush Leaves=Daun Semak Akasia Acacia Bush Sapling=Bibit Semak Akasia @@ -147,7 +102,7 @@ Pine Bush Needles=Daun Semak Pinus Pine Bush Sapling=Bibit Semak Pinus Kelp=Kelp Green Coral=Koral Hijau -Pink Coral=Koral Merah Muda +Pink Coral=Koral Jambon Cyan Coral=Koral Sian Brown Coral=Koral Cokelat Orange Coral=Koral Oranye @@ -162,7 +117,6 @@ Empty Bookshelf=Rak Buku Kosong Bookshelf (@1 written, @2 empty books)=Rak Buku (@1 buku tertulis, @2 buku kosong) Bookshelf=Rak Buku Text too long=Teks terlalu panjang -"@1"="@1" Wooden Sign=Penanda Kayu Steel Sign=Penanda Baja Wooden Ladder=Tangga Kayu @@ -181,18 +135,16 @@ Glass=Kaca Obsidian Glass=Kaca Obsidian Brick Block=Balok Bata Mese Lamp=Lampu Mese -Apple Wood Mese Post Light=Lampu Taman Mese Kayu Apel -Acacia Wood Mese Post Light=Lampu Taman Mese Kayu Akasia -Jungle Wood Mese Post Light=Lampu Taman Mese Kayu Rimba -Pine Wood Mese Post Light=Lampu Taman Mese Kayu Pinus -Aspen Wood Mese Post Light=Lampu Taman Mese Kayu Aspen +Mese Post Light=Lampu Taman Mese Cloud=Awan -Wooden Pickaxe=Belencong Kayu -Stone Pickaxe=Belencong Batu -Bronze Pickaxe=Belencong Perunggu -Steel Pickaxe=Belencong Baja -Mese Pickaxe=Belencong Mese -Diamond Pickaxe=Belencong Berlian +@1 will intersect protection on growth.=@1 akan memotong perlindungan ketika tumbuh. +Torch=Obor +Wooden Pickaxe=Beliung Kayu +Stone Pickaxe=Beliung Batu +Bronze Pickaxe=Beliung Perunggu +Steel Pickaxe=Beliung Baja +Mese Pickaxe=Beliung Mese +Diamond Pickaxe=Beliung Berlian Wooden Shovel=Sekop Kayu Stone Shovel=Sekop Batu Bronze Shovel=Sekop Perunggu @@ -211,10 +163,49 @@ Bronze Sword=Pedang Perunggu Steel Sword=Pedang Baja Mese Sword=Pedang Mese Diamond Sword=Pedang Berlian -Torch=Obor -@1 will intersect protection on growth.=@1 akan memotong perlindungan ketika tumbuh. - - -##### not used anymore ##### - -Mese Post Light=Lampu Taman Mese +Key=Kunci +Furnace is empty=Tungku kosong +100% (output full)=100% (keluaran penuh) +@1%=@1% +Not cookable=Tidak bisa dimasak +Empty=Kosong +Furnace active=Tungku nyala +Furnace inactive=Tungku mati +(Item: @1; Fuel: @2)=(Barang: @1; Bahan Bakar: @2) +Furnace=Tungku +Title:=Judul: +Contents:=Isi: +Save=Simpan +by @1=oleh @1 +Page @1 of @2=Halaman @1 dari @2 +"@1"="@1" +"@1" by @2="@1" oleh @2 +Skeleton Key=Kunci Induk +Key to @1's @2=Kunci @2 milik @1 +Blueberries=Bluberi +Book=Buku +Book with Text=Buku Tertulis +Bronze Ingot=Perunggu Batangan +Clay Brick=Bata +Clay Lump=Bongkahan Semen +Coal Lump=Bongkahan Batu Bara +Copper Ingot=Tembaga Batangan +Copper Lump=Bongkahan Tembaga +Diamond=Berlian +Flint=Batu Api +Gold Ingot=Emas Batangan +Gold Lump=Bongkahan Emas +Iron Lump=Bongkahan Besi +Mese Crystal=Kristal Mese +Mese Crystal Fragment=Pecahan Kristal Mese +Obsidian Shard=Pecahan Obsidian +Paper=Kertas +Steel Ingot=Baja Batangan +Stick=Tongkat +Tin Ingot=Timah Batangan +Tin Lump=Bongkahan Timah +Locked Chest=Peti Terkunci +Locked Chest (owned by @1)=Peti Terkunci (milik @1) +You do not own this chest.=Anda bukan pemilik peti ini. +a locked chest=suatu peti terkunci +Chest=Peti diff --git a/mods/default/locale/default.it.tr b/mods/default/locale/default.it.tr index 39406659..ea3ee20e 100644 --- a/mods/default/locale/default.it.tr +++ b/mods/default/locale/default.it.tr @@ -1,224 +1,205 @@ -# textdomain: default -Locked Chest=Baule chiuso a chiave -Locked Chest (owned by @1)=Baule chiuso a chiave (di proprietà di @1) -You do not own this chest.=Questo baule non ti appartiene. -a locked chest=un baule chiuso a chiave -Chest=Baule -Write= -Read= -Title:= -Contents:= -Save= -by @1= -Page @1 of @2= -The book you were writing to mysteriously disappeared.= -"@1" by @2="@1" di @2 -Blueberries=Mirtilli -Book=Libro -Book with Text=Libro con testo -Bronze Ingot=Lingotto di bronzo -Clay Brick=Mattone d'argilla -Clay Lump=Grumo d'argilla -Coal Lump=Grumo di carbone -Copper Ingot=Lingotto di rame -Copper Lump=Grumo di rame -Diamond=Diamante -Flint=Selce -Gold Ingot=Lingotto d'oro -Gold Lump=Grumo d'oro -Iron Lump=Grumo di ferro -Mese Crystal=Cristallo di mese -Mese Crystal Fragment=Frammento di cristallo di mese -Obsidian Shard=Scheggia d'ossidiana -Paper=Carta -Steel Ingot=Lingotto d'acciaio -Stick=Bastone -Tin Ingot=Lingotto di stagno -Tin Lump=Grumo di stagno -Furnace is empty=La fornace è vuota -100% (output full)=100% (uscita piena) -@1%=@1% -Not cookable=Non cucinabile -Empty=Vuota -Furnace active=Fornace attiva -Furnace inactive=Fornace inattiva -(Item: @1; Fuel: @2)=(Oggetto: @1; Combustibile: @2) -Furnace=Fornace -Stone=Pietra -Cobblestone=Ciottoli -Stone Brick=Mattone di pietra -Stone Block=Blocco di pietra -Mossy Cobblestone=Ciottoli muschiosi -Desert Stone=Pietra del deserto -Desert Cobblestone=Ciottoli del deserto -Desert Stone Brick=Mattone di pietra del deserto -Desert Stone Block=Blocco di pietra del deserto -Sandstone=Arenaria -Sandstone Brick=Mattone d'arenaria -Sandstone Block=Blocco d'arenaria -Desert Sandstone=Arenaria del deserto -Desert Sandstone Brick=Mattone d'arenaria del deserto -Desert Sandstone Block=Blocco d'arenaria del deserto -Silver Sandstone=Arenaria argentata -Silver Sandstone Brick=Mattone d'arenaria argentata -Silver Sandstone Block=Blocco d'arenaria argentata -Obsidian=Ossidiana -Obsidian Brick=Mattone d'ossidiana -Obsidian Block=Blocco d'ossidiana -Dirt=Terra -Dirt with Grass=Terra con erba -Dirt with Grass and Footsteps=Terra con erba e impronte -Dirt with Savanna Grass= -Dirt with Snow=Terra con neve -Dirt with Rainforest Litter=Terra con detriti della foresta pluviale -Dirt with Coniferous Litter=Terra con detriti di conifera -Savanna Dirt= -Savanna Dirt with Savanna Grass= -Permafrost=Permafrost -Permafrost with Stones=Permafrost con pietra -Permafrost with Moss=Permafrost con muschio -Sand=Sabbia -Desert Sand=Sabbia del deserto -Silver Sand=Sabbia argentata -Gravel=Ghiaia -Clay=Argilla -Snow=Neve -Snow Block=Blocco di neve -Ice=Ghiaccio -Cave Ice=Ghiaccio di caverna -Apple Tree=Melo -Apple Wood Planks=Assi di melo -Apple Tree Sapling=Alberello di melo -Apple Tree Leaves=Foglie di melo -Apple=Mela -Apple Marker=Marcatore mela -Jungle Tree=Albero della giungla -Jungle Wood Planks=Assi di legno della giungla -Jungle Tree Leaves=Foglie di albero della giungla -Jungle Tree Sapling=Alberello della giungla -Emergent Jungle Tree Sapling=Alberello della giungla emergente -Pine Tree=Pino -Pine Wood Planks=Assi di legno di pino -Pine Needles=Aghi di pino -Pine Tree Sapling=Alberello di pino -Acacia Tree=Acacia -Acacia Wood Planks=Assi di legno d'acacia -Acacia Tree Leaves=Foglie d'acacia -Acacia Tree Sapling=Alberello d'acacia -Aspen Tree=Pioppo -Aspen Wood Planks=Assi di legno di pioppo -Aspen Tree Leaves=Foglie di pioppo -Aspen Tree Sapling=Alberello di pioppo -Coal Ore=Minerale di carbone -Coal Block=Blocco di carbone -Iron Ore=Minerale di ferro -Steel Block=Blocco d'acciaio -Copper Ore=Minerale di rame -Copper Block=Blocco di rame -Tin Ore=Minerale di stagno -Tin Block=Blocco di stagno -Bronze Block=Blocco di bronzo -Mese Ore=Minerale di mese -Mese Block=Blocco di mese -Gold Ore=Minerale d'oro -Gold Block=Blocco d'oro -Diamond Ore=Minerale di diamante -Diamond Block=Blocco di diamante -Cactus=Cactus -Large Cactus Seedling=Piantina di cactus grande -Papyrus=Papiro -Dry Shrub=Arbusto secco -Jungle Grass=Erba della giungla -Grass=Erba -Savanna Grass= -Fern=Felce -Marram Grass=Ammofila arenaria -Bush Stem=Fusto di cespuglio -Bush Leaves=Foglie di cespuglio -Bush Sapling=Alberello di cespuglio -Blueberry Bush Leaves with Berries=Foglie di cespuglio di mirtilli con bacche -Blueberry Bush Leaves=Foglie di cespuglio di mirtilli -Blueberry Bush Sapling=Alberello di cespuglio di mirtilli -Acacia Bush Stem=Fusto di cespuglio d'acacia -Acacia Bush Leaves=Foglie di cespuglio d'acacia -Acacia Bush Sapling=Alberello di cespuglio d'acacia -Pine Bush Stem=Fusto di cespuglio di pino -Pine Bush Needles=Aghi di cespuglio di pino -Pine Bush Sapling=Alberello di cespuglio di pino -Kelp=Alga -Green Coral=Corallo verde -Pink Coral=Corallo rosa -Cyan Coral=Corallo ciano -Brown Coral=Corallo marrone -Orange Coral=Corallo arancione -Coral Skeleton=Scheletro di corallo -Water Source=Fonte d'acqua -Flowing Water=Acqua corrente -River Water Source=Fonte d'acqua di fiume -Flowing River Water=Acqua corrente di fiume -Lava Source=Fonte di lava -Flowing Lava=Lava corrente -Empty Bookshelf=Libreria vuota -Bookshelf (@1 written, @2 empty books)=Libreria (@1 scritti, @2 vuoti) -Bookshelf=Libreria -Text too long=Testo troppo lungo -"@1"= -Wooden Sign=Cartello di legno -Steel Sign=Cartello d'acciaio -Wooden Ladder=Scala a pioli di legno -Steel Ladder=Scala a pioli d'acciaio -Apple Wood Fence=Recinzione di legno di melo -Acacia Wood Fence=Recinzione di legno d'acacia -Jungle Wood Fence=Recinzione di legno della giungla -Pine Wood Fence=Recinzione di legno di pino -Aspen Wood Fence=Recinzione di legno di pioppo -Apple Wood Fence Rail=Ringhiera della recinzione di legno di melo -Acacia Wood Fence Rail=Ringhiera della recinzione di legno d'acacia -Jungle Wood Fence Rail=Ringhiera della recinzione di legno della giungla -Pine Wood Fence Rail=Ringhiera della recinzione di legno di pino -Aspen Wood Fence Rail=Ringhiera della recinzione di legno di pioppo -Glass=Vetro -Obsidian Glass=Vetro d'ossidiana -Brick Block=Blocco di mattone -Mese Lamp=Lampada di mese -Apple Wood Mese Post Light= -Acacia Wood Mese Post Light= -Jungle Wood Mese Post Light= -Pine Wood Mese Post Light= -Aspen Wood Mese Post Light= -Cloud=Nuvola -Wooden Pickaxe=Piccone di legno -Stone Pickaxe=Piccone di pietra -Bronze Pickaxe=Piccone di bronzo -Steel Pickaxe=Piccone d'acciaio -Mese Pickaxe=Piccone di mese -Diamond Pickaxe=Piccone di diamante -Wooden Shovel=Pala di legno -Stone Shovel=Pala di pietra -Bronze Shovel=Pala di bronzo -Steel Shovel=Pala d'acciaio -Mese Shovel=Pala di mese -Diamond Shovel=Pala di diamante -Wooden Axe=Ascia di legno -Stone Axe=Ascia di pietra -Bronze Axe=Ascia di bronzo -Steel Axe=Ascia d'acciaio -Mese Axe=Ascia di mese -Diamond Axe=Ascia di diamante -Wooden Sword=Spada di legno -Stone Sword=Spada di pietra -Bronze Sword=Spada di bronzo -Steel Sword=Spada d'acciaio -Mese Sword=Spada di mese -Diamond Sword=Spada di diamante -Torch=Torcia -@1 will intersect protection on growth.=@1 crescendo attraverserà la protezione. - - -##### not used anymore ##### - -Dirt with Dry Grass=Terra con erba secca -Dry Dirt=Terra asciutta -Dry Dirt with Dry Grass=Terra asciutta con erba secca -Dry Grass=Erba secca -Mese Post Light=Lampioncino di mese +# textdomain: default +Locked Chest=Baule chiuso a chiave +Locked Chest (owned by @1)=Baule chiuso a chiave (di proprietà di @1) +You do not own this chest.=Questo baule non ti appartiene. +a locked chest=un baule chiuso a chiave +Chest=Baule +Stick=Bastone +Paper=Carta +"@1" by @2="@1" di @2 +Book=Libro +Book with Text=Libro con testo +Skeleton Key=Chiave dello Scheletro +Key to @1's @2=Chiave per @2 di @1 +Coal Lump=Grumo di carbone +Iron Lump=Grumo di ferro +Copper Lump=Grumo di rame +Tin Lump=Grumo di stagno +Mese Crystal=Cristallo di mese +Gold Lump=Grumo d'oro +Diamond=Diamante +Clay Lump=Grumo d'argilla +Steel Ingot=Lingotto d'acciaio +Copper Ingot=Lingotto di rame +Tin Ingot=Lingotto di stagno +Bronze Ingot=Lingotto di bronzo +Gold Ingot=Lingotto d'oro +Mese Crystal Fragment=Frammento di cristallo di mese +Clay Brick=Mattone d'argilla +Obsidian Shard=Scheggia d'ossidiana +Flint=Selce +Blueberries=Mirtilli +Furnace is empty=La fornace è vuota +100% (output full)=100% (uscita piena) +@1%=@1% +Empty=Vuota +Not cookable=Non cucinabile +Furnace active=Fornace attiva +Furnace inactive=Fornace inattiva +(Item: @1; Fuel: @2)=(Oggetto: @1; Combustibile: @2) +Furnace=Fornace +Stone=Pietra +Cobblestone=Ciottoli +Stone Brick=Mattone di pietra +Stone Block=Blocco di pietra +Mossy Cobblestone=Ciottoli muschiosi +Desert Stone=Pietra del deserto +Desert Cobblestone=Ciottoli del deserto +Desert Stone Brick=Mattone di pietra del deserto +Desert Stone Block=Blocco di pietra del deserto +Sandstone=Arenaria +Sandstone Brick=Mattone d'arenaria +Sandstone Block=Blocco d'arenaria +Desert Sandstone=Arenaria del deserto +Desert Sandstone Brick=Mattone d'arenaria del deserto +Desert Sandstone Block=Blocco d'arenaria del deserto +Silver Sandstone=Arenaria argentata +Silver Sandstone Brick=Mattone d'arenaria argentata +Silver Sandstone Block=Blocco d'arenaria argentata +Obsidian=Ossidiana +Obsidian Brick=Mattone d'ossidiana +Obsidian Block=Blocco d'ossidiana +Dirt=Terra +Dirt with Grass=Terra con erba +Dirt with Grass and Footsteps=Terra con erba e impronte +Dirt with Dry Grass=Terra con erba secca +Dirt with Snow=Terra con neve +Dirt with Rainforest Litter=Terra con detriti della foresta pluviale +Dirt with Coniferous Litter=Terra con detriti di conifera +Dry Dirt=Terra asciutta +Dry Dirt with Dry Grass=Terra asciutta con erba secca +Permafrost=Permafrost +Permafrost with Stones=Permafrost con pietra +Permafrost with Moss=Permafrost con muschio +Sand=Sabbia +Desert Sand=Sabbia del deserto +Silver Sand=Sabbia argentata +Gravel=Ghiaia +Clay=Argilla +Snow=Neve +Snow Block=Blocco di neve +Ice=Ghiaccio +Cave Ice=Ghiaccio di caverna +Apple Tree=Melo +Apple Wood Planks=Assi di melo +Apple Tree Sapling=Alberello di melo +Apple Tree Leaves=Foglie di melo +Apple=Mela +Apple Marker=Marcatore mela +Jungle Tree=Albero della giungla +Jungle Wood Planks=Assi di legno della giungla +Jungle Tree Leaves=Foglie di albero della giungla +Jungle Tree Sapling=Alberello della giungla +Emergent Jungle Tree Sapling=Alberello della giungla emergente +Pine Tree=Pino +Pine Wood Planks=Assi di legno di pino +Pine Needles=Aghi di pino +Pine Tree Sapling=Alberello di pino +Acacia Tree=Acacia +Acacia Wood Planks=Assi di legno d'acacia +Acacia Tree Leaves=Foglie d'acacia +Acacia Tree Sapling=Alberello d'acacia +Aspen Tree=Pioppo +Aspen Wood Planks=Assi di legno di pioppo +Aspen Tree Leaves=Foglie di pioppo +Aspen Tree Sapling=Alberello di pioppo +Coal Ore=Minerale di carbone +Coal Block=Blocco di carbone +Iron Ore=Minerale di ferro +Steel Block=Blocco d'acciaio +Copper Ore=Minerale di rame +Copper Block=Blocco di rame +Tin Ore=Minerale di stagno +Tin Block=Blocco di stagno +Bronze Block=Blocco di bronzo +Mese Ore=Minerale di mese +Mese Block=Blocco di mese +Gold Ore=Minerale d'oro +Gold Block=Blocco d'oro +Diamond Ore=Minerale di diamante +Diamond Block=Blocco di diamante +Cactus=Cactus +Large Cactus Seedling=Piantina di cactus grande +Papyrus=Papiro +Dry Shrub=Arbusto secco +Jungle Grass=Erba della giungla +Grass=Erba +Dry Grass=Erba secca +Fern=Felce +Marram Grass=Ammofila arenaria +Bush Stem=Fusto di cespuglio +Bush Leaves=Foglie di cespuglio +Bush Sapling=Alberello di cespuglio +Blueberry Bush Leaves with Berries=Foglie di cespuglio di mirtilli con bacche +Blueberry Bush Leaves=Foglie di cespuglio di mirtilli +Blueberry Bush Sapling=Alberello di cespuglio di mirtilli +Acacia Bush Stem=Fusto di cespuglio d'acacia +Acacia Bush Leaves=Foglie di cespuglio d'acacia +Acacia Bush Sapling=Alberello di cespuglio d'acacia +Pine Bush Stem=Fusto di cespuglio di pino +Pine Bush Needles=Aghi di cespuglio di pino +Pine Bush Sapling=Alberello di cespuglio di pino +Kelp=Alga +Green Coral=Corallo verde +Pink Coral=Corallo rosa +Cyan Coral=Corallo ciano +Brown Coral=Corallo marrone +Orange Coral=Corallo arancione +Coral Skeleton=Scheletro di corallo +Water Source=Fonte d'acqua +Flowing Water=Acqua corrente +River Water Source=Fonte d'acqua di fiume +Flowing River Water=Acqua corrente di fiume +Lava Source=Fonte di lava +Flowing Lava=Lava corrente +Empty Bookshelf=Libreria vuota +Bookshelf (@1 written, @2 empty books)=Libreria (@1 scritti, @2 vuoti) +Bookshelf=Libreria +Text too long=Testo troppo lungo +Wooden Sign=Cartello di legno +Steel Sign=Cartello d'acciaio +Wooden Ladder=Scala a pioli di legno +Steel Ladder=Scala a pioli d'acciaio +Apple Wood Fence=Recinzione di legno di melo +Acacia Wood Fence=Recinzione di legno d'acacia +Jungle Wood Fence=Recinzione di legno della giungla +Pine Wood Fence=Recinzione di legno di pino +Aspen Wood Fence=Recinzione di legno di pioppo +Apple Wood Fence Rail=Ringhiera della recinzione di legno di melo +Acacia Wood Fence Rail=Ringhiera della recinzione di legno d'acacia +Jungle Wood Fence Rail=Ringhiera della recinzione di legno della giungla +Pine Wood Fence Rail=Ringhiera della recinzione di legno di pino +Aspen Wood Fence Rail=Ringhiera della recinzione di legno di pioppo +Glass=Vetro +Obsidian Glass=Vetro d'ossidiana +Brick Block=Blocco di mattone +Mese Lamp=Lampada di mese +Mese Post Light=Lampioncino di mese +Cloud=Nuvola +Wooden Pickaxe=Piccone di legno +Stone Pickaxe=Piccone di pietra +Bronze Pickaxe=Piccone di bronzo +Steel Pickaxe=Piccone d'acciaio +Mese Pickaxe=Piccone di mese +Diamond Pickaxe=Piccone di diamante +Wooden Shovel=Pala di legno +Stone Shovel=Pala di pietra +Bronze Shovel=Pala di bronzo +Steel Shovel=Pala d'acciaio +Mese Shovel=Pala di mese +Diamond Shovel=Pala di diamante +Wooden Axe=Ascia di legno +Stone Axe=Ascia di pietra +Bronze Axe=Ascia di bronzo +Steel Axe=Ascia d'acciaio +Mese Axe=Ascia di mese +Diamond Axe=Ascia di diamante +Wooden Sword=Spada di legno +Stone Sword=Spada di pietra +Bronze Sword=Spada di bronzo +Steel Sword=Spada d'acciaio +Mese Sword=Spada di mese +Diamond Sword=Spada di diamante +Key=Chiave +Torch=Torcia +@1 will intersect protection on growth.=@1 crescendo attraverserà la protezione. diff --git a/mods/default/locale/default.ja.tr b/mods/default/locale/default.ja.tr deleted file mode 100644 index cf30e45f..00000000 --- a/mods/default/locale/default.ja.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=鍵のかかったチェスト -Locked Chest (owned by @1)=鍵のかかったチェスト(@1所有) -You do not own this chest.=あなたはこのチェストの所有者ではありません。 -a locked chest=ロックされたチェスト -Chest=チェスト -Write=書き込む -Read=読む -Title:=題名 -Contents:=内容 -Save=保存 -by @1=@1著 -Page @1 of @2=@1 / @2 ページ -The book you were writing to mysteriously disappeared.=あなたが書いていた本が、不思議なことに消えました。 -"@1" by @2=@2著「@1」 -Blueberries=ブルーベリー -Book=本 -Book with Text=記入済みの本 -Bronze Ingot=青銅インゴット -Clay Brick=粘土レンガ -Clay Lump=粘土玉 -Coal Lump=石炭 -Copper Ingot=銅インゴット -Copper Lump=銅の粗鉱 -Diamond=ダイヤモンド -Flint=火打ち石 -Gold Ingot=金インゴット -Gold Lump=金の粗鉱 -Iron Lump=鉄の粗鉱 -Mese Crystal=メセクリスタル -Mese Crystal Fragment=メセクリスタルの破片 -Obsidian Shard=黒曜石の欠片 -Paper=紙 -Steel Ingot=鉄インゴット -Stick=棒 -Tin Ingot=スズインゴット -Tin Lump=スズの粗鉱 -Furnace is empty=かまどは空です -100% (output full)=100%(フル出力) -@1%=@1% -Not cookable=調理できません -Empty=空 -Furnace active=かまどは燃えてます -Furnace inactive=かまどは消えています -(Item: @1; Fuel: @2)=(アイテム: @1; 燃料: @2) -Furnace=かまど -Stone=石 -Cobblestone=丸石 -Stone Brick=石レンガ -Stone Block=石ブロック -Mossy Cobblestone=苔むした丸石 -Desert Stone=砂漠の石 -Desert Cobblestone=砂漠の丸石 -Desert Stone Brick=砂漠の石レンガ -Desert Stone Block=砂漠の石ブロック -Sandstone=砂岩 -Sandstone Brick=砂岩レンガ -Sandstone Block=砂岩ブロック -Desert Sandstone=砂漠の砂岩 -Desert Sandstone Brick=砂漠の砂岩レンガ -Desert Sandstone Block=砂漠の砂岩ブロック -Silver Sandstone=銀色の砂岩 -Silver Sandstone Brick=銀色の砂岩レンガ -Silver Sandstone Block=銀色の砂岩ブロック -Obsidian=黒曜石 -Obsidian Brick=黒曜石レンガ -Obsidian Block=黒曜石ブロック -Dirt=土 -Dirt with Grass=草に覆われた土 -Dirt with Grass and Footsteps=足跡と草に覆われた土 -Dirt with Savanna Grass=サバンナの草に覆われた土 -Dirt with Snow=雪に覆われた土 -Dirt with Rainforest Litter=熱帯雨林の落葉に覆われた土 -Dirt with Coniferous Litter=針葉樹の落葉に覆われた土 -Savanna Dirt=サバンナの土 -Savanna Dirt with Savanna Grass=サバンナの草に覆われたサバンナの土 -Permafrost=永久凍土 -Permafrost with Stones=石に覆われた永久凍土 -Permafrost with Moss=苔に覆われた永久凍土 -Sand=砂 -Desert Sand=砂漠の砂 -Silver Sand=銀色の砂 -Gravel=砂利 -Clay=粘土 -Snow=雪 -Snow Block=雪ブロック -Ice=氷 -Cave Ice=洞窟の氷 -Apple Tree=リンゴの原木 -Apple Wood Planks=リンゴの木の板材 -Apple Tree Sapling=リンゴの木の苗木 -Apple Tree Leaves=リンゴの木の葉 -Apple=リンゴ -Apple Marker=リンゴのマーカー -Jungle Tree=ジャングルの原木 -Jungle Wood Planks=ジャングルの木の板材 -Jungle Tree Leaves=ジャングルの木の葉 -Jungle Tree Sapling=ジャングルの木の苗木 -Emergent Jungle Tree Sapling=ジャングルの超高木の苗木 -Pine Tree=マツの原木 -Pine Wood Planks=マツの木の板材 -Pine Needles=マツの木の葉 -Pine Tree Sapling=マツの木の苗木 -Acacia Tree=アカシアの原木 -Acacia Wood Planks=アカシアの木の板材 -Acacia Tree Leaves=アカシアの木の葉 -Acacia Tree Sapling=アカシアの木の苗木 -Aspen Tree=ポプラの原木 -Aspen Wood Planks=ポプラの木の板材 -Aspen Tree Leaves=ポプラの木の葉 -Aspen Tree Sapling=ポプラの木の苗木 -Coal Ore=石炭鉱石 -Coal Block=石炭ブロック -Iron Ore=鉄鉱石 -Steel Block=鉄ブロック -Copper Ore=銅鉱石 -Copper Block=銅ブロック -Tin Ore=スズ鉱石 -Tin Block=スズブロック -Bronze Block=青銅ブロック -Mese Ore=メセ鉱石 -Mese Block=メセブロック -Gold Ore=金鉱石 -Gold Block=金ブロック -Diamond Ore=ダイヤモンド鉱石 -Diamond Block=ダイヤモンドブロック -Cactus=サボテン -Large Cactus Seedling=大きなサボテンの苗 -Papyrus=パピルス -Dry Shrub=枯れた低木 -Jungle Grass=ジャングルの草 -Grass=草 -Savanna Grass=サバンナの草 -Fern=シダ -Marram Grass=マラムの草 -Bush Stem=低木の幹 -Bush Leaves=低木の葉 -Bush Sapling=低木の苗木 -Blueberry Bush Leaves with Berries=ブルーベリーの実った低木 -Blueberry Bush Leaves=ブルーベリーの低木の葉 -Blueberry Bush Sapling=ブルーベリーの低木の苗木 -Acacia Bush Stem=アカシアの低木の幹 -Acacia Bush Leaves=アカシアの低木の葉 -Acacia Bush Sapling=アカシアの低木の苗木 -Pine Bush Stem=マツの低木の幹 -Pine Bush Needles=マツの低木の葉 -Pine Bush Sapling=マツの低木の苗木 -Kelp=コンブ -Green Coral=緑色のサンゴ -Pink Coral=桃色のサンゴ -Cyan Coral=青緑色のサンゴ -Brown Coral=茶色のサンゴ -Orange Coral=橙色のサンゴ -Coral Skeleton=サンゴのしがい -Water Source=水源 -Flowing Water=流れる水 -River Water Source=河川水源 -Flowing River Water=流れる河川水 -Lava Source=溶岩 -Flowing Lava=流れる溶岩 -Empty Bookshelf=空の本棚 -Bookshelf (@1 written, @2 empty books)=本棚(記述済み @1 冊, 未記述 @2 冊) -Bookshelf=本棚 -Text too long=テキストが長すぎます -"@1"=「@1」 -Wooden Sign=木製の看板 -Steel Sign=鉄の看板 -Wooden Ladder=木製のはしご -Steel Ladder=鉄のはしご -Apple Wood Fence=リンゴ材のフェンス -Acacia Wood Fence=アカシア材のフェンス -Jungle Wood Fence=ジャングル材のフェンス -Pine Wood Fence=マツ材のフェンス -Aspen Wood Fence=ポプラ材のフェンス -Apple Wood Fence Rail=リンゴ材のフェンスレール -Acacia Wood Fence Rail=アカシア材のフェンスレール -Jungle Wood Fence Rail=ジャングル材のフェンスレール -Pine Wood Fence Rail=マツ材のフェンスレール -Aspen Wood Fence Rail=ポプラ材のフェンスレール -Glass=ガラス -Obsidian Glass=黒曜石ガラス -Brick Block=レンガブロック -Mese Lamp=メセのランプ -Apple Wood Mese Post Light=リンゴ材のメセ灯柱 -Acacia Wood Mese Post Light=アカシア材のメセ灯柱 -Jungle Wood Mese Post Light=ジャングル材のメセ灯柱 -Pine Wood Mese Post Light=マツ材のメセ灯柱 -Aspen Wood Mese Post Light=ポプラ材のメセ灯柱 -Cloud=雲 -Wooden Pickaxe=木製のツルハシ -Stone Pickaxe=石のツルハシ -Bronze Pickaxe=青銅のツルハシ -Steel Pickaxe=鉄のツルハシ -Mese Pickaxe=メセのツルハシ -Diamond Pickaxe=ダイヤモンドのツルハシ -Wooden Shovel=木製のシャベル -Stone Shovel=石のシャベル -Bronze Shovel=青銅のシャベル -Steel Shovel=鉄のシャベル -Mese Shovel=メセのシャベル -Diamond Shovel=ダイヤモンドのシャベル -Wooden Axe=木製の斧 -Stone Axe=石の斧 -Bronze Axe=青銅の斧 -Steel Axe=鉄の斧 -Mese Axe=メセの斧 -Diamond Axe=ダイヤモンドの斧 -Wooden Sword=木製の剣 -Stone Sword=石の剣 -Bronze Sword=青銅の剣 -Steel Sword=鉄の剣 -Mese Sword=メセの剣 -Diamond Sword=ダイヤモンドの剣 -Torch=松明 -@1 will intersect protection on growth.=@1は成長するとき保護と交差します。 diff --git a/mods/default/locale/default.jbo.tr b/mods/default/locale/default.jbo.tr deleted file mode 100644 index 5ae97224..00000000 --- a/mods/default/locale/default.jbo.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=lo selstela gairvau -Locked Chest (owned by @1)=.i ti selstela gairvau po la'o zo'i.@1.zo'i -You do not own this chest.=.i do na ponse lo ti gairvau -a locked chest=lo selstela gairvau -Chest=lo gairvau -Write=ciska -Read=tcidu -Title:=cmene -Contents:=se cukta -Save=rejgau -by @1=la'o zo'i.@1.zo'i te cukta -Page @1 of @2=meirmoi fe li @1 li @2 -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 -Book with Text=lo cukta joi selci'a -Bronze Ingot=lo ransu manfybli -Clay Brick=lo kitybli -Clay Lump=lo kliti bakfu -Coal Lump=lo kolme bakfu -Copper Ingot=lo tunka manfybli -Copper Lump=lo tunka bakfu -Diamond=lo tabjme -Flint=lo fagyro'i -Gold Ingot=lo solji manfybli -Gold Lump=lo solji bakfu -Iron Lump=lo tirse bakfu -Mese Crystal=lo za'e krilrmese -Mese Crystal Fragment=lo za'e krilrmese spisa -Obsidian Shard=lo je'erma'ablaci spisa -Paper=lo pelji -Steel Ingot=lo gasta manfybli -Stick=lo grana -Tin Ingot=lo tinci manfybli -Tin Lump=lo tinci bakfu -Furnace is empty=.i lo toknu cu kunti -100% (output full)=100 ce'i to lo se zbasu cu culno toi -@1%=@1 ce'i -Not cookable=na kakne le ka se jukpa -Empty=ti kunti -Furnace active=.i lo toknu cu tolcando -Furnace inactive=.i lo toknu cu cando -(Item: @1; Fuel: @2)=to jukpa @1 @2 -Furnace=lo toknu -Stone=lo rokci -Cobblestone=lo lolro'iboi -Stone Brick=lo morna rokci -Stone Block=lo rokci bliku -Mossy Cobblestone=lo clika lolro'iboi -Desert Stone=lo cantu'a rokci -Desert Cobblestone=lo cantu'a lolro'iboi -Desert Stone Brick=lo morna ke cantu'a rokci -Desert Stone Block=lo cantu'a rokci bliku -Sandstone=lo canro'i -Sandstone Brick=lo morna canro'i -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 canro'i -Silver Sandstone Brick=lo morna ke rijyska canro'i -Silver Sandstone Block=lo rijyska canro'i bliku -Obsidian=lo je'erma'ablaci -Obsidian Brick=lo morna je'erma'ablaci -Obsidian Block=lo je'erma'ablaci bliku -Dirt=lo dertu -Dirt with Grass=lo dertu joi srasu -Dirt with Grass and Footsteps=lo dertu joi srasu jebo stapa bo prina -Dirt with Savanna Grass=lo dertu joi sudytu'a bo srasu -Dirt with Snow=lo dertu joi snime -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=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 -Gravel=lo cmaro'i -Clay=lo kliti -Snow=lo snime -Snow Block=lo snime bliku -Ice=lo bisli -Cave Ice=lo kevzda bisli -Apple Tree=lo plisytricu ricystani -Apple Wood Planks=lo plisymudri tanbo -Apple Tree Sapling=lo plisytricu ciftricu -Apple Tree Leaves=lo plisytricu pezli -Apple=lo plise -Apple Marker=lo plise barna -Jungle Tree=lo glatimdemricfoi ricystani -Jungle Wood Planks=lo glatimdemricfoi mudri tanbo -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 ku'urmudri tanbo -Pine Needles=lo ckunu jezpezli -Pine Tree Sapling=lo ckunu ciftricu -Acacia Tree=lo atkaci,ia ricystani -Acacia Wood Planks=lo atkaci,ia mudri tanbo -Acacia Tree Leaves=lo atkaci,ia pezli -Acacia Tree Sapling=lo atkaci,ia ciftricu -Aspen Tree=lo ricrpopulu ricystani -Aspen Wood Planks=lo mudrpopulu tanbo -Aspen Tree Leaves=lo ricrpopulu pezli -Aspen Tree Sapling=lo ricrpopulu ciftricu -Coal Ore=lo kolme kunra -Coal Block=lo kolme bliku -Iron Ore=lo tirse kunra -Steel Block=lo gasta bliku -Copper Ore=lo tunka kunra -Copper Block=lo tunka bliku -Tin Ore=lo tinci kunra -Tin Block=lo tinci bliku -Bronze Block=lo ransu bliku -Mese Ore=lo za'e kunrmese -Mese Block=lo za'e blikrmese -Gold Ore=lo solji kunra -Gold Block=lo solji bliku -Diamond Ore=lo tabjme kunra -Diamond Block=lo tabjme bliku -Cactus=lo jesyspa -Large Cactus Seedling=lo barda ke jesyspa tsiju -Papyrus=lo misryplespa -Dry Shrub=lo sudga dzitricu -Jungle Grass=lo glatimdemricfoi srasu -Grass=lo srasu -Savanna Grass=lo sudytu'a srasu -Fern=lo filcina -Marram Grass=lo xaskoi srasu -Bush Stem=lo dzitricu stani -Bush Leaves=lo dzitricu pezli -Bush Sapling=lo dzitricu ciftricu -Blueberry Bush Leaves with Berries=lo ke blajba dzitricu pezli ke'e joi jbari -Blueberry Bush Leaves=lo blajba dzitricu pezli -Blueberry Bush Sapling=lo blajba dzitrcu ciftricu -Acacia Bush Stem=lo atkaci,ia dzitricu stani -Acacia Bush Leaves=lo atkaci,ia dzitricu pezli -Acacia Bush Sapling=lo atkaci,ia dzitricu ciftricu -Pine Bush Stem=lo ckunu dzitricu stani -Pine Bush Needles=lo ckunu dzitricu jezpezli -Pine Bush Sapling=lo ckunu dzitricu ciftricu -Kelp=lo vraike -Green Coral=lo crino pevypanje -Pink Coral=lo xunblabi pevypanje -Cyan Coral=lo cicna pevypanje -Brown Coral=lo bunre pevypanje -Orange Coral=lo narju pevypanje -Coral Skeleton=lo pevypanje greku -Water Source=lo djacu velflecu -Flowing Water=lo flecu djacu -River Water Source=lo rirxe djacu velflecu -Flowing River Water=lo flecu ke rirxe djacu -Lava Source=lo likro'i velflecu -Flowing Lava=lo flecu likro'i -Empty Bookshelf=.i ti kunti ckukajna -Bookshelf (@1 written, @2 empty books)=.i ti ckukajna to @1 cukta joi selci'a .ije @2 kunti cukta toi -Bookshelf=lo ckukajna -Text too long=.i lo lerpoi cu dukse lo ka clani -"@1"=zoi sy.@1.sy. -Wooden Sign=lo mudri sinxa -Steel Sign=lo gasta sinxa -Wooden Ladder=lo mudri rajyserti -Steel Ladder=lo gasta rajyserti -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 ku'urmudri garbi'u -Aspen Wood Fence=lo mudrpopulu garbi'u -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 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 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 -Bronze Pickaxe=lo ransu velkakpymru -Steel Pickaxe=lo gasta velkakpymru -Mese Pickaxe=lo za'e kunrmese velkakpymru -Diamond Pickaxe=lo tabjme velkakpymru -Wooden Shovel=lo mudri canpa -Stone Shovel=lo rokci canpa -Bronze Shovel=lo ransu canpa -Steel Shovel=lo gasta canpa -Mese Shovel=lo za'e kunrmese canpa -Diamond Shovel=lo tabjme canpa -Wooden Axe=lo mudri ka'amru -Stone Axe=lo rokci ka'amru -Bronze Axe=lo ransu ka'amru -Steel Axe=lo gasta ka'amru -Mese Axe=lo za'e kunrmese ka'amru -Diamond Axe=lo tabjme ka'amru -Wooden Sword=lo mudri cladakyxa'i -Stone Sword=lo rokci cladakyxa'i -Bronze Sword=lo ransu cladakyxa'i -Steel Sword=lo gasta cladakyxa'i -Mese Sword=lo za'e kunrmese cladakyxa'i -Diamond Sword=lo tabjme cladakyxa'i -Torch=lo fagytergu'i -@1 will intersect protection on growth.=.i @1 cu ba kruca lo bandu ca lo nu banro diff --git a/mods/default/locale/default.lv.tr b/mods/default/locale/default.lv.tr deleted file mode 100644 index b0a1de05..00000000 --- a/mods/default/locale/default.lv.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=Aizslēgta lāde -Locked Chest (owned by @1)=Aizslēgta lāde (Saimnieks: @1) -You do not own this chest.=Jums nepieder šī lāde. -a locked chest=aizslēgta lāde -Chest=Lāde -Write=Rakstīt -Read=Lasīt -Title:=Virsraksts: -Contents:=Saturs: -Save=Saglabāt -by @1=autors @1 -Page @1 of @2=@1 lappuse no @2 -The book you were writing to mysteriously disappeared.=Grāmata, kuru rakstījāt, pēkšņi pazuda. -"@1" by @2="@1" @2 -Blueberries=Mellenes -Book=Grāmata -Book with Text=Grāmata ar tekstu -Bronze Ingot=Bronzas stienis -Clay Brick=Māla ķieģelis -Clay Lump=Māla pika -Coal Lump=Ogle -Copper Ingot=Vara stienis -Copper Lump=Vara rūdas gabals -Diamond=Dimants -Flint=Krams -Gold Ingot=Zelta stienis -Gold Lump=Zelta rūdas gabals -Iron Lump=Dzelzs rūdas gabals -Mese Crystal=Mēzes kristāls -Mese Crystal Fragment=Mēzes kristāla fragments -Obsidian Shard=Obsidiāna skaida -Paper=Papīrs -Steel Ingot=Tērauda stienis -Stick=Puļķis -Tin Ingot=Alvas stienis -Tin Lump=Alvas rūdas gabals -Furnace is empty=Krāsns ir tukša -100% (output full)=100% (izeja pilna) -@1%=@1% -Not cookable=Nav gatavojams -Empty=Tukšs -Furnace active=Krāsns kurās -Furnace inactive=Krāsns nekurās -(Item: @1; Fuel: @2)=(Priekšmets: @1; Degviela: @2) -Furnace=Krāsns -Stone=Akmens -Cobblestone=Mūrakmens -Stone Brick=Akmens ķieģeļi -Stone Block=Akmens bloks -Mossy Cobblestone=Apsūnojis mūrakmens -Desert Stone=Tuksneša akmens -Desert Cobblestone=Tuksneša mūrakmens -Desert Stone Brick=Tuksneša akmens ķieģeļi -Desert Stone Block=Tuksneša akmens bloks -Sandstone=Smilšakmens -Sandstone Brick=Smilšakmens ķieģeļi -Sandstone Block=Smilšakmens bloks -Desert Sandstone=Tuksnesa smilšakmens -Desert Sandstone Brick=Tuksneša smilšakmens ķieģeļi -Desert Sandstone Block=Tuksneša smilšakmens bloks -Silver Sandstone=Baltais smilšakmens -Silver Sandstone Brick=Baltā smilšakmens ķieģeļi -Silver Sandstone Block=Baltā smilšakmens bloks -Obsidian=Obsidiāns -Obsidian Brick=Obsidiāna ķieģeļi -Obsidian Block=Obsidiāna bloks -Dirt=Zeme -Dirt with Grass=Zeme ar zāli -Dirt with Grass and Footsteps=Pēdaina zeme ar zāli -Dirt with Savanna Grass=Zeme ar savannas zāli -Dirt with Snow=Zeme ar sniegu -Dirt with Rainforest Litter=Zeme ar lietusmeža zemsedzi -Dirt with Coniferous Litter=Zeme ar skujām -Savanna Dirt=Savannas zeme -Savanna Dirt with Savanna Grass=Savannas zeme ar savannas zāli -Permafrost=Mūžīgais sasalums -Permafrost with Stones=Mūžīgais sasalums ar akmentiņiem -Permafrost with Moss=Mūžīgais sasalums ar sūnām -Sand=Smilts -Desert Sand=Tuksneša smilts -Silver Sand=Baltā smilts -Gravel=Grants -Clay=Māla bloks -Snow=Sniegs -Snow Block=Sniega bloks -Ice=Ledus -Cave Ice=Alu ledus -Apple Tree=Ābele -Apple Wood Planks=Ābolkoka dēļi -Apple Tree Sapling=Ābeles dzinums -Apple Tree Leaves=Ābeles lapas -Apple=Ābols -Apple Marker=Ābola marķieris -Jungle Tree=Džungļu koks -Jungle Wood Planks=Džungļu koka dēļi -Jungle Tree Leaves=Džungļu koka lapas -Jungle Tree Sapling=Džungļu koka dzinums -Emergent Jungle Tree Sapling=Augsta džungļu koka dzinums -Pine Tree=Skujkoks -Pine Wood Planks=Skujkoka dēļi -Pine Needles=Skujas -Pine Tree Sapling=Skujkoka dzinums -Acacia Tree=Akācija -Acacia Wood Planks=Akācijas dēļi -Acacia Tree Leaves=Akācijas lapas -Acacia Tree Sapling=Akācijas dzinums -Aspen Tree=Apse -Aspen Wood Planks=Apses koka dēļi -Aspen Tree Leaves=Apses lapas -Aspen Tree Sapling=Apses dzinums -Coal Ore=Akmeņogļu rūda -Coal Block=Akmeņogļu bloks -Iron Ore=Dzelzs rūda -Steel Block=Tērauda bloks -Copper Ore=Vara rūda -Copper Block=Vara bloks -Tin Ore=Alvas rūda -Tin Block=Alvas bloks -Bronze Block=Bronzas bloks -Mese Ore=Mēzes rūda -Mese Block=Mēzes bloks -Gold Ore=Zelta rūda -Gold Block=Zelta bloks -Diamond Ore=Dimanta rūda -Diamond Block=Dimanta bloks -Cactus=Kaktuss -Large Cactus Seedling=Liela kaktusa dzinums -Papyrus=Papiruss -Dry Shrub=Izžuvis krūmiņš -Jungle Grass=Džungļu zāle -Grass=Zāle -Savanna Grass=Savannas zāle -Fern=Paparde -Marram Grass=Kāpu niedre -Bush Stem=Krūma stumbrājs -Bush Leaves=Krūma lapas -Bush Sapling=Krūma dzinums -Blueberry Bush Leaves with Berries=Melleņu krūms ar ogām -Blueberry Bush Leaves=Melleņu krūms -Blueberry Bush Sapling=Melleņu krūma dzinums -Acacia Bush Stem=Akācijas krūma stumbrājs -Acacia Bush Leaves=Akācijas krūma lapas -Acacia Bush Sapling=Akācijas krūma dzinums -Pine Bush Stem=Skujaina krūma stumbrājs -Pine Bush Needles=Skujaina krūma lapas -Pine Bush Sapling=Skujaina krūma dzinums -Kelp=Brūnaļģes -Green Coral=Zaļš korallis -Pink Coral=Rozā korallis -Cyan Coral=Ciānkrāsas korallis -Brown Coral=Brūns korallis -Orange Coral=Oranžs korallis -Coral Skeleton=Koraļļa skelets -Water Source=Ūdens avots -Flowing Water=Plūstošs ūdens -River Water Source=Upes ūdens avots -Flowing River Water=Tekošs upes ūdens -Lava Source=Lavas avots -Flowing Lava=Plūstoša lava -Empty Bookshelf=Tukss grāmatplaukts -Bookshelf (@1 written, @2 empty books)=Grāmatplauktā (@1 rakstītas, @2 tukšas grāmatas) -Bookshelf=Grāmatplaukts -Text too long=Teksts par garu -"@1"="@1" -Wooden Sign=Koka zīme -Steel Sign=Tērauda zīme -Wooden Ladder=Koka kāpnes -Steel Ladder=Tērauda kāpnes -Apple Wood Fence=Ābolkoka žogs -Acacia Wood Fence=Akācijas žogs -Jungle Wood Fence=Džungļu koka žogs -Pine Wood Fence=Skujkoka žogs -Aspen Wood Fence=Apses koka žogs -Apple Wood Fence Rail=Ābolkoka žoga margas -Acacia Wood Fence Rail=Akācijas žoga margas -Jungle Wood Fence Rail=Džungļu koka žoga margas -Pine Wood Fence Rail=Skujkoka žoga margas -Aspen Wood Fence Rail=Apses žoga margas -Glass=Stikls -Obsidian Glass=Obsidiāna stikls -Brick Block=Ķieģeļu bloks -Mese Lamp=Mēzes lampa -Apple Wood Mese Post Light=Ābolkoka mēzes lampa -Acacia Wood Mese Post Light=Akācijas mēzes lampa -Jungle Wood Mese Post Light=Džungļu koka mēzes lampa -Pine Wood Mese Post Light=Skujkoka mēzes lampa -Aspen Wood Mese Post Light=Apses koka mēzes lampa -Cloud=Mākonis -Wooden Pickaxe=Koka cērte -Stone Pickaxe=Akmens cērte -Bronze Pickaxe=Bronzas cērte -Steel Pickaxe=Tērauda cērte -Mese Pickaxe=Mēzes cērte -Diamond Pickaxe=Dimanta cērte -Wooden Shovel=Koka lāpsta -Stone Shovel=Akmens lāpsta -Bronze Shovel=Bronzas lāpsta -Steel Shovel=Tērauda lāpsta -Mese Shovel=Mēzes lāpsta -Diamond Shovel=Dimanta lāpsta -Wooden Axe=Koka cirvis -Stone Axe=Akmens cirvis -Bronze Axe=Bronzas cirvis -Steel Axe=Tērauda cirvis -Mese Axe=Mēzes cirvis -Diamond Axe=Dimanta cirvis -Wooden Sword=Koka zobens -Stone Sword=Akmens zobens -Bronze Sword=Bronzas zobens -Steel Sword=Tērauda zobens -Mese Sword=Mēzes zobens -Diamond Sword=Dimanta zobens -Torch=Lāpa -@1 will intersect protection on growth.=@1 augot krustos aisargājamo zonu. diff --git a/mods/default/locale/default.ms.tr b/mods/default/locale/default.ms.tr index 0395afa0..b82c2017 100644 --- a/mods/default/locale/default.ms.tr +++ b/mods/default/locale/default.ms.tr @@ -4,42 +4,36 @@ Locked Chest (owned by @1)=Peti Berkunci (milik @1) You do not own this chest.=Ini bukan peti milik anda. a locked chest=peti berkunci Chest=Peti -Write=Tulis -Read=Baca -Title:=Tajuk: -Contents:=Kandungan: -Save=Simpan -by @1=oleh @1 -Page @1 of @2=Halaman @1 daripada @2 -The book you were writing to mysteriously disappeared.=Buku yang anda tulis hilang secara misterinya. +Stick=Serpihan Kayu +Paper=Kertas "@1" by @2="@1" oleh @2 -Blueberries=Beri Biru Book=Buku Book with Text=Buku Bertulisan -Bronze Ingot=Jongkong Gangsa -Clay Brick=Bata Tanah Liat -Clay Lump=Longgokan Tanah Liat +Skeleton Key=Kunci Induk +Key to @1's @2=Kunci @2 milik @1 Coal Lump=Longgokan Batu Arang -Copper Ingot=Jongkong Tembaga -Copper Lump=Longgokan Tembaga -Diamond=Berlian -Flint=Batu Api -Gold Ingot=Jongkong Emas -Gold Lump=Longgokan Emas Iron Lump=Longgokan Besi -Mese Crystal=Kristal Mese -Mese Crystal Fragment=Serpihan Kristal Mese -Obsidian Shard=Serpihan Obsidia -Paper=Kertas -Steel Ingot=Jongkong Keluli -Stick=Serpihan Kayu -Tin Ingot=Jongkong Timah +Copper Lump=Longgokan Tembaga Tin Lump=Longgokan Timah +Mese Crystal=Kristal Mese +Gold Lump=Longgokan Emas +Diamond=Berlian +Clay Lump=Longgokan Tanah Liat +Steel Ingot=Jongkong Keluli +Copper Ingot=Jongkong Tembaga +Tin Ingot=Jongkong Timah +Bronze Ingot=Jongkong Gangsa +Gold Ingot=Jongkong Emas +Mese Crystal Fragment=Serpihan Mese +Clay Brick=Bata Tanah Liat +Obsidian Shard=Serpihan Obsidia +Flint=Batu Api +Blueberries=Beri Biru Furnace is empty=Relau masih kosong 100% (output full)=100% (keluaran penuh) @1%=@1% -Not cookable=Tidak boleh dimasak Empty=Kosong +Not cookable=Tidak boleh dimasak Furnace active=Relau aktif Furnace inactive=Relau tidak aktif (Item: @1; Fuel: @2)=(Item: @1; Bahan api: @2) @@ -68,12 +62,12 @@ Obsidian Block=Bongkah Obsidia Dirt=Tanah Dirt with Grass=Tanah Berumput Dirt with Grass and Footsteps=Tanah Berumput dan Tapak Kaki -Dirt with Savanna Grass=Tanah Berumput Savana +Dirt with Dry Grass=Tanah Berumput Kering Dirt with Snow=Tanah Bersalji Dirt with Rainforest Litter=Tanah Bersarap Hutan Hujan Dirt with Coniferous Litter=Tanah Bersarap Hutan Konifer -Savanna Dirt=Tanah Savana -Savanna Dirt with Savanna Grass=Tanah Savana Berumput Savana +Dry Dirt=Tanah Kering +Dry Dirt with Dry Grass=Tanah Kering Berumput Kering Permafrost=Ibun Abadi Permafrost with Stones=Ibun Abadi Berbatu Permafrost with Moss=Ibun Abadi Berlumut @@ -130,7 +124,7 @@ Papyrus=Papirus Dry Shrub=Pokok Renek Kering Jungle Grass=Rumput Hutan Grass=Rumput -Savanna Grass=Rumput Savana +Dry Grass=Rumput Kering Fern=Paku Pakis Marram Grass=Rumput Maram Bush Stem=Batang Belukar @@ -162,7 +156,6 @@ Empty Bookshelf=Rak Buku Kosong Bookshelf (@1 written, @2 empty books)=Rak Buku (@1 buku bertulis, @2 buku kosong) Bookshelf=Rak Buku Text too long=Tulisan terlalu panjang -"@1"="@1" Wooden Sign=Papan Tanda Kayu Steel Sign=Papan Tanda Keluli Wooden Ladder=Tangga Panjat Kayu @@ -181,11 +174,7 @@ Glass=Kaca Obsidian Glass=Kaca Obsidia Brick Block=Bongkah Bata Mese Lamp=Lampu Mese -Apple Wood Mese Post Light=Lampu Tiang Mese Kayu Epal -Acacia Wood Mese Post Light=Lampu Tiang Mese Kayu Akasia -Jungle Wood Mese Post Light=Lampu Tiang Mese Kayu Hutan -Pine Wood Mese Post Light=Lampu Tiang Mese Kayu Pain -Aspen Wood Mese Post Light=Lampu Tiang Mese Kayu Aspen +Mese Post Light=Lampu Tiang Mese Cloud=Awan Wooden Pickaxe=Beliung Kayu Stone Pickaxe=Beliung Batu @@ -211,14 +200,12 @@ Bronze Sword=Pedang Gangsa Steel Sword=Pedang Keluli Mese Sword=Pedang Mese Diamond Sword=Pedang Intan +Key=Kunci Torch=Obor @1 will intersect protection on growth.=@1 akan masuk kawasan perlindungan lain apabila ia tumbuh. - - -##### not used anymore ##### - -Dirt with Dry Grass=Tanah Berumput Kering -Dry Dirt=Tanah Kering -Dry Dirt with Dry Grass=Tanah Kering Berumput Kering -Dry Grass=Rumput Kering -Mese Post Light=Lampu Tiang Mese +Title:=Tajuk: +Contents:=Kandungan: +Save=Simpan +by @1=oleh @1 +Page @1 of @2=Ms. @1 / @2 +"@1"="@1" diff --git a/mods/default/locale/default.pl.tr b/mods/default/locale/default.pl.tr deleted file mode 100644 index dd08b841..00000000 --- a/mods/default/locale/default.pl.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=Zablokowana skrzynia -Locked Chest (owned by @1)=Zablokowana skrzynia (właściciel: @1) -You do not own this chest.=Nie jesteś właścicielem tej skrzyni. -a locked chest=zablokowana skrzynia -Chest=Skrzynia -Write=Zapis -Read=Odczyt -Title:=Tytuł: -Contents:=Zawartość: -Save=Zapisz -by @1=autor: @1 -Page @1 of @2=Strona @1 z @2 -The book you were writing to mysteriously disappeared.= -"@1" by @2="@1" przez @2 -Blueberries=Jagody -Book=Książka -Book with Text=Zapisana książka -Bronze Ingot=Sztabka brązu -Clay Brick=Gliniana cegła -Clay Lump=Glina -Coal Lump=Węgiel -Copper Ingot=Sztabka miedzi -Copper Lump=Bryłka miedzi -Diamond=Diament -Flint=Krzemień -Gold Ingot=Sztabka złota -Gold Lump=Bryłka złota -Iron Lump=Bryłka żelaza -Mese Crystal=Kryształ Mese -Mese Crystal Fragment=Fragment kryształu Mese -Obsidian Shard=Odłamek obsydianu -Paper=Papier -Steel Ingot=Sztabka stali -Stick=Patyk -Tin Ingot=Sztabka cyny -Tin Lump=Bryłka cyny -Furnace is empty=Piec jest pusty -100% (output full)=100% (zapełnione) -@1%=@1% -Not cookable=Nie nadaje się do przepalania -Empty=Puste -Furnace active=Piec aktywny -Furnace inactive=Piec nieaktywny -(Item: @1; Fuel: @2)=(Przedmiot: @1; Paliwo: @2) -Furnace=Piec -Stone=Kamień -Cobblestone=Bruk -Stone Brick=Kamienne cegły -Stone Block=Blok kamienia -Mossy Cobblestone=Bruk z mchem -Desert Stone=Pustynny kamień -Desert Cobblestone=Pustynny bruk -Desert Stone Brick=Pustynne kamienne cegły -Desert Stone Block=Blok pustynnego kamienia -Sandstone=Piaskowiec -Sandstone Brick=Cegły z piaskowca -Sandstone Block=Blok piaskowca -Desert Sandstone=Pustynny piaskowiec -Desert Sandstone Brick=Cegły z pustynnego piaskowca -Desert Sandstone Block=Blok pustynnego piaskowca -Silver Sandstone=Srebrny piaskowiec -Silver Sandstone Brick=Cegły z srebrnego piaskowca -Silver Sandstone Block=Blok srebrnego piaskowca -Obsidian=Obsydian -Obsidian Brick=Obsydianowe cegły -Obsidian Block=Blok obsydianu -Dirt=Ziemia -Dirt with Grass=Ziemia z trawą -Dirt with Grass and Footsteps=Ziemia z trawą i śladami -Dirt with Savanna Grass=Ziemia z sawannową trawą -Dirt with Snow=Ziemia ze śniegiem -Dirt with Rainforest Litter=Ziemia ze ściółką lasu deszczowego -Dirt with Coniferous Litter=Ziemia ze ściółką lasu iglastego -Savanna Dirt=Sawannowa ziemia -Savanna Dirt with Savanna Grass=Sawannowa ziemia z sawannową trawą -Permafrost=Zmarzlina -Permafrost with Stones=Zmarzlina z kamieniami -Permafrost with Moss=Zmarzlina z mchem -Sand=Piasek -Desert Sand=Pustynny piasek -Silver Sand=Srebrny piasek -Gravel=Żwir -Clay=Glina -Snow=Śnieg -Snow Block=Blok śniegu -Ice=Lód -Cave Ice=Jaskiniowy lód -Apple Tree=Jabłkowe drewno -Apple Wood Planks=Deski z drzewa jabłkowego -Apple Tree Sapling=Sadzonka drzewa jabłkowego -Apple Tree Leaves=Liście drzewa jabłkowego -Apple=Jabłko -Apple Marker=Znacznik jabłka -Jungle Tree=Dżunglowe drewno -Jungle Wood Planks=Deski z dżunglowego drzewa -Jungle Tree Leaves=Liście dżunglowego drzewa -Jungle Tree Sapling=Sadzonka dżunglowego drzewa -Emergent Jungle Tree Sapling=Wyłaniająca się sadzonka dżunglowego drzewa -Pine Tree=Sosnowe drewno -Pine Wood Planks=Deski z sosnowego drzewa -Pine Needles=Sosnowe igły -Pine Tree Sapling=Sadzonka sosnowego drzewa -Acacia Tree=Akacjowe drewno -Acacia Wood Planks=Deski z akacjowego drzewa -Acacia Tree Leaves=Liście akacjowego drzewa -Acacia Tree Sapling=Sadzonka akacjowego drzewa -Aspen Tree=Brzozowe drzewo -Aspen Wood Planks=Deski z brzozowego drzewa -Aspen Tree Leaves=Liście brzozowego drzewa -Aspen Tree Sapling=Sadzonka brzozowego drzewa -Coal Ore=Ruda węgla -Coal Block=Blok węgla -Iron Ore=Ruda żelaza -Steel Block=Blok stali -Copper Ore=Ruda miedzi -Copper Block=Blok miedzi -Tin Ore=Ruda cyny -Tin Block=Blok cyny -Bronze Block=Blok brązu -Mese Ore=Ruda Mese -Mese Block=Blok Mese -Gold Ore=Ruda złota -Gold Block=Blok złota -Diamond Ore=Ruda diamentu -Diamond Block=Blok diamentu -Cactus=Kaktus -Large Cactus Seedling=Sadzonka dużego kaktusa -Papyrus=Papirus -Dry Shrub=Uschnięty krzak -Jungle Grass=Dżunglowa trawa -Grass=Trawa -Savanna Grass=Sawannowa trawa -Fern=Paproć -Marram Grass=Trzcinnik leśny -Bush Stem=Korzeń krzaku -Bush Leaves=Liście krzaku -Bush Sapling=Sadzonka krzaku -Blueberry Bush Leaves with Berries=Liście jagodowego krzaku z jagodami -Blueberry Bush Leaves=Liście jagodowego krzaku -Blueberry Bush Sapling=Sadzonka jagodowego krzaku -Acacia Bush Stem=Korzeń akacjowego krzaku -Acacia Bush Leaves=Liście akacjowego krzaku -Acacia Bush Sapling=Sadzonka akacjowego krzaku -Pine Bush Stem=Korzeń sosnowego krzaku -Pine Bush Needles=Igły sosnowego krzaku -Pine Bush Sapling=Sadzonka sosnowego krzaku -Kelp=Wodorost -Green Coral=Zielony koralowiec -Pink Coral=Różowy koralowiec -Cyan Coral=Cyjanowy koralowiec -Brown Coral=Brązowy koralowiec -Orange Coral=Pomarańczowy koralowiec -Coral Skeleton=Szkielet koralowca -Water Source=Źródło wody -Flowing Water=Płynąca woda -River Water Source=Źródło wody rzecznej -Flowing River Water=Płynąca woda rzeczna -Lava Source=Źródło lawy -Flowing Lava=Płynąca lawa -Empty Bookshelf=Pusta półka na książki -Bookshelf (@1 written, @2 empty books)=Półka na książki (@1 zapisanych, @2 pustych książek) -Bookshelf=Półka na książki -Text too long=Tekst jest zbyt długi -"@1"="@1" -Wooden Sign=Drewniana tabliczka -Steel Sign=Stalowa tabliczka -Wooden Ladder=Drewniana drabina -Steel Ladder=Stalowa drabina -Apple Wood Fence=Płot z jabłkowego drzewa -Acacia Wood Fence=Płot z akacjowego drzewa -Jungle Wood Fence=Płot z dżunglowego drzewa -Pine Wood Fence=Płot z sosnowego drzewa -Aspen Wood Fence=Płot z brzozowego drzewa -Apple Wood Fence Rail=Szyna ogrodzeniowa z jabłkowego drzewa -Acacia Wood Fence Rail=Szyna ogrodzeniowa z akacjowego drzewa -Jungle Wood Fence Rail=Szyna ogrodzeniowa z dżunglowego drzewa -Pine Wood Fence Rail=Szyna ogrodzeniowa z sosnowego drzewa -Aspen Wood Fence Rail=Szyna ogrodzeniowa z brzozowego drzewa -Glass=Szkło -Obsidian Glass=Obsydianowe szkło -Brick Block=Blok cegieł -Mese Lamp=Lampa Mese -Apple Wood Mese Post Light=Lampa Mese z obramowaniem z jabłkowego drzewa -Acacia Wood Mese Post Light=Lampa Mese z obramowaniem z akacjowego drzewa -Jungle Wood Mese Post Light=Lampa Mese z obramowaniem z dżunglowego drzewa -Pine Wood Mese Post Light=Lampa Mese z obramowaniem z sosnowego drzewa -Aspen Wood Mese Post Light=Lampa Mese z obramowaniem z brzozowego drzewa -Cloud=Chmura -Wooden Pickaxe=Drewniany kilof -Stone Pickaxe=Kamienny kilof -Bronze Pickaxe=Brązowy kilof -Steel Pickaxe=Stalowy kilof -Mese Pickaxe=Mesowy kilof -Diamond Pickaxe=Diamentowy kilof -Wooden Shovel=Drewniana łopata -Stone Shovel=Kamienna łopata -Bronze Shovel=Brązowa łopata -Steel Shovel=Stalowa łopata -Mese Shovel=Mesowa łopata -Diamond Shovel=Diamentowa łopata -Wooden Axe=Drewniana siekiera -Stone Axe=Kamienna siekiera -Bronze Axe=Brązowa siekiera -Steel Axe=Stalowa siekiera -Mese Axe=Mesowa siekiera -Diamond Axe=Diamentowa siekiera -Wooden Sword=Drewniany miecz -Stone Sword=Kamienny miecz -Bronze Sword=Brązowy miecz -Steel Sword=Stalowy miecz -Mese Sword=Mesowy miecz -Diamond Sword=Diamentowy miecz -Torch=Pochodnia -@1 will intersect protection on growth.=@1 będzie kolidować z ochroną terenu podczas rośnięcia. diff --git a/mods/default/locale/default.pt.tr b/mods/default/locale/default.pt.tr deleted file mode 100644 index 80ad5875..00000000 --- a/mods/default/locale/default.pt.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=Baú Trancado -Locked Chest (owned by @1)=Baú Trancado (pertence a @1) -You do not own this chest.=Você não é dono deste baú. -a locked chest=um baú trancado -Chest=Baú -Write= -Read= -Title:=Título: -Contents:=Conteúdo: -Save=Salvar -by @1=por @1 -Page @1 of @2=Página @1 de @2 -The book you were writing to mysteriously disappeared.= -"@1" by @2="@1" por @2 -Blueberries=Mirtilo -Book=Livro -Book with Text=Livro com Texto -Bronze Ingot=Lingote de Bronze -Clay Brick=Tijolo de Argila -Clay Lump=Pedaço de Argila -Coal Lump=Pedaço de Carvão -Copper Ingot=Lingote de Cobre -Copper Lump=Pedaço de Cobre -Diamond=Diamante -Flint=Rocha Sílex -Gold Ingot=Lingote de Ouro -Gold Lump=Pedaço de Ouro -Iron Lump=Pedaço de Ferro -Mese Crystal=Cristal de Mese -Mese Crystal Fragment=Fragmento de Cristal de Mese -Obsidian Shard=Caco de Obsidian -Paper=Papel -Steel Ingot=Lingote de Aço -Stick=Graveto -Tin Ingot=Lingote de Estanho -Tin Lump=Pedaço de Estanho -Furnace is empty=A fornalha está vazia -100% (output full)=100% (saída cheia) -@1%=@1% -Not cookable=Não pode cozinhar -Empty=Vazio -Furnace active=Fornalha ativa -Furnace inactive=Fornalha inativa -(Item: @1; Fuel: @2)=(Item: @1; Combustível: @2) -Furnace=Fornalha -Stone=Pedra -Cobblestone=Pedregulho -Stone Brick=Tijolo de Pedra -Stone Block=Bloco de Pedra -Mossy Cobblestone=Pedregulho Musgoso -Desert Stone=Pedra do Deserto -Desert Cobblestone=Pedregulho do Deserto -Desert Stone Brick=Tijolo de Pedra do Deserto -Desert Stone Block=Bloco de Pedra do Deserto -Sandstone=Arenito -Sandstone Brick=Tijolo de Arenito -Sandstone Block=Bloco de Arenito -Desert Sandstone=Bloco de Arenito do Deserto -Desert Sandstone Brick=Tijolo de Arenito do Deserto -Desert Sandstone Block=Bloco de Arenito do Deserto -Silver Sandstone=Arenito Prateado -Silver Sandstone Brick=Tijolo de Arenito Prateado -Silver Sandstone Block=Bloco de Arenito Prateado -Obsidian=Obsidiana -Obsidian Brick=Tijolo de Obsidiana -Obsidian Block=Bloco de Obsidiana -Dirt=Terra -Dirt with Grass=Terra com Grama -Dirt with Grass and Footsteps=Terra com Grama e Pegadas -Dirt with Savanna Grass=Terra com Grama da Savana -Dirt with Snow=Terra com Neve -Dirt with Rainforest Litter=Terra com Serrapilheira Tropical -Dirt with Coniferous Litter=Terra com Serrapilheira -Savanna Dirt=Terra da Savana -Savanna Dirt with Savanna Grass=Terra da Savana com Grama da Savana -Permafrost=Terra Congelada -Permafrost with Stones=Terra Congelada com Pedras -Permafrost with Moss=Terra Congelada com Musgo -Sand=Areia -Desert Sand=Areia do Deserto -Silver Sand=Areia Prateada -Gravel=Cascalho -Clay=Argila -Snow=Neve -Snow Block=Bloco de Neve -Ice=Gelo -Cave Ice=Caverna de Gelo -Apple Tree=Macieira -Apple Wood Planks=Tábuas de Macieira -Apple Tree Sapling=Muda de Macieira -Apple Tree Leaves=Folhas de Macieira -Apple=Maçã -Apple Marker=Marcador de Maçã -Jungle Tree=Árvore da Selva -Jungle Wood Planks=Tábuas de Árvore da Selva -Jungle Tree Leaves=Folhas de Árvore da Selva -Jungle Tree Sapling=Muda de Árvore da Selva -Emergent Jungle Tree Sapling=Muda Crescida de Árvore da Selva -Pine Tree=Pinheiro -Pine Wood Planks=Tábuas de Pinheiro -Pine Needles=Agulhas de Pinheiro -Pine Tree Sapling=Muda de Pinheiro -Acacia Tree=Acácia -Acacia Wood Planks=Tábuas de Acácia -Acacia Tree Leaves=Folhas de Acácia -Acacia Tree Sapling=Mudas de Acácia -Aspen Tree=Álamo -Aspen Wood Planks=Tábuas de Álamo -Aspen Tree Leaves=Folhas de Álamo -Aspen Tree Sapling=Muda de Álamo -Coal Ore=Minério de Carvão -Coal Block=Bloco de Carvão -Iron Ore=Minério de Ferro -Steel Block=Bloco de Aço -Copper Ore=Minério de Cobre -Copper Block=Bloco de Cobre -Tin Ore=Minério de Estanho -Tin Block=Bloco de Estanho -Bronze Block=Bloco de Bronze -Mese Ore=Minério de Mese -Mese Block=Bloco de Mese -Gold Ore=Minério de Ouro -Gold Block=Bloco de Ouro -Diamond Ore=Minério de Diamante -Diamond Block=Bloco de Diamante -Cactus=Cacto -Large Cactus Seedling=Grande Muda de Cacto -Papyrus=Papiro -Dry Shrub=Arbusto Seco -Jungle Grass=Grama da Selva -Grass=Grama -Savanna Grass=Grama da Savana -Fern=Samambaia -Marram Grass=Grama de Feno -Bush Stem=Caule de Arbusto -Bush Leaves=Folhas de Arbusto -Bush Sapling=Muda de Arbusto -Blueberry Bush Leaves with Berries=Folhas de Arbusto de Mirtilo com Bagas -Blueberry Bush Leaves=Folhas de Arbusto de Mirtilo -Blueberry Bush Sapling=Muda de Arbusto de Mirtilo -Acacia Bush Stem=Caule de Arbusto de Acácia -Acacia Bush Leaves=Folhas de Arbusto de Acácia -Acacia Bush Sapling=Muda de Arbusto de Acácia -Pine Bush Stem=Caule de Arbusto de Pinheiro -Pine Bush Needles=Agulha de Arbusto de Pinheiro -Pine Bush Sapling=Muda de Arbusto de Pinheiro -Kelp=Alga -Green Coral=Coral Verde -Pink Coral=Coral Rosa -Cyan Coral=Coral Ciano -Brown Coral=Coral Marrom -Orange Coral=Coral Laranja -Coral Skeleton=Esqueleto de Coral -Water Source=Fonte de Água -Flowing Water=Água Corrente -River Water Source=Fonte de Água do Rio -Flowing River Water=Água Corrente do Rio -Lava Source=Fonte de Lava -Flowing Lava=Lava Corrente -Empty Bookshelf=Estante de Livros Vazia -Bookshelf (@1 written, @2 empty books)=Estante de Livros (@1 livros escritos, @2 livros em branco) -Bookshelf=Estante de Livros -Text too long=Texto muito longo -"@1"="@1" -Wooden Sign=Placa de Madeira -Steel Sign=Placa de Aço -Wooden Ladder=Escada de Madeira -Steel Ladder=Escada de Aço -Apple Wood Fence=Cerca de Macieira -Acacia Wood Fence=Cerca de Acácia -Jungle Wood Fence=Cerca de Madeira da Selva -Pine Wood Fence=Cerca de Pinheiro -Aspen Wood Fence=Cerca de Álamo -Apple Wood Fence Rail=Trilho de Cerca de Macieira -Acacia Wood Fence Rail=Trilho de Cerca de Acácia -Jungle Wood Fence Rail=Trilho de Cerca de Madeira da Selva -Pine Wood Fence Rail=Trilho de Cerca de Pinheiro -Aspen Wood Fence Rail=Trilho de Cerca de Álamo -Glass=Vidro -Obsidian Glass=Vidro de Obsidiana -Brick Block=Bloco de Tijolos -Mese Lamp=Lâmpada de Mese -Apple Wood Mese Post Light=Poste de Lâmpada de Mese de Macieira -Acacia Wood Mese Post Light=Poste de Lâmpada de Mese de Acácia -Jungle Wood Mese Post Light=Poste de Lâmpada de Mese de Madeira da Selva -Pine Wood Mese Post Light=Poste de Lâmpada de Mese de Pinheiro -Aspen Wood Mese Post Light=Poste de Lâmpada de Mese de Aspen -Cloud=Nuvem -Wooden Pickaxe=Picareta de Madeira -Stone Pickaxe=Picareta de Pedra -Bronze Pickaxe=Picareta de Bronze -Steel Pickaxe=Picareta de Aço -Mese Pickaxe=Picareta de Mese -Diamond Pickaxe=Picareta de Diamante -Wooden Shovel=Pá de Madeira -Stone Shovel=Pá de Pedra -Bronze Shovel=Pá de Bronze -Steel Shovel=Pá de Aço -Mese Shovel=Pá de Mese -Diamond Shovel=Pá de Diamante -Wooden Axe=Machado de Madeira -Stone Axe=Machado de Pedra -Bronze Axe=Machado de Bronze -Steel Axe=Machado de Aço -Mese Axe=Machado de Mese -Diamond Axe=Machado de Diamante -Wooden Sword=Espada de Madeira -Stone Sword=Espada de Pedra -Bronze Sword=Espada de Bronze -Steel Sword=Espada de Aço -Mese Sword=Espada de Mese -Diamond Sword=Espada de Diamante -Torch=Tocha -@1 will intersect protection on growth.=@1 cruzará a proteção no crescimento. diff --git a/mods/default/locale/default.pt_BR.tr b/mods/default/locale/default.pt_BR.tr deleted file mode 100644 index 80ad5875..00000000 --- a/mods/default/locale/default.pt_BR.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=Baú Trancado -Locked Chest (owned by @1)=Baú Trancado (pertence a @1) -You do not own this chest.=Você não é dono deste baú. -a locked chest=um baú trancado -Chest=Baú -Write= -Read= -Title:=Título: -Contents:=Conteúdo: -Save=Salvar -by @1=por @1 -Page @1 of @2=Página @1 de @2 -The book you were writing to mysteriously disappeared.= -"@1" by @2="@1" por @2 -Blueberries=Mirtilo -Book=Livro -Book with Text=Livro com Texto -Bronze Ingot=Lingote de Bronze -Clay Brick=Tijolo de Argila -Clay Lump=Pedaço de Argila -Coal Lump=Pedaço de Carvão -Copper Ingot=Lingote de Cobre -Copper Lump=Pedaço de Cobre -Diamond=Diamante -Flint=Rocha Sílex -Gold Ingot=Lingote de Ouro -Gold Lump=Pedaço de Ouro -Iron Lump=Pedaço de Ferro -Mese Crystal=Cristal de Mese -Mese Crystal Fragment=Fragmento de Cristal de Mese -Obsidian Shard=Caco de Obsidian -Paper=Papel -Steel Ingot=Lingote de Aço -Stick=Graveto -Tin Ingot=Lingote de Estanho -Tin Lump=Pedaço de Estanho -Furnace is empty=A fornalha está vazia -100% (output full)=100% (saída cheia) -@1%=@1% -Not cookable=Não pode cozinhar -Empty=Vazio -Furnace active=Fornalha ativa -Furnace inactive=Fornalha inativa -(Item: @1; Fuel: @2)=(Item: @1; Combustível: @2) -Furnace=Fornalha -Stone=Pedra -Cobblestone=Pedregulho -Stone Brick=Tijolo de Pedra -Stone Block=Bloco de Pedra -Mossy Cobblestone=Pedregulho Musgoso -Desert Stone=Pedra do Deserto -Desert Cobblestone=Pedregulho do Deserto -Desert Stone Brick=Tijolo de Pedra do Deserto -Desert Stone Block=Bloco de Pedra do Deserto -Sandstone=Arenito -Sandstone Brick=Tijolo de Arenito -Sandstone Block=Bloco de Arenito -Desert Sandstone=Bloco de Arenito do Deserto -Desert Sandstone Brick=Tijolo de Arenito do Deserto -Desert Sandstone Block=Bloco de Arenito do Deserto -Silver Sandstone=Arenito Prateado -Silver Sandstone Brick=Tijolo de Arenito Prateado -Silver Sandstone Block=Bloco de Arenito Prateado -Obsidian=Obsidiana -Obsidian Brick=Tijolo de Obsidiana -Obsidian Block=Bloco de Obsidiana -Dirt=Terra -Dirt with Grass=Terra com Grama -Dirt with Grass and Footsteps=Terra com Grama e Pegadas -Dirt with Savanna Grass=Terra com Grama da Savana -Dirt with Snow=Terra com Neve -Dirt with Rainforest Litter=Terra com Serrapilheira Tropical -Dirt with Coniferous Litter=Terra com Serrapilheira -Savanna Dirt=Terra da Savana -Savanna Dirt with Savanna Grass=Terra da Savana com Grama da Savana -Permafrost=Terra Congelada -Permafrost with Stones=Terra Congelada com Pedras -Permafrost with Moss=Terra Congelada com Musgo -Sand=Areia -Desert Sand=Areia do Deserto -Silver Sand=Areia Prateada -Gravel=Cascalho -Clay=Argila -Snow=Neve -Snow Block=Bloco de Neve -Ice=Gelo -Cave Ice=Caverna de Gelo -Apple Tree=Macieira -Apple Wood Planks=Tábuas de Macieira -Apple Tree Sapling=Muda de Macieira -Apple Tree Leaves=Folhas de Macieira -Apple=Maçã -Apple Marker=Marcador de Maçã -Jungle Tree=Árvore da Selva -Jungle Wood Planks=Tábuas de Árvore da Selva -Jungle Tree Leaves=Folhas de Árvore da Selva -Jungle Tree Sapling=Muda de Árvore da Selva -Emergent Jungle Tree Sapling=Muda Crescida de Árvore da Selva -Pine Tree=Pinheiro -Pine Wood Planks=Tábuas de Pinheiro -Pine Needles=Agulhas de Pinheiro -Pine Tree Sapling=Muda de Pinheiro -Acacia Tree=Acácia -Acacia Wood Planks=Tábuas de Acácia -Acacia Tree Leaves=Folhas de Acácia -Acacia Tree Sapling=Mudas de Acácia -Aspen Tree=Álamo -Aspen Wood Planks=Tábuas de Álamo -Aspen Tree Leaves=Folhas de Álamo -Aspen Tree Sapling=Muda de Álamo -Coal Ore=Minério de Carvão -Coal Block=Bloco de Carvão -Iron Ore=Minério de Ferro -Steel Block=Bloco de Aço -Copper Ore=Minério de Cobre -Copper Block=Bloco de Cobre -Tin Ore=Minério de Estanho -Tin Block=Bloco de Estanho -Bronze Block=Bloco de Bronze -Mese Ore=Minério de Mese -Mese Block=Bloco de Mese -Gold Ore=Minério de Ouro -Gold Block=Bloco de Ouro -Diamond Ore=Minério de Diamante -Diamond Block=Bloco de Diamante -Cactus=Cacto -Large Cactus Seedling=Grande Muda de Cacto -Papyrus=Papiro -Dry Shrub=Arbusto Seco -Jungle Grass=Grama da Selva -Grass=Grama -Savanna Grass=Grama da Savana -Fern=Samambaia -Marram Grass=Grama de Feno -Bush Stem=Caule de Arbusto -Bush Leaves=Folhas de Arbusto -Bush Sapling=Muda de Arbusto -Blueberry Bush Leaves with Berries=Folhas de Arbusto de Mirtilo com Bagas -Blueberry Bush Leaves=Folhas de Arbusto de Mirtilo -Blueberry Bush Sapling=Muda de Arbusto de Mirtilo -Acacia Bush Stem=Caule de Arbusto de Acácia -Acacia Bush Leaves=Folhas de Arbusto de Acácia -Acacia Bush Sapling=Muda de Arbusto de Acácia -Pine Bush Stem=Caule de Arbusto de Pinheiro -Pine Bush Needles=Agulha de Arbusto de Pinheiro -Pine Bush Sapling=Muda de Arbusto de Pinheiro -Kelp=Alga -Green Coral=Coral Verde -Pink Coral=Coral Rosa -Cyan Coral=Coral Ciano -Brown Coral=Coral Marrom -Orange Coral=Coral Laranja -Coral Skeleton=Esqueleto de Coral -Water Source=Fonte de Água -Flowing Water=Água Corrente -River Water Source=Fonte de Água do Rio -Flowing River Water=Água Corrente do Rio -Lava Source=Fonte de Lava -Flowing Lava=Lava Corrente -Empty Bookshelf=Estante de Livros Vazia -Bookshelf (@1 written, @2 empty books)=Estante de Livros (@1 livros escritos, @2 livros em branco) -Bookshelf=Estante de Livros -Text too long=Texto muito longo -"@1"="@1" -Wooden Sign=Placa de Madeira -Steel Sign=Placa de Aço -Wooden Ladder=Escada de Madeira -Steel Ladder=Escada de Aço -Apple Wood Fence=Cerca de Macieira -Acacia Wood Fence=Cerca de Acácia -Jungle Wood Fence=Cerca de Madeira da Selva -Pine Wood Fence=Cerca de Pinheiro -Aspen Wood Fence=Cerca de Álamo -Apple Wood Fence Rail=Trilho de Cerca de Macieira -Acacia Wood Fence Rail=Trilho de Cerca de Acácia -Jungle Wood Fence Rail=Trilho de Cerca de Madeira da Selva -Pine Wood Fence Rail=Trilho de Cerca de Pinheiro -Aspen Wood Fence Rail=Trilho de Cerca de Álamo -Glass=Vidro -Obsidian Glass=Vidro de Obsidiana -Brick Block=Bloco de Tijolos -Mese Lamp=Lâmpada de Mese -Apple Wood Mese Post Light=Poste de Lâmpada de Mese de Macieira -Acacia Wood Mese Post Light=Poste de Lâmpada de Mese de Acácia -Jungle Wood Mese Post Light=Poste de Lâmpada de Mese de Madeira da Selva -Pine Wood Mese Post Light=Poste de Lâmpada de Mese de Pinheiro -Aspen Wood Mese Post Light=Poste de Lâmpada de Mese de Aspen -Cloud=Nuvem -Wooden Pickaxe=Picareta de Madeira -Stone Pickaxe=Picareta de Pedra -Bronze Pickaxe=Picareta de Bronze -Steel Pickaxe=Picareta de Aço -Mese Pickaxe=Picareta de Mese -Diamond Pickaxe=Picareta de Diamante -Wooden Shovel=Pá de Madeira -Stone Shovel=Pá de Pedra -Bronze Shovel=Pá de Bronze -Steel Shovel=Pá de Aço -Mese Shovel=Pá de Mese -Diamond Shovel=Pá de Diamante -Wooden Axe=Machado de Madeira -Stone Axe=Machado de Pedra -Bronze Axe=Machado de Bronze -Steel Axe=Machado de Aço -Mese Axe=Machado de Mese -Diamond Axe=Machado de Diamante -Wooden Sword=Espada de Madeira -Stone Sword=Espada de Pedra -Bronze Sword=Espada de Bronze -Steel Sword=Espada de Aço -Mese Sword=Espada de Mese -Diamond Sword=Espada de Diamante -Torch=Tocha -@1 will intersect protection on growth.=@1 cruzará a proteção no crescimento. diff --git a/mods/default/locale/default.ru.tr b/mods/default/locale/default.ru.tr index ed99a2dc..214f6692 100644 --- a/mods/default/locale/default.ru.tr +++ b/mods/default/locale/default.ru.tr @@ -1,215 +1,211 @@ # textdomain: default -Locked Chest=Запертый сундук -Locked Chest (owned by @1)=Запертый сундук (владелец: @1) +Locked Chest=Заблокированный Сундук +Locked Chest (owned by @1)=Заблокированный Сундук (владелец: @1) You do not own this chest.=Вы не владелец этого сундука. -a locked chest=запертый сундук +a locked chest=заблокированный сундук Chest=Сундук -Write=Написать -Read=Читать -Title:=Заголовок: -Contents:=Содержимое: -Save=Сохранить -by @1=от @1 -Page @1 of @2=Страница @1 из @2 -The book you were writing to mysteriously disappeared.=Книга, которую вы писали, загадочно исчезла. -"@1" by @2="@1" @2 -Blueberries=Черника -Book=Книга -Book with Text=Книга с текстом -Bronze Ingot=Бронзовый слиток -Clay Brick=Кирпич -Clay Lump=Глина -Coal Lump=Уголь -Copper Ingot=Медный слиток -Copper Lump=Кусок меди -Diamond=Алмаз -Flint=Кремень -Gold Ingot=Золотой слиток -Gold Lump=Кусок золота -Iron Lump=Кусок железа -Mese Crystal=Кристалл мезы -Mese Crystal Fragment=Осколок кристалла мезы -Obsidian Shard=Обсидиановый осколок -Paper=Бумага -Steel Ingot=Стальной слиток Stick=Палка -Tin Ingot=Оловянный слиток -Tin Lump=Кусок олова -Furnace is empty=Печь пуста -100% (output full)=100% (выход заполнен) +Paper=Бумага +"@1" by @2="@1" @2 +Book=Книга +Book with Text=Книга с Текстом +Skeleton Key=Ключ Скелета +Key to @1's @2=Ключ к @2 от @1 +Coal Lump=Кусок Угля +Iron Lump=Кусок Железа +Copper Lump=Кусок Меди +Tin Lump=Кусок Олова +Mese Crystal=Кристалл Месе +Gold Lump=Кусок Золота +Diamond=Алмаз +Clay Lump=Ком Глины +Steel Ingot=Железный Брусок +Copper Ingot=Медный Брусок +Tin Ingot=Оловянный Брусок +Bronze Ingot=Бронзовый Брусок +Gold Ingot=Золотой Брусок +Mese Crystal Fragment=Осколок Кристалла Месе +Clay Brick=Глиняный Кирпич +Obsidian Shard=Обсидиановый Осколок +Flint=Огниво +Blueberries=Черника +Furnace is empty=Печь пустая +100% (output full)=100% (полное приготовление) @1%=@1% -Not cookable=Не может быть приготовлено Empty=Пустое +Not cookable=Не может быть приготовлено Furnace active=Печь зажжена Furnace inactive=Печь не зажжена (Item: @1; Fuel: @2)=(Предмет: @1; Топливо: @2) Furnace=Печь Stone=Камень Cobblestone=Булыжник -Stone Brick=Каменные кирпичи -Stone Block=Каменный блок -Mossy Cobblestone=Замшелый булыжник -Desert Stone=Пустынный камень -Desert Cobblestone=Пустынный булыжник -Desert Stone Brick=Пустынный каменные кирпичи -Desert Stone Block=Пустынный каменный блок +Stone Brick=Каменный Кирпич +Stone Block=Каменный Блок +Mossy Cobblestone=Мшистый Булыжник +Desert Stone=Пустынный Камень +Desert Cobblestone=Пустынный Булыжник +Desert Stone Brick=Пустынный Каменный Кирпич +Desert Stone Block=Пустынный Каменный Блок Sandstone=Песчаник -Sandstone Brick=Песчаниковые кирпичи -Sandstone Block=Песчаниковый блок -Desert Sandstone=Пустынный песчаник -Desert Sandstone Brick=Пустынные песчаниковые кирпичи -Desert Sandstone Block=Пустынный песчаниковый блок -Silver Sandstone=Серебристый песчаник -Silver Sandstone Brick=Серебристые песчаниковые кирпичи -Silver Sandstone Block=Серебристый песчаниковый блок +Sandstone Brick=Песчаниковый Кирпич +Sandstone Block=Песчаниковый Блок +Desert Sandstone=Пустынный Песчаник +Desert Sandstone Brick=Пустынный Песчаниковый Кирпич +Desert Sandstone Block=Пустынный Песчаниковый Блок +Silver Sandstone=Серебряный Песчаник +Silver Sandstone Brick=Серебряный Песчаниковый Кирпич +Silver Sandstone Block=Серебряный Песчаниковый Блок Obsidian=Обсидиан -Obsidian Brick=Обсидиановые кирпичи -Obsidian Block=Обсидиановый блок +Obsidian Brick=Обсидиановый Кирпич +Obsidian Block=Обсидиановый Блок Dirt=Земля -Dirt with Grass=Дёрн -Dirt with Grass and Footsteps=Дёрн со следами -Dirt with Savanna Grass=Саванный дёрн -Dirt with Snow=Земля со снегом -Dirt with Rainforest Litter=Земля с тропической подстилкой -Dirt with Coniferous Litter=Земля с сосновой подстилкой -Savanna Dirt=Саванная земля -Savanna Dirt with Savanna Grass=Саванная земля с саванной травой -Permafrost=Мёрзлая почва -Permafrost with Stones=Мёрзлая почва с камнями -Permafrost with Moss=Мёрзлая почва с мхом +Dirt with Grass=Земля с Травой +Dirt with Grass and Footsteps=Земля с Травой и Следами +Dirt with Dry Grass=Земля с Сухой Травой +Dirt with Snow=Земля Со Снегом +Dirt with Rainforest Litter=Земля с Тропической Подстилкой +Dirt with Coniferous Litter=Земля с Сосновой Подстилкой +Dry Dirt=Сухая Земля +Dry Dirt with Dry Grass=Сухая Земля с Сухой Травой +Permafrost=Замороженная Почва +Permafrost with Stones=Замороженная Почва с Камнями +Permafrost with Moss=Замороженная Почва с Мхом Sand=Песок -Desert Sand=Пустынный песок -Silver Sand=Серебристый песок +Desert Sand=Пустынный Песок +Silver Sand=Серебряный Песок Gravel=Гравий -Clay=Глиняный блок -Snow=Снежок -Snow Block=Снежный блок +Clay=Глиняный Блок +Snow=Снег +Snow Block=Снежный Блок Ice=Лёд -Cave Ice=Пещерный лёд -Apple Tree=Яблоневая древесина -Apple Wood Planks=Яблоневые доски -Apple Tree Sapling=Саженец яблони -Apple Tree Leaves=Яблоневая листва +Cave Ice=Пещерный Лёд +Apple Tree=Яблоневый Ствол +Apple Wood Planks=Яблоневые Деревянные Доски +Apple Tree Sapling=Яблоневый Саженец +Apple Tree Leaves=Яблоневая Листва Apple=Яблоко -Apple Marker=Яблочная метка -Jungle Tree=Древесина тропического дерева -Jungle Wood Planks=Доски из тропического дерева -Jungle Tree Leaves=Листва тропического дерева -Jungle Tree Sapling=Саженец тропического дерева -Emergent Jungle Tree Sapling=Выросший саженец тропического дерева -Pine Tree=Сосновая древесина -Pine Wood Planks=Сосновые доски -Pine Needles=Сосновая хвоя -Pine Tree Sapling=Саженец сосны -Acacia Tree=Акациевая древесина -Acacia Wood Planks=Акациевые доски -Acacia Tree Leaves=Акациевая листва -Acacia Tree Sapling=Саженец акации -Aspen Tree=Осиновая древесина -Aspen Wood Planks=Осиновые доски -Aspen Tree Leaves=Осиновая листва -Aspen Tree Sapling=Саженец осины -Coal Ore=Угольная руда -Coal Block=Угольный блок -Iron Ore=Железная руда -Steel Block=Стальной блок -Copper Ore=Медная руда -Copper Block=Медный блок -Tin Ore=Оловянная руда -Tin Block=Оловянный блок -Bronze Block=Бронзовый блок -Mese Ore=Мезовая руда -Mese Block=Мезовый блок -Gold Ore=Золотая руда -Gold Block=Золотой блок -Diamond Ore=Алмазная руда -Diamond Block=Алмазный блок +Apple Marker=Яблочная Метка +Jungle Tree=Ствол Тропического Дерева +Jungle Wood Planks=Деревянные Доски Тропического Дерева +Jungle Tree Leaves=Листва Тропического Дерева +Jungle Tree Sapling=Саженец Тропического Дерева +Emergent Jungle Tree Sapling=Выросший Саженец Тропического Дерева +Pine Tree=Сосновый Ствол +Pine Wood Planks=Сосновые Деревянные Доски +Pine Needles=Сосновая Хвоя +Pine Tree Sapling=Сосновый Саженец +Acacia Tree=Ствол Акации +Acacia Wood Planks=Деревянные Доски Акации +Acacia Tree Leaves=Листва Акации +Acacia Tree Sapling=Саженец Акации +Aspen Tree=Осиновый Ствол +Aspen Wood Planks=Осиновые Деревянные Доски +Aspen Tree Leaves=Осиновая Листва +Aspen Tree Sapling=Осиновый Саженец +Coal Ore=Уголь +Coal Block=Угольный Блок +Iron Ore=Железная Руда +Steel Block=Стальной Блок +Copper Ore=Медная Руда +Copper Block=Медный Блок +Tin Ore=Оловянная Руда +Tin Block=Оловянный Блок +Bronze Block=Бронзовый Блок +Mese Ore=Месевая Руда +Mese Block=Месевый Блок +Gold Ore=Золотая Руда +Gold Block=Золотой Блок +Diamond Ore=Алмаз +Diamond Block=Алмазный Блок Cactus=Кактус -Large Cactus Seedling=Саженец кактуса +Large Cactus Seedling=Кактусовый Саженец Papyrus=Папирус -Dry Shrub=Сухой куст -Jungle Grass=Тропическая трава +Dry Shrub=Сухой Куст +Jungle Grass=Тропическая Трава Grass=Трава -Savanna Grass=Саванная трава +Dry Grass=Сухая Трава Fern=Папоротник Marram Grass=Песколюб -Bush Stem=Стебель куста -Bush Leaves=Листья куста -Bush Sapling=Саженец куста -Blueberry Bush Leaves with Berries=Черничный куст с ягодами -Blueberry Bush Leaves=Листья черничного куста -Blueberry Bush Sapling=Саженец черничного куста -Acacia Bush Stem=Стебель куста акации -Acacia Bush Leaves=Листья куста акации -Acacia Bush Sapling=Саженец куста акации -Pine Bush Stem=Стебли хвойного куста -Pine Bush Needles=Хвоя куста -Pine Bush Sapling=Саженец хвойного куста +Bush Stem=Ствол Яблочного Деревца +Bush Leaves=Листья Яблочного Деревца +Bush Sapling=Саженца яблочного деревца +Blueberry Bush Leaves with Berries=Куст Черники с Ягодами +Blueberry Bush Leaves=Куст Черники +Blueberry Bush Sapling=Саженца Куста Черники +Acacia Bush Stem=Ствол Деревца Акации +Acacia Bush Leaves=Листья Деревца Акации +Acacia Bush Sapling=Саженца Деревца Акации +Pine Bush Stem=Сосновое Деревце +Pine Bush Needles=Хвоя Соснового Деревца +Pine Bush Sapling=Саженца Соснового Деревца Kelp=Ламинария -Green Coral=Зелёный коралл -Pink Coral=Розовый коралл -Cyan Coral=Бирюзовый коралл -Brown Coral=Коричневый коралл -Orange Coral=Оранжевый коралл -Coral Skeleton=Коралловый остов -Water Source=Источник воды -Flowing Water=Текущая вода -River Water Source=Источник речной воды -Flowing River Water=Текущая речная вода -Lava Source=Источник лавы -Flowing Lava=Текущая лава -Empty Bookshelf=Пустая книжная полка -Bookshelf (@1 written, @2 empty books)=Книжная полка (@1 написано, @2 чистые книги) -Bookshelf=Книжная полка +Green Coral=Зеленый Коралл +Pink Coral=Розовый Коралл +Cyan Coral=Голубой Коралл +Brown Coral=Бурый Коралл +Orange Coral=Оранжевый Коралл +Coral Skeleton=Коралловый Остов +Water Source=Водный Источник +Flowing Water=Текущая Вода +River Water Source=Речной Водный Источник +Flowing River Water=Текущая Речная Вода +Lava Source=Лавовый Источник +Flowing Lava=Текущая Лава +Empty Bookshelf=Пустая Книжная Полка +Bookshelf (@1 written, @2 empty books)=Книжная Полка (@1 написано, @2 чистые книги) +Bookshelf=Книжная Полка Text too long=Текст слишком длинный -"@1"="@1" -Wooden Sign=Деревянная табличка -Steel Sign=Стальная табличка -Wooden Ladder=Деревянная лестница -Steel Ladder=Стальная лестница -Apple Wood Fence=Яблоневый забор -Acacia Wood Fence=Акациевый забор -Jungle Wood Fence=Забор из тропического дерева -Pine Wood Fence=Сосновый забор -Aspen Wood Fence=Осиновый забор -Apple Wood Fence Rail=Яблоневый реечный забор -Acacia Wood Fence Rail=Акациевый реечный забор -Jungle Wood Fence Rail=Реечный забор из тропического дерева -Pine Wood Fence Rail=Сосновый реечный забор -Aspen Wood Fence Rail=Осиновый реечный забор +Wooden Sign=Деревянная Табличка +Steel Sign=Стальная Табличка +Wooden Ladder=Деревянная Лестница +Steel Ladder=Стальная Лестница +Apple Wood Fence=Яблоневый Деревянный Забор +Acacia Wood Fence=Деревянный Забор Из Акации +Jungle Wood Fence=Деревянный Забор Из Тропического Дерева +Pine Wood Fence=Сосновый Деревянный Забор +Aspen Wood Fence=Осиновый Деревянный Забор +Apple Wood Fence Rail=Яблоневый Деревянный Реечный Забор +Acacia Wood Fence Rail=Деревянный Реечный Забор Из Акации +Jungle Wood Fence Rail=Деревянный Реечный Забор Из Тропического Дерева +Pine Wood Fence Rail=Сосновый Деревянный Реечный Забор +Aspen Wood Fence Rail=Осиновый Деревянный Реечный Забор Glass=Стекло -Obsidian Glass=Обсидиановое стекло -Brick Block=Кирпичи -Mese Lamp=Мезовая лампа -Apple Wood Mese Post Light=Яблоневый уличный фонарь -Acacia Wood Mese Post Light=Акациевый уличный фонарь -Jungle Wood Mese Post Light=Уличный фонарь из тропического дерева -Pine Wood Mese Post Light=Сосновый уличный фонарь -Aspen Wood Mese Post Light=Осиновый уличный фонарь +Obsidian Glass=Обсидиановое Стекло +Brick Block=Кирпичный Блок +Mese Lamp=Месе Лампа +Mese Post Light=Столб с Месе Фонарем Cloud=Облако -Wooden Pickaxe=Деревянная кирка -Stone Pickaxe=Каменная кирка -Bronze Pickaxe=Бронзовая кирка -Steel Pickaxe=Стальная кирка -Mese Pickaxe=Мезовая кирка -Diamond Pickaxe=Алмазная кирка -Wooden Shovel=Деревянная лопата -Stone Shovel=Каменная лопата -Bronze Shovel=Бронзовая лопата -Steel Shovel=Стальная лопата -Mese Shovel=Мезовая лопата -Diamond Shovel=Алмазная лопата -Wooden Axe=Деревянный топор -Stone Axe=Каменный топор -Bronze Axe=Бронзовый топор -Steel Axe=Стальной топор -Mese Axe=Мезовый топор -Diamond Axe=Алмазный топор -Wooden Sword=Деревянный меч -Stone Sword=Каменный меч -Bronze Sword=Бронзовый меч -Steel Sword=Стальной меч -Mese Sword=Мезовый меч -Diamond Sword=Алмазный меч +Wooden Pickaxe=Деревянная Кирка +Stone Pickaxe=Каменная Кирка +Bronze Pickaxe=Бронзовая Кирка +Steel Pickaxe=Стальная Кирка +Mese Pickaxe=Месе Кирка +Diamond Pickaxe=Алмазная Кирка +Wooden Shovel=Деревянная Лопата +Stone Shovel=Каменная Лопата +Bronze Shovel=Бронзовая Лопата +Steel Shovel=Стальная Лопата +Mese Shovel=Месе Лопата +Diamond Shovel=Алмазная Лопата +Wooden Axe=Деревянный Топор +Stone Axe=Каменный Топор +Bronze Axe=Бронзовый Топор +Steel Axe=Стальной Топор +Mese Axe=Месе Топор +Diamond Axe=Алмазный Топор +Wooden Sword=Деревянный Меч +Stone Sword=Каменный Меч +Bronze Sword=Бронзовый Меч +Steel Sword=Стальной Меч +Mese Sword=Месе Меч +Diamond Sword=Алмазный Меч +Key=Ключ Torch=Факел -@1 will intersect protection on growth.=@1 пересечет защищённую зону при вырастании. \ No newline at end of file +@1 will intersect protection on growth.=@1 пересечёт защиту по росту. +Title:=Заголовок: +Contents:=Содержимое: +Save=Сохранить +by @1=@1 +Page @1 of @2=Страница @1 из @2 +"@1"="@1" diff --git a/mods/default/locale/default.se.tr b/mods/default/locale/default.se.tr new file mode 100644 index 00000000..d123530c --- /dev/null +++ b/mods/default/locale/default.se.tr @@ -0,0 +1,211 @@ +## textdomain: default +Locked Chest=Låst kista +Locked Chest (owned by @1)=Låst kista (Ägd av @1) +You do not own this chest.=Du äger inte denna kistan. +a locked chest=en låst kista +Chest=Kista +Stick=Pinne +Paper=Papper +"@1" by @2="@1" av @2 +Book=Bok +Book with Text=Bok med text +Skeleton Key=Skelett Nyckel +Key to @1's @2=Nyckel till @1s @2 +Coal Lump=Kol Klumo +Iron Lump=Järn Klump +Copper Lump=Koppar Klump +Tin Lump=Tenn Klump +Mese Crystal=Mese Kristall +Gold Lump=Guld Klump +Diamond=Diamant +Clay Lump=Lerklump +Steel Ingot=Stål tacka +Copper Ingot=Koppar tacka +Tin Ingot=Tenn tacka +Bronze Ingot=Brons tacka +Gold Ingot=Guld tacka +Mese Crystal Fragment=Mese Kristall Fragment +Clay Brick=Tegelsten +Obsidian Shard=Obsidian Skärva +Flint=Flinta +Blueberries=Blåbär +Furnace is empty=Ugnen är tom +100% (output full)=100% (utgången full) +@1%=@1% +Empty=Tom +Not cookable=Inte kokbar +Furnace active=Ugn aktiv +Furnace inactive=Ugn inaktiv +(Item: @1; Fuel: @2)=(Sak: @1; Bränsle: @2) +Furnace=Ugn +Stone=Sten +Cobblestone=Kullersten +Stone Brick=Stentegel +Stone Block=Sten block +Mossy Cobblestone=Mossig kullersten +Desert Stone=Öken sten +Desert Cobblestone=Öken kullersten +Desert Stone Brick=Öken stentegel +Desert Stone Block=Öken sten block +Sandstone=Sandsten +Sandstone Brick=Sandstenstegel +Sandstone Block=Sandsten block +Desert Sandstone=Öken sandsten +Desert Sandstone Brick=Öken Sandstenstegel +Desert Sandstone Block=Öken sandsten block +Silver Sandstone=Silver sandsten +Silver Sandstone Brick=Silver Sandstenstegel +Silver Sandstone Block=Silver sandsten block +Obsidian=Obsidian +Obsidian Brick=Obsidiantegel +Obsidian Block=Obsidian block +Dirt=Jord +Dirt with Grass=Jord med gräs +Dirt with Grass and Footsteps=Jord med gräs och fotsteg +Dirt with Dry Grass=Jord med torrt gräs +Dirt with Snow=Jord med snö +Dirt with Rainforest Litter=Jord med regnskogströ +Dirt with Coniferous Litter=Jord med Barrträd +Dry Dirt=Torr jord +Dry Dirt with Dry Grass=Torr jord med torrt gräs +Permafrost=Permafrost +Permafrost with Stones=Permafrost med sten +Permafrost with Moss=Permafrost med mossa +Sand=Sand +Desert Sand=Öken sand +Silver Sand=Silver sand +Gravel=Grus +Clay=Lera +Snow=Snö +Snow Block=Snö block +Ice=Is +Cave Ice=Grott Is +Apple Tree=Äpple Träd +Apple Wood Planks=Äpple Plankor +Apple Tree Sapling=Äpple Planta +Apple Tree Leaves=Äpple Löv +Apple=Äpple +Apple Marker=Äpple Markör +Jungle Tree=Djungel Träd +Jungle Wood Planks=Djungel Plankor +Jungle Tree Leaves=Djungel Löv +Jungle Tree Sapling=Djungel Planta +Emergent Jungle Tree Sapling=Nybliven Djungel Planta +Pine Tree=Tall +Pine Wood Planks= Tall Plankor +Pine Needles=Granbarr +Pine Tree Sapling=Tall Planta +Acacia Tree=Akacia Träd +Acacia Wood Planks=Akacia Plankor +Acacia Tree Leaves=Akacia Löv +Acacia Tree Sapling=Akacia Planta +Aspen Tree=Asp +Aspen Wood Planks=Asp Plankor +Aspen Tree Leaves=Asp Löv +Aspen Tree Sapling=Asp Planta +Coal Ore=Kol Malm +Coal Block=Kol Block +Iron Ore=Järn Malm +Steel Block=Stål Block +Copper Ore=Koppar Malm +Copper Block=Koppar Block +Tin Ore=Tenn Malm +Tin Block=Tenn Block +Bronze Block=Brons Block +Mese Ore=Mese Malm +Mese Block=Mese Block +Gold Ore=Guld Malm +Gold Block=Guld Block +Diamond Ore=Diamant Malm +Diamond Block=Diamant Block +Cactus=Kaktus +Large Cactus Seedling=Stor kaktusplanta +Papyrus=Papyrus +Dry Shrub=Torr Buske +Jungle Grass=Djungel Gräs +Grass=Gräs +Dry Grass=Torrt Gräs +Fern=Ormbunke +Marram Grass=Marram Gräs +Bush Stem=Busk Stam +Bush Leaves=Busk Löv +Bush Sapling=Busk Planta +Blueberry Bush Leaves with Berries=Blåbärsbusks Löv med Bär +Blueberry Bush Leaves=Blåbärsbusks Löv +Blueberry Bush Sapling=Blåbärsbusks Plantga +Acacia Bush Stem=Akacia Busks Stam +Acacia Bush Leaves=Akacia Busks Löv +Acacia Bush Sapling=Akacia Busks Planta +Pine Bush Stem=Tall Busks Stam +Pine Bush Needles=Tall Busks Granbarr +Pine Bush Sapling=Tall Busks Planta +Kelp=Brunalg +Green Coral=Grön Korall +Pink Coral=Rosa Korall +Cyan Coral=Cyan Korall +Brown Coral=Brun Korall +Orange Coral=Orange Korall +Coral Skeleton=Korall Skelett +Water Source=Vattenkälla +Flowing Water=Flödande Vatten +River Water Source=Flodvattenkälla +Flowing River Water=Flödande Flodvatten +Lava Source=Lavakälla +Flowing Lava=Flödande Lava +Empty Bookshelf=Tom Bokhylla +Bookshelf (@1 written, @2 empty books)=Bokhylla (@1 skriva, @2 tomma böcker) +Bookshelf=Bokhylla +Text too long=Text för lång +Wooden Sign=Trä Skylt +Steel Sign=Stål Skylt +Wooden Ladder=Trä Stege +Steel Ladder=Stål Stege +Apple Wood Fence=Äpple Trä Staket +Acacia Wood Fence=Akacia Trä Staket +Jungle Wood Fence=Djungel Trä Staket +Pine Wood Fence=Tall Trä Staket +Aspen Wood Fence=Asp Trä Staket +Apple Wood Fence Rail=Äpple Trä Staket Pinne +Acacia Wood Fence Rail=Akacia Trä Staket Pinne +Jungle Wood Fence Rail=Djungel Trä Staket Pinne +Pine Wood Fence Rail=Tall Trä Staket Pinne +Aspen Wood Fence Rail=Asp Trä Staket Pinne +Glass=Glas +Obsidian Glass=Obsidian Glas +Brick Block=Tegelstens Block +Mese Lamp=Mese Lampa +Mese Post Light=Mese Postljus +Cloud=Moln +Wooden Pickaxe=Trä Hacka +Stone Pickaxe=Sten Hacka +Bronze Pickaxe=Brons Hacka +Steel Pickaxe=Stål Hacka +Mese Pickaxe=Mese Hacka +Diamond Pickaxe=Diamant Hacka +Wooden Shovel=Trä Spade +Stone Shovel=Sten Spade +Bronze Shovel=Brons Spade +Steel Shovel=Stål Spade +Mese Shovel=Mese Spade +Diamond Shovel=Diamant Spade +Wooden Axe=Trä Yxa +Stone Axe=Sten Yxa +Bronze Axe=Brons Yxa +Steel Axe=Stål Yxa +Mese Axe=Mese Yxa +Diamond Axe=Diamant Yxa +Wooden Sword=Trä Svärd +Stone Sword=Sten Svärd +Bronze Sword=Brons Svärd +Steel Sword=Stål Svärd +Mese Sword=Mese Svärd +Diamond Sword=Diamant Svärd +Key=Nyckel +Torch=Fakla +@1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt. +Title:=Titel: +Contents:=Innehåll: +Save=Spara +by @1=av @1 +Page @1 of @2=Sida @1 av @2 +"@1"="@1" \ No newline at end of file diff --git a/mods/default/locale/default.sk.tr b/mods/default/locale/default.sk.tr deleted file mode 100644 index 337ebcfb..00000000 --- a/mods/default/locale/default.sk.tr +++ /dev/null @@ -1,220 +0,0 @@ -# textdomain: default -Locked Chest=Uzamknutá truhlica -Locked Chest (owned by @1)=Uzamknutá truhlica (Vlastník - @1) -You do not own this chest.=Túto truhlicu nevlastníš. -a locked chest=zamknutá truhlica -Chest=Truhlica -Write= -Read= -Title:=Názov: -Contents:=Obsah: -Save=Uložiť -by @1=od @1 -Page @1 of @2=Strana @1 z @2 -The book you were writing to mysteriously disappeared.= -"@1" by @2=„@1“ z @2 -Blueberries=Čučoriedky -Book=Kniha -Book with Text=Kniha s textom -Bronze Ingot=Bronzový ingot -Clay Brick=Nepálená tehla -Clay Lump=Hruda ílu -Coal Lump=Hruda uhlia -Copper Ingot=Medený ingot -Copper Lump=Hruda medi -Diamond=Diamant -Flint=Kresací kamienok -Gold Ingot=Zlatý ingot -Gold Lump=Hruda zlata -Iron Lump=Hruda železa -Mese Crystal=Mese Krištáľ -Mese Crystal Fragment=Fragment Mese krištáľu -Obsidian Shard=Úlomok obsidiánu -Paper=Papier -Steel Ingot=Oceľový ingot -Stick=Palica -Tin Ingot=Cínový ingot -Tin Lump=Hruda cínu -Furnace is empty=Pec je prázdna -100% (output full)=100% (Výstup je plný) -@1%=@1% -Not cookable=Nie je variteľné -Empty=Prázdne -Furnace active=Pec je aktívna -Furnace inactive=Pec je neaktívna -(Item: @1; Fuel: @2)=(Vec: @1; Palivo: @2) -Furnace=Pec -Stone=Kameň -Cobblestone=Dlažbový kameň -Stone Brick=Tehla z kameňa -Stone Block=Blok kameňa -Mossy Cobblestone=Dlažbový kameň obrastený machom -Desert Stone=Púštny kameň -Desert Cobblestone=Púštny dlažbový kameň -Desert Stone Brick=Tehla z púštneho kameňa -Desert Stone Block=Blok púštneho kameňa -Sandstone=Pieskovec -Sandstone Brick=Tehla z pieskovca -Sandstone Block=Blok pieskovca -Desert Sandstone=Púštny pieskovec -Desert Sandstone Brick=Tehla z púštneho pieskovca -Desert Sandstone Block=Blok púštneho pieskovca -Silver Sandstone=Strieborný pieskovec -Silver Sandstone Brick=Tehla zo strieborného pieskovca -Silver Sandstone Block=Blok strieborného pieskovca -Obsidian=Obsidián -Obsidian Brick=Tehla z obsidiánu -Obsidian Block=Blok obsidiánu -Dirt=Hlina -Dirt with Grass=Hlina s trávou -Dirt with Grass and Footsteps=Hlina s trávou a stopami -Dirt with Savanna Grass=Hlina s trávou zo savany -Dirt with Snow=Hlina so snehom -Dirt with Rainforest Litter=Hlina s povrchom dažďového pralesa -Dirt with Coniferous Litter=Hlina s ihličnatým povrchom -Savanna Dirt=Hlina zo savany -Savanna Dirt with Savanna Grass=Hlina zo savany s trávou -Permafrost=Permafrost -Permafrost with Stones=Permafrost s kameňmi -Permafrost with Moss=Permafrost s machom -Sand=Piesok -Desert Sand=Púštny piesok -Silver Sand=Strieborný piesok -Gravel=Štrk -Clay=Íl -Snow=Sneh -Snow Block=Blok snehu -Ice=Ľad -Cave Ice=Jaskynný ľad -Apple Tree=Jabloň -Apple Wood Planks=Drevené dosky z jablone -Apple Tree Sapling=Stromček jablone -Apple Tree Leaves=Listy z jablone -Apple=Jablko -Apple Marker=Jablková značka -Jungle Tree=Ďungľový strom -Jungle Wood Planks=Drevené dosky z džungľového stromu -Jungle Tree Leaves=Listy z džungľového stromu -Jungle Tree Sapling=Džungľový stromček -Emergent Jungle Tree Sapling=Vznikajúci džungľový stromček -Pine Tree=Borovica -Pine Wood Planks=Drevené dosky z borovice -Pine Needles=Ihličie z borovice -Pine Tree Sapling=Borovicový stromček -Acacia Tree=Akácia -Acacia Wood Planks=Drevené dosky z akácie -Acacia Tree Leaves=Listy z akácie -Acacia Tree Sapling=Stromček akácie -Aspen Tree=Osika -Aspen Wood Planks=Drevené dosky z osiky -Aspen Tree Leaves=Listy z osiky -Aspen Tree Sapling=Stromček osiky -Coal Ore=Uhoľná ruda -Coal Block=Blok uhlia -Iron Ore=Železná ruda -Steel Block=Blok ocele -Copper Ore=Medená ruda -Copper Block=Blok medi -Tin Ore=Cínová ruda -Tin Block=Blok cínu -Bronze Block=Blok bronzu -Mese Ore=Mese Ruda -Mese Block=Blok Mese -Gold Ore=Zlatá ruda -Gold Block=Blok zlata -Diamond Ore=Diamantová ruda -Diamond Block=Blok diamantu -Cactus=Kaktus -Large Cactus Seedling=Vaľká sadenica kaktusu -Papyrus=Papyrus -Dry Shrub=Suchý ker -Jungle Grass=Džungľová tráva -Grass=Tráva -Savanna Grass=Tráva zo savany -Fern=Papraď -Marram Grass=Pobrežná tráva -Bush Stem=Stonka z kríka -Bush Leaves=Listy z kríka -Bush Sapling=Sadenica kríka -Blueberry Bush Leaves with Berries=Čučoriedkové listy s čučoriedkami -Blueberry Bush Leaves=Čučoriedkové listy -Blueberry Bush Sapling=Sadenica čučoriedky -Acacia Bush Stem=Stonka z kríka akácie -Acacia Bush Leaves=Listy z kríka akácie -Acacia Bush Sapling=Sadenica kríka akácie -Pine Bush Stem=Stonka kríka borovice -Pine Bush Needles=Ihličie kríka borovice -Pine Bush Sapling=Sadenica kríka borovice -Kelp=Riasa -Green Coral=Zelený koral -Pink Coral=Ružový koral -Cyan Coral=Tyrkysový koral -Brown Coral=Hnedý koral -Orange Coral=Oranžový koral -Coral Skeleton=Koralová kostra -Water Source=Zdroj vody -Flowing Water=Tečúca voda -River Water Source=Zdroj riečnej voda -Flowing River Water=Tečúca riečna voda -Lava Source=Zdroj lávy -Flowing Lava=Tečúca láva -Empty Bookshelf=Prázdna knižnica -Bookshelf (@1 written, @2 empty books)=Knižnica (@1 popísané, @2 prázdne knihy) -Bookshelf=Knižnica -Text too long=Text je príliš dlhý -"@1"=„@1“ -Wooden Sign=Drevená tabuľka -Steel Sign=Oceľová tabuľka -Wooden Ladder=Drevený rebrík -Steel Ladder=Oceľový rebrík -Apple Wood Fence=Drevený plot z jablone -Acacia Wood Fence=Drevený plot z akácie -Jungle Wood Fence=Drevený plot z džungľového dreva -Pine Wood Fence=Drevený plot z borovice -Aspen Wood Fence=Drevený plot z osiky -Apple Wood Fence Rail=Drevené zábradlie z jablone -Acacia Wood Fence Rail=Drevené zábradlie z akácie -Jungle Wood Fence Rail=Drevené zábradlie z džungľového dreva -Pine Wood Fence Rail=Drevené zábradlie z borovice -Aspen Wood Fence Rail=Drevené zábradlie z osiky -Glass=Sklo -Obsidian Glass=Obsidiánové sklo -Brick Block=Blok z tehál -Mese Lamp=Mese lampa -Apple Wood Mese Post Light= -Acacia Wood Mese Post Light= -Jungle Wood Mese Post Light= -Pine Wood Mese Post Light= -Aspen Wood Mese Post Light= -Cloud=Oblak -Wooden Pickaxe=Drevený krompáč -Stone Pickaxe=Kamenný krompáč -Bronze Pickaxe=Bronzový krompáč -Steel Pickaxe=Oceľový krompáč -Mese Pickaxe=Mese krompáč -Diamond Pickaxe=Diamantový krompáč -Wooden Shovel=Drevená lopata -Stone Shovel=Kamenná lopata -Bronze Shovel=Bronzová lopata -Steel Shovel=Oceľová lopata -Mese Shovel=Mese lopata -Diamond Shovel=Diamantová lopata -Wooden Axe=Drevená sekera -Stone Axe=Kamenná sekera -Bronze Axe=Bronzová sekera -Steel Axe=Oceľová sekera -Mese Axe=Mese sekera -Diamond Axe=Diamantová sekera -Wooden Sword=Drevený meč -Stone Sword=Kamenný meč -Bronze Sword=Bronzový meč -Steel Sword=Oceľový meč -Mese Sword=Mese meč -Diamond Sword=Diamantový meč -Torch=Fakľa -@1 will intersect protection on growth.=@1 prekročí pri raste chránenú zónu. - - -##### not used anymore ##### - -Mese Post Light=Mese stĺpová lampa diff --git a/mods/default/locale/default.sv.tr b/mods/default/locale/default.sv.tr deleted file mode 100644 index 90df6c3c..00000000 --- a/mods/default/locale/default.sv.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=Låst kista -Locked Chest (owned by @1)=Låst kista (Ägd av @1) -You do not own this chest.=Du äger inte denna kista. -a locked chest=en låst kista -Chest=Kista -Write=Skriva -Read=Läs -Title:=Titel: -Contents:=Innehåll: -Save=Spara -by @1=av @1 -Page @1 of @2=Sida @1 av @2 -The book you were writing to mysteriously disappeared.= -"@1" by @2="@1" av @2 -Blueberries=Blåbär -Book=Bok -Book with Text=Bok med text -Bronze Ingot=Bronstacka -Clay Brick=Tegelsten -Clay Lump=Lerklump -Coal Lump=Kolklump -Copper Ingot=Koppartacka -Copper Lump=Kopparklump -Diamond=Diamant -Flint=Flinta -Gold Ingot=Guldtacka -Gold Lump=Guldklump -Iron Lump=Järnklump -Mese Crystal=Mesekristall -Mese Crystal Fragment=Mesekristallfragment -Obsidian Shard=Obsidianskärva -Paper=Papper -Steel Ingot=Ståltacka -Stick=Pinne -Tin Ingot=Tenntacka -Tin Lump=Tennklump -Furnace is empty=Ugnen är tom -100% (output full)=100% (utgången full) -@1%=@1% -Not cookable=Inte kokbar -Empty=Tom -Furnace active=Ugn aktiv -Furnace inactive=Ugn inaktiv -(Item: @1; Fuel: @2)=(Sak: @1; Bränsle: @2) -Furnace=Ugn -Stone=Sten -Cobblestone=Kullersten -Stone Brick=Stentegel -Stone Block=Stenblock -Mossy Cobblestone=Mossig kullersten -Desert Stone=Ökensten -Desert Cobblestone=Ökenkullersten -Desert Stone Brick=Ökenstenstegel -Desert Stone Block=Ökenstensblock -Sandstone=Sandsten -Sandstone Brick=Sandstenstegel -Sandstone Block=Sandstensblock -Desert Sandstone=Ökensandsten -Desert Sandstone Brick=Ökensandstenstegel -Desert Sandstone Block=Ökensandstensblock -Silver Sandstone=Silversandsten -Silver Sandstone Brick=Silversandstenstegel -Silver Sandstone Block=Silversandstensblock -Obsidian=Obsidian -Obsidian Brick=Obsidiantegel -Obsidian Block=Obsidianblock -Dirt=Jord -Dirt with Grass=Jord med gräs -Dirt with Grass and Footsteps=Jord med gräs och fotsteg -Dirt with Savanna Grass=Jord med savanngräs -Dirt with Snow=Jord med snö -Dirt with Rainforest Litter=Jord med regnskogströ -Dirt with Coniferous Litter=Jord med barrträd -Savanna Dirt=Savannjord -Savanna Dirt with Savanna Grass=Savannjord med savanngräs -Permafrost=Permafrost -Permafrost with Stones=Permafrost med sten -Permafrost with Moss=Permafrost med mossa -Sand=Sand -Desert Sand=Ökensand -Silver Sand=Silversand -Gravel=Grus -Clay=Lera -Snow=Snö -Snow Block=Snöblock -Ice=Is -Cave Ice=Grottis -Apple Tree=Äppleträd -Apple Wood Planks=Äppleträdplankor -Apple Tree Sapling=Äppleplanta -Apple Tree Leaves=Äpplelöv -Apple=Äpple -Apple Marker=Äpplemarkör -Jungle Tree=Djungelträd -Jungle Wood Planks=Djungelplankor -Jungle Tree Leaves=Djungellöv -Jungle Tree Sapling=Djungelplanta -Emergent Jungle Tree Sapling=Nybliven djungelplanta -Pine Tree=Tall -Pine Wood Planks=Tallplankor -Pine Needles=Granbarr -Pine Tree Sapling=Tallplanta -Acacia Tree=Akaciaträd -Acacia Wood Planks=Akaciaplankor -Acacia Tree Leaves=Akacialöv -Acacia Tree Sapling=Akaciaplanta -Aspen Tree=Asp -Aspen Wood Planks=Aspplankor -Aspen Tree Leaves=Asplöv -Aspen Tree Sapling=Aspplanta -Coal Ore=Kolmalm -Coal Block=Kolblock -Iron Ore=Järnmalm -Steel Block=Stålblock -Copper Ore=Kopparmalm -Copper Block=Kopparblock -Tin Ore=Tennmalm -Tin Block=Tennblock -Bronze Block=Bronsblock -Mese Ore=Mesemalm -Mese Block=Meseblock -Gold Ore=Guldmalm -Gold Block=Guldblock -Diamond Ore=Diamantmalm -Diamond Block=Diamantblock -Cactus=Kaktus -Large Cactus Seedling=Stor kaktusplanta -Papyrus=Papyrus -Dry Shrub=Torr buske -Jungle Grass=Djungelgräs -Grass=Gräs -Savanna Grass=Savanngräs -Fern=Ormbunke -Marram Grass=Marramgräs -Bush Stem=Buskstam -Bush Leaves=Busklöv -Bush Sapling=Buskplanta -Blueberry Bush Leaves with Berries=Blåbärsbuske med bär -Blueberry Bush Leaves=Blåbärsbuske -Blueberry Bush Sapling=Blåbärsbuskplanta -Acacia Bush Stem=Akaciabuskstam -Acacia Bush Leaves=Akaciabuske -Acacia Bush Sapling=Akaciabuskplanta -Pine Bush Stem=Tallbuskestam -Pine Bush Needles=Tallgranbarr -Pine Bush Sapling=Tallbuskplanta -Kelp=Brunalg -Green Coral=Grön korall -Pink Coral=Rosa korall -Cyan Coral=Cyan korall -Brown Coral=Brun korall -Orange Coral=Orange korall -Coral Skeleton=Korallskelett -Water Source=Vattenkälla -Flowing Water=Flytande vatten -River Water Source=Flodvattenkälla -Flowing River Water=Flytande flodvatten -Lava Source=Lavakälla -Flowing Lava=Flytande lava -Empty Bookshelf=Tom bokhylla -Bookshelf (@1 written, @2 empty books)=Bokhylla (@1 skriva, @2 tomma böcker) -Bookshelf=Bokhylla -Text too long=Texten är för lång -"@1"="@1" -Wooden Sign=Träskylt -Steel Sign=Stålskylt -Wooden Ladder=Trästege -Steel Ladder=Stålstege -Apple Wood Fence=Äppleträstaket -Acacia Wood Fence=Akaciastaket -Jungle Wood Fence=Djungelstaket -Pine Wood Fence=Tallstaket -Aspen Wood Fence=Aspträdstaket -Apple Wood Fence Rail=Äppleträstaketsräls -Acacia Wood Fence Rail=Akaciastaketsräls -Jungle Wood Fence Rail=Djungelstaketsräls -Pine Wood Fence Rail=Tallstaketsräls -Aspen Wood Fence Rail=Aspstaketsräls -Glass=Glas -Obsidian Glass=Obsidianglas -Brick Block=Tegelstensblock -Mese Lamp=Meselampa -Apple Wood Mese Post Light=Äppleträ-meselykta -Acacia Wood Mese Post Light=Acacia-meselykta -Jungle Wood Mese Post Light=Djungel-meselykta -Pine Wood Mese Post Light=Tall-meselykta -Aspen Wood Mese Post Light=Aspträ-meselykta -Cloud=Moln -Wooden Pickaxe=Trähacka -Stone Pickaxe=Stenhacka -Bronze Pickaxe=Bronshacka -Steel Pickaxe=Stålhacka -Mese Pickaxe=Mesehacka -Diamond Pickaxe=Diamanthacka -Wooden Shovel=Träspade -Stone Shovel=Stenspade -Bronze Shovel=Bronsspade -Steel Shovel=Stålspade -Mese Shovel=Mesespade -Diamond Shovel=Diamantspade -Wooden Axe=Träyxa -Stone Axe=Stenyxa -Bronze Axe=Bronsyxa -Steel Axe=Stålyxa -Mese Axe=Meseyxa -Diamond Axe=Diamantyxa -Wooden Sword=Träsvärd -Stone Sword=Stensvärd -Bronze Sword=Bronssvärd -Steel Sword=Stålsvärd -Mese Sword=Mesesvärd -Diamond Sword=Diamantsvärd -Torch=Fackla -@1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt. diff --git a/mods/default/locale/default.uk.tr b/mods/default/locale/default.uk.tr deleted file mode 100644 index aa24bfb8..00000000 --- a/mods/default/locale/default.uk.tr +++ /dev/null @@ -1,215 +0,0 @@ -# textdomain: default -Locked Chest=Замкнена скриня -Locked Chest (owned by @1)=Замкнена скриня (власник — @1) -You do not own this chest.=Ви — не власник цієї скрині. -a locked chest=замкнена скриня -Chest=Скриня -Write=Писати -Read=Читати -Title:=Заголовок: -Contents:=Вміст: -Save=Зберегти -by @1=Автор: @1 -Page @1 of @2=Сторінка @1 з @2 -The book you were writing to mysteriously disappeared.=Книга, в яку ви писали, загадковим чином зникла. -"@1" by @2=@2 — "@1" -Blueberries=Чорниці -Book=Книга -Book with Text=Книга з текстом -Bronze Ingot=Бронзовий злиток -Clay Brick=Глиняна цегла -Clay Lump=Шматок глини -Coal Lump=Шматок вугілля -Copper Ingot=Мідний злиток -Copper Lump=Шматок міді -Diamond=Діамант -Flint=Кремінь -Gold Ingot=Золотий злиток -Gold Lump=Шматок золота -Iron Lump=Шматок заліза -Mese Crystal=Кристал Месе -Mese Crystal Fragment=Уламок кристалу Месе -Obsidian Shard=Обсидіановий уламок -Paper=Папір -Steel Ingot=Сталевий злиток -Stick=Палиця -Tin Ingot=Олов'яний злиток -Tin Lump=Шматок олова -Furnace is empty=Піч порожня -100% (output full)=100% (піч переповнена) -@1%=@1% -Not cookable=Не може бути приготовано -Empty=Порожньо -Furnace active=Піч запалена -Furnace inactive=Піч не запалена -(Item: @1; Fuel: @2)=(Предмет: @1; Паливо: @2) -Furnace=Піч -Stone=Камінь -Cobblestone=Кругляк -Stone Brick=Кам'яна цегла -Stone Block=Блок каменю -Mossy Cobblestone=Моховитий кругляк -Desert Stone=Пустельний камінь -Desert Cobblestone=Пустельний кругляк -Desert Stone Brick=Цегла з пустельного каменю -Desert Stone Block=Блок пустельного каменю -Sandstone=Пісковик -Sandstone Brick=Пісковикова цегла -Sandstone Block=Блок пісковику -Desert Sandstone=Пустельний пісковик -Desert Sandstone Brick=Цегла з пустельного пісковику -Desert Sandstone Block=Блок пустельного пісковику -Silver Sandstone=Срібний пісковик -Silver Sandstone Brick=Цегла зі срібного пісковику -Silver Sandstone Block=Блок срібного пісковику -Obsidian=Обсидіан -Obsidian Brick=Обсидіанова цегла -Obsidian Block=Блок обсидіану -Dirt=Земля -Dirt with Grass=Земля з травою -Dirt with Grass and Footsteps=Земля з травою та слідами -Dirt with Savanna Grass=Земля із саванною травою -Dirt with Snow=Земля зі снігом -Dirt with Rainforest Litter=Земля з тропічно-лісовою підстилкою -Dirt with Coniferous Litter=Земля з хвойно-лісовою підстилкою -Savanna Dirt=Саванна земля -Savanna Dirt with Savanna Grass=Саванна земля із саванною травою -Permafrost=Вічна мерзлота -Permafrost with Stones=Вічна мерзлота з камінням -Permafrost with Moss=Вічна мерзлота з мохом -Sand=Пісок -Desert Sand=Пустельний пісок -Silver Sand=Срібний пісок -Gravel=Гравій -Clay=Глина -Snow=Сніг -Snow Block=Блок снігу -Ice=Крига -Cave Ice=Печерова крига -Apple Tree=Стовбур яблуні -Apple Wood Planks=Яблуневі дошки -Apple Tree Sapling=Саджанець яблуні -Apple Tree Leaves=Яблуневе листя -Apple=Яблуко -Apple Marker=Мітка яблука -Jungle Tree=Стовбур тропічного дерева -Jungle Wood Planks=Дошки з тропічного дерева -Jungle Tree Leaves=Листя тропічного дерева -Jungle Tree Sapling=Саджанець тропічного дерева -Emergent Jungle Tree Sapling=Молодий саджанець тропічного дерева -Pine Tree=Сосновий стовбур -Pine Wood Planks=Соснові дошки -Pine Needles=Соснова хвоя -Pine Tree Sapling=Саджанець сосни -Acacia Tree=Акацієвий стовбур -Acacia Wood Planks=Акацієві дошки -Acacia Tree Leaves=Акацієве листя -Acacia Tree Sapling=Саджанець акації -Aspen Tree=Осиковий стовбур -Aspen Wood Planks=Осикові дошки -Aspen Tree Leaves=Осикове листя -Aspen Tree Sapling=Саджанець осики -Coal Ore=Поклади вугілля -Coal Block=Блок вугілля -Iron Ore=Поклади заліза -Steel Block=Блок сталі -Copper Ore=Поклади міді -Copper Block=Блок міді -Tin Ore=Поклади олова -Tin Block=Блок олова -Bronze Block=Блок бронзи -Mese Ore=Поклади Месе -Mese Block=Блок Месе -Gold Ore=Поклади золота -Gold Block=Блок золота -Diamond Ore=Поклади діамантів -Diamond Block=Блок діамантів -Cactus=Кактус -Large Cactus Seedling=Великий саджанець кактуса -Papyrus=Папірус -Dry Shrub=Сухий кущ -Jungle Grass=Тропічна трава -Grass=Трава -Savanna Grass=Саванна трава -Fern=Папороть -Marram Grass=Пляжна трава -Bush Stem=Стебла куща -Bush Leaves=Листя куща -Bush Sapling=Саджанець куща -Blueberry Bush Leaves with Berries=Кущ чорниці з ягодами -Blueberry Bush Leaves=Кущ чорниці -Blueberry Bush Sapling=Саджанець куща чорниці -Acacia Bush Stem=Стебла акацієвого куща -Acacia Bush Leaves=Листя акацієвого куща -Acacia Bush Sapling=Саджанець акацієвого куща -Pine Bush Stem=Стебла соснового куща -Pine Bush Needles=Хвоя соснового куща -Pine Bush Sapling=Саджанець соснового куща -Kelp=Ламінарія -Green Coral=Зелений корал -Pink Coral=Рожевий корал -Cyan Coral=Блакитний корал -Brown Coral=Коричневий корал -Orange Coral=Помаранчевий корал -Coral Skeleton=Скелет корала -Water Source=Водне джерело -Flowing Water=Проточна вода -River Water Source=Річкове водне джерело -Flowing River Water=Проточна річкова вода -Lava Source=Лавове джерело -Flowing Lava=Проточна лава -Empty Bookshelf=Порожня книжкова полиця -Bookshelf (@1 written, @2 empty books)=Книжкова полиця (книги: @1 з текстом, @2 без тексту) -Bookshelf=Книжкова полиця -Text too long=Текст занадто довгий -"@1"="@1" -Wooden Sign=Дерев'яна табличка -Steel Sign=Сталева табличка -Wooden Ladder=Дерев'яна драбина -Steel Ladder=Сталева драбина -Apple Wood Fence=Яблуневий паркан -Acacia Wood Fence=Акацієвий паркан -Jungle Wood Fence=Паркан із тропічного дерева -Pine Wood Fence=Сосновий паркан -Aspen Wood Fence=Осиковий паркан -Apple Wood Fence Rail=Яблуневий рейковий паркан -Acacia Wood Fence Rail=Акацієвий рейковий паркан -Jungle Wood Fence Rail=Рейковий паркан з тропічного дерева -Pine Wood Fence Rail=Сосновий рейковий паркан -Aspen Wood Fence Rail=Осиковий рейковий паркан -Glass=Скло -Obsidian Glass=Обсидіанове скло -Brick Block=Цегляний блок -Mese Lamp=Месе-лампа -Apple Wood Mese Post Light=Яблуневий стовповий Месе-світильник -Acacia Wood Mese Post Light=Акацієвий стовповий Месе-світильник -Jungle Wood Mese Post Light=Стовповий Месе-світильник із тропічного дерева -Pine Wood Mese Post Light=Сосновий стовповий Месе-світильник -Aspen Wood Mese Post Light=Осиковий стовповий Месе-світильник -Cloud=Хмара -Wooden Pickaxe=Дерев'яне кайло -Stone Pickaxe=Кам'яне кайло -Bronze Pickaxe=Бронзове кайло -Steel Pickaxe=Сталеве кайло -Mese Pickaxe=Месе-кайло -Diamond Pickaxe=Діамантове кайло -Wooden Shovel=Дерев'яна лопата -Stone Shovel=Кам'яна лопата -Bronze Shovel=Бронзова лопата -Steel Shovel=Сталева лопата -Mese Shovel=Месе-лопата -Diamond Shovel=Діамантова лопата -Wooden Axe=Дерев'яна сокира -Stone Axe=Кам'яна сокира -Bronze Axe=Бронзова сокира -Steel Axe=Сталева сокира -Mese Axe=Месе-сокира -Diamond Axe=Діамантова сокира -Wooden Sword=Дерев'яний меч -Stone Sword=Кам'яний меч -Bronze Sword=Бронзовий меч -Steel Sword=Сталевий меч -Mese Sword=Месе-меч -Diamond Sword=Діамантовий меч -Torch=Смолоскип -@1 will intersect protection on growth.=@1 перетне захист коли виросте. diff --git a/mods/default/locale/default.zh_CN.tr b/mods/default/locale/default.zh_CN.tr index c887df87..ddd94713 100644 --- a/mods/default/locale/default.zh_CN.tr +++ b/mods/default/locale/default.zh_CN.tr @@ -1,45 +1,39 @@ # textdomain: default Locked Chest=已上锁的箱子 -Locked Chest (owned by @1)=已上锁的箱子(属于@1) +Locked Chest (owned by @1)=已上锁的箱子(属于@1所有) You do not own this chest.=这个箱子不属于你所有。 a locked chest=一个已上锁的箱子 Chest=箱子 -Write=写 -Read=读 -Title:=标题: -Contents:=内容: -Save=保存 -by @1=由@1 -Page @1 of @2=第@1页,共@2页。 -The book you were writing to mysteriously disappeared.=你正在写的书不知为何消失了。 +Stick=棒 +Paper=纸 "@1" by @2="@1" by @2 -Blueberries=蓝莓 Book=书 Book with Text=带文字的书 -Bronze Ingot=青铜锭 -Clay Brick=粘土砖 -Clay Lump=粘土块 +Skeleton Key=万能钥匙 +Key to @1's @2=@1的@2的钥匙 Coal Lump=煤块 -Copper Ingot=铜锭 -Copper Lump=铜块 -Diamond=钻石 -Flint=燧石 -Gold Ingot=金锭 -Gold Lump=金块 Iron Lump=铁块 -Mese Crystal=黄石晶体 -Mese Crystal Fragment=黄石晶体碎片 -Obsidian Shard=黑曜石碎片 -Paper=纸 -Steel Ingot=铁锭 -Stick=棒 -Tin Ingot=锡锭 +Copper Lump=铜块 Tin Lump=锡块 +Mese Crystal=黄石晶体 +Gold Lump=金块 +Diamond=钻石 +Clay Lump=粘土块 +Steel Ingot=铁锭 +Copper Ingot=铜锭 +Tin Ingot=锡锭 +Bronze Ingot=青铜锭 +Gold Ingot=金锭 +Mese Crystal Fragment=黄石晶体碎片 +Clay Brick=粘土砖 +Obsidian Shard=黑曜石碎片 +Flint=燧石 +Blueberries=蓝莓 Furnace is empty=熔炉是空的 100% (output full)=100%(输出已满) @1%=@1% -Not cookable=不可烹饪 Empty=空 +Not cookable=不可烹饪 Furnace active=熔炉正在运转 Furnace inactive=熔炉未使用 (Item: @1; Fuel: @2)=(项目:@1;燃料:@2) @@ -65,15 +59,15 @@ Silver Sandstone Block=银砂岩方块 Obsidian=黑曜石 Obsidian Brick=黑曜石砖 Obsidian Block=黑曜石方块 -Dirt=土方块 -Dirt with Grass=草方块 -Dirt with Grass and Footsteps=带有脚印的草方块 -Dirt with Savanna Grass=草原草方块 -Dirt with Snow=雪土方块 -Dirt with Rainforest Litter=雨林凋落物土 -Dirt with Coniferous Litter=针叶林凋落物土 -Savanna Dirt=草原土 -Savanna Dirt with Savanna Grass=草原草方块 +Dirt=土 +Dirt with Grass=带草的土 +Dirt with Grass and Footsteps=带草的土及脚印 +Dirt with Dry Grass=带干草的土 +Dirt with Snow=带雪的土 +Dirt with Rainforest Litter=雨林腐土 +Dirt with Coniferous Litter=针叶林腐土 +Dry Dirt=干土 +Dry Dirt with Dry Grass=干土和干草 Permafrost=多年冻土 Permafrost with Stones=带石头的多年冻土 Permafrost with Moss=生苔的多年冻土 @@ -96,7 +90,7 @@ Jungle Tree=丛林树 Jungle Wood Planks=丛林树木板 Jungle Tree Leaves=丛林树叶 Jungle Tree Sapling=丛林树苗 -Emergent Jungle Tree Sapling=露生层丛林树苗 +Emergent Jungle Tree Sapling=应急丛林树苗 Pine Tree=松树 Pine Wood Planks=松树木板 Pine Needles=松针 @@ -130,13 +124,13 @@ Papyrus=莎草纸 Dry Shrub=干灌木 Jungle Grass=丛林草 Grass=草 -Savanna Grass=草原草 +Dry Grass=干草 Fern=蕨 Marram Grass=滨草 Bush Stem=灌木 Bush Leaves=灌木叶 Bush Sapling=灌木苗 -Blueberry Bush Leaves with Berries=长蓝莓的蓝莓灌木叶 +Blueberry Bush Leaves with Berries=蓝莓灌木叶与浆果 Blueberry Bush Leaves=蓝莓灌木叶 Blueberry Bush Sapling=蓝莓灌木苗 Acacia Bush Stem=相思灌木 @@ -162,7 +156,6 @@ Empty Bookshelf=空书架 Bookshelf (@1 written, @2 empty books)=书架(@1本有字的书,@2本空书) Bookshelf=书架 Text too long=文字太长 -"@1"="@1" Wooden Sign=木牌 Steel Sign=铁牌 Wooden Ladder=木梯子 @@ -181,11 +174,7 @@ Glass=玻璃 Obsidian Glass=黑曜石玻璃 Brick Block=砖方块 Mese Lamp=黄石灯 -Apple Wood Mese Post Light=苹果木黄石灯柱 -Acacia Wood Mese Post Light=金合欢木黄石灯柱 -Jungle Wood Mese Post Light=丛林木黄石灯柱 -Pine Wood Mese Post Light=松木黄石灯柱 -Aspen Wood Mese Post Light=白杨木黄石灯柱 +Mese Post Light=黄石柱灯 Cloud=云 Wooden Pickaxe=木镐 Stone Pickaxe=石镐 @@ -211,11 +200,12 @@ Bronze Sword=青铜剑 Steel Sword=铁剑 Mese Sword=黄石剑 Diamond Sword=钻石剑 +Key=钥匙 Torch=火把 -@1 will intersect protection on growth.=@1生长时将与保护区域相交。 - - -##### not used anymore ##### - -Dirt with Dry Grass=干草土方块 -Dry Grass=干草 +@1 will intersect protection on growth.=@1将与增长的保护相交。 +Title:=标题: +Contents:=内容: +Save=保存 +by @1=由@1 +Page @1 of @2=第@1页,共@2页。 +"@1"="@1" diff --git a/mods/default/locale/default.zh_TW.tr b/mods/default/locale/default.zh_TW.tr index bd638b4a..6b06b8a8 100644 --- a/mods/default/locale/default.zh_TW.tr +++ b/mods/default/locale/default.zh_TW.tr @@ -4,42 +4,36 @@ Locked Chest (owned by @1)=已上鎖的箱子(屬於@1所有) You do not own this chest.=這個箱子不屬於你所有。 a locked chest=一個已上鎖的箱子 Chest=箱子 -Write=寫 -Read=讀 -Title:=標題: -Contents:=內容: -Save=保存 -by @1=由@1 -Page @1 of @2=第@1頁,共@2頁。 -The book you were writing to mysteriously disappeared.=你正在寫的書神秘消失了。 +Stick=棒 +Paper=紙 "@1" by @2="@1" by @2 -Blueberries=藍莓 Book=書 Book with Text=帶文字的書 -Bronze Ingot=青銅錠 -Clay Brick=粘土磚 -Clay Lump=粘土塊 +Skeleton Key=萬能鑰匙 +Key to @1's @2=@1的@2的鑰匙 Coal Lump=煤塊 -Copper Ingot=銅錠 -Copper Lump=銅塊 -Diamond=鑽石 -Flint=燧石 -Gold Ingot=金錠 -Gold Lump=金塊 Iron Lump=鐵塊 -Mese Crystal=黃石晶體 -Mese Crystal Fragment=黃石晶體碎片 -Obsidian Shard=黑曜石碎片 -Paper=紙 -Steel Ingot=鐵錠 -Stick=棒 -Tin Ingot=錫錠 +Copper Lump=銅塊 Tin Lump=錫塊 +Mese Crystal=黃石晶體 +Gold Lump=金塊 +Diamond=鑽石 +Clay Lump=粘土塊 +Steel Ingot=鐵錠 +Copper Ingot=銅錠 +Tin Ingot=錫錠 +Bronze Ingot=青銅錠 +Gold Ingot=金錠 +Mese Crystal Fragment=黃石晶體碎片 +Clay Brick=粘土磚 +Obsidian Shard=黑曜石碎片 +Flint=燧石 +Blueberries=藍莓 Furnace is empty=熔爐是空的 100% (output full)=100%(輸出已滿) @1%=@1% -Not cookable=不可烹飪 Empty=空 +Not cookable=不可烹飪 Furnace active=熔爐正在運轉 Furnace inactive=熔爐未使用 (Item: @1; Fuel: @2)=(項目:@1;燃料:@2) @@ -65,15 +59,15 @@ Silver Sandstone Block=銀砂岩方塊 Obsidian=黑曜石 Obsidian Brick=黑曜石磚 Obsidian Block=黑曜石方塊 -Dirt=土方塊 -Dirt with Grass=草方塊 -Dirt with Grass and Footsteps=草方塊及腳印 -Dirt with Savanna Grass=草原草方塊 -Dirt with Snow=雪土方塊 +Dirt=土 +Dirt with Grass=帶草的土 +Dirt with Grass and Footsteps=帶草的土及腳印 +Dirt with Dry Grass=帶乾草的土 +Dirt with Snow=帶雪的土 Dirt with Rainforest Litter=雨林腐土 Dirt with Coniferous Litter=針葉林腐土 -Savanna Dirt=草原土 -Savanna Dirt with Savanna Grass=草原草方塊(草原土) +Dry Dirt=乾土 +Dry Dirt with Dry Grass=乾土和乾草 Permafrost=多年凍土 Permafrost with Stones=帶石頭的多年凍土 Permafrost with Moss=生苔的多年凍土 @@ -130,7 +124,7 @@ Papyrus=莎草紙 Dry Shrub=幹灌木 Jungle Grass=叢林草 Grass=草 -Savanna Grass= +Dry Grass=乾草 Fern=蕨 Marram Grass=濱草 Bush Stem=灌木 @@ -162,7 +156,6 @@ Empty Bookshelf=空書架 Bookshelf (@1 written, @2 empty books)=書架(@1本有字的書,@2本空書) Bookshelf=書架 Text too long=文字太長 -"@1"="@1" Wooden Sign=木牌 Steel Sign=鐵牌 Wooden Ladder=木梯子 @@ -181,11 +174,7 @@ Glass=玻璃 Obsidian Glass=黑曜石玻璃 Brick Block=磚方塊 Mese Lamp=黃石燈 -Apple Wood Mese Post Light=蘋果木黃石燈柱 -Acacia Wood Mese Post Light=金合歡木黃石燈柱 -Jungle Wood Mese Post Light=叢林木黃石燈柱 -Pine Wood Mese Post Light=松木黃石燈柱 -Aspen Wood Mese Post Light=白楊木黃石燈柱 +Mese Post Light=黃石柱燈 Cloud=雲 Wooden Pickaxe=木鎬 Stone Pickaxe=石鎬 @@ -211,11 +200,12 @@ Bronze Sword=青銅劍 Steel Sword=鐵劍 Mese Sword=黃石劍 Diamond Sword=鑽石劍 +Key=鑰匙 Torch=火把 @1 will intersect protection on growth.=@1將與增長的保護相交。 - - -##### not used anymore ##### - -Dirt with Dry Grass=乾草土方塊 -Dry Grass=乾草 +Title:=標題: +Contents:=內容: +Save=保存 +by @1=由@1 +Page @1 of @2=第@1頁,共@2頁。 +"@1"="@1" diff --git a/mods/default/locale/template.txt b/mods/default/locale/template.txt index 815c29c5..dd554d45 100644 --- a/mods/default/locale/template.txt +++ b/mods/default/locale/template.txt @@ -1,49 +1,4 @@ # textdomain: default -Locked Chest= -Locked Chest (owned by @1)= -You do not own this chest.= -a locked chest= -Chest= -Write= -Read= -Title:= -Contents:= -Save= -by @1= -Page @1 of @2= -The book you were writing to mysteriously disappeared.= -"@1" by @2= -Blueberries= -Book= -Book with Text= -Bronze Ingot= -Clay Brick= -Clay Lump= -Coal Lump= -Copper Ingot= -Copper Lump= -Diamond= -Flint= -Gold Ingot= -Gold Lump= -Iron Lump= -Mese Crystal= -Mese Crystal Fragment= -Obsidian Shard= -Paper= -Steel Ingot= -Stick= -Tin Ingot= -Tin Lump= -Furnace is empty= -100% (output full)= -@1%= -Not cookable= -Empty= -Furnace active= -Furnace inactive= -(Item: @1; Fuel: @2)= -Furnace= Stone= Cobblestone= Stone Brick= @@ -162,7 +117,6 @@ Empty Bookshelf= Bookshelf (@1 written, @2 empty books)= Bookshelf= Text too long= -"@1"= Wooden Sign= Steel Sign= Wooden Ladder= @@ -181,12 +135,10 @@ Glass= Obsidian Glass= Brick Block= Mese Lamp= -Apple Wood Mese Post Light= -Acacia Wood Mese Post Light= -Jungle Wood Mese Post Light= -Pine Wood Mese Post Light= -Aspen Wood Mese Post Light= +Mese Post Light= Cloud= +@1 will intersect protection on growth.= +Torch= Wooden Pickaxe= Stone Pickaxe= Bronze Pickaxe= @@ -211,5 +163,49 @@ Bronze Sword= Steel Sword= Mese Sword= Diamond Sword= -Torch= -@1 will intersect protection on growth.= +Key= +Furnace is empty= +100% (output full)= +@1%= +Not cookable= +Empty= +Furnace active= +Furnace inactive= +(Item: @1; Fuel: @2)= +Furnace= +Title:= +Contents:= +Save= +by @1= +Page @1 of @2= +"@1"= +"@1" by @2= +Skeleton Key= +Key to @1's @2= +Blueberries= +Book= +Book with Text= +Bronze Ingot= +Clay Brick= +Clay Lump= +Coal Lump= +Copper Ingot= +Copper Lump= +Diamond= +Flint= +Gold Ingot= +Gold Lump= +Iron Lump= +Mese Crystal= +Mese Crystal Fragment= +Obsidian Shard= +Paper= +Steel Ingot= +Stick= +Tin Ingot= +Tin Lump= +Locked Chest= +Locked Chest (owned by @1)= +You do not own this chest.= +a locked chest= +Chest= diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index 24978ffb..8c161d1e 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -1860,13 +1860,7 @@ function default.register_decorations() -- Emergent jungle tree -- Due to 32 node height, altitude is limited and prescence depends on chunksize - local chunksize - if core.get_mapgen_chunksize then - local v = core.get_mapgen_chunksize() - chunksize = math.max(v.x, v.y, v.z) - else - chunksize = tonumber(core.get_mapgen_setting("chunksize")) - end + local chunksize = tonumber(minetest.get_mapgen_setting("chunksize")) if chunksize >= 5 then minetest.register_decoration({ name = "default:emergent_jungle_tree", @@ -2482,6 +2476,9 @@ end -- Detect mapgen to select functions -- +minetest.clear_registered_biomes() +minetest.clear_registered_ores() +minetest.clear_registered_decorations() local mg_name = minetest.get_mapgen_setting("mg_name") diff --git a/mods/default/models/torch_ceiling.obj b/mods/default/models/torch_ceiling.obj index 5df8597c..ea51f3ce 100644 --- a/mods/default/models/torch_ceiling.obj +++ b/mods/default/models/torch_ceiling.obj @@ -1,5 +1,7 @@ # Blender v2.77 (sub 0) OBJ File: 'torch_ceiling.blend' # www.blender.org +mtllib torch_ceiling.mtl +o Cube_Cube.001 v -0.062469 -0.047331 0.068152 v -0.062469 -0.559515 -0.164388 v -0.062469 0.004344 -0.045667 @@ -43,11 +45,14 @@ vn -0.0000 -0.4134 0.9105 vn -1.0000 0.0000 0.0000 vn 0.7071 0.0000 -0.7071 vn 0.7071 0.0000 0.7071 +usemtl Material.001 +s off f 3/1/1 1/2/1 5/3/1 7/4/1 f 8/5/1 4/6/1 2/7/1 6/8/1 f 3/9/2 4/6/2 8/5/2 7/10/2 f 1/11/3 3/9/3 4/6/3 2/12/3 f 5/13/2 1/11/2 2/12/2 6/14/2 f 7/10/3 8/5/3 6/14/3 5/13/3 +usemtl Material.002 f 9/15/4 10/16/4 12/17/4 11/18/4 f 13/19/5 14/20/5 16/21/5 15/22/5 diff --git a/mods/default/models/torch_floor.obj b/mods/default/models/torch_floor.obj index dfd25e8f..e2487efe 100644 --- a/mods/default/models/torch_floor.obj +++ b/mods/default/models/torch_floor.obj @@ -1,5 +1,7 @@ # Blender v2.76 (sub 11) OBJ File: 'torch_floor.blend' # www.blender.org +mtllib torch_floor.mtl +o Cube_Cube.001 v 0.062500 0.062500 -0.062500 v 0.062500 -0.500000 -0.062500 v 0.062500 0.062500 0.062500 @@ -33,11 +35,16 @@ vn 0.000000 0.000000 -1.000000 vn 1.000000 0.000000 0.000000 vn -0.707100 0.000000 -0.707100 vn -0.707100 -0.000000 0.707100 +g Cube_Cube.001_Cube_Cube.001_Material.001 +usemtl Material.001 +s off f 3/1/1 1/2/1 5/3/1 7/4/1 f 8/5/1 4/6/1 2/7/1 6/8/1 f 3/2/2 4/6/2 8/5/2 7/3/2 f 1/3/3 3/2/3 4/6/3 2/5/3 f 5/2/2 1/3/2 2/5/2 6/6/2 f 7/3/3 8/5/3 6/6/3 5/2/3 +g Cube_Cube.001_Cube_Cube.001_Material.002 +usemtl Material.002 f 9/9/4 10/10/4 12/11/4 11/12/4 f 13/12/5 14/9/5 16/10/5 15/11/5 diff --git a/mods/default/models/torch_wall.obj b/mods/default/models/torch_wall.obj index 6de4b131..57baa9e6 100644 --- a/mods/default/models/torch_wall.obj +++ b/mods/default/models/torch_wall.obj @@ -1,5 +1,7 @@ # Blender v2.76 (sub 11) OBJ File: 'torch_wall.blend' # www.blender.org +mtllib torch_wall.mtl +o Cube_Cube.001 v 0.062469 -0.195248 0.023570 v 0.062469 -0.476498 -0.463570 v 0.062469 -0.303502 0.086070 @@ -45,6 +47,9 @@ vn -0.707100 0.612400 -0.353600 vn -0.707100 -0.612400 0.353600 vn -0.707100 0.707100 -0.000000 vn -0.707100 -0.707100 -0.000000 +g Cube_Cube.001_Cube_Cube.001_Material.001 +usemtl Material.001 +s off f 3/1/1 1/2/1 5/3/1 7/4/1 f 8/5/1 4/6/1 2/7/1 6/8/1 f 3/2/2 4/6/2 8/5/2 7/3/2 @@ -53,5 +58,7 @@ f 5/2/2 1/3/2 2/5/2 6/6/2 f 7/3/3 8/5/3 6/6/3 5/2/3 f 17/9/4 18/10/4 20/11/4 19/12/4 f 21/9/5 22/10/5 24/11/5 23/12/5 +g Cube_Cube.001_Cube_Cube.001_Material.002 +usemtl Material.002 f 9/12/6 10/13/6 12/14/6 11/9/6 f 13/9/7 14/12/7 16/13/7 15/14/7 diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index e9387a58..d2a29151 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -180,9 +180,6 @@ default:sand_with_kelp Corals ------ -default:coral_green -default:coral_pink -default:coral_cyan default:coral_brown default:coral_orange default:coral_skeleton @@ -217,12 +214,6 @@ default:fence_junglewood default:fence_pine_wood default:fence_aspen_wood -default:fence_rail_wood -default:fence_rail_acacia_wood -default:fence_rail_junglewood -default:fence_rail_pine_wood -default:fence_rail_aspen_wood - default:glass default:obsidian_glass @@ -230,10 +221,6 @@ default:brick default:meselamp default:mese_post_light -default:mese_post_light_acacia_wood -default:mese_post_light_junglewood -default:mese_post_light_pine_wood -default:mese_post_light_aspen_wood Misc ---- @@ -271,7 +258,6 @@ minetest.register_node("default:cobble", { is_ground_content = false, groups = {cracky = 3, stone = 2}, sounds = default.node_sound_stone_defaults(), - _tnt_loss = 4, }) minetest.register_node("default:stonebrick", { @@ -298,9 +284,9 @@ minetest.register_node("default:mossycobble", { is_ground_content = false, groups = {cracky = 3, stone = 1}, sounds = default.node_sound_stone_defaults(), - _tnt_loss = 4, }) + minetest.register_node("default:desert_stone", { description = S("Desert Stone"), tiles = {"default_desert_stone.png"}, @@ -316,7 +302,6 @@ minetest.register_node("default:desert_cobble", { is_ground_content = false, groups = {cracky = 3, stone = 2}, sounds = default.node_sound_stone_defaults(), - _tnt_loss = 4, }) minetest.register_node("default:desert_stonebrick", { @@ -446,7 +431,6 @@ minetest.register_node("default:dirt", { tiles = {"default_dirt.png"}, groups = {crumbly = 3, soil = 1}, sounds = default.node_sound_dirt_defaults(), - _tnt_loss = 3, }) minetest.register_node("default:dirt_with_grass", { @@ -533,7 +517,6 @@ minetest.register_node("default:dry_dirt", { tiles = {"default_dry_dirt.png"}, groups = {crumbly = 3, soil = 1}, sounds = default.node_sound_dirt_defaults(), - _tnt_loss = 3, }) minetest.register_node("default:dry_dirt_with_dry_grass", { @@ -580,7 +563,6 @@ minetest.register_node("default:sand", { tiles = {"default_sand.png"}, groups = {crumbly = 3, falling_node = 1, sand = 1}, sounds = default.node_sound_sand_defaults(), - _tnt_loss = 2, }) minetest.register_node("default:desert_sand", { @@ -588,7 +570,6 @@ minetest.register_node("default:desert_sand", { tiles = {"default_desert_sand.png"}, groups = {crumbly = 3, falling_node = 1, sand = 1}, sounds = default.node_sound_sand_defaults(), - _tnt_loss = 2, }) minetest.register_node("default:silver_sand", { @@ -596,7 +577,6 @@ minetest.register_node("default:silver_sand", { tiles = {"default_silver_sand.png"}, groups = {crumbly = 3, falling_node = 1, sand = 1}, sounds = default.node_sound_sand_defaults(), - _tnt_loss = 2, }) @@ -611,8 +591,7 @@ minetest.register_node("default:gravel", { {items = {"default:flint"}, rarity = 16}, {items = {"default:gravel"}} } - }, - _tnt_loss = 3, + } }) minetest.register_node("default:clay", { @@ -647,7 +626,6 @@ minetest.register_node("default:snow", { }, groups = {crumbly = 3, falling_node = 1, snowy = 1}, sounds = default.node_sound_snow_defaults(), - _tnt_loss = 1, -- means it will disappear entirely on_construct = function(pos) pos.y = pos.y - 1 @@ -678,7 +656,7 @@ minetest.register_node("default:ice", { is_ground_content = false, paramtype = "light", groups = {cracky = 3, cools_lava = 1, slippery = 3}, - sounds = default.node_sound_ice_defaults(), + sounds = default.node_sound_glass_defaults(), }) -- Mapgen-placed ice with 'is ground content = true' to contain tunnels @@ -689,7 +667,7 @@ minetest.register_node("default:cave_ice", { groups = {cracky = 3, cools_lava = 1, slippery = 3, not_in_creative_inventory = 1}, drop = "default:ice", - sounds = default.node_sound_ice_defaults(), + sounds = default.node_sound_glass_defaults(), }) -- @@ -814,8 +792,6 @@ minetest.register_node("default:apple", { minetest.register_node("default:apple_mark", { description = S("Apple Marker"), - inventory_image = "default_apple.png^default_invisible_node_overlay.png", - wield_image = "default_apple.png^default_invisible_node_overlay.png", drawtype = "airlike", paramtype = "light", sunlight_propagates = true, @@ -1459,7 +1435,7 @@ minetest.register_node("default:junglegrass", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, junglegrass = 1, flammable = 1}, + groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1480,8 +1456,7 @@ minetest.register_node("default:grass_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, - normal_grass = 1, flammable = 1}, + groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1511,8 +1486,7 @@ for i = 2, 5 do buildable_to = true, drop = "default:grass_1", groups = {snappy = 3, flora = 1, attached_node = 1, - not_in_creative_inventory = 1, grass = 1, - normal_grass = 1, flammable = 1}, + not_in_creative_inventory = 1, grass = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1534,7 +1508,7 @@ minetest.register_node("default:dry_grass_1", { walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, - attached_node = 1, grass = 1, dry_grass = 1}, + attached_node = 1, dry_grass = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1563,7 +1537,7 @@ for i = 2, 5 do walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, - not_in_creative_inventory = 1, grass = 1, dry_grass = 1}, + not_in_creative_inventory=1, dry_grass = 1}, drop = "default:dry_grass_1", sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -1585,8 +1559,7 @@ minetest.register_node("default:fern_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, flora = 1, grass = 1, - fern = 1, attached_node = 1}, + groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1616,7 +1589,7 @@ for i = 2, 3 do walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, - grass = 1, fern = 1, not_in_creative_inventory = 1}, + not_in_creative_inventory=1}, drop = "default:fern_1", sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -1638,8 +1611,7 @@ minetest.register_node("default:marram_grass_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, flora = 1, grass = 1, marram_grass = 1, - attached_node = 1}, + groups = {snappy = 3, flammable = 3, attached_node = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1667,8 +1639,8 @@ for i = 2, 3 do sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, - grass = 1, marram_grass = 1, not_in_creative_inventory = 1}, + groups = {snappy = 3, flammable = 3, attached_node = 1, + not_in_creative_inventory=1}, drop = "default:marram_grass_1", sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -1699,6 +1671,7 @@ minetest.register_node("default:bush_stem", { minetest.register_node("default:bush_leaves", { description = S("Bush Leaves"), drawtype = "allfaces_optional", + waving = 1, tiles = {"default_leaves_simple.png"}, paramtype = "light", groups = {snappy = 3, flammable = 2, leaves = 1}, @@ -1752,6 +1725,7 @@ minetest.register_node("default:bush_sapling", { minetest.register_node("default:blueberry_bush_leaves_with_berries", { description = S("Blueberry Bush Leaves with Berries"), drawtype = "allfaces_optional", + waving = 1, tiles = {"default_blueberry_bush_leaves.png^default_blueberry_overlay.png"}, paramtype = "light", groups = {snappy = 3, flammable = 2, leaves = 1, dig_immediate = 3}, @@ -1768,6 +1742,7 @@ minetest.register_node("default:blueberry_bush_leaves_with_berries", { minetest.register_node("default:blueberry_bush_leaves", { description = S("Blueberry Bush Leaves"), drawtype = "allfaces_optional", + waving = 1, tiles = {"default_blueberry_bush_leaves.png"}, paramtype = "light", groups = {snappy = 3, flammable = 2, leaves = 1}, @@ -1846,6 +1821,7 @@ minetest.register_node("default:acacia_bush_stem", { minetest.register_node("default:acacia_bush_leaves", { description = S("Acacia Bush Leaves"), drawtype = "allfaces_optional", + waving = 1, tiles = {"default_acacia_leaves_simple.png"}, paramtype = "light", groups = {snappy = 3, flammable = 2, leaves = 1}, @@ -1916,6 +1892,7 @@ minetest.register_node("default:pine_bush_stem", { minetest.register_node("default:pine_bush_needles", { description = S("Pine Bush Needles"), drawtype = "allfaces_optional", + waving = 1, tiles = {"default_pine_needles.png"}, paramtype = "light", groups = {snappy = 3, flammable = 2, leaves = 1}, @@ -1966,7 +1943,6 @@ minetest.register_node("default:pine_bush_sapling", { end, }) - minetest.register_node("default:sand_with_kelp", { description = S("Kelp"), drawtype = "plantlike_rooted", @@ -1974,7 +1950,6 @@ minetest.register_node("default:sand_with_kelp", { tiles = {"default_sand.png"}, special_tiles = {{name = "default_kelp.png", tileable_vertical = true}}, inventory_image = "default_kelp.png", - wield_image = "default_kelp.png", paramtype = "light", paramtype2 = "leveled", groups = {snappy = 3}, @@ -1994,8 +1969,8 @@ minetest.register_node("default:sand_with_kelp", { on_place = function(itemstack, placer, pointed_thing) -- Call on_rightclick if the pointed node defines it - if pointed_thing.type == "node" and not (placer and placer:is_player() - and placer:get_player_control().sneak) then + if pointed_thing.type == "node" and placer and + not placer:get_player_control().sneak then local node_ptu = minetest.get_node(pointed_thing.under) local def_ptu = minetest.registered_nodes[node_ptu.name] if def_ptu and def_ptu.on_rightclick then @@ -2021,7 +1996,8 @@ minetest.register_node("default:sand_with_kelp", { not minetest.is_protected(pos_top, player_name) then minetest.set_node(pos, {name = "default:sand_with_kelp", param2 = height * 16}) - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(player_name)) then itemstack:take_item() end else @@ -2033,7 +2009,7 @@ minetest.register_node("default:sand_with_kelp", { return itemstack end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) + after_destruct = function(pos, oldnode) minetest.set_node(pos, {name = "default:sand"}) end }) @@ -2044,20 +2020,19 @@ minetest.register_node("default:sand_with_kelp", { -- local function coral_on_place(itemstack, placer, pointed_thing) - if pointed_thing.type ~= "node" then + if pointed_thing.type ~= "node" or not placer then return itemstack end - local player_name = placer and placer:get_player_name() + local player_name = placer:get_player_name() local pos_under = pointed_thing.under local pos_above = pointed_thing.above local node_under = minetest.get_node(pos_under) local def_under = minetest.registered_nodes[node_under.name] - if def_under and def_under.on_rightclick and not ( - placer and placer:is_player() and placer:get_player_control().sneak) then + if def_under and def_under.on_rightclick and not placer:get_player_control().sneak then return def_under.on_rightclick(pos_under, node_under, - placer, itemstack, pointed_thing) + placer, itemstack, pointed_thing) or itemstack end if node_under.name ~= "default:coral_skeleton" or @@ -2067,13 +2042,17 @@ 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)) minetest.record_protection_violation(pos_under, player_name) return itemstack end node_under.name = itemstack:get_name() minetest.set_node(pos_under, node_under) - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for(player_name)) then itemstack:take_item() end @@ -2088,7 +2067,6 @@ minetest.register_node("default:coral_green", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_green.png", tileable_vertical = true}}, inventory_image = "default_coral_green.png", - wield_image = "default_coral_green.png", groups = {snappy = 3}, selection_box = { type = "fixed", @@ -2106,7 +2084,7 @@ minetest.register_node("default:coral_green", { on_place = coral_on_place, - after_dig_node = function(pos, oldnode, oldmetadata, digger) + after_destruct = function(pos, oldnode) minetest.set_node(pos, {name = "default:coral_skeleton"}) end, }) @@ -2119,7 +2097,6 @@ minetest.register_node("default:coral_pink", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_pink.png", tileable_vertical = true}}, inventory_image = "default_coral_pink.png", - wield_image = "default_coral_pink.png", groups = {snappy = 3}, selection_box = { type = "fixed", @@ -2137,7 +2114,7 @@ minetest.register_node("default:coral_pink", { on_place = coral_on_place, - after_dig_node = function(pos, oldnode, oldmetadata, digger) + after_destruct = function(pos, oldnode) minetest.set_node(pos, {name = "default:coral_skeleton"}) end, }) @@ -2150,7 +2127,6 @@ minetest.register_node("default:coral_cyan", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_cyan.png", tileable_vertical = true}}, inventory_image = "default_coral_cyan.png", - wield_image = "default_coral_cyan.png", groups = {snappy = 3}, selection_box = { type = "fixed", @@ -2168,7 +2144,7 @@ minetest.register_node("default:coral_cyan", { on_place = coral_on_place, - after_dig_node = function(pos, oldnode, oldmetadata, digger) + after_destruct = function(pos, oldnode) minetest.set_node(pos, {name = "default:coral_skeleton"}) end, }) @@ -2227,7 +2203,7 @@ minetest.register_node("default:water_source", { }, }, }, - use_texture_alpha = "blend", + alpha = 191, paramtype = "light", walkable = false, pointable = false, @@ -2272,7 +2248,7 @@ minetest.register_node("default:water_flowing", { }, }, }, - use_texture_alpha = "blend", + alpha = 191, paramtype = "light", paramtype2 = "flowingliquid", walkable = false, @@ -2318,7 +2294,7 @@ minetest.register_node("default:river_water_source", { }, }, }, - use_texture_alpha = "blend", + alpha = 160, paramtype = "light", walkable = false, pointable = false, @@ -2368,7 +2344,7 @@ minetest.register_node("default:river_water_flowing", { }, }, }, - use_texture_alpha = "blend", + alpha = 160, paramtype = "light", paramtype2 = "flowingliquid", walkable = false, @@ -2531,7 +2507,7 @@ local function update_bookshelf(pos) end end -local default_bookshelf_def = { +minetest.register_node("default:bookshelf", { description = S("Bookshelf"), tiles = {"default_wood.png", "default_wood.png", "default_wood.png", "default_wood.png", "default_bookshelf.png", "default_bookshelf.png"}, @@ -2556,13 +2532,19 @@ local default_bookshelf_def = { end return 0 end, - on_metadata_inventory_put = function(pos) + 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_take = function(pos) + 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_move = function(pos) + 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) @@ -2572,9 +2554,7 @@ local default_bookshelf_def = { 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, { @@ -2588,7 +2568,6 @@ local function register_sign(material, desc, def) sunlight_propagates = true, is_ground_content = false, walkable = false, - use_texture_alpha = "opaque", node_box = { type = "wallmounted", wall_top = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125}, @@ -2604,9 +2583,6 @@ local function register_sign(material, desc, def) meta:set_string("formspec", "field[text;;${text}]") end, on_receive_fields = function(pos, formname, fields, sender) - if not fields.quit then - return -- workaround for https://github.com/luanti-org/luanti/issues/16187 - end local player_name = sender:get_player_name() if minetest.is_protected(pos, player_name) then minetest.record_protection_violation(pos, player_name) @@ -2616,12 +2592,12 @@ local function register_sign(material, desc, def) if not text then return end - if #text > 512 then + if string.len(text) > 512 then minetest.chat_send_player(player_name, S("Text too long")) return end - text = text:gsub("[%z-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n) - default.log_player_action(sender, ("wrote %q to the sign at"):format(text), pos) + minetest.log("action", player_name .. " wrote \"" .. text .. + "\" to the sign at " .. minetest.pos_to_string(pos)) local meta = minetest.get_meta(pos) meta:set_string("text", text) @@ -2813,21 +2789,20 @@ minetest.register_node("default:glass", { description = S("Glass"), drawtype = "glasslike_framed_optional", 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}, sounds = default.node_sound_glass_defaults(), - _tnt_loss = 2, }) minetest.register_node("default:obsidian_glass", { description = S("Obsidian Glass"), drawtype = "glasslike_framed_optional", 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(), @@ -2861,34 +2836,25 @@ minetest.register_node("default:meselamp", { light_source = default.LIGHT_MAX, }) -default.register_mesepost("default:mese_post_light", { - description = S("Apple Wood Mese Post Light"), - texture = "default_fence_wood.png", - material = "default:wood", -}) - -default.register_mesepost("default:mese_post_light_acacia_wood", { - description = S("Acacia Wood Mese Post Light"), - texture = "default_fence_acacia_wood.png", - material = "default:acacia_wood", -}) - -default.register_mesepost("default:mese_post_light_junglewood", { - description = S("Jungle Wood Mese Post Light"), - texture = "default_fence_junglewood.png", - material = "default:junglewood", -}) - -default.register_mesepost("default:mese_post_light_pine_wood", { - description = S("Pine Wood Mese Post Light"), - texture = "default_fence_pine_wood.png", - material = "default:pine_wood", -}) - -default.register_mesepost("default:mese_post_light_aspen_wood", { - description = S("Aspen Wood Mese Post Light"), - texture = "default_fence_aspen_wood.png", - material = "default:aspen_wood", +minetest.register_node("default:mese_post_light", { + description = S("Mese Post Light"), + tiles = {"default_mese_post_light_top.png", "default_mese_post_light_top.png", + "default_mese_post_light_side_dark.png", "default_mese_post_light_side_dark.png", + "default_mese_post_light_side.png", "default_mese_post_light_side.png"}, + wield_image = "default_mese_post_light_side.png", + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-2 / 16, -8 / 16, -2 / 16, 2 / 16, 8 / 16, 2 / 16}, + }, + }, + paramtype = "light", + light_source = default.LIGHT_MAX, + sunlight_propagates = true, + is_ground_content = false, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = default.node_sound_wood_defaults(), }) -- diff --git a/mods/default/schematics/large_cactus.mts b/mods/default/schematics/large_cactus.mts index 755e2d8c..cadcdccb 100644 Binary files a/mods/default/schematics/large_cactus.mts and b/mods/default/schematics/large_cactus.mts differ diff --git a/mods/default/sounds/default_dig_choppy.1.ogg b/mods/default/sounds/default_dig_choppy.1.ogg deleted file mode 100644 index 95fa6d4e..00000000 Binary files a/mods/default/sounds/default_dig_choppy.1.ogg and /dev/null differ diff --git a/mods/default/sounds/default_dig_choppy.2.ogg b/mods/default/sounds/default_dig_choppy.2.ogg deleted file mode 100644 index 5d3a0444..00000000 Binary files a/mods/default/sounds/default_dig_choppy.2.ogg and /dev/null differ diff --git a/mods/default/sounds/default_dig_choppy.3.ogg b/mods/default/sounds/default_dig_choppy.3.ogg deleted file mode 100644 index 2bb0aceb..00000000 Binary files a/mods/default/sounds/default_dig_choppy.3.ogg and /dev/null differ diff --git a/mods/default/sounds/default_dig_choppy.ogg b/mods/default/sounds/default_dig_choppy.ogg new file mode 100644 index 00000000..e2ecd841 Binary files /dev/null and b/mods/default/sounds/default_dig_choppy.ogg differ diff --git a/mods/default/sounds/default_dig_cracky.1.ogg b/mods/default/sounds/default_dig_cracky.1.ogg deleted file mode 100644 index ffced27a..00000000 Binary files a/mods/default/sounds/default_dig_cracky.1.ogg and /dev/null differ diff --git a/mods/default/sounds/default_dig_cracky.2.ogg b/mods/default/sounds/default_dig_cracky.2.ogg deleted file mode 100644 index d9e80103..00000000 Binary files a/mods/default/sounds/default_dig_cracky.2.ogg and /dev/null differ diff --git a/mods/default/sounds/default_dig_cracky.3.ogg b/mods/default/sounds/default_dig_cracky.3.ogg deleted file mode 100644 index 7d19d408..00000000 Binary files a/mods/default/sounds/default_dig_cracky.3.ogg and /dev/null differ diff --git a/mods/default/sounds/default_dig_cracky.ogg b/mods/default/sounds/default_dig_cracky.ogg new file mode 100644 index 00000000..da116791 Binary files /dev/null and b/mods/default/sounds/default_dig_cracky.ogg differ diff --git a/mods/default/sounds/default_furnace_active.ogg b/mods/default/sounds/default_furnace_active.ogg deleted file mode 100644 index 536edc24..00000000 Binary files a/mods/default/sounds/default_furnace_active.ogg and /dev/null differ diff --git a/mods/default/sounds/default_gravel_dig.1.ogg b/mods/default/sounds/default_gravel_dig.1.ogg deleted file mode 100644 index baf8fca7..00000000 Binary files a/mods/default/sounds/default_gravel_dig.1.ogg and /dev/null differ diff --git a/mods/default/sounds/default_gravel_dig.2.ogg b/mods/default/sounds/default_gravel_dig.2.ogg deleted file mode 100644 index e0c0c50f..00000000 Binary files a/mods/default/sounds/default_gravel_dig.2.ogg and /dev/null differ diff --git a/mods/default/sounds/default_gravel_dug.1.ogg b/mods/default/sounds/default_gravel_dug.1.ogg deleted file mode 100644 index 13034335..00000000 Binary files a/mods/default/sounds/default_gravel_dug.1.ogg and /dev/null differ diff --git a/mods/default/sounds/default_gravel_dug.2.ogg b/mods/default/sounds/default_gravel_dug.2.ogg deleted file mode 100644 index ee5ed330..00000000 Binary files a/mods/default/sounds/default_gravel_dug.2.ogg and /dev/null differ diff --git a/mods/default/sounds/default_gravel_dug.3.ogg b/mods/default/sounds/default_gravel_dug.3.ogg deleted file mode 100644 index add4c54b..00000000 Binary files a/mods/default/sounds/default_gravel_dug.3.ogg and /dev/null differ diff --git a/mods/default/sounds/default_hard_footstep.1.ogg b/mods/default/sounds/default_hard_footstep.1.ogg index 0a08efa8..1748bc56 100644 Binary files a/mods/default/sounds/default_hard_footstep.1.ogg and b/mods/default/sounds/default_hard_footstep.1.ogg differ diff --git a/mods/default/sounds/default_hard_footstep.2.ogg b/mods/default/sounds/default_hard_footstep.2.ogg index be52a870..fe39fd78 100644 Binary files a/mods/default/sounds/default_hard_footstep.2.ogg and b/mods/default/sounds/default_hard_footstep.2.ogg differ diff --git a/mods/default/sounds/default_hard_footstep.3.ogg b/mods/default/sounds/default_hard_footstep.3.ogg index a342787d..5030e060 100644 Binary files a/mods/default/sounds/default_hard_footstep.3.ogg and b/mods/default/sounds/default_hard_footstep.3.ogg differ diff --git a/mods/default/sounds/default_ice_dig.1.ogg b/mods/default/sounds/default_ice_dig.1.ogg deleted file mode 100644 index 97399c83..00000000 Binary files a/mods/default/sounds/default_ice_dig.1.ogg and /dev/null differ diff --git a/mods/default/sounds/default_ice_dig.2.ogg b/mods/default/sounds/default_ice_dig.2.ogg deleted file mode 100644 index 8a5da119..00000000 Binary files a/mods/default/sounds/default_ice_dig.2.ogg and /dev/null differ diff --git a/mods/default/sounds/default_ice_dig.3.ogg b/mods/default/sounds/default_ice_dig.3.ogg deleted file mode 100644 index 765fb9be..00000000 Binary files a/mods/default/sounds/default_ice_dig.3.ogg and /dev/null differ diff --git a/mods/default/sounds/default_ice_dug.ogg b/mods/default/sounds/default_ice_dug.ogg deleted file mode 100644 index ae37673e..00000000 Binary files a/mods/default/sounds/default_ice_dug.ogg and /dev/null differ diff --git a/mods/default/sounds/default_ice_footstep.1.ogg b/mods/default/sounds/default_ice_footstep.1.ogg deleted file mode 100644 index c235f1ef..00000000 Binary files a/mods/default/sounds/default_ice_footstep.1.ogg and /dev/null differ diff --git a/mods/default/sounds/default_ice_footstep.2.ogg b/mods/default/sounds/default_ice_footstep.2.ogg deleted file mode 100644 index 61d2c990..00000000 Binary files a/mods/default/sounds/default_ice_footstep.2.ogg and /dev/null differ diff --git a/mods/default/sounds/default_ice_footstep.3.ogg b/mods/default/sounds/default_ice_footstep.3.ogg deleted file mode 100644 index 2ecbb431..00000000 Binary files a/mods/default/sounds/default_ice_footstep.3.ogg and /dev/null differ diff --git a/mods/default/sounds/default_metal_footstep.1.ogg b/mods/default/sounds/default_metal_footstep.1.ogg index 49fe89ba..841286bd 100644 Binary files a/mods/default/sounds/default_metal_footstep.1.ogg and b/mods/default/sounds/default_metal_footstep.1.ogg differ diff --git a/mods/default/sounds/default_metal_footstep.2.ogg b/mods/default/sounds/default_metal_footstep.2.ogg index 878711d5..aa61ed33 100644 Binary files a/mods/default/sounds/default_metal_footstep.2.ogg and b/mods/default/sounds/default_metal_footstep.2.ogg differ diff --git a/mods/default/sounds/default_metal_footstep.3.ogg b/mods/default/sounds/default_metal_footstep.3.ogg index 2a566a83..4cc1ca47 100644 Binary files a/mods/default/sounds/default_metal_footstep.3.ogg and b/mods/default/sounds/default_metal_footstep.3.ogg differ diff --git a/mods/default/sounds/default_sand_footstep.1.ogg b/mods/default/sounds/default_sand_footstep.1.ogg index b92feabb..65b68c7e 100644 Binary files a/mods/default/sounds/default_sand_footstep.1.ogg and b/mods/default/sounds/default_sand_footstep.1.ogg differ diff --git a/mods/default/sounds/default_sand_footstep.2.ogg b/mods/default/sounds/default_sand_footstep.2.ogg index 6bc5da3e..57f35f30 100644 Binary files a/mods/default/sounds/default_sand_footstep.2.ogg and b/mods/default/sounds/default_sand_footstep.2.ogg differ diff --git a/mods/default/sounds/default_sand_footstep.3.ogg b/mods/default/sounds/default_sand_footstep.3.ogg deleted file mode 100644 index 880306fd..00000000 Binary files a/mods/default/sounds/default_sand_footstep.3.ogg and /dev/null differ diff --git a/mods/default/sounds/default_water_footstep.4.ogg b/mods/default/sounds/default_water_footstep.4.ogg new file mode 100644 index 00000000..6f1eab82 Binary files /dev/null and b/mods/default/sounds/default_water_footstep.4.ogg differ diff --git a/mods/default/textures/default_acacia_bush_stem.png b/mods/default/textures/default_acacia_bush_stem.png index f2ee9fa1..29039152 100644 Binary files a/mods/default/textures/default_acacia_bush_stem.png and b/mods/default/textures/default_acacia_bush_stem.png differ diff --git a/mods/default/textures/default_acacia_leaves.png b/mods/default/textures/default_acacia_leaves.png index 9620c400..626e1b30 100644 Binary files a/mods/default/textures/default_acacia_leaves.png and b/mods/default/textures/default_acacia_leaves.png differ diff --git a/mods/default/textures/default_acacia_leaves_simple.png b/mods/default/textures/default_acacia_leaves_simple.png index ab464bad..3c7015bb 100644 Binary files a/mods/default/textures/default_acacia_leaves_simple.png and b/mods/default/textures/default_acacia_leaves_simple.png differ diff --git a/mods/default/textures/default_acacia_sapling.png b/mods/default/textures/default_acacia_sapling.png index e34aec51..07170a03 100644 Binary files a/mods/default/textures/default_acacia_sapling.png and b/mods/default/textures/default_acacia_sapling.png differ diff --git a/mods/default/textures/default_acacia_tree.png b/mods/default/textures/default_acacia_tree.png index 86ab6b15..58bb3c40 100644 Binary files a/mods/default/textures/default_acacia_tree.png and b/mods/default/textures/default_acacia_tree.png differ diff --git a/mods/default/textures/default_acacia_tree_top.png b/mods/default/textures/default_acacia_tree_top.png index 5dbe97be..a8a0ce05 100644 Binary files a/mods/default/textures/default_acacia_tree_top.png and b/mods/default/textures/default_acacia_tree_top.png differ diff --git a/mods/default/textures/default_acacia_wood.png b/mods/default/textures/default_acacia_wood.png index f2f8337e..b5abf1e9 100644 Binary files a/mods/default/textures/default_acacia_wood.png and b/mods/default/textures/default_acacia_wood.png differ diff --git a/mods/default/textures/default_aspen_leaves.png b/mods/default/textures/default_aspen_leaves.png index 2d6a7efe..73064237 100644 Binary files a/mods/default/textures/default_aspen_leaves.png and b/mods/default/textures/default_aspen_leaves.png differ diff --git a/mods/default/textures/default_aspen_sapling.png b/mods/default/textures/default_aspen_sapling.png index f4c772c0..f8d9136a 100644 Binary files a/mods/default/textures/default_aspen_sapling.png and b/mods/default/textures/default_aspen_sapling.png differ diff --git a/mods/default/textures/default_aspen_tree.png b/mods/default/textures/default_aspen_tree.png index db2285e7..cfb05fca 100644 Binary files a/mods/default/textures/default_aspen_tree.png and b/mods/default/textures/default_aspen_tree.png differ diff --git a/mods/default/textures/default_aspen_tree_top.png b/mods/default/textures/default_aspen_tree_top.png index 61ac0096..fcca0380 100644 Binary files a/mods/default/textures/default_aspen_tree_top.png and b/mods/default/textures/default_aspen_tree_top.png differ diff --git a/mods/default/textures/default_aspen_wood.png b/mods/default/textures/default_aspen_wood.png index f31ac30f..2b584b31 100644 Binary files a/mods/default/textures/default_aspen_wood.png and b/mods/default/textures/default_aspen_wood.png differ diff --git a/mods/default/textures/default_blueberry_bush_leaves.png b/mods/default/textures/default_blueberry_bush_leaves.png index d6736ca7..2cd112c8 100644 Binary files a/mods/default/textures/default_blueberry_bush_leaves.png and b/mods/default/textures/default_blueberry_bush_leaves.png differ diff --git a/mods/default/textures/default_blueberry_bush_sapling.png b/mods/default/textures/default_blueberry_bush_sapling.png index c22a374f..5d7393f7 100644 Binary files a/mods/default/textures/default_blueberry_bush_sapling.png and b/mods/default/textures/default_blueberry_bush_sapling.png differ diff --git a/mods/default/textures/default_blueberry_overlay.png b/mods/default/textures/default_blueberry_overlay.png index a7f8ab04..de9de623 100644 Binary files a/mods/default/textures/default_blueberry_overlay.png and b/mods/default/textures/default_blueberry_overlay.png differ diff --git a/mods/default/textures/default_bookshelf.png b/mods/default/textures/default_bookshelf.png index 3407f758..10d64837 100644 Binary files a/mods/default/textures/default_bookshelf.png and b/mods/default/textures/default_bookshelf.png differ diff --git a/mods/default/textures/default_bookshelf_slot.png b/mods/default/textures/default_bookshelf_slot.png index ea4fdba1..cd2c8bce 100644 Binary files a/mods/default/textures/default_bookshelf_slot.png and b/mods/default/textures/default_bookshelf_slot.png differ diff --git a/mods/default/textures/default_brick.png b/mods/default/textures/default_brick.png index de98961e..ab191210 100644 Binary files a/mods/default/textures/default_brick.png and b/mods/default/textures/default_brick.png differ diff --git a/mods/default/textures/default_bronze_block.png b/mods/default/textures/default_bronze_block.png index 491fc78a..1d0c9d5a 100644 Binary files a/mods/default/textures/default_bronze_block.png and b/mods/default/textures/default_bronze_block.png differ diff --git a/mods/default/textures/default_bush_stem.png b/mods/default/textures/default_bush_stem.png index 6ad88885..18b615f7 100644 Binary files a/mods/default/textures/default_bush_stem.png and b/mods/default/textures/default_bush_stem.png differ diff --git a/mods/default/textures/default_cactus_side.png b/mods/default/textures/default_cactus_side.png index e5c10c33..8d6c40c1 100644 Binary files a/mods/default/textures/default_cactus_side.png and b/mods/default/textures/default_cactus_side.png differ diff --git a/mods/default/textures/default_chest_front.png b/mods/default/textures/default_chest_front.png index f4132794..85227d8f 100644 Binary files a/mods/default/textures/default_chest_front.png and b/mods/default/textures/default_chest_front.png differ diff --git a/mods/default/textures/default_chest_inside.png b/mods/default/textures/default_chest_inside.png index 9d2e883d..5f7b6b13 100644 Binary files a/mods/default/textures/default_chest_inside.png and b/mods/default/textures/default_chest_inside.png differ diff --git a/mods/default/textures/default_chest_lock.png b/mods/default/textures/default_chest_lock.png index b1885ea5..73f46c78 100644 Binary files a/mods/default/textures/default_chest_lock.png and b/mods/default/textures/default_chest_lock.png differ diff --git a/mods/default/textures/default_chest_top.png b/mods/default/textures/default_chest_top.png index 1fbdbb94..f4a92ee0 100644 Binary files a/mods/default/textures/default_chest_top.png and b/mods/default/textures/default_chest_top.png differ diff --git a/mods/default/textures/default_coal_block.png b/mods/default/textures/default_coal_block.png index e92c5322..6fe9ed93 100644 Binary files a/mods/default/textures/default_coal_block.png and b/mods/default/textures/default_coal_block.png differ diff --git a/mods/default/textures/default_coniferous_litter.png b/mods/default/textures/default_coniferous_litter.png index 9d9651ae..da340e0a 100644 Binary files a/mods/default/textures/default_coniferous_litter.png and b/mods/default/textures/default_coniferous_litter.png differ diff --git a/mods/default/textures/default_coniferous_litter_side.png b/mods/default/textures/default_coniferous_litter_side.png index 9a390584..07014614 100644 Binary files a/mods/default/textures/default_coniferous_litter_side.png and b/mods/default/textures/default_coniferous_litter_side.png differ diff --git a/mods/default/textures/default_copper_block.png b/mods/default/textures/default_copper_block.png index e1b60f0a..85337546 100644 Binary files a/mods/default/textures/default_copper_block.png and b/mods/default/textures/default_copper_block.png differ diff --git a/mods/default/textures/default_coral_brown.png b/mods/default/textures/default_coral_brown.png index 7a18bd70..8a775fe0 100644 Binary files a/mods/default/textures/default_coral_brown.png and b/mods/default/textures/default_coral_brown.png differ diff --git a/mods/default/textures/default_coral_cyan.png b/mods/default/textures/default_coral_cyan.png index 890347f7..11cc7bfd 100644 Binary files a/mods/default/textures/default_coral_cyan.png and b/mods/default/textures/default_coral_cyan.png differ diff --git a/mods/default/textures/default_coral_green.png b/mods/default/textures/default_coral_green.png index 78f3f33f..847c5721 100644 Binary files a/mods/default/textures/default_coral_green.png and b/mods/default/textures/default_coral_green.png differ diff --git a/mods/default/textures/default_coral_orange.png b/mods/default/textures/default_coral_orange.png index d7432abd..cefac627 100644 Binary files a/mods/default/textures/default_coral_orange.png and b/mods/default/textures/default_coral_orange.png differ diff --git a/mods/default/textures/default_coral_pink.png b/mods/default/textures/default_coral_pink.png index 3708ba5f..62d70c6e 100644 Binary files a/mods/default/textures/default_coral_pink.png and b/mods/default/textures/default_coral_pink.png differ diff --git a/mods/default/textures/default_coral_skeleton.png b/mods/default/textures/default_coral_skeleton.png index d00c6fed..fa48f151 100644 Binary files a/mods/default/textures/default_coral_skeleton.png and b/mods/default/textures/default_coral_skeleton.png differ diff --git a/mods/default/textures/default_desert_sand.png b/mods/default/textures/default_desert_sand.png index 75ade0b7..371b8c7e 100644 Binary files a/mods/default/textures/default_desert_sand.png and b/mods/default/textures/default_desert_sand.png differ diff --git a/mods/default/textures/default_desert_sandstone.png b/mods/default/textures/default_desert_sandstone.png index e0b22d0d..52e445fa 100644 Binary files a/mods/default/textures/default_desert_sandstone.png and b/mods/default/textures/default_desert_sandstone.png differ diff --git a/mods/default/textures/default_desert_sandstone_block.png b/mods/default/textures/default_desert_sandstone_block.png index 6f6c8ff5..8fc54e75 100644 Binary files a/mods/default/textures/default_desert_sandstone_block.png and b/mods/default/textures/default_desert_sandstone_block.png differ diff --git a/mods/default/textures/default_desert_sandstone_brick.png b/mods/default/textures/default_desert_sandstone_brick.png index d2b70dd2..ab58db52 100644 Binary files a/mods/default/textures/default_desert_sandstone_brick.png and b/mods/default/textures/default_desert_sandstone_brick.png differ diff --git a/mods/default/textures/default_desert_stone_block.png b/mods/default/textures/default_desert_stone_block.png index e8e842bc..9eb8e924 100644 Binary files a/mods/default/textures/default_desert_stone_block.png and b/mods/default/textures/default_desert_stone_block.png differ diff --git a/mods/default/textures/default_desert_stone_brick.png b/mods/default/textures/default_desert_stone_brick.png index 8e7208dc..a603d18f 100644 Binary files a/mods/default/textures/default_desert_stone_brick.png and b/mods/default/textures/default_desert_stone_brick.png differ diff --git a/mods/default/textures/default_dirt.png b/mods/default/textures/default_dirt.png index 4ed965a9..afe4a2e1 100644 Binary files a/mods/default/textures/default_dirt.png and b/mods/default/textures/default_dirt.png differ diff --git a/mods/default/textures/default_dry_grass.png b/mods/default/textures/default_dry_grass.png index 11def9c6..03455c3f 100644 Binary files a/mods/default/textures/default_dry_grass.png and b/mods/default/textures/default_dry_grass.png differ diff --git a/mods/default/textures/default_dry_grass_1.png b/mods/default/textures/default_dry_grass_1.png index d91174cc..5cf68a3b 100644 Binary files a/mods/default/textures/default_dry_grass_1.png and b/mods/default/textures/default_dry_grass_1.png differ diff --git a/mods/default/textures/default_dry_grass_2.png b/mods/default/textures/default_dry_grass_2.png index b12bf547..c925aceb 100644 Binary files a/mods/default/textures/default_dry_grass_2.png and b/mods/default/textures/default_dry_grass_2.png differ diff --git a/mods/default/textures/default_dry_grass_3.png b/mods/default/textures/default_dry_grass_3.png index c37a8eb9..4e4d84e4 100644 Binary files a/mods/default/textures/default_dry_grass_3.png and b/mods/default/textures/default_dry_grass_3.png differ diff --git a/mods/default/textures/default_dry_grass_4.png b/mods/default/textures/default_dry_grass_4.png index c00c7027..d315849e 100644 Binary files a/mods/default/textures/default_dry_grass_4.png and b/mods/default/textures/default_dry_grass_4.png differ diff --git a/mods/default/textures/default_dry_grass_5.png b/mods/default/textures/default_dry_grass_5.png index 10a09316..871d04cc 100644 Binary files a/mods/default/textures/default_dry_grass_5.png and b/mods/default/textures/default_dry_grass_5.png differ diff --git a/mods/default/textures/default_dry_grass_side.png b/mods/default/textures/default_dry_grass_side.png index 3ccbe418..ef375b7f 100644 Binary files a/mods/default/textures/default_dry_grass_side.png and b/mods/default/textures/default_dry_grass_side.png differ diff --git a/mods/default/textures/default_fence_acacia_wood.png b/mods/default/textures/default_fence_acacia_wood.png index 0fb97cc9..3b973f34 100644 Binary files a/mods/default/textures/default_fence_acacia_wood.png and b/mods/default/textures/default_fence_acacia_wood.png differ diff --git a/mods/default/textures/default_fence_aspen_wood.png b/mods/default/textures/default_fence_aspen_wood.png index fec97550..0a6558e0 100644 Binary files a/mods/default/textures/default_fence_aspen_wood.png and b/mods/default/textures/default_fence_aspen_wood.png differ diff --git a/mods/default/textures/default_fence_junglewood.png b/mods/default/textures/default_fence_junglewood.png index b3b8549c..c390941c 100644 Binary files a/mods/default/textures/default_fence_junglewood.png and b/mods/default/textures/default_fence_junglewood.png differ diff --git a/mods/default/textures/default_fence_pine_wood.png b/mods/default/textures/default_fence_pine_wood.png index 5045d19a..74609d99 100644 Binary files a/mods/default/textures/default_fence_pine_wood.png and b/mods/default/textures/default_fence_pine_wood.png differ diff --git a/mods/default/textures/default_fence_rail_acacia_wood.png b/mods/default/textures/default_fence_rail_acacia_wood.png index 7081cdb0..64dc90f1 100644 Binary files a/mods/default/textures/default_fence_rail_acacia_wood.png and b/mods/default/textures/default_fence_rail_acacia_wood.png differ diff --git a/mods/default/textures/default_fence_rail_aspen_wood.png b/mods/default/textures/default_fence_rail_aspen_wood.png index 0d35302f..ab16a60c 100644 Binary files a/mods/default/textures/default_fence_rail_aspen_wood.png and b/mods/default/textures/default_fence_rail_aspen_wood.png differ diff --git a/mods/default/textures/default_fence_rail_junglewood.png b/mods/default/textures/default_fence_rail_junglewood.png index 6616059b..ebc1ef06 100644 Binary files a/mods/default/textures/default_fence_rail_junglewood.png and b/mods/default/textures/default_fence_rail_junglewood.png differ diff --git a/mods/default/textures/default_fence_rail_pine_wood.png b/mods/default/textures/default_fence_rail_pine_wood.png index b2f74a37..fd8d99d6 100644 Binary files a/mods/default/textures/default_fence_rail_pine_wood.png and b/mods/default/textures/default_fence_rail_pine_wood.png differ diff --git a/mods/default/textures/default_fence_rail_wood.png b/mods/default/textures/default_fence_rail_wood.png index e41143cb..f84b755b 100644 Binary files a/mods/default/textures/default_fence_rail_wood.png and b/mods/default/textures/default_fence_rail_wood.png differ diff --git a/mods/default/textures/default_fence_wood.png b/mods/default/textures/default_fence_wood.png index 7d161dce..1e76430d 100644 Binary files a/mods/default/textures/default_fence_wood.png and b/mods/default/textures/default_fence_wood.png differ diff --git a/mods/default/textures/default_flint.png b/mods/default/textures/default_flint.png index 9763f4b1..226c7406 100644 Binary files a/mods/default/textures/default_flint.png and b/mods/default/textures/default_flint.png differ diff --git a/mods/default/textures/default_footprint.png b/mods/default/textures/default_footprint.png index 24d3e944..41d95463 100644 Binary files a/mods/default/textures/default_footprint.png and b/mods/default/textures/default_footprint.png differ diff --git a/mods/default/textures/default_furnace_bottom.png b/mods/default/textures/default_furnace_bottom.png index 92279ba3..b79ed063 100644 Binary files a/mods/default/textures/default_furnace_bottom.png and b/mods/default/textures/default_furnace_bottom.png differ diff --git a/mods/default/textures/default_furnace_fire_fg.png b/mods/default/textures/default_furnace_fire_fg.png index 576f113b..63888f39 100644 Binary files a/mods/default/textures/default_furnace_fire_fg.png and b/mods/default/textures/default_furnace_fire_fg.png differ diff --git a/mods/default/textures/default_furnace_front.png b/mods/default/textures/default_furnace_front.png index f445d83d..8c1798e4 100644 Binary files a/mods/default/textures/default_furnace_front.png and b/mods/default/textures/default_furnace_front.png differ diff --git a/mods/default/textures/default_furnace_front_active.png b/mods/default/textures/default_furnace_front_active.png index 68c03f57..ea43ed92 100644 Binary files a/mods/default/textures/default_furnace_front_active.png and b/mods/default/textures/default_furnace_front_active.png differ diff --git a/mods/default/textures/default_furnace_top.png b/mods/default/textures/default_furnace_top.png index 92279ba3..b79ed063 100644 Binary files a/mods/default/textures/default_furnace_top.png and b/mods/default/textures/default_furnace_top.png differ diff --git a/mods/default/textures/default_glass_detail.png b/mods/default/textures/default_glass_detail.png index 7eab49e0..811a4db8 100644 Binary files a/mods/default/textures/default_glass_detail.png and b/mods/default/textures/default_glass_detail.png differ diff --git a/mods/default/textures/default_grass_1.png b/mods/default/textures/default_grass_1.png index d16b307e..e9faa2c3 100644 Binary files a/mods/default/textures/default_grass_1.png and b/mods/default/textures/default_grass_1.png differ diff --git a/mods/default/textures/default_grass_2.png b/mods/default/textures/default_grass_2.png index 6a1dac2c..03729a00 100644 Binary files a/mods/default/textures/default_grass_2.png and b/mods/default/textures/default_grass_2.png differ diff --git a/mods/default/textures/default_grass_3.png b/mods/default/textures/default_grass_3.png index e67727a4..92ca1b5d 100644 Binary files a/mods/default/textures/default_grass_3.png and b/mods/default/textures/default_grass_3.png differ diff --git a/mods/default/textures/default_grass_4.png b/mods/default/textures/default_grass_4.png index 80269d7e..c782a33b 100644 Binary files a/mods/default/textures/default_grass_4.png and b/mods/default/textures/default_grass_4.png differ diff --git a/mods/default/textures/default_grass_5.png b/mods/default/textures/default_grass_5.png index df457605..b727e9cf 100644 Binary files a/mods/default/textures/default_grass_5.png and b/mods/default/textures/default_grass_5.png differ diff --git a/mods/default/textures/default_grass_side.png b/mods/default/textures/default_grass_side.png index 77aa6557..079d96a2 100644 Binary files a/mods/default/textures/default_grass_side.png and b/mods/default/textures/default_grass_side.png differ diff --git a/mods/default/textures/default_gravel.png b/mods/default/textures/default_gravel.png index 37bf286d..8852d384 100644 Binary files a/mods/default/textures/default_gravel.png and b/mods/default/textures/default_gravel.png differ diff --git a/mods/default/textures/default_ice.png b/mods/default/textures/default_ice.png index 09b53f28..2874e1e3 100644 Binary files a/mods/default/textures/default_ice.png and b/mods/default/textures/default_ice.png differ diff --git a/mods/default/textures/default_invisible_node_overlay.png b/mods/default/textures/default_invisible_node_overlay.png deleted file mode 100644 index 7fc88061..00000000 Binary files a/mods/default/textures/default_invisible_node_overlay.png and /dev/null differ diff --git a/mods/default/textures/default_item_smoke.png b/mods/default/textures/default_item_smoke.png index ae95c160..d62fb3b0 100644 Binary files a/mods/default/textures/default_item_smoke.png and b/mods/default/textures/default_item_smoke.png differ diff --git a/mods/default/textures/default_jungleleaves.png b/mods/default/textures/default_jungleleaves.png index 9a8d5f93..5afcc36d 100644 Binary files a/mods/default/textures/default_jungleleaves.png and b/mods/default/textures/default_jungleleaves.png differ diff --git a/mods/default/textures/default_jungleleaves_simple.png b/mods/default/textures/default_jungleleaves_simple.png index d0c3f7ed..7165100c 100644 Binary files a/mods/default/textures/default_jungleleaves_simple.png and b/mods/default/textures/default_jungleleaves_simple.png differ diff --git a/mods/default/textures/default_jungletree.png b/mods/default/textures/default_jungletree.png index 671b24dc..2cf77a68 100644 Binary files a/mods/default/textures/default_jungletree.png and b/mods/default/textures/default_jungletree.png differ diff --git a/mods/default/textures/default_jungletree_top.png b/mods/default/textures/default_jungletree_top.png index 4027d9e0..439f0786 100644 Binary files a/mods/default/textures/default_jungletree_top.png and b/mods/default/textures/default_jungletree_top.png differ diff --git a/mods/default/textures/default_junglewood.png b/mods/default/textures/default_junglewood.png index 68d9e48a..8d17917b 100644 Binary files a/mods/default/textures/default_junglewood.png and b/mods/default/textures/default_junglewood.png differ diff --git a/mods/default/textures/default_kelp.png b/mods/default/textures/default_kelp.png index 4b95b84c..70b743d5 100644 Binary files a/mods/default/textures/default_kelp.png and b/mods/default/textures/default_kelp.png differ diff --git a/mods/default/textures/default_key.png b/mods/default/textures/default_key.png new file mode 100644 index 00000000..783d3139 Binary files /dev/null and b/mods/default/textures/default_key.png differ diff --git a/mods/default/textures/default_key_skeleton.png b/mods/default/textures/default_key_skeleton.png new file mode 100644 index 00000000..2b3497d3 Binary files /dev/null and b/mods/default/textures/default_key_skeleton.png differ diff --git a/mods/default/textures/default_ladder_steel.png b/mods/default/textures/default_ladder_steel.png index 87041262..a312f3e8 100644 Binary files a/mods/default/textures/default_ladder_steel.png and b/mods/default/textures/default_ladder_steel.png differ diff --git a/mods/default/textures/default_ladder_wood.png b/mods/default/textures/default_ladder_wood.png index 6e18e547..c167fff5 100644 Binary files a/mods/default/textures/default_ladder_wood.png and b/mods/default/textures/default_ladder_wood.png differ diff --git a/mods/default/textures/default_large_cactus_seedling.png b/mods/default/textures/default_large_cactus_seedling.png index c8ebf3ce..378351ad 100644 Binary files a/mods/default/textures/default_large_cactus_seedling.png and b/mods/default/textures/default_large_cactus_seedling.png differ diff --git a/mods/default/textures/default_lava.png b/mods/default/textures/default_lava.png index 1d7039ff..e8958de5 100644 Binary files a/mods/default/textures/default_lava.png and b/mods/default/textures/default_lava.png differ diff --git a/mods/default/textures/default_lava_flowing_animated.png b/mods/default/textures/default_lava_flowing_animated.png index ebb0ec17..2ec07463 100644 Binary files a/mods/default/textures/default_lava_flowing_animated.png and b/mods/default/textures/default_lava_flowing_animated.png differ diff --git a/mods/default/textures/default_lava_source_animated.png b/mods/default/textures/default_lava_source_animated.png index 326af645..32267a6b 100644 Binary files a/mods/default/textures/default_lava_source_animated.png and b/mods/default/textures/default_lava_source_animated.png differ diff --git a/mods/default/textures/default_leaves.png b/mods/default/textures/default_leaves.png index 55ba1e68..ba09fe1d 100644 Binary files a/mods/default/textures/default_leaves.png and b/mods/default/textures/default_leaves.png differ diff --git a/mods/default/textures/default_leaves_simple.png b/mods/default/textures/default_leaves_simple.png index c71def7a..eb60f9f5 100644 Binary files a/mods/default/textures/default_leaves_simple.png and b/mods/default/textures/default_leaves_simple.png differ diff --git a/mods/default/textures/default_marram_grass_1.png b/mods/default/textures/default_marram_grass_1.png index 107a2590..73ec9e9d 100644 Binary files a/mods/default/textures/default_marram_grass_1.png and b/mods/default/textures/default_marram_grass_1.png differ diff --git a/mods/default/textures/default_marram_grass_2.png b/mods/default/textures/default_marram_grass_2.png index a6d05c51..2db75c70 100644 Binary files a/mods/default/textures/default_marram_grass_2.png and b/mods/default/textures/default_marram_grass_2.png differ diff --git a/mods/default/textures/default_marram_grass_3.png b/mods/default/textures/default_marram_grass_3.png index 2a9668c7..f6c155f4 100644 Binary files a/mods/default/textures/default_marram_grass_3.png and b/mods/default/textures/default_marram_grass_3.png differ diff --git a/mods/default/textures/default_mese_block.png b/mods/default/textures/default_mese_block.png index 77524faa..e30994e2 100644 Binary files a/mods/default/textures/default_mese_block.png and b/mods/default/textures/default_mese_block.png differ diff --git a/mods/default/textures/default_mese_post_light_side.png b/mods/default/textures/default_mese_post_light_side.png index 80a0999c..c23b551a 100644 Binary files a/mods/default/textures/default_mese_post_light_side.png and b/mods/default/textures/default_mese_post_light_side.png differ diff --git a/mods/default/textures/default_mese_post_light_side_dark.png b/mods/default/textures/default_mese_post_light_side_dark.png index 4243e486..c4fc7cea 100644 Binary files a/mods/default/textures/default_mese_post_light_side_dark.png and b/mods/default/textures/default_mese_post_light_side_dark.png differ diff --git a/mods/default/textures/default_mese_post_light_top.png b/mods/default/textures/default_mese_post_light_top.png new file mode 100644 index 00000000..365c1a78 Binary files /dev/null and b/mods/default/textures/default_mese_post_light_top.png differ diff --git a/mods/default/textures/default_meselamp.png b/mods/default/textures/default_meselamp.png index d15c8b9b..0c3a1a12 100644 Binary files a/mods/default/textures/default_meselamp.png and b/mods/default/textures/default_meselamp.png differ diff --git a/mods/default/textures/default_mineral_diamond.png b/mods/default/textures/default_mineral_diamond.png index b817bd11..39c0f83b 100644 Binary files a/mods/default/textures/default_mineral_diamond.png and b/mods/default/textures/default_mineral_diamond.png differ diff --git a/mods/default/textures/default_mineral_iron.png b/mods/default/textures/default_mineral_iron.png index 5d630628..bfec8b1f 100644 Binary files a/mods/default/textures/default_mineral_iron.png and b/mods/default/textures/default_mineral_iron.png differ diff --git a/mods/default/textures/default_mineral_mese.png b/mods/default/textures/default_mineral_mese.png index 56a447d0..6952670a 100644 Binary files a/mods/default/textures/default_mineral_mese.png and b/mods/default/textures/default_mineral_mese.png differ diff --git a/mods/default/textures/default_moss.png b/mods/default/textures/default_moss.png index bb98d7fe..479038e9 100644 Binary files a/mods/default/textures/default_moss.png and b/mods/default/textures/default_moss.png differ diff --git a/mods/default/textures/default_moss_side.png b/mods/default/textures/default_moss_side.png index f18322c6..4a20345e 100644 Binary files a/mods/default/textures/default_moss_side.png and b/mods/default/textures/default_moss_side.png differ diff --git a/mods/default/textures/default_mossycobble.png b/mods/default/textures/default_mossycobble.png index 1071cb46..1ae7c91f 100644 Binary files a/mods/default/textures/default_mossycobble.png and b/mods/default/textures/default_mossycobble.png differ diff --git a/mods/default/textures/default_obsidian.png b/mods/default/textures/default_obsidian.png index 30e063fd..8f4a49c4 100644 Binary files a/mods/default/textures/default_obsidian.png and b/mods/default/textures/default_obsidian.png differ diff --git a/mods/default/textures/default_obsidian_block.png b/mods/default/textures/default_obsidian_block.png index dd93f8d1..7e1d4d3f 100644 Binary files a/mods/default/textures/default_obsidian_block.png and b/mods/default/textures/default_obsidian_block.png differ diff --git a/mods/default/textures/default_obsidian_brick.png b/mods/default/textures/default_obsidian_brick.png index e4c8fe7f..30c67caa 100644 Binary files a/mods/default/textures/default_obsidian_brick.png and b/mods/default/textures/default_obsidian_brick.png differ diff --git a/mods/default/textures/default_obsidian_glass_detail.png b/mods/default/textures/default_obsidian_glass_detail.png index 1397ecc4..a8bbec98 100644 Binary files a/mods/default/textures/default_obsidian_glass_detail.png and b/mods/default/textures/default_obsidian_glass_detail.png differ diff --git a/mods/default/textures/default_papyrus.png b/mods/default/textures/default_papyrus.png index 982d589c..a85e8090 100644 Binary files a/mods/default/textures/default_papyrus.png and b/mods/default/textures/default_papyrus.png differ diff --git a/mods/default/textures/default_pine_bush_stem.png b/mods/default/textures/default_pine_bush_stem.png index 7dc00f7b..e239f812 100644 Binary files a/mods/default/textures/default_pine_bush_stem.png and b/mods/default/textures/default_pine_bush_stem.png differ diff --git a/mods/default/textures/default_pine_needles.png b/mods/default/textures/default_pine_needles.png index e0e39908..f6997271 100644 Binary files a/mods/default/textures/default_pine_needles.png and b/mods/default/textures/default_pine_needles.png differ diff --git a/mods/default/textures/default_pine_tree_top.png b/mods/default/textures/default_pine_tree_top.png index e26a835d..8705710e 100644 Binary files a/mods/default/textures/default_pine_tree_top.png and b/mods/default/textures/default_pine_tree_top.png differ diff --git a/mods/default/textures/default_pine_wood.png b/mods/default/textures/default_pine_wood.png index 29f9d6d2..6844ceb8 100644 Binary files a/mods/default/textures/default_pine_wood.png and b/mods/default/textures/default_pine_wood.png differ diff --git a/mods/default/textures/default_rainforest_litter_side.png b/mods/default/textures/default_rainforest_litter_side.png index 1bd0bb60..7ccb11de 100644 Binary files a/mods/default/textures/default_rainforest_litter_side.png and b/mods/default/textures/default_rainforest_litter_side.png differ diff --git a/mods/default/textures/default_river_water.png b/mods/default/textures/default_river_water.png index bee757be..3b55c5f6 100644 Binary files a/mods/default/textures/default_river_water.png and b/mods/default/textures/default_river_water.png differ diff --git a/mods/default/textures/default_river_water_flowing_animated.png b/mods/default/textures/default_river_water_flowing_animated.png index 760d9eb7..536acc53 100644 Binary files a/mods/default/textures/default_river_water_flowing_animated.png and b/mods/default/textures/default_river_water_flowing_animated.png differ diff --git a/mods/default/textures/default_river_water_source_animated.png b/mods/default/textures/default_river_water_source_animated.png index e7259ccc..daa5653f 100644 Binary files a/mods/default/textures/default_river_water_source_animated.png and b/mods/default/textures/default_river_water_source_animated.png differ diff --git a/mods/default/textures/default_sandstone_block.png b/mods/default/textures/default_sandstone_block.png index c3adfd97..2e06491e 100644 Binary files a/mods/default/textures/default_sandstone_block.png and b/mods/default/textures/default_sandstone_block.png differ diff --git a/mods/default/textures/default_sandstone_brick.png b/mods/default/textures/default_sandstone_brick.png index 6326391b..e7150e50 100644 Binary files a/mods/default/textures/default_sandstone_brick.png and b/mods/default/textures/default_sandstone_brick.png differ diff --git a/mods/default/textures/default_sign_steel.png b/mods/default/textures/default_sign_steel.png index 1ea3ec97..3ca0c59d 100644 Binary files a/mods/default/textures/default_sign_steel.png and b/mods/default/textures/default_sign_steel.png differ diff --git a/mods/default/textures/default_sign_wall_steel.png b/mods/default/textures/default_sign_wall_steel.png index 9a9273db..2227477f 100644 Binary files a/mods/default/textures/default_sign_wall_steel.png and b/mods/default/textures/default_sign_wall_steel.png differ diff --git a/mods/default/textures/default_sign_wall_wood.png b/mods/default/textures/default_sign_wall_wood.png index eb91cf6d..40552c73 100644 Binary files a/mods/default/textures/default_sign_wall_wood.png and b/mods/default/textures/default_sign_wall_wood.png differ diff --git a/mods/default/textures/default_sign_wood.png b/mods/default/textures/default_sign_wood.png index 07eb9846..d0559dac 100644 Binary files a/mods/default/textures/default_sign_wood.png and b/mods/default/textures/default_sign_wood.png differ diff --git a/mods/default/textures/default_silver_sand.png b/mods/default/textures/default_silver_sand.png index 90a7044b..c4a8f730 100644 Binary files a/mods/default/textures/default_silver_sand.png and b/mods/default/textures/default_silver_sand.png differ diff --git a/mods/default/textures/default_silver_sandstone.png b/mods/default/textures/default_silver_sandstone.png index 1ccecbf3..eac62cb1 100644 Binary files a/mods/default/textures/default_silver_sandstone.png and b/mods/default/textures/default_silver_sandstone.png differ diff --git a/mods/default/textures/default_silver_sandstone_block.png b/mods/default/textures/default_silver_sandstone_block.png index c8c14e41..9997461b 100644 Binary files a/mods/default/textures/default_silver_sandstone_block.png and b/mods/default/textures/default_silver_sandstone_block.png differ diff --git a/mods/default/textures/default_silver_sandstone_brick.png b/mods/default/textures/default_silver_sandstone_brick.png index cb7be40d..93d87a57 100644 Binary files a/mods/default/textures/default_silver_sandstone_brick.png and b/mods/default/textures/default_silver_sandstone_brick.png differ diff --git a/mods/default/textures/default_snow.png b/mods/default/textures/default_snow.png index 6a12161d..fcbef0e5 100644 Binary files a/mods/default/textures/default_snow.png and b/mods/default/textures/default_snow.png differ diff --git a/mods/default/textures/default_snow_side.png b/mods/default/textures/default_snow_side.png index 8465d80d..03456c84 100644 Binary files a/mods/default/textures/default_snow_side.png and b/mods/default/textures/default_snow_side.png differ diff --git a/mods/default/textures/default_snowball.png b/mods/default/textures/default_snowball.png index 13eb27af..3a4dc1f6 100644 Binary files a/mods/default/textures/default_snowball.png and b/mods/default/textures/default_snowball.png differ diff --git a/mods/default/textures/default_steel_block.png b/mods/default/textures/default_steel_block.png index 5e421f02..7f49f61f 100644 Binary files a/mods/default/textures/default_steel_block.png and b/mods/default/textures/default_steel_block.png differ diff --git a/mods/default/textures/default_stone.png b/mods/default/textures/default_stone.png index d3f0ef80..63cb7c4e 100644 Binary files a/mods/default/textures/default_stone.png and b/mods/default/textures/default_stone.png differ diff --git a/mods/default/textures/default_stone_block.png b/mods/default/textures/default_stone_block.png index 2d098783..3b771e72 100644 Binary files a/mods/default/textures/default_stone_block.png and b/mods/default/textures/default_stone_block.png differ diff --git a/mods/default/textures/default_stone_brick.png b/mods/default/textures/default_stone_brick.png index 3ae9602a..4dbb49db 100644 Binary files a/mods/default/textures/default_stone_brick.png and b/mods/default/textures/default_stone_brick.png differ diff --git a/mods/default/textures/default_stones.png b/mods/default/textures/default_stones.png index d09e3299..4d3b6cfa 100644 Binary files a/mods/default/textures/default_stones.png and b/mods/default/textures/default_stones.png differ diff --git a/mods/default/textures/default_tin_block.png b/mods/default/textures/default_tin_block.png index a834d272..72759b04 100644 Binary files a/mods/default/textures/default_tin_block.png and b/mods/default/textures/default_tin_block.png differ diff --git a/mods/default/textures/default_tool_diamondpick.png b/mods/default/textures/default_tool_diamondpick.png index 5dcc9983..f9883c66 100644 Binary files a/mods/default/textures/default_tool_diamondpick.png and b/mods/default/textures/default_tool_diamondpick.png differ diff --git a/mods/default/textures/default_torch_on_ceiling_animated.png b/mods/default/textures/default_torch_on_ceiling_animated.png index 5465217f..3a8b5ad9 100644 Binary files a/mods/default/textures/default_torch_on_ceiling_animated.png and b/mods/default/textures/default_torch_on_ceiling_animated.png differ diff --git a/mods/default/textures/default_tree.png b/mods/default/textures/default_tree.png index fe89963c..10e297b4 100644 Binary files a/mods/default/textures/default_tree.png and b/mods/default/textures/default_tree.png differ diff --git a/mods/default/textures/default_tree_top.png b/mods/default/textures/default_tree_top.png index 9205ed98..da99bce7 100644 Binary files a/mods/default/textures/default_tree_top.png and b/mods/default/textures/default_tree_top.png differ diff --git a/mods/default/textures/default_water.png b/mods/default/textures/default_water.png index ee093a9a..00500e9b 100644 Binary files a/mods/default/textures/default_water.png and b/mods/default/textures/default_water.png differ diff --git a/mods/default/textures/default_water_flowing_animated.png b/mods/default/textures/default_water_flowing_animated.png index c9d9e3ba..070d7971 100644 Binary files a/mods/default/textures/default_water_flowing_animated.png and b/mods/default/textures/default_water_flowing_animated.png differ diff --git a/mods/default/textures/default_water_source_animated.png b/mods/default/textures/default_water_source_animated.png index c4fed814..7e7f9ff1 100644 Binary files a/mods/default/textures/default_water_source_animated.png and b/mods/default/textures/default_water_source_animated.png differ diff --git a/mods/default/textures/gui_formbg.png b/mods/default/textures/gui_formbg.png index e259fec2..c543466c 100644 Binary files a/mods/default/textures/gui_formbg.png and b/mods/default/textures/gui_formbg.png differ diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 1a95a50d..e3c974c2 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -4,8 +4,9 @@ local S = default.get_translator -- The hand --- Override the hand item registered in the engine in builtin/game/register.lua -minetest.override_item("", { +minetest.register_item(":", { + type = "none", + wield_image = "wieldhand.png", wield_scale = {x=1,y=1,z=2.5}, tool_capabilities = { full_punch_interval = 0.9, @@ -452,6 +453,46 @@ for name, mat in pairs(craft_ingreds) do }) end +minetest.register_tool("default:key", { + description = S("Key"), + inventory_image = "default_key.png", + groups = {key = 1, not_in_creative_inventory = 1}, + stack_max = 1, + on_place = function(itemstack, placer, pointed_thing) + local under = pointed_thing.under + local node = minetest.get_node(under) + local def = minetest.registered_nodes[node.name] + if def and def.on_rightclick and + not (placer and placer:is_player() and + placer:get_player_control().sneak) then + return def.on_rightclick(under, node, placer, itemstack, + pointed_thing) or itemstack + end + if pointed_thing.type ~= "node" then + return itemstack + end + + local pos = pointed_thing.under + node = minetest.get_node(pos) + + if not node or node.name == "ignore" then + return itemstack + end + + local ndef = minetest.registered_nodes[node.name] + if not ndef then + return itemstack + end + + local on_key_use = ndef.on_key_use + if on_key_use then + on_key_use(pos, placer) + end + + return nil + end +}) + minetest.register_craft({ type = "fuel", recipe = "default:pick_wood", diff --git a/mods/default/torch.lua b/mods/default/torch.lua index e8f734c7..c06dee8f 100644 --- a/mods/default/torch.lua +++ b/mods/default/torch.lua @@ -11,7 +11,7 @@ local function on_flood(pos, oldnode, newnode) nodedef.groups.igniter and nodedef.groups.igniter > 0) then minetest.sound_play( "default_cool_lava", - {pos = pos, max_hear_distance = 16, gain = 0.07}, + {pos = pos, max_hear_distance = 16, gain = 0.1}, true ) end @@ -29,7 +29,6 @@ minetest.register_node("default:torch", { name = "default_torch_on_floor_animated.png", animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} }}, - use_texture_alpha = "clip", paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -82,7 +81,6 @@ minetest.register_node("default:torch_wall", { name = "default_torch_on_floor_animated.png", animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} }}, - use_texture_alpha = "clip", paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -107,7 +105,6 @@ minetest.register_node("default:torch_ceiling", { name = "default_torch_on_floor_animated.png", animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} }}, - use_texture_alpha = "clip", paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, diff --git a/mods/default/trees.lua b/mods/default/trees.lua index 5445a6fb..a850644c 100644 --- a/mods/default/trees.lua +++ b/mods/default/trees.lua @@ -26,10 +26,6 @@ function default.can_grow(pos) return true end -function default.on_grow_failed(pos) - minetest.get_node_timer(pos):start(300) -end - -- 'is snow nearby' function @@ -38,6 +34,84 @@ local function is_snow_nearby(pos) end +-- Grow sapling + +function default.grow_sapling(pos) + if not default.can_grow(pos) then + -- try again 5 min later + minetest.get_node_timer(pos):start(300) + return + end + + local mg_name = minetest.get_mapgen_setting("mg_name") + local node = minetest.get_node(pos) + if node.name == "default:sapling" then + minetest.log("action", "A sapling grows into a tree at ".. + minetest.pos_to_string(pos)) + if mg_name == "v6" then + default.grow_tree(pos, random(1, 4) == 1) + else + default.grow_new_apple_tree(pos) + end + elseif node.name == "default:junglesapling" then + minetest.log("action", "A jungle sapling grows into a tree at ".. + minetest.pos_to_string(pos)) + if mg_name == "v6" then + default.grow_jungle_tree(pos) + else + default.grow_new_jungle_tree(pos) + end + elseif node.name == "default:pine_sapling" then + minetest.log("action", "A pine sapling grows into a tree at ".. + minetest.pos_to_string(pos)) + local snow = is_snow_nearby(pos) + if mg_name == "v6" then + default.grow_pine_tree(pos, snow) + elseif snow then + default.grow_new_snowy_pine_tree(pos) + else + default.grow_new_pine_tree(pos) + end + elseif node.name == "default:acacia_sapling" then + minetest.log("action", "An acacia sapling grows into a tree at ".. + minetest.pos_to_string(pos)) + default.grow_new_acacia_tree(pos) + elseif node.name == "default:aspen_sapling" then + minetest.log("action", "An aspen sapling grows into a tree at ".. + minetest.pos_to_string(pos)) + default.grow_new_aspen_tree(pos) + elseif node.name == "default:bush_sapling" then + minetest.log("action", "A bush sapling grows into a bush at ".. + minetest.pos_to_string(pos)) + default.grow_bush(pos) + elseif node.name == "default:blueberry_bush_sapling" then + minetest.log("action", "A blueberry bush sapling grows into a bush at ".. + minetest.pos_to_string(pos)) + default.grow_blueberry_bush(pos) + elseif node.name == "default:acacia_bush_sapling" then + minetest.log("action", "An acacia bush sapling grows into a bush at ".. + minetest.pos_to_string(pos)) + default.grow_acacia_bush(pos) + elseif node.name == "default:pine_bush_sapling" then + minetest.log("action", "A pine bush sapling grows into a bush at ".. + minetest.pos_to_string(pos)) + default.grow_pine_bush(pos) + elseif node.name == "default:emergent_jungle_sapling" then + minetest.log("action", "An emergent jungle sapling grows into a tree at ".. + minetest.pos_to_string(pos)) + default.grow_new_emergent_jungle_tree(pos) + end +end + +minetest.register_lbm({ + name = "default:convert_saplings_to_node_timer", + nodenames = {"default:sapling", "default:junglesapling", + "default:pine_sapling", "default:acacia_sapling", + "default:aspen_sapling"}, + action = function(pos) + minetest.get_node_timer(pos):start(math.random(300, 1500)) + end +}) -- -- Tree generation @@ -132,11 +206,10 @@ function default.grow_tree(pos, is_apple_tree, bad) vm:set_data(data) vm:write_to_map() - if vm.close ~= nil then - vm:close() - end + vm:update_map() end + -- Jungle tree function default.grow_jungle_tree(pos, bad) @@ -186,9 +259,7 @@ function default.grow_jungle_tree(pos, bad) vm:set_data(data) vm:write_to_map() - if vm.close ~= nil then - vm:close() - end + vm:update_map() end @@ -314,9 +385,7 @@ function default.grow_pine_tree(pos, snow) vm:set_data(data) vm:write_to_map() - if vm.close ~= nil then - vm:close() - end + vm:update_map() end @@ -494,17 +563,20 @@ function default.sapling_on_place(itemstack, placer, pointed_thing, interval) then minetest.record_protection_violation(pos, player_name) -- Print extra information to explain +-- minetest.chat_send_player(player_name, +-- itemstack:get_definition().description .. " will intersect protection " .. +-- "on growth") minetest.chat_send_player(player_name, S("@1 will intersect protection on growth.", itemstack:get_definition().description)) return itemstack end - if placer then - default.log_player_action(placer, "places node", sapling_name, "at", pos) - end + minetest.log("action", player_name .. " places node " + .. sapling_name .. " at " .. minetest.pos_to_string(pos)) - local take_item = not minetest.is_creative_enabled(player_name) + local take_item = not (creative and creative.is_enabled_for + and creative.is_enabled_for(player_name)) local newnode = {name = sapling_name} local ndef = minetest.registered_nodes[sapling_name] minetest.set_node(pos, newnode) @@ -534,78 +606,3 @@ function default.sapling_on_place(itemstack, placer, pointed_thing, return itemstack end - --- Grow sapling - -default.sapling_growth_defs = {} - -function default.register_sapling_growth(name, def) - default.sapling_growth_defs[name] = { - can_grow = def.can_grow or default.can_grow, - on_grow_failed = def.on_grow_failed or default.on_grow_failed, - grow = assert(def.grow) - } -end - -function default.grow_sapling(pos) - local node = minetest.get_node(pos) - local sapling_def = default.sapling_growth_defs[node.name] - - if not sapling_def then - minetest.log("warning", "default.grow_sapling called on undefined sapling " .. node.name) - return - end - - if not sapling_def.can_grow(pos) then - sapling_def.on_grow_failed(pos) - return - end - - minetest.log("action", "Growing sapling " .. node.name .. " at " .. minetest.pos_to_string(pos)) - sapling_def.grow(pos) -end - -local function register_sapling_growth(nodename, grow) - default.register_sapling_growth("default:" .. nodename, {grow = grow}) -end - -if minetest.get_mapgen_setting("mg_name") == "v6" then - register_sapling_growth("sapling", function(pos) - default.grow_tree(pos, random(1, 4) == 1) - end) - register_sapling_growth("junglesapling", default.grow_jungle_tree) - register_sapling_growth("pine_sapling", function(pos) - local snow = is_snow_nearby(pos) - default.grow_pine_tree(pos, snow) - end) -else - register_sapling_growth("sapling", default.grow_new_apple_tree) - register_sapling_growth("junglesapling", default.grow_new_jungle_tree) - register_sapling_growth("pine_sapling", function(pos) - local snow = is_snow_nearby(pos) - if snow then - default.grow_new_snowy_pine_tree(pos) - else - default.grow_new_pine_tree(pos) - end - end) -end - -register_sapling_growth("acacia_sapling", default.grow_new_acacia_tree) -register_sapling_growth("aspen_sapling", default.grow_new_aspen_tree) -register_sapling_growth("bush_sapling", default.grow_bush) -register_sapling_growth("blueberry_bush_sapling", default.grow_blueberry_bush) -register_sapling_growth("acacia_bush_sapling", default.grow_acacia_bush) -register_sapling_growth("pine_bush_sapling", default.grow_pine_bush) -register_sapling_growth("emergent_jungle_sapling", default.grow_new_emergent_jungle_tree) - --- Backwards compatibility for saplings that used to use ABMs; does not need to include newer saplings. -minetest.register_lbm({ - name = "default:convert_saplings_to_node_timer", - nodenames = {"default:sapling", "default:junglesapling", - "default:pine_sapling", "default:acacia_sapling", - "default:aspen_sapling"}, - action = function(pos) - minetest.get_node_timer(pos):start(math.random(300, 1500)) - end -}) diff --git a/mods/doors/README.txt b/mods/doors/README.txt index b1ad3b56..f9caaffc 100644 --- a/mods/doors/README.txt +++ b/mods/doors/README.txt @@ -14,7 +14,7 @@ Re-implemented most of the door algorithms, added meshes, UV wrapped texture. Added doors API to facilitate coding mods accessing and operating doors. Added Fence Gate model, code, and sounds. -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) diff --git a/mods/doors/init.lua b/mods/doors/init.lua index d198f1e2..2048a643 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -19,10 +19,6 @@ local function replace_old_owner_information(pos) end end -local function is_doors_upper_node(pos) - return minetest.get_node(pos).name == "doors:hidden" -end - -- returns an object to a door object or nil function doors.get(pos) local node_name = minetest.get_node(pos).name @@ -82,8 +78,6 @@ end -- nodes from being placed in the top half of the door. minetest.register_node("doors:hidden", { description = S("Hidden Door Segment"), - inventory_image = "doors_hidden_segment.png^default_invisible_node_overlay.png", - wield_image = "doors_hidden_segment.png^default_invisible_node_overlay.png", drawtype = "airlike", paramtype = "light", paramtype2 = "facedir", @@ -174,10 +168,10 @@ function doors.door_toggle(pos, node, clicker) if state % 2 == 0 then minetest.sound_play(def.door.sounds[1], - {pos = pos, gain = def.door.gains[1], max_hear_distance = 10}, true) + {pos = pos, gain = 0.3, max_hear_distance = 10}, true) else minetest.sound_play(def.door.sounds[2], - {pos = pos, gain = def.door.gains[2], max_hear_distance = 10}, true) + {pos = pos, gain = 0.3, max_hear_distance = 10}, true) end minetest.swap_node(pos, { @@ -264,11 +258,10 @@ function doors.register(name, def) on_place = function(itemstack, placer, pointed_thing) local pos - if pointed_thing.type ~= "node" then + if not pointed_thing.type == "node" then return itemstack end - local doorname = itemstack:get_name() local node = minetest.get_node(pointed_thing.under) local pdef = minetest.registered_nodes[node.name] if pdef and pdef.on_rightclick and @@ -320,10 +313,10 @@ function doors.register(name, def) local state = 0 if minetest.get_item_group(minetest.get_node(aside).name, "door") == 1 then state = state + 2 - minetest.set_node(pos, {name = doorname .. "_b", param2 = dir}) + minetest.set_node(pos, {name = name .. "_b", param2 = dir}) minetest.set_node(above, {name = "doors:hidden", param2 = (dir + 3) % 4}) else - minetest.set_node(pos, {name = doorname .. "_a", param2 = dir}) + minetest.set_node(pos, {name = name .. "_a", param2 = dir}) minetest.set_node(above, {name = "doors:hidden", param2 = dir}) end @@ -335,7 +328,7 @@ function doors.register(name, def) meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn)) end - if not minetest.is_creative_enabled(pn) then + if not (creative and creative.is_enabled_for and creative.is_enabled_for(pn)) then itemstack:take_item() end @@ -369,21 +362,12 @@ function doors.register(name, def) def.sound_close = "doors_door_close" end - if not def.gain_open then - def.gain_open = 0.3 - end - - if not def.gain_close then - def.gain_close = 0.3 - end - def.groups.not_in_creative_inventory = 1 def.groups.door = 1 def.drop = name def.door = { name = name, - sounds = {def.sound_close, def.sound_open}, - gains = {def.gain_close, def.gain_open}, + sounds = { def.sound_close, def.sound_open }, } if not def.on_rightclick then def.on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) @@ -392,11 +376,8 @@ function doors.register(name, def) end end def.after_dig_node = function(pos, node, meta, digger) - local above = pos:offset(0, 1, 0) - if is_doors_upper_node(above) then - minetest.remove_node(above) - end - minetest.check_for_falling(above) + minetest.remove_node({x = pos.x, y = pos.y + 1, z = pos.z}) + minetest.check_for_falling({x = pos.x, y = pos.y + 1, z = pos.z}) end def.on_rotate = function(pos, node, user, mode, new_param2) return false @@ -434,20 +415,14 @@ function doors.register(name, def) else def.on_blast = function(pos, intensity) minetest.remove_node(pos) - local above = pos:offset(0, 1, 0) -- hidden node doesn't get blasted away. - if is_doors_upper_node(above) then - minetest.remove_node(above) - end + minetest.remove_node({x = pos.x, y = pos.y + 1, z = pos.z}) return {name} end end def.on_destruct = function(pos) - local above = pos:offset(0, 1, 0) - if is_doors_upper_node(above) then - minetest.remove_node(above) - end + minetest.remove_node({x = pos.x, y = pos.y + 1, z = pos.z}) end def.drawtype = "mesh" @@ -459,19 +434,18 @@ function doors.register(name, def) def.buildable_to = false def.selection_box = {type = "fixed", fixed = {-1/2,-1/2,-1/2,1/2,3/2,-6/16}} def.collision_box = {type = "fixed", fixed = {-1/2,-1/2,-1/2,1/2,3/2,-6/16}} - def.use_texture_alpha = def.use_texture_alpha or "clip" - def.mesh = "door_a.b3d" - minetest.register_node(":" .. name .. "_a", table.copy(def)) + def.mesh = "door_a.obj" + minetest.register_node(":" .. name .. "_a", def) - def.mesh = "door_b.b3d" - minetest.register_node(":" .. name .. "_b", table.copy(def)) + def.mesh = "door_b.obj" + minetest.register_node(":" .. name .. "_b", def) - def.mesh = "door_b.b3d" - minetest.register_node(":" .. name .. "_c", table.copy(def)) + def.mesh = "door_a2.obj" + minetest.register_node(":" .. name .. "_c", def) - def.mesh = "door_a.b3d" - minetest.register_node(":" .. name .. "_d", table.copy(def)) + def.mesh = "door_b2.obj" + minetest.register_node(":" .. name .. "_d", def) doors.registered_doors[name .. "_a"] = true doors.registered_doors[name .. "_b"] = true @@ -484,8 +458,6 @@ doors.register("door_wood", { description = S("Wooden Door"), inventory_image = "doors_item_wood.png", groups = {node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - gain_open = 0.06, - gain_close = 0.13, recipe = { {"group:wood", "group:wood"}, {"group:wood", "group:wood"}, @@ -502,8 +474,6 @@ doors.register("door_steel", { sounds = default.node_sound_metal_defaults(), sound_open = "doors_steel_door_open", sound_close = "doors_steel_door_close", - gain_open = 0.2, - gain_close = 0.2, recipe = { {"default:steel_ingot", "default:steel_ingot"}, {"default:steel_ingot", "default:steel_ingot"}, @@ -519,8 +489,6 @@ doors.register("door_glass", { sounds = default.node_sound_glass_defaults(), sound_open = "doors_glass_door_open", sound_close = "doors_glass_door_close", - gain_open = 0.3, - gain_close = 0.25, recipe = { {"default:glass", "default:glass"}, {"default:glass", "default:glass"}, @@ -536,8 +504,6 @@ doors.register("door_obsidian_glass", { sounds = default.node_sound_glass_defaults(), sound_open = "doors_glass_door_open", sound_close = "doors_glass_door_close", - gain_open = 0.3, - gain_close = 0.25, recipe = { {"default:obsidian_glass", "default:obsidian_glass"}, {"default:obsidian_glass", "default:obsidian_glass"}, @@ -584,12 +550,12 @@ function doors.trapdoor_toggle(pos, node, clicker) if string.sub(node.name, -5) == "_open" then minetest.sound_play(def.sound_close, - {pos = pos, gain = def.gain_close, max_hear_distance = 10}, true) + {pos = pos, gain = 0.3, max_hear_distance = 10}, true) minetest.swap_node(pos, {name = string.sub(node.name, 1, string.len(node.name) - 5), param1 = node.param1, param2 = node.param2}) else minetest.sound_play(def.sound_open, - {pos = pos, gain = def.gain_open, max_hear_distance = 10}, true) + {pos = pos, gain = 0.3, max_hear_distance = 10}, true) minetest.swap_node(pos, {name = node.name .. "_open", param1 = node.param1, param2 = node.param2}) end @@ -613,7 +579,6 @@ function doors.register_trapdoor(name, def) def.paramtype = "light" def.paramtype2 = "facedir" def.is_ground_content = false - def.use_texture_alpha = def.use_texture_alpha or "clip" if def.protected then def.can_dig = can_dig_door @@ -623,7 +588,7 @@ function doors.register_trapdoor(name, def) meta:set_string("owner", pn) meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn)) - return minetest.is_creative_enabled(pn) + return (creative and creative.is_enabled_for and creative.is_enabled_for(pn)) end def.on_blast = function() end @@ -672,25 +637,13 @@ function doors.register_trapdoor(name, def) def.sound_close = "doors_door_close" end - if not def.gain_open then - def.gain_open = 0.3 - end - - if not def.gain_close then - def.gain_close = 0.3 - end - local def_opened = table.copy(def) local def_closed = table.copy(def) - if def.nodebox_closed and def.nodebox_opened then - def_closed.node_box = def.nodebox_closed - else - def_closed.node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} - } - end + def_closed.node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} + } def_closed.selection_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} @@ -704,14 +657,10 @@ function doors.register_trapdoor(name, def) def.tile_side } - if def.nodebox_opened and def.nodebox_closed then - def_opened.node_box = def.nodebox_opened - else - def_opened.node_box = { - type = "fixed", - fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} - } - end + def_opened.node_box = { + type = "fixed", + fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} + } def_opened.selection_box = { type = "fixed", fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} @@ -741,8 +690,6 @@ doors.register_trapdoor("doors:trapdoor", { wield_image = "doors_trapdoor.png", tile_front = "doors_trapdoor.png", tile_side = "doors_trapdoor_side.png", - gain_open = 0.06, - gain_close = 0.13, groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1}, }) @@ -756,8 +703,6 @@ doors.register_trapdoor("doors:trapdoor_steel", { sounds = default.node_sound_metal_defaults(), sound_open = "doors_steel_door_open", sound_close = "doors_steel_door_close", - gain_open = 0.2, - gain_close = 0.2, groups = {cracky = 1, level = 2, door = 1}, }) @@ -797,8 +742,8 @@ function doors.register_fencegate(name, def) sounds = def.sounds, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local node_def = minetest.registered_nodes[node.name] - minetest.swap_node(pos, {name = node_def._gate, param2 = node.param2}) - minetest.sound_play(node_def._gate_sound, {pos = pos, gain = 0.15, + minetest.swap_node(pos, {name = node_def.gate, param2 = node.param2}) + minetest.sound_play(node_def.sound, {pos = pos, gain = 0.3, max_hear_distance = 8}, true) return itemstack end, @@ -826,8 +771,8 @@ function doors.register_fencegate(name, def) local fence_closed = table.copy(fence) fence_closed.mesh = "doors_fencegate_closed.obj" - fence_closed._gate = name .. "_open" - fence_closed._gate_sound = "doors_fencegate_open" + fence_closed.gate = name .. "_open" + fence_closed.sound = "doors_fencegate_open" fence_closed.collision_box = { type = "fixed", fixed = {-1/2, -1/2, -1/8, 1/2, 1/2 + fence_collision_extra, 1/8} @@ -835,8 +780,8 @@ function doors.register_fencegate(name, def) local fence_open = table.copy(fence) fence_open.mesh = "doors_fencegate_open.obj" - fence_open._gate = name .. "_closed" - fence_open._gate_sound = "doors_fencegate_close" + fence_open.gate = name .. "_closed" + fence_open.sound = "doors_fencegate_close" fence_open.groups.not_in_creative_inventory = 1 fence_open.collision_box = { type = "fixed", diff --git a/mods/doors/license.txt b/mods/doors/license.txt index 97e60c27..8ce73c49 100644 --- a/mods/doors/license.txt +++ b/mods/doors/license.txt @@ -5,7 +5,7 @@ The MIT License (MIT) Copyright (C) 2012-2016 PilzAdam Copyright (C) 2014-2016 BlockMen Copyright (C) 2015-2016 sofar (sofar@foo-projects.org) -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/doors/locale/doors.bg.tr b/mods/doors/locale/doors.bg.tr deleted file mode 100755 index 97c92c64..00000000 --- a/mods/doors/locale/doors.bg.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Част от скрита врата -Owned by @1=Собственик е @1 -You do not own this locked door.=Не притежавате тази заключена врата. -a locked door=заключена врата -Wooden Door=Дървена врата -Steel Door=Стоманена врата -Glass Door=Стъклена врата -Obsidian Glass Door=Врата от обсидианово стъкло -You do not own this trapdoor.=Не притежавате този капак. -a locked trapdoor=заключен капак -Wooden Trapdoor=Дървен капак -Steel Trapdoor=Стоманен капак -Apple Wood Fence Gate=Врата за ограда от ябълково дърво -Acacia Wood Fence Gate=Врата за ограда от акациево дърво -Jungle Wood Fence Gate=Врата за ограда от боабаб -Pine Wood Fence Gate=Врата за ограда от борово дърво -Aspen Wood Fence Gate=Врата за ограда от трепетликово дърво diff --git a/mods/doors/locale/doors.eo.tr b/mods/doors/locale/doors.eo.tr deleted file mode 100644 index e8e10ddc..00000000 --- a/mods/doors/locale/doors.eo.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Kaŝita porda segmento -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 tiun plankpordon. -a locked trapdoor=ŝlosita plankpordo -Wooden Trapdoor=Ligna plankpordo -Steel Trapdoor=Ŝtala plankpordo -Apple Wood Fence Gate=Poma ligna barila pordo -Acacia Wood Fence Gate=Akacia ligna barila pordo -Jungle Wood Fence Gate=Ĝangala ligna barila pordo -Pine Wood Fence Gate=Pina ligna barila pordo -Aspen Wood Fence Gate=Tremola ligna barila pordo diff --git a/mods/doors/locale/doors.eu.tr b/mods/doors/locale/doors.eu.tr deleted file mode 100644 index 1c6eaf40..00000000 --- a/mods/doors/locale/doors.eu.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Ezkutuko atearen segmentua -Owned by @1=Jabea: @1 -You do not own this locked door.=Ate itxi hau ez da zurea. -a locked door=ate itxi bat -Wooden Door=Zurezko atea -Steel Door=Altzairuzko atea -Glass Door=Beirazko atea -Obsidian Glass Door=Obsidianazko beirazko atea -You do not own this trapdoor.=Tranpola hau ez da zurea. -a locked trapdoor=Tranpola itxi bat -Wooden Trapdoor=Zurezko tranpola -Steel Trapdoor=Altzairuzko tranpola -Apple Wood Fence Gate=Sagarrondo-inguruko atea -Acacia Wood Fence Gate=Akaziatik hurbil dagoen atea -Jungle Wood Fence Gate=Zur tropikaleko ate hurbila -Pine Wood Fence Gate=Pinu inguruko atea -Aspen Wood Fence Gate=Makalaren inguruko atea diff --git a/mods/doors/locale/doors.it.tr b/mods/doors/locale/doors.it.tr index ccd00d36..4a9599d6 100644 --- a/mods/doors/locale/doors.it.tr +++ b/mods/doors/locale/doors.it.tr @@ -1,18 +1,19 @@ -# textdomain: doors -Hidden Door Segment=Segmento di porta nascosto -Owned by @1=Di proprietà di @1 -You do not own this locked door.=Non sei il proprietario di questa porta chiusa a chiave. -a locked door=una porta chiusa a chiave -Wooden Door=Porta di legno -Steel Door=Porta d'acciaio -Glass Door=Porta di vetro -Obsidian Glass Door=Porta di vetro d'ossidiana -You do not own this trapdoor.=Non sei il proprietario di questa botola. -a locked trapdoor=una botola chiusa a chiave -Wooden Trapdoor=Botola di legno -Steel Trapdoor=Botola d'acciaio -Apple Wood Fence Gate=Cancello della recinzione di legno di melo -Acacia Wood Fence Gate=Cancello della recinzione di legno d'acacia -Jungle Wood Fence Gate=Cancello della recinzione di legno della giungla -Pine Wood Fence Gate=Cancello della recinzione di legno di pino -Aspen Wood Fence Gate=Cancello della recinzione di legno di pioppo +# textdomain: doors +Hidden Door Segment=Segmento di porta nascosto +Owned by @1=Di proprietà di @1 +You do not own this locked door.=Non sei il proprietario di questa porta chiusa a chiave. +a locked door=una porta chiusa a chiave +Wooden Door=Porta di legno +Steel Door=Porta d'acciaio +Glass Door=Porta di vetro +Obsidian Glass Door=Porta di vetro d'ossidiana +Owned by @1=Di proprietà di @1 +You do not own this trapdoor.=Non sei il proprietario di questa botola. +a locked trapdoor=una botola chiusa a chiave +Wooden Trapdoor=Botola di legno +Steel Trapdoor=Botola d'acciaio +Apple Wood Fence Gate=Cancello della recinzione di legno di melo +Acacia Wood Fence Gate=Cancello della recinzione di legno d'acacia +Jungle Wood Fence Gate=Cancello della recinzione di legno della giungla +Pine Wood Fence Gate=Cancello della recinzione di legno di pino +Aspen Wood Fence Gate=Cancello della recinzione di legno di pioppo diff --git a/mods/doors/locale/doors.ja.tr b/mods/doors/locale/doors.ja.tr deleted file mode 100644 index b173504b..00000000 --- a/mods/doors/locale/doors.ja.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=隠しドアの区切り -Owned by @1=所有者 @1 -You do not own this locked door.=あなたはこのロックされたドアの所有者ではありません。 -a locked door=ロックされたドア -Wooden Door=木製のドア -Steel Door=鉄のドア -Glass Door=ガラスのドア -Obsidian Glass Door=黒曜石ガラスのドア -You do not own this trapdoor.=あなたはこのトラップドアの所有者ではありません。 -a locked trapdoor=ロックされたトラップドア -Wooden Trapdoor=木製のトラップドア -Steel Trapdoor=鉄のトラップドア -Apple Wood Fence Gate=リンゴ材のフェンスゲート -Acacia Wood Fence Gate=アカシア材のフェンスゲート -Jungle Wood Fence Gate=ジャングル材のフェンスゲート -Pine Wood Fence Gate=マツ材のフェンスゲート -Aspen Wood Fence Gate=ポプラ材のフェンスゲート diff --git a/mods/doors/locale/doors.jbo.tr b/mods/doors/locale/doors.jbo.tr deleted file mode 100644 index f15854eb..00000000 --- a/mods/doors/locale/doors.jbo.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=lo se mipri pagbu be lo vrogai -Owned by @1=.i ti ponse zoi zo'i.@1.zo'i -You do not own this locked door.=.i do na ponse lo ti selstela vrogai -a locked door=lo selstela vrogai -Wooden Door=lo mudri vrogai -Steel Door=lo gasta vrogai -Glass Door=lo blaci vrogai -Obsidian Glass Door=lo je'erma'ablaci blaci vrogai -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 plisymudri garbimvrogai -Acacia Wood Fence Gate=lo atkaci,ia mudri garbimvrogai -Jungle Wood Fence Gate=lo glatimdemricfoi mudri garbimvrogai -Pine Wood Fence Gate=lo ku'urmudri garbimvrogai -Aspen Wood Fence Gate=lo mudrpopulu garbimvrogai diff --git a/mods/doors/locale/doors.lv.tr b/mods/doors/locale/doors.lv.tr deleted file mode 100644 index 624e440d..00000000 --- a/mods/doors/locale/doors.lv.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Palsēptais durvju segments -Owned by @1=Saimnieks: @1 -You do not own this locked door.=Jums nepieder šīs aizslēgtās durvis. -a locked door=Aizslēgtas durvis -Wooden Door=Koka durvis -Steel Door=Tērauda durvis -Glass Door=Stikla durvis -Obsidian Glass Door=Obsidiānstikla durvis -You do not own this trapdoor.=Jums nepieder šī aizslēgtā lūka. -a locked trapdoor=Aizslēgta lūka -Wooden Trapdoor=Koka lūka -Steel Trapdoor=Tērauda lūka -Apple Wood Fence Gate=Ābolkoka žoga vārti -Acacia Wood Fence Gate=Akācijas žoga vārti -Jungle Wood Fence Gate=Džungļu koka žoga vārti -Pine Wood Fence Gate=Skujkoka žoga vārti -Aspen Wood Fence Gate=Apses žoga vārti diff --git a/mods/doors/locale/doors.pl.tr b/mods/doors/locale/doors.pl.tr deleted file mode 100644 index 6aec2852..00000000 --- a/mods/doors/locale/doors.pl.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Ukryty segment drzwi -Owned by @1=Właściciel: @1 -You do not own this locked door.=Nie jesteś właścicielem tych zablokowanych drzwi. -a locked door=zablokowane drzwi -Wooden Door=Drewniane drzwi -Steel Door=Stalowe drzwi -Glass Door=Szklane drzwi -Obsidian Glass Door=Drzwi z obsydianowego szkła -You do not own this trapdoor.=Nie jesteś właścicielem tego włazu. -a locked trapdoor=zablokowany właz -Wooden Trapdoor=Drewniany właz -Steel Trapdoor=Stalowy właz -Apple Wood Fence Gate=Furtka z jabłkowego drzewa -Acacia Wood Fence Gate=Furtka z akacjowego drzewa -Jungle Wood Fence Gate=Furtka z dżunglowego drzewa -Pine Wood Fence Gate=Furtka z sosnowego drzewa -Aspen Wood Fence Gate=Furtka z brzozowego drzewa diff --git a/mods/doors/locale/doors.pt_BR.tr b/mods/doors/locale/doors.pt_BR.tr deleted file mode 100644 index 82324424..00000000 --- a/mods/doors/locale/doors.pt_BR.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Segmento de Porta Oculto -Owned by @1=Propriedade de @1 -You do not own this locked door.=Você não é dono desta porta trancada. -a locked door=uma porta trancada -Wooden Door=Porta de Madeira -Steel Door=Porta de Aço -Glass Door=Porta de Vidro -Obsidian Glass Door=Porta de Vidro de Obsidiana -You do not own this trapdoor.=Você não é dono deste alçapão. -a locked trapdoor=um alçapão trancado -Wooden Trapdoor=Alçapão de Madeira -Steel Trapdoor=Alçapão de Aço -Apple Wood Fence Gate=Portão de Cerca de Macieira -Acacia Wood Fence Gate=Portão de Cerca de Acácia -Jungle Wood Fence Gate=Portão de Cerca de Madeira da Selva -Pine Wood Fence Gate=Portão de Cerca de Pinheiro -Aspen Wood Fence Gate=Portão de Cerca de Álamo diff --git a/mods/doors/locale/doors.ru.tr b/mods/doors/locale/doors.ru.tr index 7b967629..dc5c3c09 100644 --- a/mods/doors/locale/doors.ru.tr +++ b/mods/doors/locale/doors.ru.tr @@ -1,18 +1,18 @@ # textdomain: doors -Hidden Door Segment=Спрятанная часть двери +Hidden Door Segment=Спрятанная Часть Двери Owned by @1=Владелец: @1 -You do not own this locked door.=Вы не владелец этой запертой двери. -a locked door=запертая дверь -Wooden Door=Деревянная дверь -Steel Door=Стальная дверь -Glass Door=Стеклянная дверь -Obsidian Glass Door=Дверь из обсидианового стекла +You do not own this locked door.=Вы не владелец этой заблокированной двери. +a locked door=заблокированная дверь +Wooden Door=Деревянная Дверь +Steel Door=Стальная Дверь +Glass Door=Стеклянная Дверь +Obsidian Glass Door=Дверь Из Обсидианового Стекла You do not own this trapdoor.=Вы не владелец этого люка. -a locked trapdoor=запертый люк -Wooden Trapdoor=Деревянный люк -Steel Trapdoor=Стальной люк -Apple Wood Fence Gate=Яблоневая калитка -Acacia Wood Fence Gate=Акациевая калитка -Jungle Wood Fence Gate=Калитка из тропического дерева -Pine Wood Fence Gate=Сосновая калитка -Aspen Wood Fence Gate=Осиновая калитка +a locked trapdoor=заблокированный люк +Wooden Trapdoor=Деревянный Люк +Steel Trapdoor=Стальной Люк +Apple Wood Fence Gate=Яблоневая Деревянная Калитка +Acacia Wood Fence Gate=Деревянная Калитка Из Акации +Jungle Wood Fence Gate=Деревянная Калитка Из Тропического Дерева +Pine Wood Fence Gate=Сосновая Деревянная Калитка +Aspen Wood Fence Gate=Осиновая Деревянная Калитка diff --git a/mods/doors/locale/doors.se.tr b/mods/doors/locale/doors.se.tr new file mode 100644 index 00000000..1ecbead1 --- /dev/null +++ b/mods/doors/locale/doors.se.tr @@ -0,0 +1,19 @@ +# textdomain: doors +Hidden Door Segment=Dold dörrsegment +Owned by @1=Ägd av @1 +You do not own this locked door.=Du äger inte denna låsta dörr. +a locked door=en låst dörr +Wooden Door=Trä Dörr +Steel Door=Stål Dörr +Glass Door=Glas Dörr +Obsidian Glass Door=Obsidian Glas Dörr +Owned by @1=Ägd av @1 +You do not own this trapdoor.=Du äger inte denna fallucka +a locked trapdoor=en låst fallucka +Wooden Trapdoor=Trä Fallucka +Steel Trapdoor=Stål Fallucka +Apple Wood Fence Gate=Äpple Trä Fallucka +Acacia Wood Fence Gate=Akacia Trä Fallucka +Jungle Wood Fence Gate=Djungel Trä Fallucka +Pine Wood Fence Gate=Tall Trä Fallucka +Aspen Wood Fence Gate=Asp Trä Fallucka \ No newline at end of file diff --git a/mods/doors/locale/doors.sk.tr b/mods/doors/locale/doors.sk.tr deleted file mode 100644 index e6943ac3..00000000 --- a/mods/doors/locale/doors.sk.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Skrytá časť dverí -Owned by @1=Vlastník - @1 -You do not own this locked door.=Nevlastníš tieto uzamknuté dvere. -a locked door=uzamknuté dvere -Wooden Door=Drevené dvere -Steel Door=Oceľové dvere -Glass Door=Sklenené dvere -Obsidian Glass Door=Obsidiánové sklenené dvere -You do not own this trapdoor.=Nevlastníš tieto padacie dvere. -a locked trapdoor=uzamknuté padacie dvere -Wooden Trapdoor=Drevené padacie dvere -Steel Trapdoor=Oceľové padacie dvere -Apple Wood Fence Gate=Drevený plot z jablone -Acacia Wood Fence Gate=Drevený plot z akácie -Jungle Wood Fence Gate=Drevený plot z džungľového dreva -Pine Wood Fence Gate=Drevený plot z borovice -Aspen Wood Fence Gate=Drevený plot z osiky diff --git a/mods/doors/locale/doors.sv.tr b/mods/doors/locale/doors.sv.tr deleted file mode 100644 index 9f31d9c8..00000000 --- a/mods/doors/locale/doors.sv.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Dolt dörrsegment -Owned by @1=Ägd av @1 -You do not own this locked door.=Du äger inte denna låsta dörr. -a locked door=en låst dörr -Wooden Door=Trädörr -Steel Door=Ståldörr -Glass Door=Glasdörr -Obsidian Glass Door=Obsidianglasdörr -You do not own this trapdoor.=Du äger inte denna fallucka -a locked trapdoor=en låst fallucka -Wooden Trapdoor=Träfallucka -Steel Trapdoor=Stålfallucka -Apple Wood Fence Gate=Äppleträfallucka -Acacia Wood Fence Gate=Akaciaträfallucka -Jungle Wood Fence Gate=Djungelträfallucka -Pine Wood Fence Gate=Tallträfallucka -Aspen Wood Fence Gate=Aspträfallucka diff --git a/mods/doors/locale/doors.uk.tr b/mods/doors/locale/doors.uk.tr deleted file mode 100644 index fc07f397..00000000 --- a/mods/doors/locale/doors.uk.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Прихована частина дверей -Owned by @1=Власник: @1 -You do not own this locked door.=Ви — не власник цих замкнених дверей. -a locked door=замкнені двері -Wooden Door=Дерев'яні двері -Steel Door=Сталеві двері -Glass Door=Скляні двері -Obsidian Glass Door=Двері з обсидіанового скла -You do not own this trapdoor.=Ви — не власник цього люка. -a locked trapdoor=замкнений люк -Wooden Trapdoor=Дерев'яний люк -Steel Trapdoor=Сталевий люк -Apple Wood Fence Gate=Яблунева хвіртка -Acacia Wood Fence Gate=Акацієва хвіртка -Jungle Wood Fence Gate=Хвіртка з тропічного дерева -Pine Wood Fence Gate=Соснова хвіртка -Aspen Wood Fence Gate=Осикова хвіртка diff --git a/mods/doors/locale/doors.zh_CN.tr b/mods/doors/locale/doors.zh_CN.tr index cf32996e..52945588 100644 --- a/mods/doors/locale/doors.zh_CN.tr +++ b/mods/doors/locale/doors.zh_CN.tr @@ -1,17 +1,17 @@ # textdomain: doors Hidden Door Segment=隐藏门段 -Owned by @1=由@1所有 -You do not own this locked door.=这个门不属于你。 +Owned by @1=由@1拥有 +You do not own this locked door.=这个门不属于你所有。 a locked door=一扇已上锁的门 Wooden Door=木门 Steel Door=铁门 Glass Door=玻璃门 Obsidian Glass Door=黑曜石玻璃门 -You do not own this trapdoor.=这个活板门不属于你。 +You do not own this trapdoor.=这个活板门不属于你所有。 a locked trapdoor=一扇已上锁的活板门 Wooden Trapdoor=木活板门 Steel Trapdoor=铁活板门 -Apple Wood Fence Gate=苹果木栅栏门 +Apple Wood Fence Gate=用苹果树做的木栅栏门 Acacia Wood Fence Gate=相思木栅栏门 Jungle Wood Fence Gate=丛林木栅栏门 Pine Wood Fence Gate=松木栅栏门 diff --git a/mods/doors/locale/doors.zh_TW.tr b/mods/doors/locale/doors.zh_TW.tr index 81e06fcc..47959eec 100644 --- a/mods/doors/locale/doors.zh_TW.tr +++ b/mods/doors/locale/doors.zh_TW.tr @@ -11,7 +11,7 @@ You do not own this trapdoor.=這個活板門不屬於你所有。 a locked trapdoor=一扇已上鎖的活板門 Wooden Trapdoor=木活板門 Steel Trapdoor=鐵活板門 -Apple Wood Fence Gate=蘋果木柵欄門 +Apple Wood Fence Gate=用蘋果樹做的木柵欄門 Acacia Wood Fence Gate=相思木柵欄門 Jungle Wood Fence Gate=叢林木柵欄門 Pine Wood Fence Gate=松木柵欄門 diff --git a/mods/doors/models/door.blend b/mods/doors/models/door.blend deleted file mode 100644 index 56047b16..00000000 Binary files a/mods/doors/models/door.blend and /dev/null differ diff --git a/mods/doors/models/door_a.b3d b/mods/doors/models/door_a.b3d deleted file mode 100644 index 7f9249fe..00000000 Binary files a/mods/doors/models/door_a.b3d and /dev/null differ diff --git a/mods/doors/models/door_a.obj b/mods/doors/models/door_a.obj new file mode 100644 index 00000000..7948f2f3 --- /dev/null +++ b/mods/doors/models/door_a.obj @@ -0,0 +1,40 @@ +# Blender v2.76 (sub 0) OBJ File: 'door_a.blend' +# www.blender.org +mtllib door_a.mtl +o door_a +v 0.499000 -0.499000 -0.499000 +v 0.499000 1.499000 -0.499000 +v 0.499000 -0.499000 -0.375000 +v 0.499000 1.499000 -0.375000 +v -0.499000 -0.499000 -0.499000 +v -0.499000 1.499000 -0.499000 +v -0.499000 -0.499000 -0.375000 +v -0.499000 1.499000 -0.375000 +vt 0.842105 1.000000 +vt 0.894737 1.000000 +vt 0.894737 0.000000 +vt 0.842105 0.000000 +vt 0.421053 1.000000 +vt 0.421053 0.000000 +vt 0.947368 1.000000 +vt 0.947368 0.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.500000 +vt 0.947368 0.500000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +usemtl None +s off +f 2/1/1 4/2/1 3/3/1 1/4/1 +f 4/5/2 8/1/2 7/4/2 3/6/2 +f 8/2/3 6/7/3 5/8/3 7/3/3 +f 6/9/4 2/5/4 1/6/4 5/10/4 +f 1/11/5 3/12/5 7/7/5 5/13/5 +f 6/14/6 8/8/6 4/12/6 2/11/6 diff --git a/mods/doors/models/door_a2.obj b/mods/doors/models/door_a2.obj new file mode 100644 index 00000000..3bedc202 --- /dev/null +++ b/mods/doors/models/door_a2.obj @@ -0,0 +1,50 @@ +# Blender v2.79 (sub 0) OBJ File: '' +# www.blender.org +mtllib door_a2.mtl +o door_a2 +v -0.499000 1.499000 -0.499000 +v -0.499000 -0.499000 -0.499000 +v -0.499000 -0.499000 -0.375000 +v -0.499000 1.499000 -0.375000 +v 0.499000 -0.499000 -0.375000 +v 0.499000 1.499000 -0.375000 +v 0.499000 -0.499000 -0.499000 +v 0.499000 1.499000 -0.499000 +vt 0.894737 1.000000 +vt 0.894737 0.000000 +vt 0.842105 0.000000 +vt 0.842105 1.000000 +vt 0.421052 1.000000 +vt 0.421052 0.000000 +vt 0.000001 0.000000 +vt 0.000001 1.000000 +vt 0.894737 1.000000 +vt 0.894737 0.000000 +vt 0.947368 0.000000 +vt 0.947368 1.000000 +vt 0.842105 1.000000 +vt 0.842105 0.000000 +vt 0.421052 0.000000 +vt 0.421052 1.000000 +vt 0.947368 0.000000 +vt 0.947368 0.500000 +vt 1.000000 0.500000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 1.000000 0.500000 +vt 0.947368 0.500000 +vt 0.947368 1.000000 +vn -1.0000 -0.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +usemtl None.009 +s 1 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 4/5/2 3/6/2 5/7/2 6/8/2 +f 6/9/3 5/10/3 7/11/3 8/12/3 +f 8/13/4 7/14/4 2/15/4 1/16/4 +f 2/17/5 7/18/5 5/19/5 3/20/5 +f 8/21/6 1/22/6 4/23/6 6/24/6 diff --git a/mods/doors/models/door_b.b3d b/mods/doors/models/door_b.b3d deleted file mode 100644 index 77a1a16c..00000000 Binary files a/mods/doors/models/door_b.b3d and /dev/null differ diff --git a/mods/doors/models/door_b.obj b/mods/doors/models/door_b.obj new file mode 100644 index 00000000..87f1729c --- /dev/null +++ b/mods/doors/models/door_b.obj @@ -0,0 +1,50 @@ +# Blender v2.79 (sub 0) OBJ File: '' +# www.blender.org +mtllib door_b.mtl +o door_b +v 0.499000 1.499000 -0.499000 +v 0.499000 1.499000 -0.375000 +v 0.499000 -0.499000 -0.375000 +v 0.499000 -0.499000 -0.499000 +v -0.499000 1.499000 -0.375000 +v -0.499000 -0.499000 -0.375000 +v -0.499000 1.499000 -0.499000 +v -0.499000 -0.499000 -0.499000 +vt 0.894736 1.000000 +vt 0.947368 1.000000 +vt 0.947368 0.000000 +vt 0.894736 0.000000 +vt 0.842105 1.000000 +vt 0.421053 1.000000 +vt 0.421053 0.000000 +vt 0.842105 0.000000 +vt 0.842105 1.000000 +vt 0.894736 1.000000 +vt 0.894736 0.000000 +vt 0.842105 0.000000 +vt 0.421053 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.421053 0.000000 +vt 1.000000 0.500000 +vt 0.947368 0.500000 +vt 0.947368 1.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 0.947368 0.000000 +vt 0.947368 0.500000 +vt 1.000000 0.500000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +usemtl None.007 +s 1 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 2/5/2 5/6/2 6/7/2 3/8/2 +f 5/9/3 7/10/3 8/11/3 6/12/3 +f 7/13/4 1/14/4 4/15/4 8/16/4 +f 4/17/5 3/18/5 6/19/5 8/20/5 +f 7/21/6 5/22/6 2/23/6 1/24/6 diff --git a/mods/doors/models/door_b2.obj b/mods/doors/models/door_b2.obj new file mode 100644 index 00000000..35632a5e --- /dev/null +++ b/mods/doors/models/door_b2.obj @@ -0,0 +1,50 @@ +# Blender v2.79 (sub 0) OBJ File: '' +# www.blender.org +mtllib door_b2.mtl +o door_b2 +v 0.499000 1.499000 -0.499000 +v 0.499000 1.499000 -0.375000 +v 0.499000 -0.499000 -0.375000 +v 0.499000 -0.499000 -0.499000 +v -0.499000 1.499000 -0.375000 +v -0.499000 -0.499000 -0.375000 +v -0.499000 1.499000 -0.499000 +v -0.499000 -0.499000 -0.499000 +vt 0.842105 1.000000 +vt 0.894737 1.000000 +vt 0.894737 0.000000 +vt 0.842105 0.000000 +vt 0.421052 1.000000 +vt 0.000001 1.000000 +vt 0.000001 0.000000 +vt 0.421052 0.000000 +vt 0.894737 1.000000 +vt 0.947368 1.000000 +vt 0.947368 0.000000 +vt 0.894737 0.000000 +vt 0.842105 1.000000 +vt 0.421052 1.000000 +vt 0.421052 0.000000 +vt 0.842105 0.000000 +vt 1.000000 0.500000 +vt 0.947368 0.500000 +vt 0.947368 1.000000 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 0.947368 0.000000 +vt 0.947368 0.500000 +vt 1.000000 0.500000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +usemtl None.010 +s 1 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 2/5/2 5/6/2 6/7/2 3/8/2 +f 5/9/3 7/10/3 8/11/3 6/12/3 +f 7/13/4 1/14/4 4/15/4 8/16/4 +f 4/17/5 3/18/5 6/19/5 8/20/5 +f 7/21/6 5/22/6 2/23/6 1/24/6 diff --git a/mods/doors/textures/doors_door_glass.png b/mods/doors/textures/doors_door_glass.png index ea6fdc1f..c296a0ff 100644 Binary files a/mods/doors/textures/doors_door_glass.png and b/mods/doors/textures/doors_door_glass.png differ diff --git a/mods/doors/textures/doors_door_obsidian_glass.png b/mods/doors/textures/doors_door_obsidian_glass.png index fab25b34..07ac5b20 100644 Binary files a/mods/doors/textures/doors_door_obsidian_glass.png and b/mods/doors/textures/doors_door_obsidian_glass.png differ diff --git a/mods/doors/textures/doors_door_steel.png b/mods/doors/textures/doors_door_steel.png index 9e33ff1a..f42f3350 100644 Binary files a/mods/doors/textures/doors_door_steel.png and b/mods/doors/textures/doors_door_steel.png differ diff --git a/mods/doors/textures/doors_door_wood.png b/mods/doors/textures/doors_door_wood.png index c073faf1..7b18203e 100644 Binary files a/mods/doors/textures/doors_door_wood.png and b/mods/doors/textures/doors_door_wood.png differ diff --git a/mods/doors/textures/doors_hidden_segment.png b/mods/doors/textures/doors_hidden_segment.png deleted file mode 100644 index b3b6f34c..00000000 Binary files a/mods/doors/textures/doors_hidden_segment.png and /dev/null differ diff --git a/mods/doors/textures/doors_item_glass.png b/mods/doors/textures/doors_item_glass.png index d883f6e6..86406fbb 100644 Binary files a/mods/doors/textures/doors_item_glass.png and b/mods/doors/textures/doors_item_glass.png differ diff --git a/mods/doors/textures/doors_item_obsidian_glass.png b/mods/doors/textures/doors_item_obsidian_glass.png index 8c7920c5..1026d437 100644 Binary files a/mods/doors/textures/doors_item_obsidian_glass.png and b/mods/doors/textures/doors_item_obsidian_glass.png differ diff --git a/mods/dungeon_loot/mapgen.lua b/mods/dungeon_loot/mapgen.lua index 3b597f2e..b2c80fa8 100644 --- a/mods/dungeon_loot/mapgen.lua +++ b/mods/dungeon_loot/mapgen.lua @@ -14,7 +14,7 @@ local function random_sample(rand, list, count) return ret end -local function find_walls(cpos, is_temple) +local function find_walls(cpos) local is_wall = function(node) return node.name ~= "air" and node.name ~= "ignore" end @@ -55,7 +55,7 @@ local function find_walls(cpos, is_temple) local biome = minetest.get_biome_data(cpos) biome = biome and minetest.get_biome_name(biome.biome) or "" local type = "normal" - if is_temple or biome:find("desert") == 1 then + if biome:find("desert") == 1 then type = "desert" elseif biome:find("sandstone_desert") == 1 then type = "sandstone" @@ -125,8 +125,6 @@ end minetest.register_on_generated(function(minp, maxp, blockseed) local gennotify = minetest.get_mapgen_object("gennotify") local poslist = gennotify["dungeon"] or {} - local n_dungeons = #poslist - -- Add MGv6 desert temples to the list too for _, entry in ipairs(gennotify["temple"] or {}) do table.insert(poslist, entry) end @@ -139,7 +137,7 @@ minetest.register_on_generated(function(minp, maxp, blockseed) -- process at most 8 rooms to keep runtime of this predictable local num_process = math.min(#poslist, 8) for i = 1, num_process do - local room = find_walls(poslist[i], i > n_dungeons) + local room = find_walls(poslist[i]) -- skip small rooms and everything that doesn't at least have 3 walls if math.min(room.size.x, room.size.z) >= 4 and #room.walls >= 3 then table.insert(candidates, room) diff --git a/mods/dye/README.txt b/mods/dye/README.txt index 4b922fa8..a2fbdd24 100644 --- a/mods/dye/README.txt +++ b/mods/dye/README.txt @@ -6,7 +6,7 @@ See init.lua for documentation. Authors of source code ---------------------- Originally by Perttu Ahola (celeron55) (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) --------------------------- diff --git a/mods/dye/license.txt b/mods/dye/license.txt index 340820ce..bf9d3501 100644 --- a/mods/dye/license.txt +++ b/mods/dye/license.txt @@ -3,7 +3,7 @@ License of source code The MIT License (MIT) Copyright (C) 2012-2016 Perttu Ahola (celeron55) -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/dye/locale/dye.bg.tr b/mods/dye/locale/dye.bg.tr deleted file mode 100755 index e82ae354..00000000 --- a/mods/dye/locale/dye.bg.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Бяло багрило -Grey Dye=Сиво багрило -Dark Grey Dye=Тъмносиво багрило -Black Dye=Черно багрило -Violet Dye=Лилаво багрило -Blue Dye=Синьо багрило -Cyan Dye=Синьо-зелено багрило -Dark Green Dye=Масленозелено багрило -Green Dye=Зелено багрило -Yellow Dye=Жълто багрило -Brown Dye=Кафяво багрило -Orange Dye=Оранжево багрило -Red Dye=Червено багрило -Magenta Dye=Пурпурно багрило -Pink Dye=Розово багрило diff --git a/mods/dye/locale/dye.eo.tr b/mods/dye/locale/dye.eo.tr deleted file mode 100644 index ee37abbb..00000000 --- a/mods/dye/locale/dye.eo.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Blanka tinkturo -Grey Dye=Griza tinkturo -Dark Grey Dye=Malhela griza tinkturo -Black Dye=Nigra 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ĝkolora tinkturo -Red Dye=Ruĝa tinkturo -Magenta Dye=Fiksina tinkturo -Pink Dye=Rozkolora tinkturo diff --git a/mods/dye/locale/dye.eu.tr b/mods/dye/locale/dye.eu.tr deleted file mode 100644 index 08906957..00000000 --- a/mods/dye/locale/dye.eu.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Tindagai zuria -Grey Dye=Tindagai grisa -Dark Grey Dye=Tindagai gris iluna -Black Dye=Tindagai beltza -Violet Dye=Tindagai morea -Blue Dye=Tindagai urdina -Cyan Dye=Tindaketa ziana -Dark Green Dye=Tindagai berde iluna -Green Dye=Tindagai berdea -Yellow Dye=Tindagai horia -Brown Dye=Tindaketa marroia -Orange Dye=Tindagai laranja -Red Dye=Tindagai gorria -Magenta Dye=Tindagai magenta -Pink Dye=Tindagai arrosa diff --git a/mods/dye/locale/dye.id.tr b/mods/dye/locale/dye.id.tr index d5871075..1614345a 100644 --- a/mods/dye/locale/dye.id.tr +++ b/mods/dye/locale/dye.id.tr @@ -13,4 +13,4 @@ Brown Dye=Pewarna Cokelat Orange Dye=Pewarna Oranye Red Dye=Pewarna Merah Magenta Dye=Pewarna Magenta -Pink Dye=Pewarna Merah Muda +Pink Dye=Pewarna Jambon diff --git a/mods/dye/locale/dye.it.tr b/mods/dye/locale/dye.it.tr index 9deb385e..e15e2b55 100644 --- a/mods/dye/locale/dye.it.tr +++ b/mods/dye/locale/dye.it.tr @@ -1,16 +1,16 @@ -# textdomain: dye -White Dye=Tintura bianca -Grey Dye=Tintura grigia -Dark Grey Dye=Tintura grigia scura -Black Dye=Tintura nera -Violet Dye=Tintura viola -Blue Dye=Tintura blu -Cyan Dye=Tintura ciano -Dark Green Dye=Tintura verde scura -Green Dye=Tintura verde -Yellow Dye=Tintura gialla -Brown Dye=Tintura marrone -Orange Dye=Tintura arancione -Red Dye=Tintura rossa -Magenta Dye=Tintura magenta -Pink Dye=Tintura rosa +# textdomain: dye +White Dye=Tintura bianca +Grey Dye=Tintura grigia +Dark Grey Dye=Tintura grigia scura +Black Dye=Tintura nera +Violet Dye=Tintura viola +Blue Dye=Tintura blu +Cyan Dye=Tintura ciano +Dark Green Dye=Tintura verde scura +Green Dye=Tintura verde +Yellow Dye=Tintura gialla +Brown Dye=Tintura marrone +Orange Dye=Tintura arancione +Red Dye=Tintura rossa +Magenta Dye=Tintura magenta +Pink Dye=Tintura rosa \ No newline at end of file diff --git a/mods/dye/locale/dye.ja.tr b/mods/dye/locale/dye.ja.tr deleted file mode 100644 index d7ae3068..00000000 --- a/mods/dye/locale/dye.ja.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=白色の染料 -Grey Dye=灰色の染料 -Dark Grey Dye=濃灰色の染料 -Black Dye=黒色の染料 -Violet Dye=紫色の染料 -Blue Dye=青色の染料 -Cyan Dye=青緑色の染料 -Dark Green Dye=濃緑色の染料 -Green Dye=緑色の染料 -Yellow Dye=黄色の染料 -Brown Dye=茶色の染料 -Orange Dye=橙色の染料 -Red Dye=赤色の染料 -Magenta Dye=赤紫色の染料 -Pink Dye=桃色の染料 diff --git a/mods/dye/locale/dye.jbo.tr b/mods/dye/locale/dye.jbo.tr deleted file mode 100644 index 39ec7ab2..00000000 --- a/mods/dye/locale/dye.jbo.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=lo blabi xinmo -Grey Dye=lo grusi xinmo -Dark Grey Dye=lo xekri grusi xinmo -Black Dye=lo xekri xinmo -Violet Dye=lo zirpu xinmo -Blue Dye=lo blanu xinmo -Cyan Dye=lo cicna xinmo -Dark Green Dye=lo xekri crino xinmo -Green Dye=lo crino xinmo -Yellow Dye=lo pelxu xinmo -Brown Dye=lo bunre xinmo -Orange Dye=lo narju xinmo -Red Dye=lo xunre xinmo -Magenta Dye=lo nukni xinmo -Pink Dye=lo xunblabi xinmo diff --git a/mods/dye/locale/dye.lv.tr b/mods/dye/locale/dye.lv.tr deleted file mode 100644 index 048a087e..00000000 --- a/mods/dye/locale/dye.lv.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Baltā krāsa -Grey Dye=Pelēkā krāsa -Dark Grey Dye=Tumšpelēkā krāsa -Black Dye=Melnā krāsa -Violet Dye=Violetā krāsa -Blue Dye=Zilā krāsa -Cyan Dye=Ciāna krāsa -Dark Green Dye=Tumšzaļā krāsa -Green Dye=Zaļā krāsa -Yellow Dye=Dzeltenā krāsa -Brown Dye=Brūnā krāsa -Orange Dye=Oranžā krāsa -Red Dye=Sarkanā krāsa -Magenta Dye=Fuksīna krāsa -Pink Dye=Rozā krāsa diff --git a/mods/dye/locale/dye.ms.tr b/mods/dye/locale/dye.ms.tr index a4256c73..50c04730 100644 --- a/mods/dye/locale/dye.ms.tr +++ b/mods/dye/locale/dye.ms.tr @@ -1,16 +1,16 @@ # textdomain: dye White Dye=Pewarna Putih Grey Dye=Pewarna Kelabu -Dark Grey Dye=Pewarna Kelabu Tua +Dark Grey Dye=Pewarna Kelabu Gelap Black Dye=Pewarna Hitam Violet Dye=Pewarna Ungu Blue Dye=Pewarna Biru Cyan Dye=Pewarna Biru Kehijauan -Dark Green Dye=Pewarna Hijau Tua +Dark Green Dye=Pewarna Hijau Gelap Green Dye=Pewarna Hijau Yellow Dye=Pewarna Kuning Brown Dye=Pewarna Perang Orange Dye=Pewarna Jingga Red Dye=Pewarna Merah -Magenta Dye=Pewarna Magenta +Magenta Dye=Pewarna Merah Lembayung Pink Dye=Pewarna Merah Jambu diff --git a/mods/dye/locale/dye.pl.tr b/mods/dye/locale/dye.pl.tr deleted file mode 100644 index a4bfa640..00000000 --- a/mods/dye/locale/dye.pl.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Biały barwnik -Grey Dye=Szary barwnik -Dark Grey Dye=Ciemnoszary barwnik -Black Dye=Czarny barwnik -Violet Dye=Fioletowy barwnik -Blue Dye=Niebieski barwnik -Cyan Dye=Cyjanowy barwnik -Dark Green Dye=Ciemnozielony barwnik -Green Dye=Zielony barwnik -Yellow Dye=Żółty barwnik -Brown Dye=Brązowy barwnik -Orange Dye=Pomarańczowy barwnik -Red Dye=Czerwony barwnik -Magenta Dye=Karmazynowy barwnik -Pink Dye=Różowy barwnik diff --git a/mods/dye/locale/dye.pt_BR.tr b/mods/dye/locale/dye.pt_BR.tr deleted file mode 100644 index 29e98dac..00000000 --- a/mods/dye/locale/dye.pt_BR.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Tinta Branca -Grey Dye=Tinta Cinza -Dark Grey Dye=Tinta Cinza-escuro -Black Dye=Tinta Preta -Violet Dye=Tinta Violeta -Blue Dye=Tinta Azul -Cyan Dye=Tinta Ciano -Dark Green Dye=Tinta Verde-escuro -Green Dye=Tinta Verde -Yellow Dye=Tinta Amarela -Brown Dye=Tinta Marrom -Orange Dye=Tinta Laranja -Red Dye=Tinta Vermelha -Magenta Dye=Tinta Magenta -Pink Dye=Tinta Rosa diff --git a/mods/dye/locale/dye.ru.tr b/mods/dye/locale/dye.ru.tr index eff51f94..fa3c5c44 100644 --- a/mods/dye/locale/dye.ru.tr +++ b/mods/dye/locale/dye.ru.tr @@ -1,16 +1,16 @@ # textdomain: dye -White Dye=Белый краситель -Grey Dye=Серый краситель -Dark Grey Dye=Тёмно-серый краситель -Black Dye=Черный краситель -Violet Dye=Фиолетовый краситель -Blue Dye=Синий краситель -Cyan Dye=Бирюзовый краситель -Dark Green Dye=Тёмно-зелёный краситель -Green Dye=Зелёный краситель -Yellow Dye=Жёлтый краситель -Brown Dye=Коричневый краситель -Orange Dye=Оранжевый краситель -Red Dye=Красный краситель -Magenta Dye=Сиреневый краситель -Pink Dye=Розовый краситель +White Dye=Белая Краска +Grey Dye=Серая Краска +Dark Grey Dye=Тёмно-Серая Краска +Black Dye=Черная Краска +Violet Dye=Фиолетовая Краска +Blue Dye=Синяя Краска +Cyan Dye=Голубая Краска +Dark Green Dye=Тёмно-Зелёная Краска +Green Dye=Зелёная Краска +Yellow Dye=Жёлтая Краска +Brown Dye=Бурая Краска +Orange Dye=Оранжевая Краска +Red Dye=Красная Краска +Magenta Dye=Пурпурная Краска +Pink Dye=Розовая Краска diff --git a/mods/dye/locale/dye.se.tr b/mods/dye/locale/dye.se.tr new file mode 100644 index 00000000..27adb10b --- /dev/null +++ b/mods/dye/locale/dye.se.tr @@ -0,0 +1,16 @@ +# textdomain: dye +White Dye=Vit Färg +Grey Dye=Grå Färg +Dark Grey Dye=Mörk Grå Färg +Black Dye=Svart Färg +Violet Dye=Violett Färg +Blue Dye=Blå Färg +Cyan Dye=Cyan Färg +Dark Green Dye=Mörk Grön Färg +Green Dye=Grön Färg +Yellow Dye=Gul Färg +Brown Dye=Brun Färg +Orange Dye=Orange Färg +Red Dye=Röd Färg +Magenta Dye=Magenta Färg +Pink Dye=Rosa Färg \ No newline at end of file diff --git a/mods/dye/locale/dye.sk.tr b/mods/dye/locale/dye.sk.tr deleted file mode 100644 index 625804c3..00000000 --- a/mods/dye/locale/dye.sk.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Biele farbivo -Grey Dye=Šedé farbivo -Dark Grey Dye=Tmavo šedé farbivo -Black Dye=Čierne farbivo -Violet Dye=Fialové farbivo -Blue Dye=Modré farbivo -Cyan Dye=Tyrkysové farbivo -Dark Green Dye=Tmavozelené farbivo -Green Dye=Zelené farbivo -Yellow Dye=Žlté farbivo -Brown Dye=Hnedé farbivo -Orange Dye=Oranžové farbivo -Red Dye=Červené farbivo -Magenta Dye=Purpurové farbivo -Pink Dye=Ružové farbivo diff --git a/mods/dye/locale/dye.sv.tr b/mods/dye/locale/dye.sv.tr deleted file mode 100644 index ecde4433..00000000 --- a/mods/dye/locale/dye.sv.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Vit färg -Grey Dye=Grå färg -Dark Grey Dye=Mörkgrå färg -Black Dye=Svart färg -Violet Dye=Violett färg -Blue Dye=Blå färg -Cyan Dye=Cyan färg -Dark Green Dye=Mörkgrön färg -Green Dye=Grön färg -Yellow Dye=Gul färg -Brown Dye=Brun färg -Orange Dye=Orange färg -Red Dye=Röd färg -Magenta Dye=Magenta färg -Pink Dye=Rosa färg diff --git a/mods/dye/locale/dye.uk.tr b/mods/dye/locale/dye.uk.tr deleted file mode 100644 index 7bf0f45c..00000000 --- a/mods/dye/locale/dye.uk.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Білий барвник -Grey Dye=Сірий барвник -Dark Grey Dye=Темно-сірий барвник -Black Dye=Чорний барвник -Violet Dye=Фіолетовий барвник -Blue Dye=Синій барвник -Cyan Dye=Синьо-зелений барвник -Dark Green Dye=Темно-зелений барвник -Green Dye=Зелений барвник -Yellow Dye=Жовтий барвник -Brown Dye=Коричневий барвник -Orange Dye=Помаранчевий барвник -Red Dye=Червоний барвник -Magenta Dye=Пурпурний барвник -Pink Dye=Рожевий барвник diff --git a/mods/dye/locale/dye.zh_CN.tr b/mods/dye/locale/dye.zh_CN.tr index 11bf9cb2..8dcf3117 100644 --- a/mods/dye/locale/dye.zh_CN.tr +++ b/mods/dye/locale/dye.zh_CN.tr @@ -1,16 +1,16 @@ # textdomain: dye -White Dye=白色染料 -Grey Dye=灰色染料 +White Dye=白染料 +Grey Dye=灰染料 Dark Grey Dye=暗灰染料 -Black Dye=黑色染料 -Violet Dye=紫色染料 -Blue Dye=蓝色染料 -Cyan Dye=青色染料 +Black Dye=黑染料 +Violet Dye=紫染料 +Blue Dye=蓝染料 +Cyan Dye=青染料 Dark Green Dye=暗绿染料 -Green Dye=绿色染料 -Yellow Dye=黄色染料 -Brown Dye=棕色染料 -Orange Dye=橙色染料 -Red Dye=红色染料 +Green Dye=绿染料 +Yellow Dye=黄染料 +Brown Dye=棕染料 +Orange Dye=橙染料 +Red Dye=红染料 Magenta Dye=品红染料 Pink Dye=粉红染料 diff --git a/mods/dye/locale/dye.zh_TW.tr b/mods/dye/locale/dye.zh_TW.tr index b84d07e1..cc60a219 100644 --- a/mods/dye/locale/dye.zh_TW.tr +++ b/mods/dye/locale/dye.zh_TW.tr @@ -1,16 +1,16 @@ # textdomain: dye -White Dye=白色染料 -Grey Dye=灰色染料 +White Dye=白染料 +Grey Dye=灰染料 Dark Grey Dye=暗灰染料 -Black Dye=黑色染料 -Violet Dye=紫色染料 -Blue Dye=藍色染料 -Cyan Dye=青色染料 +Black Dye=黑染料 +Violet Dye=紫染料 +Blue Dye=藍染料 +Cyan Dye=青染料 Dark Green Dye=暗綠染料 -Green Dye=綠色染料 -Yellow Dye=黃色染料 -Brown Dye=棕色染料 -Orange Dye=橙色染料 -Red Dye=紅色染料 +Green Dye=綠染料 +Yellow Dye=黃染料 +Brown Dye=棕染料 +Orange Dye=橙染料 +Red Dye=紅染料 Magenta Dye=品紅染料 Pink Dye=粉紅染料 diff --git a/mods/env_sounds/README.txt b/mods/env_sounds/README.txt index 3b3d2755..42835d21 100644 --- a/mods/env_sounds/README.txt +++ b/mods/env_sounds/README.txt @@ -11,7 +11,3 @@ Authors of media (sounds) Yuval (CC0 1.0) https://freesound.org/people/Yuval/sounds/197023/ env_sounds_water.*.ogg - -Halion (CC0 1.0) -https://freesound.org/people/Halion/sounds/17785/ - env_sounds_lava.*.ogg diff --git a/mods/env_sounds/init.lua b/mods/env_sounds/init.lua index 31cc483e..546e9908 100644 --- a/mods/env_sounds/init.lua +++ b/mods/env_sounds/init.lua @@ -1,41 +1,11 @@ -- Parameters --- Node search radius around player -local radius = 8 +local radius = 8 -- Water node search radius around player -local allsounds = { - ["env_sounds_water"] = { - trigger = {"default:water_flowing", "default:river_water_flowing"}, - base_volume = 0.04, - max_volume = 0.4, - per_node = 0.004, - }, - ["env_sounds_lava"] = { - trigger = {"default:lava_source", "default:lava_flowing"}, - base_volume = 0, - max_volume = 0.6, - per_node = { - ["default:lava_source"] = 0.008, - ["default:lava_flowing"] = 0.002, - }, - }, -} - -if minetest.settings:get_bool("river_source_sounds") then - table.insert(allsounds["env_sounds_water"].trigger, - "default:river_water_source") -end +-- End of parameters --- Cache the union of all trigger nodes - -local cache_triggers = {} - -for sound, def in pairs(allsounds) do - for _, name in ipairs(def.trigger) do - table.insert(cache_triggers, name) - end -end +local river_source_sounds = minetest.settings:get_bool("river_source_sounds") -- Update sound for player @@ -43,57 +13,39 @@ end local function update_sound(player) local player_name = player:get_player_name() local ppos = player:get_pos() - ppos = vector.add(ppos, player:get_properties().eye_height) local areamin = vector.subtract(ppos, radius) local areamax = vector.add(ppos, radius) - - local pos = minetest.find_nodes_in_area(areamin, areamax, cache_triggers, true) - if next(pos) == nil then -- If table empty + local water_nodes = {"default:water_flowing", "default:river_water_flowing"} + if river_source_sounds then + table.insert(water_nodes, "default:river_water_source") + end + local wpos, _ = minetest.find_nodes_in_area(areamin, areamax, water_nodes) + local waters = #wpos + if waters == 0 then return end - for sound, def in pairs(allsounds) do - -- Find average position - local posav = {0, 0, 0} - local count = 0 - for _, name in ipairs(def.trigger) do - if pos[name] then - for _, p in ipairs(pos[name]) do - posav[1] = posav[1] + p.x - posav[2] = posav[2] + p.y - posav[3] = posav[3] + p.z - end - count = count + #pos[name] - end - end - if count > 0 then - posav = vector.new(posav[1] / count, posav[2] / count, - posav[3] / count) - - -- Calculate gain - local gain = def.base_volume - if type(def.per_node) == 'table' then - for name, multiplier in pairs(def.per_node) do - if pos[name] then - gain = gain + #pos[name] * multiplier - end - end - else - gain = gain + count * def.per_node - end - gain = math.min(gain, def.max_volume) - - minetest.sound_play(sound, { - pos = posav, - to_player = player_name, - gain = gain, - }, true) - end + -- Find average position of water positions + local wposav = vector.new() + for _, pos in ipairs(wpos) do + wposav.x = wposav.x + pos.x + wposav.y = wposav.y + pos.y + wposav.z = wposav.z + pos.z end + wposav = vector.divide(wposav, waters) + + minetest.sound_play( + "env_sounds_water", + { + pos = wposav, + to_player = player_name, + gain = math.min(0.04 + waters * 0.004, 0.4), + } + ) end --- Update sound when player joins +-- Update sound 'on joinplayer' minetest.register_on_joinplayer(function(player) update_sound(player) diff --git a/mods/env_sounds/sounds/env_sounds_lava.1.ogg b/mods/env_sounds/sounds/env_sounds_lava.1.ogg deleted file mode 100644 index 3eafce2d..00000000 Binary files a/mods/env_sounds/sounds/env_sounds_lava.1.ogg and /dev/null differ diff --git a/mods/env_sounds/sounds/env_sounds_lava.2.ogg b/mods/env_sounds/sounds/env_sounds_lava.2.ogg deleted file mode 100644 index 8648f17f..00000000 Binary files a/mods/env_sounds/sounds/env_sounds_lava.2.ogg and /dev/null differ diff --git a/mods/farming/README.txt b/mods/farming/README.txt index 69cfa758..a6427d04 100644 --- a/mods/farming/README.txt +++ b/mods/farming/README.txt @@ -6,7 +6,7 @@ Authors of source code ---------------------- Originally by PilzAdam (MIT) webdesigner97 (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) --------------------------- diff --git a/mods/farming/api.lua b/mods/farming/api.lua index 08ab0a0a..91d557c7 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -45,14 +45,12 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses) return end - local player_name = user and user:get_player_name() or "" - - if minetest.is_protected(pt.under, player_name) then - minetest.record_protection_violation(pt.under, player_name) + if minetest.is_protected(pt.under, user:get_player_name()) then + minetest.record_protection_violation(pt.under, user:get_player_name()) return end - if minetest.is_protected(pt.above, player_name) then - minetest.record_protection_violation(pt.above, player_name) + if minetest.is_protected(pt.above, user:get_player_name()) then + minetest.record_protection_violation(pt.above, user:get_player_name()) return end @@ -60,13 +58,14 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses) minetest.set_node(pt.under, {name = regN[under.name].soil.dry}) minetest.sound_play("default_dig_crumbly", { pos = pt.under, - gain = 0.3, + gain = 0.5, }, true) - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(user:get_player_name())) then -- wear tool local wdef = itemstack:get_definition() - itemstack:add_wear_by_uses(uses) + itemstack:add_wear(65535/(uses-1)) -- tool break sound if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then minetest.sound_play(wdef.sound.breaks, {pos = pt.above, @@ -178,23 +177,17 @@ farming.place_seed = function(itemstack, placer, pointed_thing, plantname) end -- add the node and remove 1 item from the itemstack - if placer then - default.log_player_action(placer, "places node", plantname, "at", pt.above) - end + minetest.log("action", player_name .. " places node " .. plantname .. " at " .. + minetest.pos_to_string(pt.above)) minetest.add_node(pt.above, {name = plantname, param2 = 1}) tick(pt.above) - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(player_name)) then itemstack:take_item() end return itemstack end --- check if on wet soil -farming.can_grow = function(pos) - local below = minetest.get_node(pos:offset(0, -1, 0)) - return minetest.get_item_group(below.name, "soil") >= 3 -end - farming.grow_plant = function(pos, elapsed) local node = minetest.get_node(pos) local name = node.name @@ -230,7 +223,9 @@ farming.grow_plant = function(pos, elapsed) return end - if not (def.can_grow or farming.can_grow)(pos) then + -- check if on wet soil + local below = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) + if minetest.get_item_group(below.name, "soil") < 3 then tick_again(pos) return end diff --git a/mods/farming/license.txt b/mods/farming/license.txt index a90d8084..b9708de3 100644 --- a/mods/farming/license.txt +++ b/mods/farming/license.txt @@ -4,7 +4,7 @@ License of source code The MIT License (MIT) Copyright (C) 2012-2016 PilzAdam Copyright (C) 2014-2016 webdesigner97 -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/farming/locale/farming.bg.tr b/mods/farming/locale/farming.bg.tr deleted file mode 100755 index c46033e5..00000000 --- a/mods/farming/locale/farming.bg.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Мотика -Seed=Семе -Wooden Hoe=Дървена мотика -Stone Hoe=Каменна мотика -Steel Hoe=Стоманена мотика -Bronze Hoe=Бронзова мотика -Mese Hoe=Мотика от кристала мезе -Diamond Hoe=Диамантена мотика -Wheat Seed=Пшеничено семе -Wheat=Пшеница -Flour=Брашно -Bread=Хляб -Cotton Seed=Памучено семе -Cotton=Памук -String=Връв -Soil=Почва -Wet Soil=Влажна почва -Savanna Soil=Почва от саваната -Wet Savanna Soil=Влажна почва от саваната -Desert Sand Soil=Пустинна пясъчна почва -Wet Desert Sand Soil=Влажна пустинна пясъчна почва -Straw=Слама -Straw Stair=Сламено стълбище -Inner Straw Stair=Вътрешно сламено стълбище -Outer Straw Stair=Външно сламено стълбище -Straw Slab=Сламена плоча -Wild Cotton=Див памук diff --git a/mods/farming/locale/farming.de.tr b/mods/farming/locale/farming.de.tr index b16748db..6c63a92c 100644 --- a/mods/farming/locale/farming.de.tr +++ b/mods/farming/locale/farming.de.tr @@ -1,6 +1,4 @@ # textdomain: farming -Hoe=Hacke -Seed=Samen Wooden Hoe=Holzhacke Stone Hoe=Steinhacke Steel Hoe=Stahlhacke @@ -8,11 +6,9 @@ Bronze Hoe=Bronzehacke Mese Hoe=Mesehacke Diamond Hoe=Diamanthacke Wheat Seed=Weizensamen -Wheat=Weizen Flour=Mehl Bread=Brot Cotton Seed=Baumwollsamen -Cotton=Baumwolle String=Faden Soil=Ackerboden Wet Soil=Nasser Ackerboden @@ -22,7 +18,11 @@ Desert Sand Soil=Wüstensandackerboden Wet Desert Sand Soil=Nasser Wüstensandackerboden Straw=Stroh Straw Stair=Strohtreppe +Straw Slab=Strohplatte Inner Straw Stair=Innere Strohtreppe Outer Straw Stair=Äußere Strohtreppe -Straw Slab=Strohplatte +Wheat=Weizen +Cotton=Baumwolle +Hoe=Hacke +Seed=Samen Wild Cotton=Wilde Baumwolle diff --git a/mods/farming/locale/farming.eo.tr b/mods/farming/locale/farming.eo.tr deleted file mode 100644 index 887ef004..00000000 --- a/mods/farming/locale/farming.eo.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Sarkilo -Seed=Semo -Wooden Hoe=Ligna sarkilo -Stone Hoe=Ŝtona sarkilo -Steel Hoe=Ŝtala sarkilo -Bronze Hoe=Bronza sarkilo -Mese Hoe=Mesea sarkilo -Diamond Hoe=Diamanta sarkilo -Wheat Seed=Tritika semo -Wheat=Tritiko -Flour=Faruno -Bread=Pano -Cotton Seed=Katuna semo -Cotton=Katuno -String=Ŝnuro -Soil=Tero -Wet Soil=Malseka tero -Savanna Soil=Savana tero -Wet Savanna Soil=Malseka savana tero -Desert Sand Soil=Dezerta sablo tero -Wet Desert Sand Soil=Malseka dezerta sablo tero -Straw=Pajlo -Straw Stair=Pajla ŝtupo -Inner Straw Stair=Interna pajla ŝtupo -Outer Straw Stair=Ekstera pajla ŝtupo -Straw Slab=Pajla plato -Wild Cotton=Sovaĝa kotonujo diff --git a/mods/farming/locale/farming.es.tr b/mods/farming/locale/farming.es.tr index b17a4524..8f958870 100644 --- a/mods/farming/locale/farming.es.tr +++ b/mods/farming/locale/farming.es.tr @@ -1,6 +1,4 @@ # textdomain: farming -Hoe= -Seed= Wooden Hoe=Azada de madera Stone Hoe=Azada de piedra Steel Hoe=Azada de acero @@ -8,27 +6,21 @@ Bronze Hoe=Azada de bronce Mese Hoe=Azada de mese Diamond Hoe=Azada de diamante Wheat Seed=Semilla de trigo -Wheat=Trigo Flour=Harina Bread=Pan Cotton Seed=Semilla de algodón -Cotton=Algodón String=Hilo Soil=Tierra de cultivo Wet Soil=Tierra de cultivo humeda -Savanna Soil= -Wet Savanna Soil= +Dry Soil=Tierra de cultivo seca +Wet Dry Soil=Tierra de cultivo seca-humeda Desert Sand Soil=Tierra de cultivo de arena de desierto Wet Desert Sand Soil=Tierra de cultivo de arena de desierto humeda Straw=Paja Straw Stair=Escalera de paja +Straw Slab=Losa de paja Inner Straw Stair=Escalera de paja interior Outer Straw Stair=Escalera de paja exterior -Straw Slab=Losa de paja +Wheat=Trigo +Cotton=Algodón Wild Cotton=Algodón silvestre - - -##### not used anymore ##### - -Dry Soil=Tierra de cultivo seca -Wet Dry Soil=Tierra de cultivo seca-humeda diff --git a/mods/farming/locale/farming.eu.tr b/mods/farming/locale/farming.eu.tr deleted file mode 100644 index be160a51..00000000 --- a/mods/farming/locale/farming.eu.tr +++ /dev/null @@ -1,34 +0,0 @@ -# textdomain: farming -Hoe=Aitzurra -Seed=Hazia -Wooden Hoe=Zurezko aitzurra -Stone Hoe=Harrizko aitzurra -Steel Hoe=Altzairuzko aitzurra -Bronze Hoe=Brontzezko aitzurra -Mese Hoe=Hileko aitzurra -Diamond Hoe=Diamantezko aitzurra -Wheat Seed=Gari-hazia -Wheat=Garia -Flour=Irina -Bread=Ogia -Cotton Seed=Kotoi-hazia -Cotton=Kotoia -String=Haria -Soil=Laborantza-lurra -Wet Soil=Labore-lur ketsua -Savanna Soil=Sabanako lurra -Wet Savanna Soil=Sabanako lur hezea -Desert Sand Soil=Basamortuko harea lantzeko lurra -Wet Desert Sand Soil=Basamortuko harea lantzeko lur hezea -Straw=Lastoa -Straw Stair=Lastozko eskailera -Inner Straw Stair=Barruko lastozko eskailera -Outer Straw Stair=Kanpoko lastozko eskailera -Straw Slab=Lastozko lauza -Wild Cotton=Basa-kotoia - - -##### not used anymore ##### - -Dry Soil=Labore lehorreko lurra -Wet Dry Soil=Lehor-ke laborantzako lurra diff --git a/mods/farming/locale/farming.fr.tr b/mods/farming/locale/farming.fr.tr index 826949e1..cd059971 100644 --- a/mods/farming/locale/farming.fr.tr +++ b/mods/farming/locale/farming.fr.tr @@ -1,6 +1,4 @@ # textdomain: farming -Hoe=Houe -Seed=Grain Wooden Hoe=Houe en bois Stone Hoe=Houe en pierre Steel Hoe=Houe en acier @@ -8,27 +6,20 @@ Bronze Hoe=Houe en bronze Mese Hoe=Houe en Mese Diamond Hoe=Houe en diamant Wheat Seed=Grain de blé -Wheat=Blé Flour=Farine Bread=Pain Cotton Seed=Graine de coton -Cotton=Coton String=Ficelle Soil=Sol Wet Soil=Sol humide -Savanna Soil=Sol de la savanne -Wet Savanna Soil=Sol de la savanne humide +Dry Soil=Sol sec +Wet Dry Soil=Sol sec et humide Desert Sand Soil=Sol de sable du désert Wet Desert Sand Soil=Sol de sable du désert humide Straw=Paille Straw Stair=Escalier de paille +Straw Slab=Dalle de paille Inner Straw Stair=Escalier intérieur en paille Outer Straw Stair=Escalier extérieur en paille -Straw Slab=Dalle de paille -Wild Cotton=Coton sauvage - - -##### not used anymore ##### - -Dry Soil=Sol sec -Wet Dry Soil=Sol sec et humide +Wheat=Blé +Cotton=Coton diff --git a/mods/farming/locale/farming.id.tr b/mods/farming/locale/farming.id.tr index 7b276801..9904b6f6 100644 --- a/mods/farming/locale/farming.id.tr +++ b/mods/farming/locale/farming.id.tr @@ -1,19 +1,4 @@ # textdomain: farming -Hoe=Cangkul -Seed=Benih -Wooden Hoe=Cangkul Kayu -Stone Hoe=Cangkul Batu -Steel Hoe=Cangkul Baja -Bronze Hoe=Cangkul Perunggu -Mese Hoe=Cangkul Mese -Diamond Hoe=Cangkul Berlian -Wheat Seed=Benih Gandum -Wheat=Gandum -Flour=Tepung -Bread=Roti -Cotton Seed=Benih Kapas -Cotton=Kapas -String=Benang Soil=Tanah Tanam Wet Soil=Tanah Tanam Basah Savanna Soil=Tanah Tanam Sabana @@ -26,3 +11,18 @@ Inner Straw Stair=Tangga Jerami Dalam Outer Straw Stair=Tangga Jerami Luar Straw Slab=Lempengan Jerami Wild Cotton=Kapas Liar +Wheat Seed=Benih Gandum +Wheat=Gandum +Flour=Tepung +Bread=Roti +Cotton Seed=Benih Kapas +Cotton=Kapas +String=Benang +Wooden Hoe=Cangkul Kayu +Stone Hoe=Cangkul Batu +Steel Hoe=Cangkul Baja +Bronze Hoe=Cangkul Perunggu +Mese Hoe=Cangkul Mese +Diamond Hoe=Cangkul Berlian +Hoe=Cangkul +Seed=Benih diff --git a/mods/farming/locale/farming.it.tr b/mods/farming/locale/farming.it.tr index aeb9c0a7..95c1478e 100644 --- a/mods/farming/locale/farming.it.tr +++ b/mods/farming/locale/farming.it.tr @@ -1,34 +1,25 @@ -# textdomain: farming -Hoe= -Seed= -Wooden Hoe=Zappa di legno -Stone Hoe=Zappa di pietra -Steel Hoe=Zappa d'acciaio -Bronze Hoe=Zappa di bronzo -Mese Hoe=Zappa di mese -Diamond Hoe=Zappa di diamante -Wheat Seed=Seme di grano -Wheat=Grano -Flour=Farina -Bread=Pane -Cotton Seed=Seme di cotone -Cotton=Cotone -String=Filo -Soil=Terreno -Wet Soil=Terreno bagnato -Savanna Soil= -Wet Savanna Soil= -Desert Sand Soil=Terreno di sabbia del deserto -Wet Desert Sand Soil=Terreno bagnato di sabbia del deserto -Straw=Paglia -Straw Stair=Scala di paglia -Inner Straw Stair=Scala di paglia interna -Outer Straw Stair=Scala di paglia esterna -Straw Slab=Lastra di paglia -Wild Cotton= - - -##### not used anymore ##### - -Dry Soil=Terreno asciutto -Wet Dry Soil=Terreno asciutto bagnato +# textdomain: farming +Wooden Hoe=Zappa di legno +Stone Hoe=Zappa di pietra +Steel Hoe=Zappa d'acciaio +Bronze Hoe=Zappa di bronzo +Mese Hoe=Zappa di mese +Diamond Hoe=Zappa di diamante +Wheat Seed=Seme di grano +Flour=Farina +Bread=Pane +Cotton Seed=Seme di cotone +String=Filo +Soil=Terreno +Wet Soil=Terreno bagnato +Dry Soil=Terreno asciutto +Wet Dry Soil=Terreno asciutto bagnato +Desert Sand Soil=Terreno di sabbia del deserto +Wet Desert Sand Soil=Terreno bagnato di sabbia del deserto +Straw=Paglia +Straw Stair=Scala di paglia +Inner Straw Stair=Scala di paglia interna +Outer Straw Stair=Scala di paglia esterna +Straw Slab=Lastra di paglia +Wheat=Grano +Cotton=Cotone \ No newline at end of file diff --git a/mods/farming/locale/farming.ja.tr b/mods/farming/locale/farming.ja.tr deleted file mode 100644 index 887d839e..00000000 --- a/mods/farming/locale/farming.ja.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=クワ -Seed=種 -Wooden Hoe=木製のクワ -Stone Hoe=石のクワ -Steel Hoe=鉄のクワ -Bronze Hoe=青銅のクワ -Mese Hoe=メセのクワ -Diamond Hoe=ダイヤモンドのクワ -Wheat Seed=小麦の種 -Wheat=小麦 -Flour=小麦粉 -Bread=パン -Cotton Seed=綿の種 -Cotton=綿 -String=糸 -Soil=土壌 -Wet Soil=湿った土壌 -Savanna Soil=サバンナの土壌 -Wet Savanna Soil=湿ったサバンナの土壌 -Desert Sand Soil=砂漠の砂の土壌 -Wet Desert Sand Soil=湿った砂漠の砂の土壌 -Straw=ワラ -Straw Stair=ワラの階段 -Inner Straw Stair=ワラの凹階段 -Outer Straw Stair=ワラの凸階段 -Straw Slab=ワラの厚板 -Wild Cotton=天然綿 diff --git a/mods/farming/locale/farming.jbo.tr b/mods/farming/locale/farming.jbo.tr deleted file mode 100644 index 51bb9db9..00000000 --- a/mods/farming/locale/farming.jbo.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=lo te plixa -Seed=lo tsiju -Wooden Hoe=lo mudri te plixa -Stone Hoe=lo rokci te plixa -Steel Hoe=lo gasta te plixa -Bronze Hoe=lo ransu te plixa -Mese Hoe=lo za'e kunrmese te plixa -Diamond Hoe=lo tabjme te plixa -Wheat Seed=lo tsiju be lo maxri -Wheat=lo maxri -Flour=lo grupu'o -Bread=lo nanba -Cotton Seed=lo tsiju be lo mapni -Cotton=lo mapni -String=lo skori -Soil=lo ferti dertu -Wet Soil=lo cilmo ke ferti dertu -Savanna Soil=lo ferti ke sudytu'a dertu -Wet Savanna Soil=lo cilmo ke ferti ke sudytu'a dertu -Desert Sand Soil=lo ferti ke cantu'a canre -Wet Desert Sand Soil=lo cilmo ke ferti ke cantu'a canre -Straw=lo sudysrasu -Straw Stair=lo sudysrasu serti -Inner Straw Stair=lo zo'i sudysrasu serti -Outer Straw Stair=lo ze'o sudysrasu serti -Straw Slab=lo sudysrasu ke xadba bliku -Wild Cotton=lo cilce ke mapni spati diff --git a/mods/farming/locale/farming.lv.tr b/mods/farming/locale/farming.lv.tr deleted file mode 100644 index b1f9546d..00000000 --- a/mods/farming/locale/farming.lv.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Kaplis -Seed=Sēklas -Wooden Hoe=Koka kaplis -Stone Hoe=Akmens kaplis -Steel Hoe=Tērauda kaplis -Bronze Hoe=Bronzas kaplis -Mese Hoe=Mēzes kaplis -Diamond Hoe=Dimanta kaplis -Wheat Seed=Kviešu sēkla -Wheat=Kvieši -Flour=Milti -Bread=Maize -Cotton Seed=Kokvilnas sēklas -Cotton=Kokvilna -String=Stiegra -Soil=Augsne -Wet Soil=Slapja augsne -Savanna Soil=Savannas augsne -Wet Savanna Soil=Slapja savannas augsne -Desert Sand Soil=Tuksneša smilts augsne -Wet Desert Sand Soil=Slapja tuksneša smilts augsne -Straw=Salmi -Straw Stair=Salmu pakāpiens -Inner Straw Stair=Iekšējais salmu pakāpiens -Outer Straw Stair=Ārējais salmu pakāpiens -Straw Slab=Salmu plātne -Wild Cotton=Savvaļas kokvilna diff --git a/mods/farming/locale/farming.ms.tr b/mods/farming/locale/farming.ms.tr index 5b8315b2..408f495b 100644 --- a/mods/farming/locale/farming.ms.tr +++ b/mods/farming/locale/farming.ms.tr @@ -1,6 +1,4 @@ # textdomain: farming -Hoe=Cangkul -Seed=Benih Wooden Hoe=Cangkul Kayu Stone Hoe=Cangkul Batu Steel Hoe=Cangkul Keluli @@ -8,16 +6,14 @@ Bronze Hoe=Cangkul Gangsa Mese Hoe=Cangkul Mese Diamond Hoe=Cangkul Intan Wheat Seed=Benih Gandum -Wheat=Gandum Flour=Tepung Bread=Roti Cotton Seed=Benih Kapas -Cotton=Kapas String=Benang Soil=Tanih Wet Soil=Tanih Lembap -Savanna Soil=Tanih Savana -Wet Savanna Soil=Tanih Savana Lembap +Dry Soil=Tanih Kering +Wet Dry Soil=Tanih Kering Lembap Desert Sand Soil=Tanih Pasir Gurun Wet Desert Sand Soil=Tanih Pasir Gurun Lembap Straw=Jerami @@ -25,10 +21,5 @@ Straw Stair=Tangga Jerami Inner Straw Stair=Tangga Jerami Dalaman Outer Straw Stair=Tangga Jerami Luaran Straw Slab=Papak Jerami -Wild Cotton=Kapuk - - -##### not used anymore ##### - -Dry Soil=Tanih Kering -Wet Dry Soil=Tanih Kering Lembap +Wheat=Gandum +Cotton=Kapas diff --git a/mods/farming/locale/farming.pl.tr b/mods/farming/locale/farming.pl.tr deleted file mode 100644 index ffde3b76..00000000 --- a/mods/farming/locale/farming.pl.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Motyka -Seed=Nasiona -Wooden Hoe=Drewniana motyka -Stone Hoe=Kamienna motyka -Steel Hoe=Stalowa motyka -Bronze Hoe=Brązowa motyka -Mese Hoe=Mesowa motyka -Diamond Hoe=Diamentowa motyka -Wheat Seed=Nasiona pszenicy -Wheat=Pszenica -Flour=Mąka -Bread=Chleb -Cotton Seed=Nasiona bawełny -Cotton=Bawełna -String=Nić -Soil=Gleba -Wet Soil=Mokra gleba -Savanna Soil=Sawannowa gleba -Wet Savanna Soil=Mokra sawannowa gleba -Desert Sand Soil=Pustynno-piaszczysta gleba -Wet Desert Sand Soil=Mokra pustynno-piaszczysta gleba -Straw=Słoma -Straw Stair=Słomiane schody -Inner Straw Stair=Wewnętrzne słomiane schody -Outer Straw Stair=Zewnętrzne słomiane schody -Straw Slab=Słomiany półblok -Wild Cotton=Dzika bawełna diff --git a/mods/farming/locale/farming.pt.tr b/mods/farming/locale/farming.pt.tr deleted file mode 100644 index fb0a83c1..00000000 --- a/mods/farming/locale/farming.pt.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Enxada -Seed=Semente -Wooden Hoe=Enxada de Madeira -Stone Hoe=Enxada de Pedra -Steel Hoe=Enxada de Aço -Bronze Hoe=Enxada de Bronze -Mese Hoe=Enxada de Mese -Diamond Hoe=Enxada de Diamante -Wheat Seed=Semente de Trigo -Wheat=Trigo -Flour=Farinha -Bread=Pão -Cotton Seed=Semente de Algodão -Cotton=Algodão -String=Fio -Soil=Solo -Wet Soil=Solo Molhado -Savanna Soil=Solo da Savana -Wet Savanna Soil=Solo da Savana Molhado -Desert Sand Soil=Solo Arenoso do Deserto -Wet Desert Sand Soil=Solo Arenoso do Deserto Molhado -Straw=Palha -Straw Stair=Escada de Palha -Inner Straw Stair=Escada de Palha Externa -Outer Straw Stair=Escada de Palha Interna -Straw Slab=Laje de Palha -Wild Cotton=Algodão Selvagem diff --git a/mods/farming/locale/farming.pt_BR.tr b/mods/farming/locale/farming.pt_BR.tr deleted file mode 100644 index fb0a83c1..00000000 --- a/mods/farming/locale/farming.pt_BR.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Enxada -Seed=Semente -Wooden Hoe=Enxada de Madeira -Stone Hoe=Enxada de Pedra -Steel Hoe=Enxada de Aço -Bronze Hoe=Enxada de Bronze -Mese Hoe=Enxada de Mese -Diamond Hoe=Enxada de Diamante -Wheat Seed=Semente de Trigo -Wheat=Trigo -Flour=Farinha -Bread=Pão -Cotton Seed=Semente de Algodão -Cotton=Algodão -String=Fio -Soil=Solo -Wet Soil=Solo Molhado -Savanna Soil=Solo da Savana -Wet Savanna Soil=Solo da Savana Molhado -Desert Sand Soil=Solo Arenoso do Deserto -Wet Desert Sand Soil=Solo Arenoso do Deserto Molhado -Straw=Palha -Straw Stair=Escada de Palha -Inner Straw Stair=Escada de Palha Externa -Outer Straw Stair=Escada de Palha Interna -Straw Slab=Laje de Palha -Wild Cotton=Algodão Selvagem diff --git a/mods/farming/locale/farming.ru.tr b/mods/farming/locale/farming.ru.tr index 8ec25f78..ad6249b7 100644 --- a/mods/farming/locale/farming.ru.tr +++ b/mods/farming/locale/farming.ru.tr @@ -1,28 +1,25 @@ # textdomain: farming -Hoe=Мотыга -Seed=Семена -Wooden Hoe=Деревянная мотыга -Stone Hoe=Каменная мотыга -Steel Hoe=Стальная мотыга -Bronze Hoe=Бронзовая мотыга -Mese Hoe=Мезовая мотыга -Diamond Hoe=Алмазная мотыга -Wheat Seed=Семена пшеницы -Wheat=Пшеница +Wooden Hoe=Деревянная Мотыга +Stone Hoe=Каменная Мотыга +Steel Hoe=Стальная Мотыга +Bronze Hoe=Бронзовая Мотыга +Mese Hoe=Месе Мотыга +Diamond Hoe=Алмазная Мотыга +Wheat Seed=Семена Пшеницы Flour=Мука Bread=Хлеб -Cotton Seed=Семена хлопчатника -Cotton=Хлопок +Cotton Seed=Семена Хлопка String=Нить Soil=Почва -Wet Soil=Влажная почва -Savanna Soil=Саванная почва -Wet Savanna Soil=Влажная саванная почва -Desert Sand Soil=Пустынная песчаная почва -Wet Desert Sand Soil=Влажная пустынная песчаная почва +Wet Soil=Влажная Почва +Dry Soil=Сухая Почва +Wet Dry Soil=Влажная Сухая Почва +Desert Sand Soil=Пустынная Песчаная Почва +Wet Desert Sand Soil=Влажная Пустынная Песчаная Почва Straw=Солома -Straw Stair=Соломенные ступени -Inner Straw Stair=Внутренние соломенные ступени -Outer Straw Stair=Внешние соломенные ступени -Straw Slab=Соломенная плита -Wild Cotton=Дикий хлопчатник +Straw Stair=Соломенная Ступень +Inner Straw Stair=Угловая Соломенная Ступень (Внутренний Угол) +Outer Straw Stair=Угловая Соломенная Ступень (Внешний Угол) +Straw Slab=Соломенная Плита +Wheat=Пшеница +Cotton=Хлопок diff --git a/mods/farming/locale/farming.se.tr b/mods/farming/locale/farming.se.tr new file mode 100644 index 00000000..6218e3aa --- /dev/null +++ b/mods/farming/locale/farming.se.tr @@ -0,0 +1,25 @@ +# textdomain: farming +Wooden Hoe=Träsko +Stone Hoe=Stensko +Steel Hoe=Stålsko +Bronze Hoe=Bronssko +Mese Hoe=Mesesko +Diamond Hoe=Diamantsko +Wheat Seed=Vetefrö +Flour=Mjöl +Bread=Bröd +Cotton Seed=Bollumsfrö +String=Snöra +Soil=Odlningsmark +Wet Soil=Våt Odlningsmark +Dry Soil=Torr Odlningsmark +Wet Dry Soil=Våt Torr Odlningsmark +Desert Sand Soil=Öken Sand Odlningsmark +Wet Desert Sand Soil=Våt Öken Sand Odlningsmark +Straw=Halm +Straw Stair=Halmstrappa +Inner Straw Stair=Inre Halmstrappa +Outer Straw Stair=Yttre Halmstrappa +Straw Slab=Halmplatta +Wheat=Vete +Cotton=Bomull \ No newline at end of file diff --git a/mods/farming/locale/farming.sk.tr b/mods/farming/locale/farming.sk.tr deleted file mode 100644 index 2caa4b57..00000000 --- a/mods/farming/locale/farming.sk.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Motyka -Seed=Semienko -Wooden Hoe=Drevená motyka -Stone Hoe=Kamenná motyka -Steel Hoe=Oceľová motyka -Bronze Hoe=Bronzová motyka -Mese Hoe=Mese motyka -Diamond Hoe=Diamantová motyka -Wheat Seed=Pšeničné semienko -Wheat=Pšenica -Flour=Múka -Bread=Chlieb -Cotton Seed=Bavlnené semienko -Cotton=Bavlna -String=Šňúra -Soil=Zemina -Wet Soil=Mokrá zemina -Savanna Soil=Zemina zo savany -Wet Savanna Soil=Morká zemina zo savany -Desert Sand Soil=Zemina s púšte -Wet Desert Sand Soil=Mokrá zemina s púšte -Straw=Slama -Straw Stair=Slamenné schody -Inner Straw Stair=Vnútorné slamenné schodisko -Outer Straw Stair=Vonkajšie slamenné schodisko -Straw Slab=Slamenná doska -Wild Cotton=Divoká bavlna diff --git a/mods/farming/locale/farming.sv.tr b/mods/farming/locale/farming.sv.tr deleted file mode 100644 index e6c9e685..00000000 --- a/mods/farming/locale/farming.sv.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Kratta -Seed=Frö -Wooden Hoe=Träkratta -Stone Hoe=Stenkratta -Steel Hoe=Stålkratta -Bronze Hoe=Bronskratta -Mese Hoe=Mesekratta -Diamond Hoe=Diamantkratta -Wheat Seed=Vetefrö -Wheat=Vete -Flour=Mjöl -Bread=Bröd -Cotton Seed=Bomullfrö -Cotton=Bomull -String=Snöre -Soil=Odlinngsmark -Wet Soil=Våt Odlingsmark -Savanna Soil=Savannodlingsmark -Wet Savanna Soil=Våt savannodlingsmark -Desert Sand Soil=Ökensandsodlingsmark -Wet Desert Sand Soil=Våt ökensandsodlingsmark -Straw=Halm -Straw Stair=Halmtrappa -Inner Straw Stair=Inre halmtrappa -Outer Straw Stair=Yttre halmtrappa -Straw Slab=Halmplatta -Wild Cotton= diff --git a/mods/farming/locale/farming.uk.tr b/mods/farming/locale/farming.uk.tr deleted file mode 100644 index 75e7deae..00000000 --- a/mods/farming/locale/farming.uk.tr +++ /dev/null @@ -1,28 +0,0 @@ -# textdomain: farming -Hoe=Мотика -Seed=Насіння -Wooden Hoe=Дерев'яна мотика -Stone Hoe=Кам'яна мотика -Steel Hoe=Сталева мотика -Bronze Hoe=Бронзова мотика -Mese Hoe=Месе-мотика -Diamond Hoe=Діамантова мотика -Wheat Seed=Насіння пшениці -Wheat=Пшениця -Flour=Борошно -Bread=Хліб -Cotton Seed=Насіння бавовнику -Cotton=Бавовна -String=Нитка -Soil=Ґрунт -Wet Soil=Вологий ґрунт -Savanna Soil=Саванний ґрунт -Wet Savanna Soil=Вологий саванний ґрунт -Desert Sand Soil=Пустельний піщаний ґрунт -Wet Desert Sand Soil=Вологий пустельний піщаний ґрунт -Straw=Солома -Straw Stair=Солом'яна сходинка -Inner Straw Stair=Кутова солом'яна сходинка (внутрішній кут) -Outer Straw Stair=Кутова солом'яна сходинка (зовнішній кут) -Straw Slab=Солом'яна плита -Wild Cotton=Дикий бавовник diff --git a/mods/farming/locale/farming.zh_CN.tr b/mods/farming/locale/farming.zh_CN.tr index 33ad9be4..d8562884 100644 --- a/mods/farming/locale/farming.zh_CN.tr +++ b/mods/farming/locale/farming.zh_CN.tr @@ -1,6 +1,4 @@ # textdomain: farming -Hoe=锄头 -Seed=种子 Wooden Hoe=木锄头 Stone Hoe=石锄头 Steel Hoe=铁锄头 @@ -8,16 +6,14 @@ Bronze Hoe=青铜锄头 Mese Hoe=黄石锄头 Diamond Hoe=钻石锄头 Wheat Seed=小麦种子 -Wheat=小麦 Flour=面粉 Bread=面包 Cotton Seed=棉花种子 -Cotton=棉 String=线 Soil=土 Wet Soil=湿土 -Savanna Soil=草原土 -Wet Savanna Soil=湿草原土 +Dry Soil=干土 +Wet Dry Soil=湿干土 Desert Sand Soil=沙漠沙土 Wet Desert Sand Soil=湿沙漠沙土 Straw=稻草 @@ -25,10 +21,5 @@ Straw Stair=稻草台阶 Inner Straw Stair=稻草内楼梯 Outer Straw Stair=稻草外楼梯 Straw Slab=稻草板 -Wild Cotton=野棉花 - - -##### not used anymore ##### - -Dry Soil=干土 -Wet Dry Soil=湿干土 +Wheat=小麦 +Cotton=棉 diff --git a/mods/farming/locale/farming.zh_TW.tr b/mods/farming/locale/farming.zh_TW.tr index 36037af0..f1b7a7a6 100644 --- a/mods/farming/locale/farming.zh_TW.tr +++ b/mods/farming/locale/farming.zh_TW.tr @@ -1,6 +1,4 @@ # textdomain: farming -Hoe=鋤頭 -Seed=種子 Wooden Hoe=木鋤頭 Stone Hoe=石鋤頭 Steel Hoe=鐵鋤頭 @@ -8,16 +6,14 @@ Bronze Hoe=青銅鋤頭 Mese Hoe=黃石鋤頭 Diamond Hoe=鑽石鋤頭 Wheat Seed=小麥種子 -Wheat=小麥 Flour=麵粉 Bread=麵包 Cotton Seed=棉花種子 -Cotton=棉 String=線 Soil=土 Wet Soil=溼土 -Savanna Soil=草原土 -Wet Savanna Soil=溼草原土 +Dry Soil=乾土 +Wet Dry Soil=溼乾土 Desert Sand Soil=沙漠沙土 Wet Desert Sand Soil=溼沙漠沙土 Straw=稻草 @@ -25,10 +21,5 @@ Straw Stair=稻草臺階 Inner Straw Stair=稻草內樓梯 Outer Straw Stair=稻草外樓梯 Straw Slab=稻草板 -Wild Cotton=野生棉花 - - -##### not used anymore ##### - -Dry Soil=乾土 -Wet Dry Soil=溼乾土 +Wheat=小麥 +Cotton=棉 diff --git a/mods/farming/locale/template.txt b/mods/farming/locale/template.txt index af923474..2f4248bd 100644 --- a/mods/farming/locale/template.txt +++ b/mods/farming/locale/template.txt @@ -1,19 +1,4 @@ # textdomain: farming -Hoe= -Seed= -Wooden Hoe= -Stone Hoe= -Steel Hoe= -Bronze Hoe= -Mese Hoe= -Diamond Hoe= -Wheat Seed= -Wheat= -Flour= -Bread= -Cotton Seed= -Cotton= -String= Soil= Wet Soil= Savanna Soil= @@ -26,3 +11,18 @@ Inner Straw Stair= Outer Straw Stair= Straw Slab= Wild Cotton= +Wheat Seed= +Wheat= +Flour= +Bread= +Cotton Seed= +Cotton= +String= +Wooden Hoe= +Stone Hoe= +Steel Hoe= +Bronze Hoe= +Mese Hoe= +Diamond Hoe= +Hoe= +Seed= diff --git a/mods/farming/textures/farming_bread.png b/mods/farming/textures/farming_bread.png index 16b25f19..0c25678c 100644 Binary files a/mods/farming/textures/farming_bread.png and b/mods/farming/textures/farming_bread.png differ diff --git a/mods/farming/textures/farming_cotton_5.png b/mods/farming/textures/farming_cotton_5.png index 520e8f6c..3e890855 100644 Binary files a/mods/farming/textures/farming_cotton_5.png and b/mods/farming/textures/farming_cotton_5.png differ diff --git a/mods/farming/textures/farming_cotton_7.png b/mods/farming/textures/farming_cotton_7.png index 11c0cf6d..466d40a2 100644 Binary files a/mods/farming/textures/farming_cotton_7.png and b/mods/farming/textures/farming_cotton_7.png differ diff --git a/mods/farming/textures/farming_cotton_8.png b/mods/farming/textures/farming_cotton_8.png index 4450a2c4..f835ba5b 100644 Binary files a/mods/farming/textures/farming_cotton_8.png and b/mods/farming/textures/farming_cotton_8.png differ diff --git a/mods/farming/textures/farming_cotton_wild.png b/mods/farming/textures/farming_cotton_wild.png index fba344c7..0107ad4a 100644 Binary files a/mods/farming/textures/farming_cotton_wild.png and b/mods/farming/textures/farming_cotton_wild.png differ diff --git a/mods/farming/textures/farming_soil.png b/mods/farming/textures/farming_soil.png index 31504258..5cd3e681 100644 Binary files a/mods/farming/textures/farming_soil.png and b/mods/farming/textures/farming_soil.png differ diff --git a/mods/farming/textures/farming_soil_wet.png b/mods/farming/textures/farming_soil_wet.png index 2eb2c3cd..0b4487d8 100644 Binary files a/mods/farming/textures/farming_soil_wet.png and b/mods/farming/textures/farming_soil_wet.png differ diff --git a/mods/farming/textures/farming_wheat.png b/mods/farming/textures/farming_wheat.png index 435d5df5..1e0ad3b3 100644 Binary files a/mods/farming/textures/farming_wheat.png and b/mods/farming/textures/farming_wheat.png differ diff --git a/mods/farming/textures/farming_wheat_3.png b/mods/farming/textures/farming_wheat_3.png index 9d90ac14..36ebb192 100644 Binary files a/mods/farming/textures/farming_wheat_3.png and b/mods/farming/textures/farming_wheat_3.png differ diff --git a/mods/farming/textures/farming_wheat_4.png b/mods/farming/textures/farming_wheat_4.png index 14d055fb..735ed777 100644 Binary files a/mods/farming/textures/farming_wheat_4.png and b/mods/farming/textures/farming_wheat_4.png differ diff --git a/mods/farming/textures/farming_wheat_5.png b/mods/farming/textures/farming_wheat_5.png index 5b88c578..f40b5f04 100644 Binary files a/mods/farming/textures/farming_wheat_5.png and b/mods/farming/textures/farming_wheat_5.png differ diff --git a/mods/farming/textures/farming_wheat_7.png b/mods/farming/textures/farming_wheat_7.png index 6b7bb4b9..cc26ca96 100644 Binary files a/mods/farming/textures/farming_wheat_7.png and b/mods/farming/textures/farming_wheat_7.png differ diff --git a/mods/fire/README.txt b/mods/fire/README.txt index eb3e1e24..25ba26ef 100644 --- a/mods/fire/README.txt +++ b/mods/fire/README.txt @@ -5,7 +5,7 @@ See license.txt for license information. Authors of source code ---------------------- Originally by Perttu Ahola (celeron55) (LGPLv2.1+) -Various Minetest Game developers and contributors (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) Authors of media (textures and sounds) -------------------------------------- diff --git a/mods/fire/init.lua b/mods/fire/init.lua index 538cfa6f..b69a7311 100644 --- a/mods/fire/init.lua +++ b/mods/fire/init.lua @@ -92,7 +92,7 @@ minetest.register_tool("fire:flint_and_steel", { on_use = function(itemstack, user, pointed_thing) local sound_pos = pointed_thing.above or user:get_pos() minetest.sound_play("fire_flint_and_steel", - {pos = sound_pos, gain = 0.2, max_hear_distance = 8}, true) + {pos = sound_pos, gain = 0.5, max_hear_distance = 8}, true) local player_name = user:get_player_name() if pointed_thing.type == "node" then local node_under = minetest.get_node(pointed_thing.under).name @@ -101,25 +101,21 @@ minetest.register_tool("fire:flint_and_steel", { return end if minetest.is_protected(pointed_thing.under, player_name) then - minetest.record_protection_violation(pointed_thing.under, player_name) + minetest.chat_send_player(player_name, "This area is protected") return end if nodedef.on_ignite then nodedef.on_ignite(pointed_thing.under, user) elseif minetest.get_item_group(node_under, "flammable") >= 1 and minetest.get_node(pointed_thing.above).name == "air" then - if minetest.is_protected(pointed_thing.above, player_name) then - minetest.record_protection_violation(pointed_thing.above, player_name) - return - end - minetest.set_node(pointed_thing.above, {name = "fire:basic_flame"}) end end - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(player_name)) then -- Wear tool local wdef = itemstack:get_definition() - itemstack:add_wear_by_uses(66) + itemstack:add_wear(1000) -- Tool break sound if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then diff --git a/mods/fire/license.txt b/mods/fire/license.txt index 9f2aca92..43f9cd7f 100644 --- a/mods/fire/license.txt +++ b/mods/fire/license.txt @@ -3,7 +3,7 @@ License of source code GNU Lesser General Public License, version 2.1 Copyright (C) 2012-2016 celeron55, Perttu Ahola -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; diff --git a/mods/fire/locale/fire.bg.tr b/mods/fire/locale/fire.bg.tr deleted file mode 100755 index 300799e8..00000000 --- a/mods/fire/locale/fire.bg.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Огън -Permanent Fire=Вечен огън -Flint and Steel=Кремък и стомана diff --git a/mods/fire/locale/fire.eo.tr b/mods/fire/locale/fire.eo.tr deleted file mode 100644 index c1e992be..00000000 --- a/mods/fire/locale/fire.eo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Fajro -Permanent Fire=Ĉiama fajro -Flint and Steel=Siliko kaj ŝtalo diff --git a/mods/fire/locale/fire.es.tr b/mods/fire/locale/fire.es.tr index 4ce3f328..8c1b6045 100644 --- a/mods/fire/locale/fire.es.tr +++ b/mods/fire/locale/fire.es.tr @@ -1,4 +1,3 @@ # textdomain: fire -Fire=Fuego -Permanent Fire=Fuego permanente +Permanent Flame=Llama permanente Flint and Steel=Yesca y pedernal diff --git a/mods/fire/locale/fire.eu.tr b/mods/fire/locale/fire.eu.tr deleted file mode 100644 index c78cd8cf..00000000 --- a/mods/fire/locale/fire.eu.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Sua -Permanent Fire=Su iraunkorra -Flint and Steel=Suharria eta Altzairua diff --git a/mods/fire/locale/fire.fr.tr b/mods/fire/locale/fire.fr.tr index 6218c53c..268e823a 100644 --- a/mods/fire/locale/fire.fr.tr +++ b/mods/fire/locale/fire.fr.tr @@ -1,9 +1,3 @@ # textdomain: fire -Fire=Feu -Permanent Fire=Feu qui brûle en permanence -Flint and Steel=Briquet à silex en acier - - -##### not used anymore ##### - Permanent Flame=Flamme permanente +Flint and Steel=Briquet à silex en acier diff --git a/mods/fire/locale/fire.id.tr b/mods/fire/locale/fire.id.tr index a6d2da55..60c1c01b 100644 --- a/mods/fire/locale/fire.id.tr +++ b/mods/fire/locale/fire.id.tr @@ -1,4 +1,4 @@ # textdomain: fire Fire=Api Permanent Fire=Api Abadi -Flint and Steel=Pemantik Api +Flint and Steel=Pemantik diff --git a/mods/fire/locale/fire.it.tr b/mods/fire/locale/fire.it.tr index 14ad3828..03e8c874 100644 --- a/mods/fire/locale/fire.it.tr +++ b/mods/fire/locale/fire.it.tr @@ -1,9 +1,3 @@ -# textdomain: fire -Fire= -Permanent Fire= -Flint and Steel=Acciarino - - -##### not used anymore ##### - -Permanent Flame=Fiamma permanente +# textdomain: fire +Permanent Flame=Fiamma permanente +Flint and Steel=Acciarino \ No newline at end of file diff --git a/mods/fire/locale/fire.ja.tr b/mods/fire/locale/fire.ja.tr deleted file mode 100644 index bf5fec4e..00000000 --- a/mods/fire/locale/fire.ja.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=炎 -Permanent Fire=燃え続ける炎 -Flint and Steel=火打ち石と打ち金 diff --git a/mods/fire/locale/fire.jbo.tr b/mods/fire/locale/fire.jbo.tr deleted file mode 100644 index b081236d..00000000 --- a/mods/fire/locale/fire.jbo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=lo fagri -Permanent Fire=lo vitno fagri -Flint and Steel=lo fakro'i jo'u gasta diff --git a/mods/fire/locale/fire.lv.tr b/mods/fire/locale/fire.lv.tr deleted file mode 100644 index b9b50ef8..00000000 --- a/mods/fire/locale/fire.lv.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Uguns -Permanent Fire=Mūžīgā uguns -Flint and Steel=Krams un zāģītis diff --git a/mods/fire/locale/fire.ms.tr b/mods/fire/locale/fire.ms.tr index e43f26c1..67b5bbeb 100644 --- a/mods/fire/locale/fire.ms.tr +++ b/mods/fire/locale/fire.ms.tr @@ -1,9 +1,3 @@ # textdomain: fire -Fire=Api -Permanent Fire=Api Abadi -Flint and Steel=Pemetik Api - - -##### not used anymore ##### - Permanent Flame=Api Abadi +Flint and Steel=Pemetik Api diff --git a/mods/fire/locale/fire.pl.tr b/mods/fire/locale/fire.pl.tr deleted file mode 100644 index a19e6aff..00000000 --- a/mods/fire/locale/fire.pl.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Ogień -Permanent Fire=Stały ogień -Flint and Steel=Zapalniczka diff --git a/mods/fire/locale/fire.pt.tr b/mods/fire/locale/fire.pt.tr deleted file mode 100644 index 4a84b6e5..00000000 --- a/mods/fire/locale/fire.pt.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Fogo -Permanent Fire=Fogo Permanente -Flint and Steel=Pederneira Primitiva diff --git a/mods/fire/locale/fire.pt_BR.tr b/mods/fire/locale/fire.pt_BR.tr deleted file mode 100644 index 4a84b6e5..00000000 --- a/mods/fire/locale/fire.pt_BR.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Fogo -Permanent Fire=Fogo Permanente -Flint and Steel=Pederneira Primitiva diff --git a/mods/fire/locale/fire.ru.tr b/mods/fire/locale/fire.ru.tr index 5b38a8c1..e10813b6 100644 --- a/mods/fire/locale/fire.ru.tr +++ b/mods/fire/locale/fire.ru.tr @@ -1,4 +1,3 @@ # textdomain: fire -Fire=Огонь -Permanent Fire=Вечный огонь -Flint and Steel=Огниво \ No newline at end of file +Permanent Flame=Вечный Огонь +Flint and Steel=Огниво и Сталь diff --git a/mods/fire/locale/fire.se.tr b/mods/fire/locale/fire.se.tr new file mode 100644 index 00000000..622925dd --- /dev/null +++ b/mods/fire/locale/fire.se.tr @@ -0,0 +1,3 @@ +# textdomain: fire +Permanent Flame=Permanent Eld +Flint and Steel=Flinta och Stål \ No newline at end of file diff --git a/mods/fire/locale/fire.sk.tr b/mods/fire/locale/fire.sk.tr deleted file mode 100644 index 125c8603..00000000 --- a/mods/fire/locale/fire.sk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Oheň -Permanent Fire=Stály oheň -Flint and Steel=Pazúrik a ocieľka diff --git a/mods/fire/locale/fire.sv.tr b/mods/fire/locale/fire.sv.tr deleted file mode 100644 index 28e9a4a2..00000000 --- a/mods/fire/locale/fire.sv.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Eld -Permanent Fire=Permanent eld -Flint and Steel=Flinta och stål diff --git a/mods/fire/locale/fire.uk.tr b/mods/fire/locale/fire.uk.tr deleted file mode 100644 index da202aa7..00000000 --- a/mods/fire/locale/fire.uk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: fire -Fire=Вогонь -Permanent Fire=Вічний вогонь -Flint and Steel=Кресало diff --git a/mods/fire/locale/fire.zh_CN.tr b/mods/fire/locale/fire.zh_CN.tr index 7b0a4727..b28157eb 100644 --- a/mods/fire/locale/fire.zh_CN.tr +++ b/mods/fire/locale/fire.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: fire -Fire=火焰 Permanent Fire=永久火焰 -Flint and Steel=火石和划片 +Flint and Steel=火石和钢 +Fire=火焰 diff --git a/mods/fire/locale/fire.zh_TW.tr b/mods/fire/locale/fire.zh_TW.tr index 9e3d7663..2e7e9ddd 100644 --- a/mods/fire/locale/fire.zh_TW.tr +++ b/mods/fire/locale/fire.zh_TW.tr @@ -1,4 +1,4 @@ # textdomain: fire -Fire=火焰 Permanent Fire=永久火焰 Flint and Steel=火石和鋼 +Fire=火焰 diff --git a/mods/fireflies/init.lua b/mods/fireflies/init.lua index 827ed983..1c533a12 100644 --- a/mods/fireflies/init.lua +++ b/mods/fireflies/init.lua @@ -3,8 +3,6 @@ -- Load support for MT game translation. local S = minetest.get_translator("fireflies") --- Legacy compatibility, when pointabilities don't exist, pointable is set to true. -local pointable_compat = not minetest.features.item_specific_pointabilities minetest.register_node("fireflies:firefly", { description = S("Firefly"), @@ -25,7 +23,6 @@ minetest.register_node("fireflies:firefly", { sunlight_propagates = true, buildable_to = true, walkable = false, - pointable = pointable_compat, groups = {catchable = 1}, selection_box = { type = "fixed", @@ -33,8 +30,18 @@ minetest.register_node("fireflies:firefly", { }, light_source = 6, floodable = true, - on_construct = function(pos) - minetest.get_node_timer(pos):start(1) + on_place = function(itemstack, placer, pointed_thing) + local player_name = placer:get_player_name() + local pos = pointed_thing.above + + if not minetest.is_protected(pos, player_name) and + not minetest.is_protected(pointed_thing.under, player_name) and + minetest.get_node(pos).name == "air" then + minetest.set_node(pos, {name = "fireflies:firefly"}) + minetest.get_node_timer(pos):start(1) + itemstack:take_item() + end + return itemstack end, on_timer = function(pos, elapsed) if minetest.get_node_light(pos) > 11 then @@ -47,8 +54,8 @@ minetest.register_node("fireflies:firefly", { minetest.register_node("fireflies:hidden_firefly", { description = S("Hidden Firefly"), drawtype = "airlike", - inventory_image = "fireflies_firefly.png^default_invisible_node_overlay.png", - wield_image = "fireflies_firefly.png^default_invisible_node_overlay.png", + inventory_image = "fireflies_firefly.png", + wield_image = "fireflies_firefly.png", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -58,8 +65,18 @@ minetest.register_node("fireflies:hidden_firefly", { drop = "", groups = {not_in_creative_inventory = 1}, floodable = true, - on_construct = function(pos) - minetest.get_node_timer(pos):start(1) + on_place = function(itemstack, placer, pointed_thing) + local player_name = placer:get_player_name() + local pos = pointed_thing.above + + if not minetest.is_protected(pos, player_name) and + not minetest.is_protected(pointed_thing.under, player_name) and + minetest.get_node(pos).name == "air" then + minetest.set_node(pos, {name = "fireflies:hidden_firefly"}) + minetest.get_node_timer(pos):start(1) + itemstack:take_item() + end + return itemstack end, on_timer = function(pos, elapsed) if minetest.get_node_light(pos) <= 11 then @@ -74,12 +91,26 @@ minetest.register_node("fireflies:hidden_firefly", { minetest.register_tool("fireflies:bug_net", { description = S("Bug Net"), inventory_image = "fireflies_bugnet.png", - pointabilities = {nodes = {["group:catchable"] = true}}, - tool_capabilities = { - groupcaps = { - catchable = { maxlevel = 1, uses = 256, times = { [1] = 0, [2] = 0, [3] = 0 } } - }, - }, + on_use = function(itemstack, player, pointed_thing) + if not pointed_thing or pointed_thing.type ~= "node" or + minetest.is_protected(pointed_thing.under, player:get_player_name()) then + return + end + local node_name = minetest.get_node(pointed_thing.under).name + local inv = player:get_inventory() + if minetest.get_item_group(node_name, "catchable") == 1 then + minetest.set_node(pointed_thing.under, {name = "air"}) + local stack = ItemStack(node_name.." 1") + local leftover = inv:add_item("main", stack) + if leftover:get_count() > 0 then + minetest.add_item(pointed_thing.under, node_name.." 1") + end + end + if not (creative and creative.is_enabled_for(player:get_player_name())) then + itemstack:add_wear(256) + return itemstack + end + end }) minetest.register_craft( { diff --git a/mods/fireflies/locale/fireflies.bg.tr b/mods/fireflies/locale/fireflies.bg.tr deleted file mode 100755 index 60228479..00000000 --- a/mods/fireflies/locale/fireflies.bg.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Светулка -Hidden Firefly=Скрита светулка -Bug Net=Сак за насекоми -Firefly in a Bottle=Светулка в буркан diff --git a/mods/fireflies/locale/fireflies.eo.tr b/mods/fireflies/locale/fireflies.eo.tr deleted file mode 100644 index 0eaa2cb7..00000000 --- a/mods/fireflies/locale/fireflies.eo.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Lampiro -Hidden Firefly=Kaŝita lampiro -Bug Net=Insekta reto -Firefly in a Bottle=Lampiro en botelo diff --git a/mods/fireflies/locale/fireflies.eu.tr b/mods/fireflies/locale/fireflies.eu.tr deleted file mode 100644 index b3321fcc..00000000 --- a/mods/fireflies/locale/fireflies.eu.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Ipurtargia -Hidden Firefly=Ezkutuk ipurtargi -Bug Net=Intsektu-sarea -Firefly in a Bottle=Ipurtargia botilan diff --git a/mods/fireflies/locale/fireflies.it.tr b/mods/fireflies/locale/fireflies.it.tr index 22ad57b3..130b2481 100644 --- a/mods/fireflies/locale/fireflies.it.tr +++ b/mods/fireflies/locale/fireflies.it.tr @@ -1,5 +1,5 @@ -# textdomain: fireflies -Firefly=Lucciola -Hidden Firefly=Lucciola nascosta -Bug Net=Retino -Firefly in a Bottle=Lucciola imbottigliata +# textdomain: fireflies +Firefly=Lucciola +Hidden Firefly=Lucciola nascosta +Bug Net=Retino +Firefly in a Bottle=Lucciola imbottigliata \ No newline at end of file diff --git a/mods/fireflies/locale/fireflies.ja.tr b/mods/fireflies/locale/fireflies.ja.tr deleted file mode 100644 index 4116ca2f..00000000 --- a/mods/fireflies/locale/fireflies.ja.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=ホタル -Hidden Firefly=隠されたホタル -Bug Net=虫取り網 -Firefly in a Bottle=ホタルの入った瓶 diff --git a/mods/fireflies/locale/fireflies.jbo.tr b/mods/fireflies/locale/fireflies.jbo.tr deleted file mode 100644 index 4e69ab49..00000000 --- a/mods/fireflies/locale/fireflies.jbo.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=lo gusycinki -Hidden Firefly=lo se mipri gusycinki -Bug Net=lo cinki julne -Firefly in a Bottle=lo gusycinki poi nenri lo botpi diff --git a/mods/fireflies/locale/fireflies.lv.tr b/mods/fireflies/locale/fireflies.lv.tr deleted file mode 100644 index 7bb65207..00000000 --- a/mods/fireflies/locale/fireflies.lv.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Jāņtārpiņš -Hidden Firefly=Paslēpts jāņtārpiņš -Bug Net=Ķeramtīkls -Firefly in a Bottle=Jāņtārpiņš pudelē diff --git a/mods/fireflies/locale/fireflies.pl.tr b/mods/fireflies/locale/fireflies.pl.tr deleted file mode 100644 index b07152b9..00000000 --- a/mods/fireflies/locale/fireflies.pl.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Świetlik -Hidden Firefly=Ukryty świetlik -Bug Net=Siatka na owady -Firefly in a Bottle=Świetlik w butelce diff --git a/mods/fireflies/locale/fireflies.pt_BR.tr b/mods/fireflies/locale/fireflies.pt_BR.tr deleted file mode 100644 index 543c00b7..00000000 --- a/mods/fireflies/locale/fireflies.pt_BR.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Vaga-lume -Hidden Firefly=Vaga-lume escondido -Bug Net=Rede de Insetos -Firefly in a Bottle=Vaga-lume em uma garrafa diff --git a/mods/fireflies/locale/fireflies.ru.tr b/mods/fireflies/locale/fireflies.ru.tr index 8c50a7da..c05f2884 100644 --- a/mods/fireflies/locale/fireflies.ru.tr +++ b/mods/fireflies/locale/fireflies.ru.tr @@ -1,5 +1,5 @@ # textdomain: fireflies Firefly=Светлячок -Hidden Firefly=Притаившийся светлячок -Bug Net=Сачок -Firefly in a Bottle=Светлячок в бутылке +Hidden Firefly=Притаившийся Светлячок +Bug Net=Сачок Для Ловли Насекомых +Firefly in a Bottle=Светлячок в Бутылке diff --git a/mods/fireflies/locale/fireflies.se.tr b/mods/fireflies/locale/fireflies.se.tr new file mode 100644 index 00000000..1bff7820 --- /dev/null +++ b/mods/fireflies/locale/fireflies.se.tr @@ -0,0 +1,5 @@ +# textdomain: fireflies +Firefly=Eldfluga +Hidden Firefly=Gömd Eldfluga +Bug Net=Buggernät +Firefly in a Bottle=Eldfluga i en flaska \ No newline at end of file diff --git a/mods/fireflies/locale/fireflies.sk.tr b/mods/fireflies/locale/fireflies.sk.tr deleted file mode 100644 index b68674dd..00000000 --- a/mods/fireflies/locale/fireflies.sk.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Svetluška -Hidden Firefly=Skrytá svetluška -Bug Net=Sieťka na hmyz -Firefly in a Bottle=Svetluška vo fľaši diff --git a/mods/fireflies/locale/fireflies.sv.tr b/mods/fireflies/locale/fireflies.sv.tr deleted file mode 100644 index d8016f99..00000000 --- a/mods/fireflies/locale/fireflies.sv.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Eldfluga -Hidden Firefly=Gömd eldfluga -Bug Net=Insektshåv -Firefly in a Bottle=Eldfluga i en flaska diff --git a/mods/fireflies/locale/fireflies.uk.tr b/mods/fireflies/locale/fireflies.uk.tr deleted file mode 100644 index f1bcb163..00000000 --- a/mods/fireflies/locale/fireflies.uk.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Світляк -Hidden Firefly=Світляк, що причаївся -Bug Net=Сачок -Firefly in a Bottle=Світляк у пляшці diff --git a/mods/fireflies/textures/fireflies_bottle_animated.png b/mods/fireflies/textures/fireflies_bottle_animated.png index 294ff974..96062b3c 100644 Binary files a/mods/fireflies/textures/fireflies_bottle_animated.png and b/mods/fireflies/textures/fireflies_bottle_animated.png differ diff --git a/mods/flowers/README.txt b/mods/flowers/README.txt index 1cb02a75..4b3149c4 100644 --- a/mods/flowers/README.txt +++ b/mods/flowers/README.txt @@ -5,7 +5,7 @@ See license.txt for license information. Authors of source code ---------------------- Originally by Ironzorg (MIT) and VanessaE (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) --------------------------- diff --git a/mods/flowers/init.lua b/mods/flowers/init.lua index 6456216f..97317501 100644 --- a/mods/flowers/init.lua +++ b/mods/flowers/init.lua @@ -1,6 +1,6 @@ -- flowers/init.lua --- Minetest Game mod: flowers +-- Minetest 0.4 mod: default -- See README.txt for licensing and other information. @@ -248,7 +248,7 @@ end minetest.register_abm({ label = "Mushroom spread", - nodenames = {"group:mushroom"}, + nodenames = {"flowers:mushroom_brown", "flowers:mushroom_red"}, interval = 11, chance = 150, action = function(...) @@ -279,7 +279,6 @@ local waterlily_def = { tiles = {"flowers_waterlily.png", "flowers_waterlily_bottom.png"}, inventory_image = "flowers_waterlily.png", wield_image = "flowers_waterlily.png", - use_texture_alpha = "clip", liquids_pointable = true, walkable = false, buildable_to = true, @@ -313,7 +312,8 @@ local waterlily_def = { minetest.set_node(pos, {name = "flowers:waterlily" .. (def.waving == 3 and "_waving" or ""), param2 = math.random(0, 3)}) - if not minetest.is_creative_enabled(player_name) then + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(player_name)) then itemstack:take_item() end else diff --git a/mods/flowers/license.txt b/mods/flowers/license.txt index 4cd70249..419ebe5a 100644 --- a/mods/flowers/license.txt +++ b/mods/flowers/license.txt @@ -3,7 +3,7 @@ License of source code The MIT License (MIT) Copyright (C) 2012-2016 Ironzorg, VanessaE -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/flowers/locale/flowers.bg.tr b/mods/flowers/locale/flowers.bg.tr deleted file mode 100755 index bee898cf..00000000 --- a/mods/flowers/locale/flowers.bg.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Червена роза -Orange Tulip=Оранжево лале -Yellow Dandelion=Жълтурче -Green Chrysanthemum=Зелена хризантема -Blue Geranium=Син здравец -Viola=Виолетка -White Dandelion=Глухарче -Black Tulip=Черно лале -Red Mushroom=Червена гъба -Brown Mushroom=Кафява гъба -Waterlily=Водна лилия diff --git a/mods/flowers/locale/flowers.eo.tr b/mods/flowers/locale/flowers.eo.tr deleted file mode 100644 index 076df181..00000000 --- a/mods/flowers/locale/flowers.eo.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Ruĝa rozo -Orange Tulip=Oranĝkolora tulipo -Yellow Dandelion=Flava leontodo -Green Chrysanthemum=Verda krizantemo -Blue Geranium=Blua geranio -Viola=Violo -White Dandelion=Blanka leontodo -Black Tulip=Nigra tulipo -Red Mushroom=Ruĝa fungo -Brown Mushroom=Bruna fungo -Waterlily=Nimfeo diff --git a/mods/flowers/locale/flowers.eu.tr b/mods/flowers/locale/flowers.eu.tr deleted file mode 100644 index 10157976..00000000 --- a/mods/flowers/locale/flowers.eu.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Arrosa gorria -Orange Tulip=Tulipan laranja -Yellow Dandelion=Txikoria-belar horia -Green Chrysanthemum=Krisantemo berdea -Blue Geranium=Geranio urdina -Viola=Pentsamendua -White Dandelion=Txikoria-belar zuria -Black Tulip=Tulipan beltza -Red Mushroom=Perretxiko gorria -Brown Mushroom=Perretxiko marroia -Waterlily=Nenufarra diff --git a/mods/flowers/locale/flowers.it.tr b/mods/flowers/locale/flowers.it.tr index 1ab49dd4..e273941f 100644 --- a/mods/flowers/locale/flowers.it.tr +++ b/mods/flowers/locale/flowers.it.tr @@ -1,12 +1,12 @@ -# textdomain: flowers -Red Rose=Rosa rossa -Orange Tulip=Tulipano arancione -Yellow Dandelion=Dente di leone giallo -Green Chrysanthemum=Crisantemo verde -Blue Geranium=Geranio blu -Viola=Viola -White Dandelion=Dente di leone bianco -Black Tulip=Tulipano nero -Red Mushroom=Fungo rosso -Brown Mushroom=Fungo marrone -Waterlily=Ninfea +# textdomain: flowers +Red Rose=Rosa rossa +Orange Tulip=Tulipano arancione +Yellow Dandelion=Dente di leone giallo +Green Chrysanthemum=Crisantemo verde +Blue Geranium=Geranio blu +Viola=Viola +White Dandelion=Dente di leone bianco +Black Tulip=Tulipano nero +Red Mushroom=Fungo rosso +Brown Mushroom=Fungo marrone +Waterlily=Ninfea \ No newline at end of file diff --git a/mods/flowers/locale/flowers.ja.tr b/mods/flowers/locale/flowers.ja.tr deleted file mode 100644 index bea87e27..00000000 --- a/mods/flowers/locale/flowers.ja.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=赤色のバラ -Orange Tulip=橙色のチューリップ -Yellow Dandelion=黄色のタンポポ -Green Chrysanthemum=緑色のキク -Blue Geranium=青色のゼラニウム -Viola=ビオラ -White Dandelion=白色のタンポポ -Black Tulip=黒色のチューリップ -Red Mushroom=赤色のキノコ -Brown Mushroom=茶色のキノコ -Waterlily=スイレン diff --git a/mods/flowers/locale/flowers.jbo.tr b/mods/flowers/locale/flowers.jbo.tr deleted file mode 100644 index 1df06ec5..00000000 --- a/mods/flowers/locale/flowers.jbo.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=lo xunre rozgu -Orange Tulip=lo narju tujli -Yellow Dandelion=lo pelxu spatrtaraksaku -Green Chrysanthemum=lo crino xrisantemo -Blue Geranium=lo blanu plargoni -Viola=lo spatrvi'ola -White Dandelion=lo blabi spatrtaraksaku -Black Tulip=lo xekri tujli -Red Mushroom=lo xunre ledgrute -Brown Mushroom=lo bunre ledgrute -Waterlily=lo jacrulspa diff --git a/mods/flowers/locale/flowers.lv.tr b/mods/flowers/locale/flowers.lv.tr deleted file mode 100644 index 315272d8..00000000 --- a/mods/flowers/locale/flowers.lv.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Sarkanā roze -Orange Tulip=Oranžā tulpe -Yellow Dandelion=Dzeltena pienene -Green Chrysanthemum=Zaļā krizantema -Blue Geranium=Zilā ģerānija -Viola=Vijolīte -White Dandelion=Balta pienene -Black Tulip=Melnā tulpe -Red Mushroom=Sarkanā sēne -Brown Mushroom=Brūnā sēne -Waterlily=Ūdensroze diff --git a/mods/flowers/locale/flowers.pl.tr b/mods/flowers/locale/flowers.pl.tr deleted file mode 100644 index ff6a5e20..00000000 --- a/mods/flowers/locale/flowers.pl.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Czerwona róża -Orange Tulip=Pomarańczowy tulipan -Yellow Dandelion=Żółty mlecz -Green Chrysanthemum=Zielona chryzantema -Blue Geranium=Niebieska pelargonia -Viola=Fiołek -White Dandelion=Biały mlecz -Black Tulip=Czarny tulipan -Red Mushroom=Czerwony muchomor -Brown Mushroom=Brązowy grzyb -Waterlily=Lilia wodna diff --git a/mods/flowers/locale/flowers.pt_BR.tr b/mods/flowers/locale/flowers.pt_BR.tr deleted file mode 100644 index 1f5ff929..00000000 --- a/mods/flowers/locale/flowers.pt_BR.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Rosa Vermelha -Orange Tulip=Tulipa Laranja -Yellow Dandelion=Dente-de-leão Amarelo -Green Chrysanthemum=Crisântemo Verde -Blue Geranium=Gerânio Azul -Viola=Violeta -White Dandelion=Dente-de-leão Branco -Black Tulip=Tulipa Negra -Red Mushroom=Cogumelo Vermelho -Brown Mushroom=Cogumelo Marrom -Waterlily=Nenúfar diff --git a/mods/flowers/locale/flowers.ru.tr b/mods/flowers/locale/flowers.ru.tr index 0d129a58..d861e2a4 100644 --- a/mods/flowers/locale/flowers.ru.tr +++ b/mods/flowers/locale/flowers.ru.tr @@ -1,12 +1,12 @@ # textdomain: flowers -Red Rose=Красная роза -Orange Tulip=Оранжевый тюльпан -Yellow Dandelion=Жёлтый одуванчик -Green Chrysanthemum=Зелёная хризантема -Blue Geranium=Синяя герань +Red Rose=Красная Роза +Orange Tulip=Оранжевый Тюльпан +Yellow Dandelion=Желтый Одуванчик +Green Chrysanthemum=Зелёная Хризантема +Blue Geranium=Синяя Герань Viola=Фиалка -White Dandelion=Белый одуванчик -Black Tulip=Чёрный тюльпан -Red Mushroom=Красный гриб -Brown Mushroom=Коричневый гриб -Waterlily=Лилия +White Dandelion=Белый Одуванчик +Black Tulip=Черный Тюльпан +Red Mushroom=Мухомор +Brown Mushroom=Коричневый Гриб +Waterlily=Кувшинка diff --git a/mods/flowers/locale/flowers.se.tr b/mods/flowers/locale/flowers.se.tr new file mode 100644 index 00000000..1bee6458 --- /dev/null +++ b/mods/flowers/locale/flowers.se.tr @@ -0,0 +1,12 @@ +# textdomain: flowers +Red Rose=Röd ros +Orange Tulip=Orange Tulpan +Yellow Dandelion=Gul Maskros +Green Chrysanthemum=Grön Krysantemum +Blue Geranium=Blå Geranium +Viola=Violett Viola +White Dandelion=Vit Maskros +Black Tulip=Svart Tulpan +Red Mushroom=Röd Svamp +Brown Mushroom=Brun Svamp +Waterlily=Näckros \ No newline at end of file diff --git a/mods/flowers/locale/flowers.sk.tr b/mods/flowers/locale/flowers.sk.tr deleted file mode 100644 index 75d4ae1e..00000000 --- a/mods/flowers/locale/flowers.sk.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Červená ruža -Orange Tulip=Oranžový tulipán -Yellow Dandelion=Žltá púpava -Green Chrysanthemum=Zelená chryzantéma -Blue Geranium=Modrý muškát -Viola=Fialka -White Dandelion=Biela púpava -Black Tulip=Čierny tulipán -Red Mushroom=Červená huba -Brown Mushroom=Hnedá huba -Waterlily=Lekno diff --git a/mods/flowers/locale/flowers.sv.tr b/mods/flowers/locale/flowers.sv.tr deleted file mode 100644 index c8a26a3d..00000000 --- a/mods/flowers/locale/flowers.sv.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Röd ros -Orange Tulip=Orange tulpan -Yellow Dandelion=Gul maskros -Green Chrysanthemum=Grön krysantemum -Blue Geranium=Blå geranium -Viola=Violett viola -White Dandelion=Vit maskros -Black Tulip=Svart tulpan -Red Mushroom=Röd svamp -Brown Mushroom=Brun svamp -Waterlily=Näckros diff --git a/mods/flowers/locale/flowers.uk.tr b/mods/flowers/locale/flowers.uk.tr deleted file mode 100644 index 56200293..00000000 --- a/mods/flowers/locale/flowers.uk.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Червона троянда -Orange Tulip=Помаранчевий тюльпан -Yellow Dandelion=Жовта кульбаба -Green Chrysanthemum=Зелена хризантема -Blue Geranium=Синій журавець -Viola=Фіалка -White Dandelion=Біла кульбаба -Black Tulip=Чорний тюльпан -Red Mushroom=Червоний гриб -Brown Mushroom=Коричневий гриб -Waterlily=Латаття diff --git a/mods/flowers/textures/flowers_chrysanthemum_green.png b/mods/flowers/textures/flowers_chrysanthemum_green.png index 01d8c7e3..11980463 100644 Binary files a/mods/flowers/textures/flowers_chrysanthemum_green.png and b/mods/flowers/textures/flowers_chrysanthemum_green.png differ diff --git a/mods/flowers/textures/flowers_waterlily.png b/mods/flowers/textures/flowers_waterlily.png index 973e5113..305c4458 100644 Binary files a/mods/flowers/textures/flowers_waterlily.png and b/mods/flowers/textures/flowers_waterlily.png differ diff --git a/mods/game_commands/locale/game_commands.bg.tr b/mods/game_commands/locale/game_commands.bg.tr deleted file mode 100755 index 332ca2a6..00000000 --- a/mods/game_commands/locale/game_commands.bg.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=Загинете, за да се преродите -No static_spawnpoint defined=Не е зададена стойност на static_spawnpoint -You need to be online to be killed!=Трябва да бъдете на линия за да загинете! diff --git a/mods/game_commands/locale/game_commands.eo.tr b/mods/game_commands/locale/game_commands.eo.tr deleted file mode 100644 index 0ff99aab..00000000 --- a/mods/game_commands/locale/game_commands.eo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -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 enreta por esti mortigita! diff --git a/mods/game_commands/locale/game_commands.eu.tr b/mods/game_commands/locale/game_commands.eu.tr deleted file mode 100644 index 2fdd4290..00000000 --- a/mods/game_commands/locale/game_commands.eu.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=Suizida zaitez berriro agertzeko -No static_spawnpoint defined=Ez da zehaztu agerpen-punturik -You need to be online to be killed!=Linean egon behar duzu hil zaitzaten! diff --git a/mods/game_commands/locale/game_commands.id.tr b/mods/game_commands/locale/game_commands.id.tr index 0d586c93..1ab364b2 100644 --- a/mods/game_commands/locale/game_commands.id.tr +++ b/mods/game_commands/locale/game_commands.id.tr @@ -1,4 +1,4 @@ # textdomain: game_commands Kill yourself to respawn=Bunuh diri untuk bangkit kembali -No static_spawnpoint defined=Tidak ada static_spawnpoint (titik bangkit statis) yang diatur +No static_spawnpoint defined=Tiada static_spawnpoint (titik bangkit statis) yang diatur You need to be online to be killed!=Anda harus daring untuk dibunuh! diff --git a/mods/game_commands/locale/game_commands.it.tr b/mods/game_commands/locale/game_commands.it.tr index 91646b0f..b2431faf 100644 --- a/mods/game_commands/locale/game_commands.it.tr +++ b/mods/game_commands/locale/game_commands.it.tr @@ -1,4 +1,4 @@ -# textdomain: game_commands -Kill yourself to respawn=Ucciditi per ricomparire -No static_spawnpoint defined=Nessuno static_spawnpoint definito -You need to be online to be killed!=Devi essere in linea per essere ucciso! +# textdomain: game_commands +Kill yourself to respawn=Ucciditi per ricomparire +No static_spawnpoint defined=Nessuno static_spawnpoint definito +You need to be online to be killed!=Devi essere in linea per essere ucciso! \ No newline at end of file diff --git a/mods/game_commands/locale/game_commands.ja.tr b/mods/game_commands/locale/game_commands.ja.tr deleted file mode 100644 index b6c77dce..00000000 --- a/mods/game_commands/locale/game_commands.ja.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=リセットしてリスポーンします -No static_spawnpoint defined=static_spawnpoint が設定されていません -You need to be online to be killed!=リセットするにはオンラインである必要があります diff --git a/mods/game_commands/locale/game_commands.jbo.tr b/mods/game_commands/locale/game_commands.jbo.tr deleted file mode 100644 index ddddcd7a..00000000 --- a/mods/game_commands/locale/game_commands.jbo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=.i ro nu do catra do cu tadji pa nu do tolcanci -No static_spawnpoint defined=.i no da ckaji lo me la'o zoi.static_spawnpoint.zoi -You need to be online to be killed!=.i lo nu samjo'e cu sarcu lo nu do se catra diff --git a/mods/game_commands/locale/game_commands.lv.tr b/mods/game_commands/locale/game_commands.lv.tr deleted file mode 100644 index b498bcb5..00000000 --- a/mods/game_commands/locale/game_commands.lv.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=Nobeidzieties lai atdzīvotos -No static_spawnpoint defined=static_spawnpoint nav definēts -You need to be online to be killed!=Jums jābūt tiešsaistē lai nobeigtos. diff --git a/mods/game_commands/locale/game_commands.ms.tr b/mods/game_commands/locale/game_commands.ms.tr index d22e0a40..ed4a0bdf 100644 --- a/mods/game_commands/locale/game_commands.ms.tr +++ b/mods/game_commands/locale/game_commands.ms.tr @@ -1,4 +1,4 @@ # textdomain: game_commands -Kill yourself to respawn=Bunuh diri anda untuk jelma semula -No static_spawnpoint defined=Tiada titik jelma statik (tetapan static_spawnpoint) ditakrifkan +Kill yourself to respawn=Bunuh diri anda untuk lahir semula +No static_spawnpoint defined=Tiada titik permulaan statik (tetapan static_spawnpoint) ditakrifkan You need to be online to be killed!=Anda mesti berada dalam talian untuk dibunuh! diff --git a/mods/game_commands/locale/game_commands.pl.tr b/mods/game_commands/locale/game_commands.pl.tr deleted file mode 100644 index 52477c6d..00000000 --- a/mods/game_commands/locale/game_commands.pl.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=Zastosować komendę kill aby się zrespawnować -No static_spawnpoint defined=Nie zdefiniowano static_spawnpoint -You need to be online to be killed!=Musisz być online aby zastosować komendę kill diff --git a/mods/game_commands/locale/game_commands.pt_BR.tr b/mods/game_commands/locale/game_commands.pt_BR.tr deleted file mode 100644 index 6c52c0bd..00000000 --- a/mods/game_commands/locale/game_commands.pt_BR.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=Mate-se para reaparecer -No static_spawnpoint defined=Nenhum ponto de reaparecer estático definido -You need to be online to be killed!=Você precisa estar online para ser morto! diff --git a/mods/game_commands/locale/game_commands.ru.tr b/mods/game_commands/locale/game_commands.ru.tr index 59a59711..26d9e08a 100644 --- a/mods/game_commands/locale/game_commands.ru.tr +++ b/mods/game_commands/locale/game_commands.ru.tr @@ -1,4 +1,4 @@ # textdomain: game_commands Kill yourself to respawn=Убейте себя, чтобы возродиться No static_spawnpoint defined=static_spawnpoint не определён -You need to be online to be killed!=Вы должны быть в сети, чтобы убить себя! +You need to be online to be killed!=Вы должны быть онлайн, чтобы убить себя! diff --git a/mods/game_commands/locale/game_commands.sv.tr b/mods/game_commands/locale/game_commands.se.tr similarity index 65% rename from mods/game_commands/locale/game_commands.sv.tr rename to mods/game_commands/locale/game_commands.se.tr index e3110dad..259e1db0 100644 --- a/mods/game_commands/locale/game_commands.sv.tr +++ b/mods/game_commands/locale/game_commands.se.tr @@ -1,4 +1,4 @@ # textdomain: game_commands Kill yourself to respawn=Döda dig själv för att respawna -No static_spawnpoint defined=Ingen static_spawnpoint definierad -You need to be online to be killed!=Du måsta vara online för att bli dödad! +No static_spawnpoint defined=Ingen static_spawnpoint definierat +You need to be online to be killed!=Du måsta vara online för att bli dödad! \ No newline at end of file diff --git a/mods/game_commands/locale/game_commands.sk.tr b/mods/game_commands/locale/game_commands.sk.tr deleted file mode 100644 index f7d153ae..00000000 --- a/mods/game_commands/locale/game_commands.sk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=Samovražda pre znovuzrodenie -No static_spawnpoint defined=Nie je definované stále miesto znovuzrodenia -You need to be online to be killed!=Musíš byť online, aby si mohol byť zabitý! diff --git a/mods/game_commands/locale/game_commands.uk.tr b/mods/game_commands/locale/game_commands.uk.tr deleted file mode 100644 index 03cd2678..00000000 --- a/mods/game_commands/locale/game_commands.uk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: game_commands -Kill yourself to respawn=Вбити себе, щоб відродитися -No static_spawnpoint defined=Немає визначеного static_spawnpoint -You need to be online to be killed!=Ви повинні бути онлайн, щоби Вас було вбито! diff --git a/mods/game_commands/locale/game_commands.zh_CN.tr b/mods/game_commands/locale/game_commands.zh_CN.tr index ba9a0275..3c69dfb7 100644 --- a/mods/game_commands/locale/game_commands.zh_CN.tr +++ b/mods/game_commands/locale/game_commands.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: game_commands -Kill yourself to respawn=自杀并重生 +Kill yourself to respawn=杀死自己并重生 No static_spawnpoint defined=static_spawnpoint 未定义 You need to be online to be killed!=您需要在线才能被杀死! diff --git a/mods/give_initial_stuff/README.txt b/mods/give_initial_stuff/README.txt index b10c3602..cbd240fe 100644 --- a/mods/give_initial_stuff/README.txt +++ b/mods/give_initial_stuff/README.txt @@ -5,4 +5,4 @@ See license.txt for license information. Authors of source code ---------------------- Perttu Ahola (celeron55) (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) diff --git a/mods/give_initial_stuff/license.txt b/mods/give_initial_stuff/license.txt index 45dba3fb..8134c920 100644 --- a/mods/give_initial_stuff/license.txt +++ b/mods/give_initial_stuff/license.txt @@ -3,7 +3,7 @@ License of source code The MIT License (MIT) Copyright (C) 2012-2016 Perttu Ahola (celeron55) -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/keys/README.txt b/mods/keys/README.txt deleted file mode 100644 index 0db27df1..00000000 --- a/mods/keys/README.txt +++ /dev/null @@ -1,21 +0,0 @@ -Minetest Game mod: keys -========================== -See license.txt for license information. - -Authors of source code ----------------------- -Originally by celeron55, Perttu Ahola (LGPLv2.1+) -Various Minetest Game developers and contributors (LGPLv2.1+) - -Authors of media (textures, sounds, models and schematics) ----------------------------------------------------------- - -Textures --------- -Gambit (CC BY-SA 3.0): - keys_key.png - keys_key_skeleton.png - -Features --------- -This mod uses the key API as defined in game_api.txt section [Key API]. diff --git a/mods/keys/aliases.lua b/mods/keys/aliases.lua deleted file mode 100644 index 4297498b..00000000 --- a/mods/keys/aliases.lua +++ /dev/null @@ -1,6 +0,0 @@ --- --- Aliases for backward compatibility --- - -minetest.register_alias("default:key", "keys:key") -minetest.register_alias("default:skeleton_key", "keys:skeleton_key") diff --git a/mods/keys/crafting.lua b/mods/keys/crafting.lua deleted file mode 100644 index b9b503a5..00000000 --- a/mods/keys/crafting.lua +++ /dev/null @@ -1,28 +0,0 @@ --- --- Crafting recipes --- - -minetest.register_craft({ - output = "keys:skeleton_key", - recipe = { - {"default:gold_ingot"}, - } -}) - --- --- Cooking recipes --- - -minetest.register_craft({ - type = "cooking", - output = "default:gold_ingot", - recipe = "keys:key", - cooktime = 5, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:gold_ingot", - recipe = "keys:skeleton_key", - cooktime = 5, -}) diff --git a/mods/keys/craftitems.lua b/mods/keys/craftitems.lua deleted file mode 100644 index 45e0b824..00000000 --- a/mods/keys/craftitems.lua +++ /dev/null @@ -1,101 +0,0 @@ --- Load support for MT game translation. -local S = minetest.get_translator("keys") - --- --- Craftitems --- - -minetest.register_craftitem("keys:skeleton_key", { - description = S("Skeleton Key"), - inventory_image = "keys_key_skeleton.png", - on_use = function(itemstack, user, pointed_thing) - if pointed_thing.type ~= "node" then - return itemstack - end - - local pos = pointed_thing.under - local node = minetest.get_node(pos) - - if not node then - return itemstack - end - - local node_reg = minetest.registered_nodes[node.name] - local on_skeleton_key_use = node_reg and node_reg.on_skeleton_key_use - if not on_skeleton_key_use then - return itemstack - end - - -- make a new key secret in case the node callback needs it - local random = math.random - local newsecret = string.format( - "%04x%04x%04x%04x", - random(2^16) - 1, random(2^16) - 1, - random(2^16) - 1, random(2^16) - 1) - - local secret, _, _ = on_skeleton_key_use(pos, user, newsecret) - - if secret then - local inv = minetest.get_inventory({type="player", name=user:get_player_name()}) - - -- update original itemstack - itemstack:take_item() - - -- finish and return the new key - local new_stack = ItemStack("keys:key") - local meta = new_stack:get_meta() - meta:set_string("secret", secret) - meta:set_string("description", S("Key to @1's @2", user:get_player_name(), - minetest.registered_nodes[node.name].description)) - - if itemstack:get_count() == 0 then - itemstack = new_stack - else - if inv:add_item("main", new_stack):get_count() > 0 then - minetest.add_item(user:get_pos(), new_stack) - end -- else: added to inventory successfully - end - - return itemstack - end - end -}) - -minetest.register_craftitem("keys:key", { - description = S("Key"), - inventory_image = "keys_key.png", - groups = {key = 1, not_in_creative_inventory = 1}, - on_place = function(itemstack, placer, pointed_thing) - local under = pointed_thing.under - local node = minetest.get_node(under) - local def = minetest.registered_nodes[node.name] - if def and def.on_rightclick and - not (placer and placer:is_player() and - placer:get_player_control().sneak) then - return def.on_rightclick(under, node, placer, itemstack, - pointed_thing) or itemstack - end - if pointed_thing.type ~= "node" then - return itemstack - end - - local pos = pointed_thing.under - node = minetest.get_node(pos) - - if not node or node.name == "ignore" then - return itemstack - end - - local ndef = minetest.registered_nodes[node.name] - if not ndef then - return itemstack - end - - local on_key_use = ndef.on_key_use - if on_key_use then - on_key_use(pos, placer) - end - - return nil - end -}) diff --git a/mods/keys/init.lua b/mods/keys/init.lua deleted file mode 100644 index ed45adba..00000000 --- a/mods/keys/init.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Minetest Game mod: keys -local keys_path = minetest.get_modpath("keys") - -dofile(keys_path.."/craftitems.lua") -dofile(keys_path.."/crafting.lua") -dofile(keys_path.."/aliases.lua") diff --git a/mods/keys/license.txt b/mods/keys/license.txt deleted file mode 100644 index e96ffb95..00000000 --- a/mods/keys/license.txt +++ /dev/null @@ -1,52 +0,0 @@ -License of source code ----------------------- - -GNU Lesser General Public License, version 2.1 -Copyright (C) 2011-2018 celeron55, Perttu Ahola -Copyright (C) 2011-2018 Various Minetest Game developers and contributors - -This program is free software; you can redistribute it and/or modify it under the terms -of the GNU Lesser General Public License as published by the Free Software Foundation; -either version 2.1 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU Lesser General Public License for more details: -https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - - -Licenses of media (textures, models and sounds) ------------------------------------------------ - -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2010-2018: - - Gambit - -You are free to: -Share — copy and redistribute the material in any medium or format. -Adapt — remix, transform, and build upon the material for any purpose, even commercially. -The licensor cannot revoke these freedoms as long as you follow the license terms. - -Under the following terms: - -Attribution — You must give appropriate credit, provide a link to the license, and -indicate if changes were made. You may do so in any reasonable manner, but not in any way -that suggests the licensor endorses you or your use. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -No additional restrictions — You may not apply legal terms or technological measures that -legally restrict others from doing anything the license permits. - -Notices: - -You do not have to comply with the license for elements of the material in the public -domain or where your use is permitted by an applicable exception or limitation. -No warranties are given. The license may not give you all of the permissions necessary -for your intended use. For example, other rights such as publicity, privacy, or moral -rights may limit how you use the material. - -For more details: -http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/mods/keys/locale/keys.bg.tr b/mods/keys/locale/keys.bg.tr deleted file mode 100755 index 28a79766..00000000 --- a/mods/keys/locale/keys.bg.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: keys -Key=Ключ -Key to @1's @2=Ключ за @2 на @1 -Skeleton Key=Заготовка за ключ diff --git a/mods/keys/locale/keys.de.tr b/mods/keys/locale/keys.de.tr deleted file mode 100644 index 499a6ba7..00000000 --- a/mods/keys/locale/keys.de.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Schlüssel -Key to @1's @2=Schlüssel für @2 von @1 -Skeleton Key=Skelettschlüssel diff --git a/mods/keys/locale/keys.eo.tr b/mods/keys/locale/keys.eo.tr deleted file mode 100644 index 02a06d42..00000000 --- a/mods/keys/locale/keys.eo.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Ŝlosilo -Key to @1's @2=Ŝlosilo por la @2 de @1 -Skeleton Key=Skeleta ŝlosilo diff --git a/mods/keys/locale/keys.es.tr b/mods/keys/locale/keys.es.tr deleted file mode 100644 index e408c32a..00000000 --- a/mods/keys/locale/keys.es.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Llave -Key to @1's @2=Llave para @2 de @1 -Skeleton Key=Llave esqueleto diff --git a/mods/keys/locale/keys.eu.tr b/mods/keys/locale/keys.eu.tr deleted file mode 100644 index 17212bcc..00000000 --- a/mods/keys/locale/keys.eu.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: keys -Key=Giltza -Key to @1's @2=@1-erako @2 giltza -Skeleton Key=Eskeleto-giltza diff --git a/mods/keys/locale/keys.fr.tr b/mods/keys/locale/keys.fr.tr deleted file mode 100644 index b1b9e6a8..00000000 --- a/mods/keys/locale/keys.fr.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Clé -Key to @1's @2=Clé pour @2 de @1 -Skeleton Key=Squelette diff --git a/mods/keys/locale/keys.id.tr b/mods/keys/locale/keys.id.tr deleted file mode 100644 index 58f8fc55..00000000 --- a/mods/keys/locale/keys.id.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Kunci -Key to @1's @2=Kunci @2 milik @1 -Skeleton Key=Kunci Induk diff --git a/mods/keys/locale/keys.it.tr b/mods/keys/locale/keys.it.tr deleted file mode 100644 index ed7bb312..00000000 --- a/mods/keys/locale/keys.it.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Chiave -Key to @1's @2=Chiave per @2 di @1 -Skeleton Key=Chiave dello Scheletro diff --git a/mods/keys/locale/keys.ja.tr b/mods/keys/locale/keys.ja.tr deleted file mode 100644 index b356178a..00000000 --- a/mods/keys/locale/keys.ja.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=鍵 -Key to @1's @2=@1の@2への鍵 -Skeleton Key=スケルトンの鍵 diff --git a/mods/keys/locale/keys.jbo.tr b/mods/keys/locale/keys.jbo.tr deleted file mode 100644 index bd12f09b..00000000 --- a/mods/keys/locale/keys.jbo.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=lo ckiku -Key to @1's @2=lo ckiku be @2 po la'o zo'i.@1.zo'i -Skeleton Key=lo greku ckiku diff --git a/mods/keys/locale/keys.lv.tr b/mods/keys/locale/keys.lv.tr deleted file mode 100644 index 04922cc2..00000000 --- a/mods/keys/locale/keys.lv.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Atslēga -Key to @1's @2=Atslēga priekš @1 @2 -Skeleton Key=Novīlēta atslēga diff --git a/mods/keys/locale/keys.ms.tr b/mods/keys/locale/keys.ms.tr deleted file mode 100644 index 58f8fc55..00000000 --- a/mods/keys/locale/keys.ms.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Kunci -Key to @1's @2=Kunci @2 milik @1 -Skeleton Key=Kunci Induk diff --git a/mods/keys/locale/keys.pl.tr b/mods/keys/locale/keys.pl.tr deleted file mode 100644 index 864d8a94..00000000 --- a/mods/keys/locale/keys.pl.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Klucz -Key to @1's @2=Klucz do @2 gracza @1 -Skeleton Key=Szkieletowy klucz diff --git a/mods/keys/locale/keys.pt_BR.tr b/mods/keys/locale/keys.pt_BR.tr deleted file mode 100644 index ef9ca1ee..00000000 --- a/mods/keys/locale/keys.pt_BR.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Chave -Key to @1's @2=Chave para @2 de @1 -Skeleton Key=Chave de Mestra diff --git a/mods/keys/locale/keys.ru.tr b/mods/keys/locale/keys.ru.tr deleted file mode 100644 index a804e182..00000000 --- a/mods/keys/locale/keys.ru.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Ключ -Key to @1's @2=Ключ к @2 от @1 -Skeleton Key=Заготовка ключа diff --git a/mods/keys/locale/keys.sv.tr b/mods/keys/locale/keys.sv.tr deleted file mode 100644 index f666eb3d..00000000 --- a/mods/keys/locale/keys.sv.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=Nyckel -Key to @1's @2=Nyckel till @1s @2 -Skeleton Key=Skelettnyckel diff --git a/mods/keys/locale/keys.uk.tr b/mods/keys/locale/keys.uk.tr deleted file mode 100644 index 6f6a681d..00000000 --- a/mods/keys/locale/keys.uk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: keys -Key=Ключ -Key to @1's @2=Ключ з биркою "@2, власником якого(-ої/-их) є @1" -Skeleton Key=Заготовка ключа diff --git a/mods/keys/locale/keys.zh_CN.tr b/mods/keys/locale/keys.zh_CN.tr deleted file mode 100644 index 57f632ae..00000000 --- a/mods/keys/locale/keys.zh_CN.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=钥匙 -Key to @1's @2=@1的@2的钥匙 -Skeleton Key=万能钥匙 diff --git a/mods/keys/locale/keys.zh_TW.tr b/mods/keys/locale/keys.zh_TW.tr deleted file mode 100644 index c97879ca..00000000 --- a/mods/keys/locale/keys.zh_TW.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key=鑰匙 -Key to @1's @2=@1的@2的鑰匙 -Skeleton Key=萬能鑰匙 diff --git a/mods/keys/locale/template.txt b/mods/keys/locale/template.txt deleted file mode 100644 index 9fbf62fd..00000000 --- a/mods/keys/locale/template.txt +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: keys - -Key= -Key to @1's @2= -Skeleton Key= diff --git a/mods/keys/mod.conf b/mods/keys/mod.conf deleted file mode 100644 index 8b8d6693..00000000 --- a/mods/keys/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = keys -description = Minetest Game mod: keys -depends = default diff --git a/mods/keys/textures/keys_key.png b/mods/keys/textures/keys_key.png deleted file mode 100644 index d39d9afa..00000000 Binary files a/mods/keys/textures/keys_key.png and /dev/null differ diff --git a/mods/keys/textures/keys_key_skeleton.png b/mods/keys/textures/keys_key_skeleton.png deleted file mode 100644 index f60cacee..00000000 Binary files a/mods/keys/textures/keys_key_skeleton.png and /dev/null differ diff --git a/mods/map/init.lua b/mods/map/init.lua index b91e528d..7c1e36fc 100644 --- a/mods/map/init.lua +++ b/mods/map/init.lua @@ -9,11 +9,18 @@ map = {} local S = minetest.get_translator("map") +-- Cache creative mode setting + +local creative_mode_cache = minetest.settings:get_bool("creative_mode") + + -- Update HUD flags -- Global to allow overriding function map.update_hud_flags(player) - local creative_enabled = minetest.is_creative_enabled(player:get_player_name()) + local creative_enabled = + (creative and creative.is_enabled_for(player:get_player_name())) or + creative_mode_cache local minimap_enabled = creative_enabled or player:get_inventory():contains_item("main", "map:mapping_kit") @@ -51,7 +58,7 @@ minetest.register_craftitem("map:mapping_kit", { description = S("Mapping Kit") .. "\n" .. S("Use with 'Minimap' key"), inventory_image = "map_mapping_kit.png", stack_max = 1, - groups = {flammable = 3, tool = 1}, + groups = {flammable = 3}, on_use = function(itemstack, user, pointed_thing) map.update_hud_flags(user) diff --git a/mods/map/locale/map.bg.tr b/mods/map/locale/map.bg.tr deleted file mode 100755 index c720c5a5..00000000 --- a/mods/map/locale/map.bg.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Картографски комплект -Use with 'Minimap' key=Използвайте с клавиша за „Миникарта“ diff --git a/mods/map/locale/map.eo.tr b/mods/map/locale/map.eo.tr deleted file mode 100644 index 906be7b6..00000000 --- a/mods/map/locale/map.eo.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Mapa ilaro -Use with 'Minimap' key=Uzi per 'Minimapo' klavo diff --git a/mods/map/locale/map.eu.tr b/mods/map/locale/map.eu.tr deleted file mode 100644 index c4c2fe68..00000000 --- a/mods/map/locale/map.eu.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Mapak egiteko kita -Use with 'Minimap' key='Minimapa' teklarekin erabili diff --git a/mods/map/locale/map.fr.tr b/mods/map/locale/map.fr.tr index fcffb6de..29f8e208 100644 --- a/mods/map/locale/map.fr.tr +++ b/mods/map/locale/map.fr.tr @@ -1,3 +1,3 @@ # textdomain: map Mapping Kit=Kit de carthographie -Use with 'Minimap' key=Utiliser avec le bouton « Mini-carte » +Use with 'Minimap' key=Utiliser avec le bouton « Minimap » diff --git a/mods/map/locale/map.id.tr b/mods/map/locale/map.id.tr index c90a0293..cb31d0f7 100644 --- a/mods/map/locale/map.id.tr +++ b/mods/map/locale/map.id.tr @@ -1,3 +1,3 @@ # textdomain: map Mapping Kit=Alat Pemetaan -Use with 'Minimap' key=Gunakan dengan tombol 'Peta Mini' +Use with 'Minimap' key=Pakai dengan tombol 'Peta Mini' diff --git a/mods/map/locale/map.it.tr b/mods/map/locale/map.it.tr index 59885e98..237f4dfb 100644 --- a/mods/map/locale/map.it.tr +++ b/mods/map/locale/map.it.tr @@ -1,3 +1,3 @@ -# textdomain: map -Mapping Kit=Kit di mappatura -Use with 'Minimap' key=Usalo col tasto 'Minimappa' +# textdomain: map +Mapping Kit=Kit di mappatura +Use with 'Minimap' key=Usalo col tasto 'Minimappa' \ No newline at end of file diff --git a/mods/map/locale/map.ja.tr b/mods/map/locale/map.ja.tr deleted file mode 100644 index 7205f244..00000000 --- a/mods/map/locale/map.ja.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=地図キット -Use with 'Minimap' key=ミニマップキーで使います diff --git a/mods/map/locale/map.jbo.tr b/mods/map/locale/map.jbo.tr deleted file mode 100644 index 8f37c188..00000000 --- a/mods/map/locale/map.jbo.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=lo cartu ke sidju bakfu -Use with 'Minimap' key=.i tu'a le cmalu cartu batke cu tadji lo nu pilno diff --git a/mods/map/locale/map.lv.tr b/mods/map/locale/map.lv.tr deleted file mode 100644 index fb74f513..00000000 --- a/mods/map/locale/map.lv.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Kartēšanas komplekts -Use with 'Minimap' key=Izmantojiet ar pogu 'Minikarte' diff --git a/mods/map/locale/map.pl.tr b/mods/map/locale/map.pl.tr deleted file mode 100644 index d665de0c..00000000 --- a/mods/map/locale/map.pl.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Zestaw kartograficzny -Use with 'Minimap' key=Naciśnij 'Minimap' aby użyć diff --git a/mods/map/locale/map.pt_BR.tr b/mods/map/locale/map.pt_BR.tr deleted file mode 100644 index 0095c395..00000000 --- a/mods/map/locale/map.pt_BR.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Kit de mapeamento -Use with 'Minimap' key=Use com a tecla do 'mini-mapa' diff --git a/mods/map/locale/map.ru.tr b/mods/map/locale/map.ru.tr index 4c03d549..73120b62 100644 --- a/mods/map/locale/map.ru.tr +++ b/mods/map/locale/map.ru.tr @@ -1,3 +1,3 @@ # textdomain: map Mapping Kit=Картографический комплект -Use with 'Minimap' key=Используйте клавишей 'Миникарта' +Use with 'Minimap' key=Используйте с ключом 'Minimap' diff --git a/mods/map/locale/map.se.tr b/mods/map/locale/map.se.tr new file mode 100644 index 00000000..c1bb01af --- /dev/null +++ b/mods/map/locale/map.se.tr @@ -0,0 +1,3 @@ +# textdomain: map +Mapping Kit=Kartläggningssats +Use with 'Minimap' key=Använd med 'Minimap' tangent \ No newline at end of file diff --git a/mods/map/locale/map.sk.tr b/mods/map/locale/map.sk.tr deleted file mode 100644 index 2016c85f..00000000 --- a/mods/map/locale/map.sk.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Kartografická súprava -Use with 'Minimap' key=Použi klávesou 'Prepni minimpu' diff --git a/mods/map/locale/map.sv.tr b/mods/map/locale/map.sv.tr deleted file mode 100644 index bc79d44e..00000000 --- a/mods/map/locale/map.sv.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Kartläggningssats -Use with 'Minimap' key=Använd med 'Minimap'-tangent diff --git a/mods/map/locale/map.uk.tr b/mods/map/locale/map.uk.tr deleted file mode 100644 index b7d6452c..00000000 --- a/mods/map/locale/map.uk.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Картографічний набір -Use with 'Minimap' key=Використовується клавішею 'Мінімапа' diff --git a/mods/map/mod.conf b/mods/map/mod.conf index bb045c77..2099c199 100644 --- a/mods/map/mod.conf +++ b/mods/map/mod.conf @@ -1,3 +1,4 @@ name = map description = Minetest Game mod: map depends = default, dye +optional_depends = creative diff --git a/mods/mtg_craftguide/README.md b/mods/mtg_craftguide/README.md deleted file mode 100644 index 9c4ed7a4..00000000 --- a/mods/mtg_craftguide/README.md +++ /dev/null @@ -1,25 +0,0 @@ -Minetest Game mod: mtg_craftguide -================================= - -Adds a "Recipes" tab to the inventory. Click an item to see it's recipes. -Click again to show usages. - -Based on [craftguide](https://github.com/minetest-mods/craftguide). - -Authors of media ----------------- - -paramat (CC BY-SA 3.0): - -* craftguide_clear_icon.png -* craftguide_next_icon.png -* craftguide_prev_icon.png -* craftguide_search_icon.png - -Neuromancer (CC BY-SA 3.0): - -* craftguide_furnace.png - -Wuzzy (CC BY-SA 3.0): - -* craftguide_shapeless.png diff --git a/mods/mtg_craftguide/init.lua b/mods/mtg_craftguide/init.lua deleted file mode 100644 index 97cd63a7..00000000 --- a/mods/mtg_craftguide/init.lua +++ /dev/null @@ -1,438 +0,0 @@ -local S = minetest.get_translator("mtg_craftguide") -local esc = minetest.formspec_escape - -local player_data = {} -local init_items = {} -local recipes_cache = {} -local usages_cache = {} - -local group_stereotypes = { - dye = "dye:white", - wool = "wool:white", - coal = "default:coal_lump", - vessel = "vessels:glass_bottle", - flower = "flowers:dandelion_yellow" -} - -local group_names = { - coal = S("Any coal"), - sand = S("Any sand"), - wool = S("Any wool"), - stick = S("Any stick"), - vessel = S("Any vessel"), - wood = S("Any wood planks"), - stone = S("Any kind of stone block"), - - ["color_red,flower"] = S("Any red flower"), - ["color_blue,flower"] = S("Any blue flower"), - ["color_black,flower"] = S("Any black flower"), - ["color_green,flower"] = S("Any green flower"), - ["color_white,flower"] = S("Any white flower"), - ["color_orange,flower"] = S("Any orange flower"), - ["color_violet,flower"] = S("Any violet flower"), - ["color_yellow,flower"] = S("Any yellow flower"), - - ["color_red,dye"] = S("Any red dye"), - ["color_blue,dye"] = S("Any blue dye"), - ["color_cyan,dye"] = S("Any cyan dye"), - ["color_grey,dye"] = S("Any grey dye"), - ["color_pink,dye"] = S("Any pink dye"), - ["color_black,dye"] = S("Any black dye"), - ["color_brown,dye"] = S("Any brown dye"), - ["color_green,dye"] = S("Any green dye"), - ["color_white,dye"] = S("Any white dye"), - ["color_orange,dye"] = S("Any orange dye"), - ["color_violet,dye"] = S("Any violet dye"), - ["color_yellow,dye"] = S("Any yellow dye"), - ["color_magenta,dye"] = S("Any magenta dye"), - ["color_dark_grey,dye"] = S("Any dark grey dye"), - ["color_dark_green,dye"] = S("Any dark green dye") -} - -local function table_replace(t, val, new) - for k, v in pairs(t) do - if v == val then - t[k] = new - end - end -end - -local function extract_groups(str) - if str:sub(1, 6) == "group:" then - return str:sub(7):split() - end - return nil -end - -local function item_has_groups(item_groups, groups) - for _, group in ipairs(groups) do - if not item_groups[group] then - return false - end - end - return true -end - -local function groups_to_item(groups) - if #groups == 1 then - local group = groups[1] - if group_stereotypes[group] then - return group_stereotypes[group] - elseif minetest.registered_items["default:"..group] then - return "default:"..group - end - end - - for name, def in pairs(minetest.registered_items) do - if item_has_groups(def.groups, groups) then - return name - end - end - - return ":unknown" -end - -local function get_craftable_recipes(output) - local recipes = minetest.get_all_craft_recipes(output) - if not recipes then - return nil - end - - for i = #recipes, 1, -1 do - for _, item in pairs(recipes[i].items) do - local groups = extract_groups(item) - if groups then - item = groups_to_item(groups) - end - if not minetest.registered_items[item] then - table.remove(recipes, i) - break - end - end - end - - if #recipes > 0 then - return recipes - end -end - -local function show_item(def) - return def.groups.not_in_craft_guide ~= 1 and def.description ~= "" -end - -local function cache_usages(recipe) - local added = {} - for _, item in pairs(recipe.items) do - if not added[item] then - local groups = extract_groups(item) - if groups then - for name, def in pairs(minetest.registered_items) do - if not added[name] and show_item(def) - and item_has_groups(def.groups, groups) then - local usage = table.copy(recipe) - table_replace(usage.items, item, name) - usages_cache[name] = usages_cache[name] or {} - table.insert(usages_cache[name], usage) - added[name] = true - end - end - elseif show_item(minetest.registered_items[item]) then - usages_cache[item] = usages_cache[item] or {} - table.insert(usages_cache[item], recipe) - end - added[item] = true - end - end -end - -minetest.register_on_mods_loaded(function() - for name, def in pairs(minetest.registered_items) do - if show_item(def) then - local recipes = get_craftable_recipes(name) - if recipes then - recipes_cache[name] = recipes - for _, recipe in ipairs(recipes) do - cache_usages(recipe) - end - end - end - end - for name, def in pairs(minetest.registered_items) do - if recipes_cache[name] or usages_cache[name] then - table.insert(init_items, name) - end - end - table.sort(init_items) -end) - -local function coords(i, cols) - return i % cols, math.floor(i / cols) -end - -local function is_fuel(item) - return minetest.get_craft_result({method="fuel", items={item}}).time > 0 -end - -local function item_button_fs(fs, x, y, item, element_name, groups) - table.insert(fs, ("item_image_button[%s,%s;1.05,1.05;%s;%s;%s]") - :format(x, y, item, element_name, groups and "\n"..esc(S("G")) or "")) - - local tooltip - if groups then - table.sort(groups) - tooltip = group_names[table.concat(groups, ",")] - if not tooltip then - local groupstr = {} - for _, group in ipairs(groups) do - table.insert(groupstr, minetest.colorize("yellow", group)) - end - groupstr = table.concat(groupstr, ", ") - tooltip = S("Any item belonging to the group(s): @1", groupstr) - end - elseif is_fuel(item) then - local itemdef = minetest.registered_items[item:match("%S*")] - local desc = itemdef and itemdef.description or S("Unknown Item") - tooltip = desc.."\n"..minetest.colorize("orange", S("Fuel")) - end - if tooltip then - table.insert(fs, ("tooltip[%s;%s]"):format(element_name, esc(tooltip))) - end -end - -local function recipe_fs(fs, data) - local recipe = data.recipes[data.rnum] - local width = recipe.width - local cooktime, shapeless - - if recipe.method == "cooking" then - cooktime, width = width, 1 - elseif width == 0 then - shapeless = true - if #recipe.items == 1 then - width = 1 - elseif #recipe.items <= 4 then - width = 2 - else - width = 3 - end - end - - table.insert(fs, ("label[5.5,1;%s]"):format(esc(data.show_usages - and S("Usage @1 of @2", data.rnum, #data.recipes) - or S("Recipe @1 of @2", data.rnum, #data.recipes)))) - - if #data.recipes > 1 then - table.insert(fs, - "image_button[5.5,1.6;0.8,0.8;craftguide_prev_icon.png;recipe_prev;]".. - "image_button[6.2,1.6;0.8,0.8;craftguide_next_icon.png;recipe_next;]".. - "tooltip[recipe_prev;"..esc(S("Previous recipe")).."]".. - "tooltip[recipe_next;"..esc(S("Next recipe")).."]") - end - - local rows = math.ceil(table.maxn(recipe.items) / width) - if width > 3 or rows > 3 then - table.insert(fs, ("label[0,1;%s]") - :format(esc(S("Recipe is too big to be displayed.")))) - return - end - - local base_x = 3 - width - local base_y = rows == 1 and 1 or 0 - - for i, item in pairs(recipe.items) do - local x, y = coords(i - 1, width) - - local elem_name = item - local groups = extract_groups(item) - if groups then - item = groups_to_item(groups) - elem_name = esc(item.."."..table.concat(groups, "+")) - end - item_button_fs(fs, base_x + x, base_y + y, item, elem_name, groups) - end - - if shapeless or recipe.method == "cooking" then - table.insert(fs, ("image[3.2,0.5;0.5,0.5;craftguide_%s.png]") - :format(shapeless and "shapeless" or "furnace")) - local tooltip = shapeless and S("Shapeless") or - S("Cooking time: @1", minetest.colorize("yellow", cooktime)) - table.insert(fs, "tooltip[3.2,0.5;0.5,0.5;"..esc(tooltip).."]") - end - table.insert(fs, "image[3,1;1,1;sfinv_crafting_arrow.png]") - - item_button_fs(fs, 4, 1, recipe.output, recipe.output:match("%S*")) -end - -local function get_formspec(player) - local name = player:get_player_name() - local data = player_data[name] - data.pagemax = math.max(1, math.ceil(#data.items / 32)) - - local fs = {} - table.insert(fs, - "style_type[item_image_button;padding=2]".. - "field[0.3,4.2;2.8,1.2;filter;;"..esc(data.filter).."]".. - "label[5.8,4.15;"..minetest.colorize("yellow", data.pagenum).." / ".. - data.pagemax.."]".. - "image_button[2.63,4.05;0.8,0.8;craftguide_search_icon.png;search;]".. - "image_button[3.25,4.05;0.8,0.8;craftguide_clear_icon.png;clear;]".. - "image_button[5,4.05;0.8,0.8;craftguide_prev_icon.png;prev;]".. - "image_button[7.25,4.05;0.8,0.8;craftguide_next_icon.png;next;]".. - "tooltip[search;"..esc(S("Search")).."]".. - "tooltip[clear;"..esc(S("Reset")).."]".. - "tooltip[prev;"..esc(S("Previous page")).."]".. - "tooltip[next;"..esc(S("Next page")).."]".. - "field_enter_after_edit[filter;true]".. - "field_close_on_enter[filter;false]") - - if #data.items == 0 then - table.insert(fs, "label[3,2;"..esc(S("No items to show.")).."]") - else - local first_item = (data.pagenum - 1) * 32 - for i = first_item, first_item + 31 do - local item = data.items[i + 1] - if not item then - break - end - local x, y = coords(i % 32, 8) - item_button_fs(fs, x, y, item, item) - end - end - - table.insert(fs, "container[0,5.6]") - if data.recipes then - recipe_fs(fs, data) - elseif data.prev_item then - table.insert(fs, ("label[2,1;%s]"):format(esc(data.show_usages - and S("No usages.").."\n"..S("Click again to show recipes.") - or S("No recipes.").."\n"..S("Click again to show usages.")))) - end - table.insert(fs, "container_end[]") - - return table.concat(fs) -end - -local function imatch(str, filter) - return str:lower():find(filter, 1, true) ~= nil -end - -local function execute_search(data) - local filter = data.filter - if filter == "" then - data.items = init_items - return - end - data.items = {} - - for _, item in ipairs(init_items) do - local def = minetest.registered_items[item] - local desc = def and minetest.get_translated_string(data.lang_code, def.description) - - if imatch(item, filter) or desc and imatch(desc, filter) then - table.insert(data.items, item) - end - end -end - -local function on_receive_fields(player, fields) - local name = player:get_player_name() - local data = player_data[name] - - if fields.clear then - data.filter = "" - data.pagenum = 1 - data.prev_item = nil - data.recipes = nil - data.items = init_items - return true - - elseif (fields.key_enter_field == "filter" or fields.search) - and fields.filter then - local new = fields.filter:sub(1, 128) -- truncate to a sane length - :gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n) - :lower() -- search is case insensitive - if data.filter == new then - return - end - data.filter = new - data.pagenum = 1 - execute_search(data) - return true - - elseif fields.prev or fields.next then - if data.pagemax == 1 then - return - end - data.pagenum = data.pagenum + (fields.next and 1 or -1) - if data.pagenum > data.pagemax then - data.pagenum = 1 - elseif data.pagenum == 0 then - data.pagenum = data.pagemax - end - return true - - elseif fields.recipe_next or fields.recipe_prev then - data.rnum = data.rnum + (fields.recipe_next and 1 or -1) - if data.rnum > #data.recipes then - data.rnum = 1 - elseif data.rnum == 0 then - data.rnum = #data.recipes - end - return true - - else - local item - for field in pairs(fields) do - if field:find(":") then - item = field:match("[%w_:]+") - break - end - end - if not item then - return - end - - if item == data.prev_item then - data.show_usages = not data.show_usages - else - data.show_usages = nil - end - if data.show_usages then - data.recipes = usages_cache[item] - else - data.recipes = recipes_cache[item] - end - data.prev_item = item - data.rnum = 1 - return true - end -end - -minetest.register_on_joinplayer(function(player) - local name = player:get_player_name() - local info = minetest.get_player_information(name) - - player_data[name] = { - filter = "", - pagenum = 1, - items = init_items, - lang_code = info.lang_code - } -end) - -minetest.register_on_leaveplayer(function(player) - local name = player:get_player_name() - player_data[name] = nil -end) - -sfinv.register_page("mtg_craftguide:craftguide", { - title = esc(S("Recipes")), - get = function(self, player, context) - return sfinv.make_formspec(player, context, get_formspec(player)) - end, - on_player_receive_fields = function(self, player, context, fields) - if on_receive_fields(player, fields) then - sfinv.set_player_inventory_formspec(player) - end - end -}) diff --git a/mods/mtg_craftguide/license.txt b/mods/mtg_craftguide/license.txt deleted file mode 100644 index 8d28c5c7..00000000 --- a/mods/mtg_craftguide/license.txt +++ /dev/null @@ -1,63 +0,0 @@ -License of source code ----------------------- - -The MIT License (MIT) - -Copyright (C) 2015-2019 Jean-Patrick Guerrero and contributors. -Copyright (C) 2020 pauloue - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - -Licenses of media (textures) ----------------------------- - -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) - -Copyright (C) 2018 paramat -Copyright (C) Neuromancer -Copyright (C) 2017 Wuzzy - -You are free to: -Share — copy and redistribute the material in any medium or format. -Adapt — remix, transform, and build upon the material for any purpose, even commercially. -The licensor cannot revoke these freedoms as long as you follow the license terms. - -Under the following terms: - -Attribution — You must give appropriate credit, provide a link to the license, and -indicate if changes were made. You may do so in any reasonable manner, but not in any way -that suggests the licensor endorses you or your use. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -No additional restrictions — You may not apply legal terms or technological measures that -legally restrict others from doing anything the license permits. - -Notices: - -You do not have to comply with the license for elements of the material in the public -domain or where your use is permitted by an applicable exception or limitation. -No warranties are given. The license may not give you all of the permissions necessary -for your intended use. For example, other rights such as publicity, privacy, or moral -rights may limit how you use the material. - -For more details: -http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.bg.tr b/mods/mtg_craftguide/locale/mtg_craftguide.bg.tr deleted file mode 100755 index 17bd53f5..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.bg.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Всякакви въглища -Any sand=Всякакъв пясък -Any wool=Всякаква вълна -Any stick=Всякакви пръчки -Any vessel=Всяква съдина -Any wood planks=Всякакви дървени дъски -Any kind of stone block=Всякакъв вид каменен блок -Any red flower=Всякакво червено цвете -Any blue flower=Всякакво синьо цвете -Any black flower=Всякакво черно цвете -Any green flower=Всякакво зелено цвете -Any white flower=Всякакво бяло цвете -Any orange flower=Всякакво оранжево цвете -Any violet flower=Всякакво лилаво цвете -Any yellow flower=Всякакво жълто цвете -Any red dye=Всякакво червено багрило -Any blue dye=Всякакво синьо багрило -Any cyan dye=Всякакво светло-синьо багрило -Any grey dye=Всякакво сиво багрило -Any pink dye=Всякакво розово багрило -Any black dye=Всякакво черно багрило -Any brown dye=Всякакво кафяво багрило -Any green dye=Всякакво зелено багрило -Any white dye=Всякакво бяло багрило -Any orange dye=Всякакво оранжево багрило -Any violet dye=Всякакво лилаво багрило -Any yellow dye=Всякакво жълто багрило -Any magenta dye=Всякакво пурпурно багрило -Any dark grey dye=Всякакво тъмносиво багрило -Any dark green dye=Всякакво масленозелено багрило -# Label for group ingredients -G=Г -Any item belonging to the group(s): @1=Всеки предмет от групата: @1 -Unknown Item=Неизвестен предмет -Fuel=Гориво -Usage @1 of @2=Използване @1 от @2 -Recipe @1 of @2=Рецепта @1 от @2 -Previous recipe=Предишна рецепта -Next recipe=Следваща рецепта -Recipe is too big to be displayed.=Рецептата е твърде голяма, за да бъде показана. -Shapeless=Без определена подредба -Cooking time: @1=Време за готвене: @1 -Search=Търсене -Reset=Нулиране -Previous page=Предишна страница -Next page=Следваща страница -No items to show.=Няма предмети. -No usages.=Не се използва. -Click again to show recipes.=Изберете отново, за да видите рецептите. -No recipes.=Няма рецепти. -Click again to show usages.=Изберете отново, за да видите къде се използва. -Recipes=Рецепти diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.de.tr b/mods/mtg_craftguide/locale/mtg_craftguide.de.tr deleted file mode 100644 index d90f833d..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.de.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Beliebige Kohle -Any sand=Beliebiger Sand -Any wool=Beliebige Wolle -Any stick=Beliebiger Stock -Any vessel=Beliebiges Gefäß -Any wood planks=Beliebige Holzplanken -Any kind of stone block=Beliebige Art von Steinblock -Any red flower=Beliebige rote Blume -Any blue flower=Beliebige blaue Blume -Any black flower=Beliebige schwarze Blume -Any green flower=Beliebige grüne Blume -Any white flower=Beliebige weiße Blume -Any orange flower=Beliebige orange Blume -Any violet flower=Beliebige violette Blume -Any yellow flower=Beliebige gelbe Blume -Any red dye=Beliebiger roter Farbstoff -Any blue dye=Beliebiger blauer Farbstoff -Any cyan dye=Beliebiger türkiser Farbstoff -Any grey dye=Beliebiger grauer Farbstoff -Any pink dye=Beliebiger rosa Farbstoff -Any black dye=Beliebiger schwarzer Farbstoff -Any brown dye=Beliebiger brauner Farbstoff -Any green dye=Beliebiger grüner Farbstoff -Any white dye=Beliebiger weißer Farbstoff -Any orange dye=Beliebiger orange Farbstoff -Any violet dye=Beliebiger violetter Farbstoff -Any yellow dye=Beliebiger gelber Farbstoff -Any magenta dye=Beliebiger magenta Farbstoff -Any dark grey dye=Beliebiger dunkelgrauer Farbstoff -Any dark green dye=Beliebiger dunkelgrüner Farbstoff -# Label for group ingredients -G=G -Any item belonging to the group(s): @1=Beliebiger Gegenstand, der zu Gruppe(n) gehört: @1 -Unknown Item=Unbekannter Gegenstand -Fuel=Brennstoff -Usage @1 of @2=Verwendung @1 von @2 -Recipe @1 of @2=Rezept @1 von @2 -Previous recipe=Vorheriges Rezept -Next recipe=Nächstes Rezept -Recipe is too big to be displayed.=Rezept ist zu groß für die Anzeige. -Shapeless=Formlos -Cooking time: @1=Kochdauer: @1 -Search=Suche -Reset=Zurücksetzen -Previous page=Vorherige Seite -Next page=Nächste Seite -No items to show.=Keine Gegenstände anzuzeigen. -No usages.=Keine Verwendungen. -Click again to show recipes.=Erneut klicken, um Rezepte zu zeigen. -No recipes.=Keine Rezepte. -Click again to show usages.=Erneut klicken, um Verwendungen zu zeigen. -Recipes=Rezepte diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr b/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr deleted file mode 100644 index 80a1e391..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.eo.tr +++ /dev/null @@ -1,54 +0,0 @@ -# textdomain: mtg_craftguide - -Any coal=Ajna karbo -Any sand=Ajna sablo -Any wool=Ajna lano -Any stick=Ajna bastono -Any vessel=Ajna vazo -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ĝ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 griza tinkturo -Any pink dye=Ajna rozkolora tinkturo -Any black dye=Ajna nigra tinkturo -Any brown dye=Ajna bruna tinkturo -Any green dye=Ajna verda tinkturo -Any white dye=Ajna blanka tinkturo -Any orange dye=Ajna oranĝkolora tinkturo -Any violet dye=Ajna violkolora tinkturo -Any yellow dye=Ajna flava tinkturo -Any magenta dye=Ajna fuksina tinkturo -Any dark grey dye=Ajna malhela griza tinkturo -Any dark green dye=Ajna malhela verda tinkturo -# Label for group ingredients -G=A -Any item belonging to the group(s): @1=Ajna objekto de la aro(j): @1 -Unknown Item=Nekonata objekto -Fuel=Brulaĵo -Usage @1 of @2=Uzo @1 el @2 -Recipe @1 of @2=Recepto @1 el @2 -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=Serĉi -Reset=Rekomincigi -Previous page=Antaŭa paĝo -Next page=Sekva paĝo -No items to show.=Neniu objekto por prezenti. -No usages.=Neniu uzo. -Click again to show recipes.=Reklaki por prezenti receptojn. -No recipes.=Neniu recepto. -Click again to show usages.=Reklaki por prezenti uzojn. -Recipes=Receptoj diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.es.tr b/mods/mtg_craftguide/locale/mtg_craftguide.es.tr deleted file mode 100644 index a5b5149d..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.es.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Carbón -Any sand=Arena -Any wool=Lana -Any stick=Palitos -Any vessel=Recipiente -Any wood planks=Tablas de madera -Any kind of stone block=Derivado de bloque de piedra -Any red flower=Flor roja -Any blue flower=Flor azul -Any black flower=Flor negra -Any green flower=Flor verde -Any white flower=Flor blanca -Any orange flower=Flor naranja -Any violet flower=Flor violeta -Any yellow flower=Flor amarilla -Any red dye=Tinte rojo -Any blue dye=Tinte azul -Any cyan dye=Tinte cian -Any grey dye=Tinte gris -Any pink dye=Tinte rosa -Any black dye=Tinte negro -Any brown dye=Tinte marrón -Any green dye=Tinte verde -Any white dye=Tinte blanco -Any orange dye=Tinte naranja -Any violet dye=Tinte violeta -Any yellow dye=Tinte amarillo -Any magenta dye=Tinte magenta -Any dark grey dye=Tinte gris oscuro -Any dark green dye=Tinte verde oscuro -# Label for group ingredients -G=G -Any item belonging to the group(s): @1=Objeto del grupo: @1 -Unknown Item=Objeto desconocido -Fuel=Combustible -Usage @1 of @2=Usa @1 en @2 -Recipe @1 of @2=Receta @1 en @2 -Previous recipe=Receta anterior -Next recipe=Próxima Receta -Recipe is too big to be displayed.=La receta es muy grande para ser mostrada. -Shapeless=Sin forma -Cooking time: @1=Tiempo de cocción: @1 -Search=Buscar -Reset=Resetear -Previous page=Página anterior -Next page=Próxima página -No items to show.=No hay objetos para mostrar. -No usages.=Sin usos. -Click again to show recipes.=Clica de nuevo para mostrar recetas. -No recipes.=No hay recetas. -Click again to show usages.=Clica de nuevo para mostrar usos. -Recipes=Recetas diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.eu.tr b/mods/mtg_craftguide/locale/mtg_craftguide.eu.tr deleted file mode 100644 index fb01dcb5..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.eu.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Edozein ikatz -Any sand=Edozein hare -Any wool=Edozein artile -Any stick=Edozein makilatxo -Any vessel=Edozein ontzi -Any wood planks=Zurezko edozein taula -Any kind of stone block=Edozein motako harrizko blokea -Any red flower=Edozein lore gorri -Any blue flower=Edozein lore urdin -Any black flower=Edozein lore beltz -Any green flower=Edozein lore berde -Any white flower=Edozein lore zuri -Any orange flower=Edozein lore laranja -Any violet flower=Edozein lore more -Any yellow flower=Edozein lore hori -Any red dye=Edozein tindagai gorri -Any blue dye=Edozein tindagai urdin -Any cyan dye=Edozein tindagai zian -Any grey dye=Edozein tindagai gris -Any pink dye=Edozein tindagai arros -Any black dye=Edozein tindagai beltz -Any brown dye=Edozein tindagai marroi -Any green dye=Edozein tindagai berde -Any white dye=Edozein tindagai zuri -Any orange dye=Edozein tindagai laranja -Any violet dye=Edozein tindagai more -Any yellow dye=Edozein tindagai hori -Any magenta dye=Edozein tindagai magenta -Any dark grey dye=Edozein tindagai gris ilun -Any dark green dye=Edozein tindagai berde ilun -# Label for group ingredients -G=G -Any item belonging to the group(s): @1=@1 taldearen a den edozein objektu -Unknown Item=Objektu ezezaguna -Fuel=Erregaia -Usage @1 of @2=Erabilera @2tik @1 -Recipe @1 of @2=Errezeta @2tik @1 -Previous recipe=Aurreko errezeta -Next recipe=Hurrengo errezeta -Recipe is too big to be displayed.=Errezeta erakusteko handiegia da. -Shapeless=Formarik gabe -Cooking time: @1=Kozinatze denbora: @1 -Search=Bilatu -Reset=Berriz hasi -Previous page=Aurreko orria -Next page=Hurrengo orria -No items to show.=Ez dago erakusteko objekturik. -No usages.=Erabilerarik ez. -Click again to show recipes.=Klikatu berriro errezetak erakusteko. -No recipes.=Ez dago errezetarik. -Click again to show usages.=Klikatu berriro erabilerak erakusteko. -Recipes=Errezetak diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr b/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr deleted file mode 100644 index afc82249..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr +++ /dev/null @@ -1,54 +0,0 @@ -# textdomain: mtg_craftguide - -Any coal=Quelconque charbon -Any sand=Quelconque sable -Any wool=Quelconque laine -Any stick=Quelconque bâton -Any vessel=Quelconque couvert -Any wood planks=Quelconques planches de bois -Any kind of stone block=Quelconque roche -Any red flower=Quelconque fleur rouge -Any blue flower=Quelconque fleur bleue -Any black flower=Quelconque fleur noire -Any green flower=Quelconque fleur verte -Any white flower=Quelconque fleur blanche -Any orange flower=Quelconque fleur orange -Any violet flower=Quelconque fleur violette -Any yellow flower=Quelconque fleur jaune -Any red dye=Quelconque colorant rouge -Any blue dye=Quelconque colorant bleu -Any cyan dye=Quelconque colorant bleu ciel -Any grey dye=Quelconque colorant gris -Any pink dye=Quelconque colorant rose -Any black dye=Quelconque colorant noir -Any brown dye=Quelconque colorant marron -Any green dye=Quelconque colorant vert -Any white dye=Quelconque colorant blanc -Any orange dye=Quelconque colorant orange -Any violet dye=Quelconque colorant violet -Any yellow dye=Quelconque colorant jaune -Any magenta dye=Quelconque colorant magenta -Any dark grey dye=Quelconque colorant gris foncé -Any dark green dye=Quelconque colorant vert foncé -# Label for group ingredients -G=G -Any item belonging to the group(s): @1=Tout item appartenant au(x) groupe(s) : @1 -Unknown Item=Object inconnu -Fuel=Combustible -Usage @1 of @2=Usage @1 sur @2 -Recipe @1 of @2=Recette @1 sur @2 -Previous recipe=Recette précédente -Next recipe=Prochaine recette -Recipe is too big to be displayed.=Recette trop grande pour être affichée. -Shapeless=Sans forme -Cooking time: @1=Temps de cuisson : @1 -Search=Recherche -Reset=Réinitialiser -Previous page=Page précédente -Next page=Prochaine page -No items to show.=Aucun item à afficher. -No usages.=Sans utilité. -Click again to show recipes.=Cliquez encore pour afficher la recette. -No recipes.=Aucune recette. -Click again to show usages.=Cliquez encore pour afficher l'usage. -Recipes=Recettes diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.id.tr b/mods/mtg_craftguide/locale/mtg_craftguide.id.tr deleted file mode 100644 index d4e6ea08..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.id.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Batu bara apa pun -Any sand=Pasir apa pun -Any wool=Wol apa pun -Any stick=Tongkat apa pun -Any vessel=Bejana apa pun -Any wood planks=Papan kayu apa pun -Any kind of stone block=Blok batu apa pun -Any red flower=Bunga merah apa pun -Any blue flower=Bunga biru apa pun -Any black flower=Bunga hitam apa pun -Any green flower=Bunga hijau apa pun -Any white flower=Bunga putih apa pun -Any orange flower=Bunga oranye apa pun -Any violet flower=Bunga ungu apa pun -Any yellow flower=Bunga kuning apa pun -Any red dye=Pewarna merah apa pun -Any blue dye=Pewarna biru apa pun -Any cyan dye=Pewarna sian apa pun -Any grey dye=Pewarna abu apa pun -Any pink dye=Pewarna merah jambu apa pun -Any black dye=Pewarna hitam apa pun -Any brown dye=Pewarna cokelat apa pun -Any green dye=Pewarna hijau apa pun -Any white dye=Pewarna putih apa pun -Any orange dye=Pewarna oranye apa pun -Any violet dye=Pewarna ungu apa pun -Any yellow dye=Pewarna kuning apa pun -Any magenta dye=Pewarna magenta apa pun -Any dark grey dye=Pewarna abu tua apa pun -Any dark green dye=Pewarna hijau tua apa pun -# Label for group ingredients -G=G -Any item belonging to the group(s): @1=Barang apa pun yang termasuk grup: @1 -Unknown Item=Barang Tak Diketahui -Fuel=Bahan Bakar -Usage @1 of @2=Penggunaan @1 dari @2 -Recipe @1 of @2=Resep @1 dari @2 -Previous recipe=Resep sebelumnya -Next recipe=Resep selanjutnya -Recipe is too big to be displayed.=Resep terlalu besar untuk ditampilkan. -Shapeless=Tak berbentuk -Cooking time: @1=Waktu memasak: @1 -Search=Cari -Reset=Atur ulang -Previous page=Halaman sebelumnya -Next page=Halaman selanjutnya -No items to show.=Tidak ada barang untuk ditampilkan. -No usages.=Tidak ada penggunaan. -Click again to show recipes.=Klik lagi untuk menampilkan resep. -No recipes.=Tidak ada resep. -Click again to show usages.=Klik lagi untuk menampilkan penggunaan. -Recipes=Resep diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.ja.tr b/mods/mtg_craftguide/locale/mtg_craftguide.ja.tr deleted file mode 100644 index c6ec66ae..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.ja.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=石炭 -Any sand=砂 -Any wool=羊毛 -Any stick=棒 -Any vessel=瓶 -Any wood planks=板材 -Any kind of stone block=石のブロック -Any red flower=赤色の花 -Any blue flower=青色の花 -Any black flower=黒色の花 -Any green flower=緑色の花 -Any white flower=白色の花 -Any orange flower=橙色の花 -Any violet flower=紫色の花 -Any yellow flower=黄色の花 -Any red dye=赤色の染料 -Any blue dye=青色の染料 -Any cyan dye=青緑色の染料 -Any grey dye=灰色の染料 -Any pink dye=桃色の染料 -Any black dye=黒色の染料 -Any brown dye=茶色の染料 -Any green dye=緑色の染料 -Any white dye=白色の染料 -Any orange dye=橙色の染料 -Any violet dye=紫色の染料 -Any yellow dye=黄色の染料 -Any magenta dye=赤紫色の染料 -Any dark grey dye=濃灰色の染料 -Any dark green dye=濃緑色の染料 -# Label for group ingredients -G= -Any item belonging to the group(s): @1=グループに属するアイテム: @1 -Unknown Item=不明なアイテム -Fuel=燃料 -Usage @1 of @2=利用方法 @1 / @2 -Recipe @1 of @2=レシピ @1 / @2 -Previous recipe=前のレシピ -Next recipe=次のレシピ -Recipe is too big to be displayed.=レシピが大きすぎて表示できません。 -Shapeless=無形 -Cooking time: @1=調理時間: @1 -Search=検索 -Reset=リセット -Previous page=前のページ -Next page=次のページ -No items to show.=表示する項目がありません。 -No usages.=利用方法がありません。 -Click again to show recipes.=もう一度クリックするとレシピを表示します。 -No recipes.=レシピがありません。 -Click again to show usages.=もう一度クリックすると使用方法を表示します。 -Recipes=レシピ diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.jbo.tr b/mods/mtg_craftguide/locale/mtg_craftguide.jbo.tr deleted file mode 100644 index c9e6fbf0..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.jbo.tr +++ /dev/null @@ -1,54 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=lo cmina lo'i kolme -Any sand=lo cmima lo'i sance -Any wool=lo cmima lo'i sunla -Any stick=lo cmima lo'i grana -Any vessel=lo cmima lo'i vasru -Any wood planks=lo cmima lo'i mudri tanbo -Any kind of stone block=lo cmima lo'i rokci bliku -Any red flower=lo cmima lo'i xunre xrula -Any blue flower=lo cmima lo'i blanu xrula -Any black flower=lo cmima lo'i xekri xrula -Any green flower=lo cmima lo'i crino xrula -Any white flower=lo cmima lo'i blabi xrula -Any orange flower=lo cmima lo'i narju xrula -Any violet flower=lo cmima lo'i zirpu xrula -Any yellow flower=lo cmima lo'i pelxu xrula -Any red dye=lo cmima lo'i xunre xinmo -Any blue dye=lo cmima lo'i blanu xinmo -Any cyan dye=lo cmima lo'i cicna xinmo -Any grey dye=lo cmima lo'i grusi xinmo -Any pink dye=lo cmima lo'i xunblabi xinmo -Any black dye=lo cmima lo'i xekri xinmo -Any brown dye=lo cmima lo'i bunre xinmo -Any green dye=lo cmima lo'i crino xinmo -Any white dye=lo cmima lo'i blabi xinmo -Any orange dye=lo cmima lo'i narju xinmo -Any violet dye=lo cmima lo'i zirpu xinmo -Any yellow dye=lo cmima lo'i pelxu xinmo -Any magenta dye=lo cmima lo'i nukni xinmo -Any dark grey dye=lo cmima lo'i xekri grusi xinmo -Any dark green dye=lo cmima lo'i xekri crino xinmo -# Label for group ingredients -# c = cmima -G=c -Any item belonging to the group(s): @1=lo cmima lo'i me zoi gi'u.@1.gi'u -Unknown Item=lo na te djuno dacti -Fuel=.i livla -Usage @1 of @2=.i meirmoi fe li @1 li @2@nle'i te zbasu -Recipe @1 of @2=.i meirmoi fe li @1 li @2@nle'i te jukpa -Previous recipe=lidne -Next recipe=selyli'e -Recipe is too big to be displayed.=.i lo te jukpa cu dukse lo ka barda tezu'e lo nu jarco -Shapeless=tarmi claxu -Cooking time: @1=lo pu'u jukpa cu snidu li @1 -Search=sisku -Reset=kraga'igau -Previous page=lidne -Next page=selyli'e -No items to show.=no da dacti cu se jarco -No usages.=na te zbasu -Click again to show recipes.=.i ko rapli .iklki fi lo nu .arco lo te jukpa -No recipes.=na te jukpa -Click again to show usages.=.i ko rapli .iklki fi lo nu .arco lo te zbasu -Recipes=lo te jukpa diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.lv.tr b/mods/mtg_craftguide/locale/mtg_craftguide.lv.tr deleted file mode 100644 index 253aae51..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.lv.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Jebkura ogle -Any sand=Jebkura smilts -Any wool=Jebkura vilna -Any stick=Jebkurš puļķis -Any vessel=Jebkurš trauks -Any wood planks=Jebkuri dēļi -Any kind of stone block=Jebkads akmens bloks -Any red flower=Jebkāda sarkana puķe -Any blue flower=Jebkāda zila puķe -Any black flower=Jebkāda melna puķe -Any green flower=Jebkāda zaļa puķe -Any white flower=Jebkāda balta puķe -Any orange flower=Jebkāda oranža puķe -Any violet flower=Jebkāda violeta puķe -Any yellow flower=Jebkāda dzeltena puķe -Any red dye=Jebkāda sarkanā krāsa -Any blue dye=Jebkāda zilā krāsa -Any cyan dye=Jebkāda ciānkrāsas krāsa -Any grey dye=Jebkāda pelēkā krāsa -Any pink dye=Jebkāda rozā krāsa -Any black dye=Jebkāda melnā krāsa -Any brown dye=Jebkāda brūnā krāsa -Any green dye=Jebkāda zaļā krāsa -Any white dye=Jebkāda baltā krāsa -Any orange dye=Jebkāda oranžā krāsa -Any violet dye=Jebkāda violetā krāsa -Any yellow dye=Jebkāda dzeltanā krāsa -Any magenta dye=Jebkāda fuksīna krāsa -Any dark grey dye=Jebkāda tumšpelēkā krāsa -Any dark green dye=Jebkāka tumši zaļā krāsa -# Label for group ingredients -G=G -Any item belonging to the group(s): @1=Jebkurš priekšmets no grupas/ām: @1 -Unknown Item=Nezināms priekšmets -Fuel=Degviela -Usage @1 of @2=Izmantošana @1 no @2 -Recipe @1 of @2=Recepte @1 no @2 -Previous recipe=Iepriekšējā recepte -Next recipe=Nākošā recepte -Recipe is too big to be displayed.=Recepte ir pārāk liela lai to attēlotu. -Shapeless=Bezformas -Cooking time: @1=Apstādāšanas laiks @1 -Search=Meklēšana -Reset=Atiestatīt -Previous page=Iepriekšējā lapa -Next page=Nākošā lapa -No items to show.=Nav priekšmetu ko parādīt. -No usages.=Nav pielietojumu. -Click again to show recipes.=Uzklikšķiniet atkal lai parādītu receptes. -No recipes.=Nav recepšu. -Click again to show usages.=Uzklikšķiniet atkal lai parādītu izmantojamības. -Recipes=Receptes diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.ms.tr b/mods/mtg_craftguide/locale/mtg_craftguide.ms.tr deleted file mode 100644 index 0cfb297f..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.ms.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Sebarang arang -Any sand=Sebarang pasir -Any wool=Sebarang bulu biri-biri -Any stick=Sebarang serpihan kayu -Any vessel=Sebarang bekas kaca -Any wood planks=Sebarang papan kayu -Any kind of stone block=Sebarang jenis bongkah batu -Any red flower=Sebarang bunga merah -Any blue flower=Sebarang bunga biru -Any black flower=Sebarang bunga hitam -Any green flower=Sebarang bunga hijau -Any white flower=Sebarang bunga putih -Any orange flower=Sebarang bunga jingga -Any violet flower=Sebarang bunga ungu -Any yellow flower=Sebarang bunga kuning -Any red dye=Sebarang pewarna merah -Any blue dye=Sebarang pewarna biru -Any cyan dye=Sebarang pewarna biru kehijauan -Any grey dye=Sebarang pewarna kelabu -Any pink dye=Sebarang pewarna merah jambu -Any black dye=Sebarang pewarna hitam -Any brown dye=Sebarang pewarna perang -Any green dye=Sebarang pewarna hijau -Any white dye=Sebarang pewarna putih -Any orange dye=Sebarang pewarna jingga -Any violet dye=Sebarang pewarna ungu -Any yellow dye=Sebarang pewarna kuning -Any magenta dye=Sebarang pewarna magenta -Any dark grey dye=Sebarang pewarna kelabu tua -Any dark green dye=Sebarang pewarna hijau tua -# Label for group ingredients -G=K -Any item belonging to the group(s): @1=Sebarang item milik kumpulan: @1 -Unknown Item=Item Tidak Diketahui -Fuel=Bahan Api -Usage @1 of @2=Kegunaan @1 daripada @2 -Recipe @1 of @2=Resipi @1 daripada @2 -Previous recipe=Resipi sebelumnya -Next recipe=Resipi seterusnya -Recipe is too big to be displayed.=Resipi terlalu besar untuk dipaparkan. -Shapeless=Tidak Berbentuk -Cooking time: @1=Masa memasak: @1 -Search=Cari -Reset=Tetap Semula -Previous page=Halaman sebelumnya -Next page=Halaman seterusnya -No items to show.=Tiada item untuk ditunjukkan. -No usages.=Tiada kegunaan. -Click again to show recipes.=Klik lagi untuk tunjuk resipi. -No recipes.=Tiada resipi. -Click again to show usages.=Klik lagi untuk tunjuk kegunaan. -Recipes=Resipi diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.pl.tr b/mods/mtg_craftguide/locale/mtg_craftguide.pl.tr deleted file mode 100644 index 88d8e95e..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.pl.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Dowolny węgiel -Any sand=Dowonly piasek -Any wool=Dowolna wełna -Any stick=Dowolny patyk -Any vessel=Dowolne naczynie -Any wood planks=Dowolne deski -Any kind of stone block=Dowolny rodzaj kamiennego bloku -Any red flower=Dowolny czerwony kwiat -Any blue flower=Dowolny niebieski kwiat -Any black flower=Dowolny czarny kwiat -Any green flower=Dowolny zielony kwiat -Any white flower=Dowolny biały kwiat -Any orange flower=Dowolny pomarańczowy kwiat -Any violet flower=Dowolny fioletowy kwiat -Any yellow flower=Dowolny żółty kwiat -Any red dye=Dowolny czerwony barwnik -Any blue dye=Dowolny niebieski barwnik -Any cyan dye=Dowolny cyjanowy barwnik -Any grey dye=Dowolny szary barwnik -Any pink dye=Dowolny różowy barwnik -Any black dye=Dowolny czarny barwnik -Any brown dye=Dowolny brązowy barwnik -Any green dye=Dowolny zielony barwnik -Any white dye=Dowolny biały barwnik -Any orange dye=Dowolny pomarańczowy barwnik -Any violet dye=Dowolny fioletowy barwnik -Any yellow dye=Dowolny zółty barwnik -Any magenta dye=Dowolny karmazynowy barwnik -Any dark grey dye=Dowolny ciemnoszary barwnik -Any dark green dye=Dowolny ciemnozielony barwnik -# Label for group ingredients -G=G -Any item belonging to the group(s): @1= -Unknown Item=Nieznany przedmiot -Fuel=Paliwo -Usage @1 of @2=Użycie @1 z @2 -Recipe @1 of @2=Receptura @1 z @2 -Previous recipe=Poprzednia receptura -Next recipe=Następna receptura -Recipe is too big to be displayed.=Receptura jest zbyt duża aby mogła być wyświetlona. -Shapeless=Bez kształtu -Cooking time: @1=Czas przepalania: @1 -Search=Wyszukaj -Reset=Zresetuj -Previous page=Poprzednia strona -Next page=Następna strona -No items to show.=Brak przedmiotów do pokazania. -No usages.=Brak użyć. -Click again to show recipes.=Naciśnij jeszcze raz aby pokazać receptury. -No recipes.=Brak receptur. -Click again to show usages.=Naciśnij jeszcze raz aby pokazać użycia. -Recipes=Receptury diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.pt_BR.tr b/mods/mtg_craftguide/locale/mtg_craftguide.pt_BR.tr deleted file mode 100644 index a4bbf7f9..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.pt_BR.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Qualquer carvão -Any sand=Qualquer areia -Any wool=Qualquer madeira -Any stick=Qualquer graveto -Any vessel=Qualquer navio -Any wood planks=Qualquer tábua de madeira -Any kind of stone block=Qualquer tipo de bloco de pedra -Any red flower=Qualquer flor vermelha -Any blue flower=Qualquer flor azul -Any black flower=Qualquer flor preta -Any green flower=Qualquer flor verde -Any white flower=Qualquer flor branca -Any orange flower=Qualquer flor laranja -Any violet flower=Qualquer flor violeta -Any yellow flower=Qualquer flor amarela -Any red dye=Qualquer tinta vermelha -Any blue dye=Qualquer tinta azul -Any cyan dye=Qualquer tinta ciano -Any grey dye=Qualquer tinta cinza -Any pink dye=Qualquer tinta rosa -Any black dye=Qualquer tinta preto -Any brown dye=Qualquer tinta marrom -Any green dye=Qualquer tinta verde -Any white dye=Qualquer tinta branca -Any orange dye=Qualquer tinta laranja -Any violet dye=Qualquer tinta violeta -Any yellow dye=Qualquer tinta amarela -Any magenta dye=Qualquer tinta magenta -Any dark grey dye=Qualquer tinta cinza-escuro -Any dark green dye=Qualquer tinta cinza-escuro -# Label for group ingredients -G=G -Any item belonging to the group(s): @1=Qualquer item pertencente ao(s) grupo(s): @1 -Unknown Item=Item Desconhecido -Fuel=Combustível -Usage @1 of @2=Uso @1 de @2 -Recipe @1 of @2=Receita @1 de @2 -Previous recipe=Receita anterior -Next recipe=Próxima receita -Recipe is too big to be displayed.=Receita é muito grande para ser exibida. -Shapeless=Sem forma -Cooking time: @1=Tempo de Cozimento: @1 -Search=Buscar -Reset=Redefinir -Previous page=Página anterior -Next page=Próxima página -No items to show.=Nenhum item para mostrar. -No usages.=Nenhum uso. -Click again to show recipes.=Clique novamente para mostrar receitas. -No recipes.=Nenhuma receita. -Click again to show usages.=Clique novamente para mostrar os usos. -Recipes=Receitas diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr b/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr deleted file mode 100644 index ea7a717c..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Любой уголь -Any sand=Любой песок -Any wool=Любая шерсть -Any stick=Любая палка -Any vessel=Любой сосуд -Any wood planks=Любые доски -Any kind of stone block=Любой вид камня -Any red flower=Любой красный цветок -Any blue flower=Любой синий цветок -Any black flower=Любой чёрный цветок -Any green flower=Любой зелёный цветок -Any white flower=Любой белый цветок -Any orange flower=Любой оранжевый цветок -Any violet flower=Любой фиолетовый цветок -Any yellow flower=Любой жёлтый цветок -Any red dye=Любой красный краситель -Any blue dye=Любой синий краситель -Any cyan dye=Любой бирюзовый краситель -Any grey dye=Любой серый краситель -Any pink dye=Любой розовый краситель -Any black dye=Любой чёрный краситель -Any brown dye=Любой коричневый краситель -Any green dye=Любой зелёный краситель -Any white dye=Любой белый краситель -Any orange dye=Любой оранжевый краситель -Any violet dye=Любой фиолетовый краситель -Any yellow dye=Любой жёлтый краситель -Any magenta dye=Любой сиреневый краситель -Any dark grey dye=Любой тёмно-серый краситель -Any dark green dye=Любой тёмно-зелёный краситель -# Label for group ingredients -G=Г -Any item belonging to the group(s): @1=Любой предмет из групп(ы): @1 -Unknown Item=Неизвестный предмет -Fuel=Топливо -Usage @1 of @2=Использование @1 из @2 -Recipe @1 of @2=Рецепт @1 из @2 -Previous recipe=Предыдущий рецепт -Next recipe=Следующий рецепт -Recipe is too big to be displayed.=Рецепт слишком большой для отображения. -Shapeless=Бесформенный -Cooking time: @1=Время готовки: @1 -Search=Поиск -Reset=Сброс -Previous page=Предыдущая страница -Next page=Следующая страница -No items to show.=Нет предметов. -No usages.=Нет использований. -Click again to show recipes.=Кликните снова чтобы увидеть рецепты. -No recipes.=Нет рецептов. -Click again to show usages.=Кликните снова чтобы увидеть использования. -Recipes=Рецепты diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr b/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr deleted file mode 100644 index 00b40564..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Någon typ av kol -Any sand=Någon typ av sand -Any wool=Någon typ av ull -Any stick=Någon typ av pinne -Any vessel=Någon typ av fartygshylla -Any wood planks=Någon typ av träplanka -Any kind of stone block=Någon typ av stenblock -Any red flower=Någon typ av röd blomma -Any blue flower=Någon typ av blå blomma -Any black flower=Någon typ av svart blomma -Any green flower=Någon typ av grön blomma -Any white flower=Någon typ av vit blomma -Any orange flower=Någon typ av orange blomma -Any violet flower=Någon typ av violett blomma -Any yellow flower=Någon typ av gul blomma -Any red dye=Någon typ av röd färg -Any blue dye=Någon typ av blå färg -Any cyan dye=Någon typ av cyan färg -Any grey dye=Någon typ av grå färg -Any pink dye=Någon typ av rosa färg -Any black dye=Någon typ av svart färg -Any brown dye=Någon typ av brun färg -Any green dye=Någon typ av grön färg -Any white dye=Någon typ av vit färg -Any orange dye=Någon typ av orange färg -Any violet dye=Någon typ av violett färg -Any yellow dye=Någon typ av gul färg -Any magenta dye=Någon typ av magenta färg -Any dark grey dye=Någon typ av mörkgrå färg -Any dark green dye=Någon typ av mörkgrön färg -# Label for group ingredients -G=G -Any item belonging to the group(s): @1=Vilket föremål som helst som tillhör grupp(erna): @1 -Unknown Item=Okänt föremål -Fuel=Bränsle -Usage @1 of @2=Användning @1 av @2 -Recipe @1 of @2=Recept @1 av @2 -Previous recipe=Föregående recept -Next recipe=Nästa recept -Recipe is too big to be displayed.=Receptet är för stort för att visas. -Shapeless=Formlöst -Cooking time: @1=Tillagningstid: @1 -Search=Sök -Reset=Återställ -Previous page=Föregående sida -Next page=Nästa sida -No items to show.=Inga föremål att visa. -No usages.=Inga användningsområden. -Click again to show recipes.=Tryck igen för att visa recept. -No recipes.=Inga recept. -Click again to show usages.=Tryck igen för att visa användningsområden. -Recipes=Recept diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr b/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr deleted file mode 100644 index 8fe78a92..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=Будь-яке вугілля -Any sand=Будь-який пісок -Any wool=Будь-яка вовна -Any stick=Будь-яка палиця -Any vessel=Будь-який посуд -Any wood planks=Будь-які дошки -Any kind of stone block=Будь-який кам'яний блок -Any red flower=Будь-яка червона квітка -Any blue flower=Будь-яка синя квітка -Any black flower=Будь-яка чорна квітка -Any green flower=Будь-яка зелена квітка -Any white flower=Будь-яка біла квітка -Any orange flower=Будь-яка помаранчева квітка -Any violet flower=Будь-яка фіолетова квітка -Any yellow flower=Будь-яка жовта квітка -Any red dye=Будь-який червоний барвник -Any blue dye=Будь-який синій барвник -Any cyan dye=Будь-який синьо-зелений барвник -Any grey dye=Будь-який сірий барвник -Any pink dye=Будь-який рожевий барвник -Any black dye=Будь-який чорний барвник -Any brown dye=Будь-який коричневий барвник -Any green dye=Будь-який зелений барвник -Any white dye=Будь-який білий барвник -Any orange dye=Будь-який помаранчевий барвник -Any violet dye=Будь-який фіолетовий барвник -Any yellow dye=Будь-який жовтий барвник -Any magenta dye=Будь-який пурпурний барвник -Any dark grey dye=Будь-який темно-сірий барвник -Any dark green dye=Будь-який темно-зелений барвник -# Label for group ingredients -G=Г -Any item belonging to the group(s): @1=Будь-який предмет з груп(и): @1 -Unknown Item=Невідомий предмет -Fuel=Паливо -Usage @1 of @2=Матеріал: @1 з @2 -Recipe @1 of @2=Рецепт: @1 з @2 -Previous recipe=Попередній рецепт -Next recipe=Наступний рецепт -Recipe is too big to be displayed.=Рецепт завеликий для показу. -Shapeless=Безформний -Cooking time: @1=Час виготовлення: @1 -Search=Пошук -Reset=Скинути -Previous page=Попередня сторінка -Next page=Наступна сторінка -No items to show.=Немає результатів. -No usages.=Не використовується. -Click again to show recipes.=Натисніть ще раз для рецептів. -No recipes.=Немає рецептів. -Click again to show usages.=Натисніть ще раз для використань. -Recipes=Рецепти diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.zh_CN.tr b/mods/mtg_craftguide/locale/mtg_craftguide.zh_CN.tr deleted file mode 100644 index 56ae7d5a..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.zh_CN.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=任何煤炭 -Any sand=任何沙子 -Any wool=任何羊毛 -Any stick=任何棒 -Any vessel=任何容器 -Any wood planks=任何木板 -Any kind of stone block=任何种类的石块 -Any red flower=任何红色花朵 -Any blue flower=任何蓝色花朵 -Any black flower=任何黑色花朵 -Any green flower=任何绿色花朵 -Any white flower=任何白色花朵 -Any orange flower=任何橙色花朵 -Any violet flower=任何紫色花朵 -Any yellow flower=任何黄色花朵 -Any red dye=任何红色染料 -Any blue dye=任何蓝色染料 -Any cyan dye=任何青色染料 -Any grey dye=任何灰色染料 -Any pink dye=任何粉色染料 -Any black dye=任何黑色染料 -Any brown dye=任何棕色染料 -Any green dye=任何绿色染料 -Any white dye=任何白色染料 -Any orange dye=任何橙色染料 -Any violet dye=任何紫色染料 -Any yellow dye=任何黄色染料 -Any magenta dye=任何品红染料 -Any dark grey dye=任何暗灰染料 -Any dark green dye=任何暗绿染料 -# Label for group ingredients -G= -Any item belonging to the group(s): @1=属于该组的任何项目:@1 -Unknown Item=未知项目 -Fuel=燃料 -Usage @1 of @2=用法@1,共@2个 -Recipe @1 of @2=配方@1,共@2个 -Previous recipe=上一配方 -Next recipe=下一配方 -Recipe is too big to be displayed.=配方太大,无法显示 -Shapeless=没有形状 -Cooking time: @1=烹饪时间:@1 -Search=搜索 -Reset=重置 -Previous page=上一页 -Next page=下一页 -No items to show.=没有项目可以显示。 -No usages.=没有用法 -Click again to show recipes.=再次单击以显示配方。 -No recipes.=没有配方。 -Click again to show usages.=再次单击以显示用法 -Recipes=配方 diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.zh_TW.tr b/mods/mtg_craftguide/locale/mtg_craftguide.zh_TW.tr deleted file mode 100644 index 859cdfe6..00000000 --- a/mods/mtg_craftguide/locale/mtg_craftguide.zh_TW.tr +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal=任何煤炭 -Any sand=任何沙子 -Any wool=任何羊毛 -Any stick=任何棒 -Any vessel=任何容器 -Any wood planks=任何木板 -Any kind of stone block=任何種類的石塊 -Any red flower=任何紅色花朵 -Any blue flower=任何藍色花朵 -Any black flower=任何黑色花朵 -Any green flower=任何綠色花朵 -Any white flower=任何白色花朵 -Any orange flower=任何橙色花朵 -Any violet flower=任何紫色花朵 -Any yellow flower=任何黃色花朵 -Any red dye=任何紅色染料 -Any blue dye=任何藍色染料 -Any cyan dye=任何青色染料 -Any grey dye=任何灰色染料 -Any pink dye=任何粉色染料 -Any black dye=任何黑色染料 -Any brown dye=任何棕色染料 -Any green dye=任何綠色染料 -Any white dye=任何白色染料 -Any orange dye=任何橙色染料 -Any violet dye=任何紫色染料 -Any yellow dye=任何黃色染料 -Any magenta dye=任何品紅染料 -Any dark grey dye=任何暗灰染料 -Any dark green dye=任何暗綠染料 -# Label for group ingredients -G= -Any item belonging to the group(s): @1=屬於該組的任何項目:@1 -Unknown Item=未知項目 -Fuel=燃料 -Usage @1 of @2=用法@1,共@2個 -Recipe @1 of @2=配方@1,共@2個 -Previous recipe=上一配方 -Next recipe=下一配方 -Recipe is too big to be displayed.=配方太大,無法顯示 -Shapeless=沒有形狀 -Cooking time: @1=烹飪時間:@1 -Search=搜索 -Reset=重置 -Previous page=上一頁 -Next page=下一頁 -No items to show.=沒有項目可以顯示。 -No usages.=沒有用法 -Click again to show recipes.=再次單擊以顯示配方。 -No recipes.=沒有配方。 -Click again to show usages.=再次單擊以顯示用法 -Recipes=配方 diff --git a/mods/mtg_craftguide/locale/template.txt b/mods/mtg_craftguide/locale/template.txt deleted file mode 100644 index e02a721d..00000000 --- a/mods/mtg_craftguide/locale/template.txt +++ /dev/null @@ -1,53 +0,0 @@ -# textdomain: mtg_craftguide -Any coal= -Any sand= -Any wool= -Any stick= -Any vessel= -Any wood planks= -Any kind of stone block= -Any red flower= -Any blue flower= -Any black flower= -Any green flower= -Any white flower= -Any orange flower= -Any violet flower= -Any yellow flower= -Any red dye= -Any blue dye= -Any cyan dye= -Any grey dye= -Any pink dye= -Any black dye= -Any brown dye= -Any green dye= -Any white dye= -Any orange dye= -Any violet dye= -Any yellow dye= -Any magenta dye= -Any dark grey dye= -Any dark green dye= -# Label for group ingredients -G= -Any item belonging to the group(s): @1= -Unknown Item= -Fuel= -Usage @1 of @2= -Recipe @1 of @2= -Previous recipe= -Next recipe= -Recipe is too big to be displayed.= -Shapeless= -Cooking time: @1= -Search= -Reset= -Previous page= -Next page= -No items to show.= -No usages.= -Click again to show recipes.= -No recipes.= -Click again to show usages.= -Recipes= diff --git a/mods/mtg_craftguide/mod.conf b/mods/mtg_craftguide/mod.conf deleted file mode 100644 index 3b2d975f..00000000 --- a/mods/mtg_craftguide/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = mtg_craftguide -description = Minetest Game mod: mtg_craftguide -depends = sfinv diff --git a/mods/mtg_craftguide/textures/craftguide_clear_icon.png b/mods/mtg_craftguide/textures/craftguide_clear_icon.png deleted file mode 100644 index 1a0e513f..00000000 Binary files a/mods/mtg_craftguide/textures/craftguide_clear_icon.png and /dev/null differ diff --git a/mods/mtg_craftguide/textures/craftguide_furnace.png b/mods/mtg_craftguide/textures/craftguide_furnace.png deleted file mode 100644 index 60d1a619..00000000 Binary files a/mods/mtg_craftguide/textures/craftguide_furnace.png and /dev/null differ diff --git a/mods/mtg_craftguide/textures/craftguide_next_icon.png b/mods/mtg_craftguide/textures/craftguide_next_icon.png deleted file mode 100644 index 266c9ba6..00000000 Binary files a/mods/mtg_craftguide/textures/craftguide_next_icon.png and /dev/null differ diff --git a/mods/mtg_craftguide/textures/craftguide_prev_icon.png b/mods/mtg_craftguide/textures/craftguide_prev_icon.png deleted file mode 100644 index c8072961..00000000 Binary files a/mods/mtg_craftguide/textures/craftguide_prev_icon.png and /dev/null differ diff --git a/mods/mtg_craftguide/textures/craftguide_search_icon.png b/mods/mtg_craftguide/textures/craftguide_search_icon.png deleted file mode 100644 index 1c374cad..00000000 Binary files a/mods/mtg_craftguide/textures/craftguide_search_icon.png and /dev/null differ diff --git a/mods/mtg_craftguide/textures/craftguide_shapeless.png b/mods/mtg_craftguide/textures/craftguide_shapeless.png deleted file mode 100644 index 51d8ce50..00000000 Binary files a/mods/mtg_craftguide/textures/craftguide_shapeless.png and /dev/null differ diff --git a/mods/player_api/README.txt b/mods/player_api/README.txt index eade644a..0f6a0b8a 100644 --- a/mods/player_api/README.txt +++ b/mods/player_api/README.txt @@ -9,15 +9,17 @@ This mod is only for content related to the Player API and the player object. Authors of source code ---------------------- Originally by celeron55, Perttu Ahola (LGPLv2.1+) -Various Minetest Game developers and contributors (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) Authors of media (textures, models and sounds) ---------------------------------------------- -Original model by MirceaKitsune (CC BY-SA 3.0). -Various alterations and fixes by kilbith, sofar, xunto, Rogier-5, TeTpaAka, Desour, -stujones11, An0n3m0us (CC BY-SA 3.0): +stujones11 (CC BY-SA 3.0): character.b3d - character.blend + character.blend -- Both derived from a model by MirceaKitsune (CC BY-SA 3.0) + +An0n3m0us (CC BY-SA 3.0): + character.b3d + character.blend -- Player animation improvement Jordach (CC BY-SA 3.0): character.png diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index 6a572f55..5803e954 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -1,88 +1,54 @@ +-- Minetest 0.4 mod: player +-- See README.txt for licensing and other information. + player_api = {} -- Player animation blending -- Note: This is currently broken due to a bug in Irrlicht, leave at 0 local animation_blend = 0 -player_api.registered_models = {} +player_api.registered_models = { } -- Local for speed. local models = player_api.registered_models -local function collisionbox_equals(collisionbox, other_collisionbox) - if collisionbox == other_collisionbox then - return true - end - for index = 1, 6 do - if collisionbox[index] ~= other_collisionbox[index] then - return false - end - end - return true -end - function player_api.register_model(name, def) models[name] = def - def.visual_size = def.visual_size or {x = 1, y = 1} - def.collisionbox = def.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3} - def.stepheight = def.stepheight or 0.6 - def.eye_height = def.eye_height or 1.47 - - -- Sort animations into property classes: - -- Animations with same properties have the same _equals value - for animation_name, animation in pairs(def.animations) do - animation.eye_height = animation.eye_height or def.eye_height - animation.collisionbox = animation.collisionbox or def.collisionbox - animation.override_local = animation.override_local or false - - for _, other_animation in pairs(def.animations) do - if other_animation._equals then - if collisionbox_equals(animation.collisionbox, other_animation.collisionbox) - and animation.eye_height == other_animation.eye_height then - animation._equals = other_animation._equals - break - end - end - end - animation._equals = animation._equals or animation_name - end end -- Player stats and animations --- model, textures, animation -local players = {} +local player_model = {} +local player_textures = {} +local player_anim = {} +local player_sneak = {} player_api.player_attached = {} -local function get_player_data(player) - return assert(players[player:get_player_name()]) -end - function player_api.get_animation(player) - return get_player_data(player) + local name = player:get_player_name() + return { + model = player_model[name], + textures = player_textures[name], + animation = player_anim[name], + } end -- Called when a player's appearance needs to be updated function player_api.set_model(player, model_name) - local player_data = get_player_data(player) - if player_data.model == model_name then - return - end - -- Update data - player_data.model = model_name - -- Clear animation data as the model has changed - -- (required for setting the `stand` animation not to be a no-op) - player_data.animation, player_data.animation_speed, player_data.animation_loop = nil, nil, nil - + local name = player:get_player_name() local model = models[model_name] if model then + if player_model[name] == model_name then + return + end player:set_properties({ mesh = model_name, - textures = player_data.textures or model.textures, + textures = player_textures[name] or model.textures, visual = "mesh", - visual_size = model.visual_size, - stepheight = model.stepheight + visual_size = model.visual_size or {x = 1, y = 1}, + collisionbox = model.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, + stepheight = model.stepheight or 0.6, + eye_height = model.eye_height or 1.47, }) - -- sets local_animation, collisionbox & eye_height player_api.set_animation(player, "stand") else player:set_properties({ @@ -94,85 +60,36 @@ function player_api.set_model(player, model_name) eye_height = 1.625, }) end -end - -function player_api.get_textures(player) - local player_data = get_player_data(player) - local model = models[player_data.model] - return assert(player_data.textures or (model and model.textures)) + player_model[name] = model_name end function player_api.set_textures(player, textures) - local player_data = get_player_data(player) - local model = models[player_data.model] - local new_textures = assert(textures or (model and model.textures)) - player_data.textures = new_textures - player:set_properties({textures = new_textures}) + local name = player:get_player_name() + local model = models[player_model[name]] + local model_textures = model and model.textures or nil + player_textures[name] = textures or model_textures + player:set_properties({textures = textures or model_textures,}) end -function player_api.set_texture(player, index, texture) - local textures = table.copy(player_api.get_textures(player)) - textures[index] = texture - player_api.set_textures(player, textures) -end - -function player_api.set_animation(player, anim_name, speed, loop) - local player_data = get_player_data(player) - local model = models[player_data.model] +function player_api.set_animation(player, anim_name, speed) + local name = player:get_player_name() + if player_anim[name] == anim_name then + return + end + local model = player_model[name] and models[player_model[name]] if not (model and model.animations[anim_name]) then return end - speed = speed or model.animation_speed - if loop == nil then - loop = true - end - if player_data.animation == anim_name - and player_data.animation_speed == speed - and player_data.animation_loop == loop - then - return - end - local previous_anim = model.animations[player_data.animation] or {} local anim = model.animations[anim_name] - player_data.animation = anim_name - player_data.animation_speed = speed - player_data.animation_loop = loop - -- If necessary change the local animation (only seen by the client of *that* player) - -- `override_local` <=> suspend local animations while this one is active - -- (this is basically a hack, proper engine feature needed...) - if anim.override_local ~= previous_anim.override_local then - if anim.override_local then - local none = {x=0, y=0} - player:set_local_animation(none, none, none, none, 1) - else - local a = model.animations -- (not specific to the animation being set) - player:set_local_animation( - a.stand, a.walk, a.mine, a.walk_mine, - model.animation_speed or 30 - ) - end - end - -- Set the animation seen by everyone else - player:set_animation(anim, speed, animation_blend, loop) - -- Update related properties if they changed - if anim._equals ~= previous_anim._equals then - player:set_properties({ - collisionbox = anim.collisionbox, - eye_height = anim.eye_height - }) - end + player_anim[name] = anim_name + player:set_animation(anim, speed or model.animation_speed, animation_blend) end -minetest.register_on_joinplayer(function(player) - local name = player:get_player_name() - players[name] = {} - player_api.player_attached[name] = false -end) - minetest.register_on_leaveplayer(function(player) local name = player:get_player_name() - players[name] = nil - player_api.player_attached[name] = nil + player_model[name] = nil + player_anim[name] = nil + player_textures[name] = nil end) -- Localize for better performance. @@ -189,11 +106,11 @@ function minetest.calculate_knockback(player, ...) end -- Check each player and apply animations -function player_api.globalstep() - for _, player in ipairs(minetest.get_connected_players()) do +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 = player_data and models[player_data.model] + local model_name = player_model[name] + local model = model_name and models[model_name] if model and not player_attached[name] then local controls = player:get_player_control() local animation_speed_mod = model.animation_speed or 30 @@ -206,7 +123,12 @@ function player_api.globalstep() -- Apply animations based on what the player is doing if player:get_hp() == 0 then player_set_animation(player, "lay") + -- Determine if the player is walking elseif controls.up or controls.down or controls.left or controls.right then + if player_sneak[name] ~= controls.sneak then + player_anim[name] = nil + player_sneak[name] = controls.sneak + end if controls.LMB or controls.RMB then player_set_animation(player, "walk_mine", animation_speed_mod) else @@ -219,21 +141,4 @@ function player_api.globalstep() end end end -end - --- Mods can modify the globalstep by overriding player_api.globalstep -minetest.register_globalstep(function(...) - player_api.globalstep(...) end) - -for _, api_function in pairs({"get_animation", "set_animation", "set_model", "set_textures"}) do - local original_function = player_api[api_function] - player_api[api_function] = function(player, ...) - if not players[player:get_player_name()] then - -- HACK for keeping backwards compatibility - minetest.log("warning", api_function .. " called on offline player") - return - end - return original_function(player, ...) - end -end diff --git a/mods/player_api/init.lua b/mods/player_api/init.lua index f258aea7..19028de1 100644 --- a/mods/player_api/init.lua +++ b/mods/player_api/init.lua @@ -1,19 +1,19 @@ +-- player/init.lua + dofile(minetest.get_modpath("player_api") .. "/api.lua") -- Default player appearance player_api.register_model("character.b3d", { animation_speed = 30, - textures = {"character.png"}, + textures = {"character.png", }, animations = { -- Standard animations. stand = {x = 0, y = 79}, - lay = {x = 162, y = 166, eye_height = 0.3, override_local = true, - collisionbox = {-0.6, 0.0, -0.6, 0.6, 0.3, 0.6}}, + lay = {x = 162, y = 166}, walk = {x = 168, y = 187}, mine = {x = 189, y = 198}, walk_mine = {x = 200, y = 219}, - sit = {x = 81, y = 160, eye_height = 0.8, override_local = true, - collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.0, 0.3}} + sit = {x = 81, y = 160}, }, collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, stepheight = 0.6, @@ -22,5 +22,13 @@ player_api.register_model("character.b3d", { -- Update appearance when the player joins minetest.register_on_joinplayer(function(player) + player_api.player_attached[player:get_player_name()] = false player_api.set_model(player, "character.b3d") + player:set_local_animation( + {x = 0, y = 79}, + {x = 168, y = 187}, + {x = 189, y = 198}, + {x = 200, y = 219}, + 30 + ) end) diff --git a/mods/player_api/license.txt b/mods/player_api/license.txt index 8ddb090e..dac0408a 100644 --- a/mods/player_api/license.txt +++ b/mods/player_api/license.txt @@ -2,8 +2,8 @@ License of source code ---------------------- GNU Lesser General Public License, version 2.1 -Copyright (C) 2011 celeron55, Perttu Ahola -Copyright (C) 2011 Various Minetest Game developers and contributors +Copyright (C) 2011-2018 celeron55, Perttu Ahola +Copyright (C) 2011-2018 Various Minetest developers and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; @@ -19,15 +19,8 @@ Licenses of media (textures, models and sounds) ----------------------------------------------- Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2011 celeron55, Perttu Ahola -Copyright (C) 2012 MirceaKitsune -Copyright (C) 2012 Jordach -Copyright (C) 2015 kilbith -Copyright (C) 2016 sofar -Copyright (C) 2016 xunto -Copyright (C) 2016 Rogier-5 -Copyright (C) 2017 TeTpaAka -Copyright (C) 2017 Desour +Copyright (C) 2011-2018 celeron55, Perttu Ahola +Copyright (C) 2012-2018 Jordach Copyright (C) 2018 stujones11 Copyright (C) 2019 An0n3m0us diff --git a/mods/player_api/mod.conf b/mods/player_api/mod.conf index bf62327b..198b86dc 100644 --- a/mods/player_api/mod.conf +++ b/mods/player_api/mod.conf @@ -1,2 +1,2 @@ name = player_api -description = Minetest Game mod: Manages player visuals +description = Minetest Game mod: player_api diff --git a/mods/player_api/models/character.b3d b/mods/player_api/models/character.b3d index 3e0827e4..8edbaf63 100644 Binary files a/mods/player_api/models/character.b3d and b/mods/player_api/models/character.b3d differ diff --git a/mods/player_api/models/character.blend b/mods/player_api/models/character.blend index a32c3438..f0ce4117 100644 Binary files a/mods/player_api/models/character.blend and b/mods/player_api/models/character.blend differ diff --git a/mods/screwdriver/README.txt b/mods/screwdriver/README.txt index aa95e19f..14c073e7 100644 --- a/mods/screwdriver/README.txt +++ b/mods/screwdriver/README.txt @@ -5,7 +5,7 @@ See license.txt for license information. License of source code ---------------------- Originally by RealBadAngel, Maciej Kasatkin (LGPLv2.1+) -Various Minetest Game developers and contributors (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) License of media (textures) --------------------------- diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua index e7227bf0..82fbaab2 100644 --- a/mods/screwdriver/init.lua +++ b/mods/screwdriver/init.lua @@ -60,19 +60,6 @@ end screwdriver.rotate.colorfacedir = screwdriver.rotate.facedir -screwdriver.rotate["4dir"] = function(pos, node, mode) - if mode ~= screwdriver.ROTATE_FACE then - -- Can only rotate 4dir nodes in face mode - return nil - end - local rotation = node.param2 % 4 -- get first 2 bits - local other = node.param2 - rotation - rotation = (rotation + 1) % 4 - return rotation + other -end - -screwdriver.rotate["color4dir"] = screwdriver.rotate["4dir"] - local wallmounted_tbl = { [screwdriver.ROTATE_FACE] = {[2] = 5, [3] = 4, [4] = 2, [5] = 3, [1] = 0, [0] = 1}, [screwdriver.ROTATE_AXIS] = {[2] = 5, [3] = 4, [4] = 2, [5] = 1, [1] = 0, [0] = 3} @@ -126,10 +113,6 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses) local new_param2 if fn then new_param2 = fn(pos, node, mode) - if not new_param2 then - -- rotation refused - return itemstack - end else new_param2 = node.param2 end @@ -157,8 +140,9 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses) minetest.check_for_falling(pos) end - if not minetest.is_creative_enabled(player_name) then - itemstack:add_wear_by_uses(uses or 200) + if not (creative and creative.is_enabled_for and + creative.is_enabled_for(player_name)) then + itemstack:add_wear(65535 / ((uses or 200) - 1)) end return itemstack diff --git a/mods/screwdriver/license.txt b/mods/screwdriver/license.txt index cc5a28d3..d9b721bb 100644 --- a/mods/screwdriver/license.txt +++ b/mods/screwdriver/license.txt @@ -3,7 +3,7 @@ License of source code GNU Lesser General Public License, version 2.1 Copyright (C) 2013-2016 RealBadAngel, Maciej Kasatkin -Copyright (C) 2013-2016 Various Minetest Game developers and contributors +Copyright (C) 2013-2016 Various Minetest developers and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; diff --git a/mods/screwdriver/locale/screwdriver.bg.tr b/mods/screwdriver/locale/screwdriver.bg.tr deleted file mode 100755 index 05981b03..00000000 --- a/mods/screwdriver/locale/screwdriver.bg.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: screwdriver -Screwdriver=Отвертка -(left-click rotates face, right-click rotates axis)= -# (ляв бутон завърта лицето, десен бутон върти оста) diff --git a/mods/screwdriver/locale/screwdriver.eo.tr b/mods/screwdriver/locale/screwdriver.eo.tr deleted file mode 100644 index 7f8fedfa..00000000 --- a/mods/screwdriver/locale/screwdriver.eo.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=Ŝraŭbturnilo -(left-click rotates face, right-click rotates axis)=(maldekstra-klako turnas supraĵon, dekstra-klako turnas akson) diff --git a/mods/screwdriver/locale/screwdriver.eu.tr b/mods/screwdriver/locale/screwdriver.eu.tr deleted file mode 100644 index ad4fc587..00000000 --- a/mods/screwdriver/locale/screwdriver.eu.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=Bihurkina -(left-click rotates face, right-click rotates axis)=(ezkerra-klik aurpegia biratzeko, eskuina-klik ardatza biratzeko) \ No newline at end of file diff --git a/mods/screwdriver/locale/screwdriver.it.tr b/mods/screwdriver/locale/screwdriver.it.tr index ff44b89f..d9fc0a08 100644 --- a/mods/screwdriver/locale/screwdriver.it.tr +++ b/mods/screwdriver/locale/screwdriver.it.tr @@ -1,3 +1,3 @@ -# textdomain: screwdriver -Screwdriver=Cacciavite -(left-click rotates face, right-click rotates axis)=(click sinistro ruota la faccia, click destro ruota l'asse) +# textdomain: screwdriver +Screwdriver=Cacciavite +(left-click rotates face, right-click rotates axis)=(click sinistro ruota la faccia, click destro ruota l'asse) \ No newline at end of file diff --git a/mods/screwdriver/locale/screwdriver.ja.tr b/mods/screwdriver/locale/screwdriver.ja.tr deleted file mode 100644 index 55690f25..00000000 --- a/mods/screwdriver/locale/screwdriver.ja.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=ドライバー -(left-click rotates face, right-click rotates axis)=(左クリックで面が回転。右クリックで軸が回転) diff --git a/mods/screwdriver/locale/screwdriver.jbo.tr b/mods/screwdriver/locale/screwdriver.jbo.tr deleted file mode 100644 index 1a85bb61..00000000 --- a/mods/screwdriver/locale/screwdriver.jbo.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=lo lupcartci -(left-click rotates face, right-click rotates axis)=.i tu'a le zulselpevysmacu cu rinka lo nu le sefta cu carna@n.i tu'a le prityselpevysmacu cu rinka lo nu le jendu cu carna diff --git a/mods/screwdriver/locale/screwdriver.lv.tr b/mods/screwdriver/locale/screwdriver.lv.tr deleted file mode 100644 index 3296dab5..00000000 --- a/mods/screwdriver/locale/screwdriver.lv.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=Skrūvgrieznis -(left-click rotates face, right-click rotates axis)=(kreisais klikšķis rotē plakni, labais klikšķis rotē asi) diff --git a/mods/screwdriver/locale/screwdriver.pl.tr b/mods/screwdriver/locale/screwdriver.pl.tr deleted file mode 100644 index 3b4bfd6e..00000000 --- a/mods/screwdriver/locale/screwdriver.pl.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=Śrubokręt -(left-click rotates face, right-click rotates axis)=(lewy przycisk myszy obraca powierzchnię, prawy przycisk myszy obraca oś) diff --git a/mods/screwdriver/locale/screwdriver.pt_BR.tr b/mods/screwdriver/locale/screwdriver.pt_BR.tr deleted file mode 100644 index 3e89f40f..00000000 --- a/mods/screwdriver/locale/screwdriver.pt_BR.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=Chave de fenda -(left-click rotates face, right-click rotates axis)=(Clique esquerdo rotaciona a face, clique direito rotaciona o eixo) diff --git a/mods/screwdriver/locale/screwdriver.ru.tr b/mods/screwdriver/locale/screwdriver.ru.tr index d50ee760..bbab3305 100644 --- a/mods/screwdriver/locale/screwdriver.ru.tr +++ b/mods/screwdriver/locale/screwdriver.ru.tr @@ -1,3 +1,3 @@ # textdomain: screwdriver Screwdriver=Отвёртка -(left-click rotates face, right-click rotates axis)=(левый клик вращает грань, правый клик вращает ось) +(left-click rotates face, right-click rotates axis)=(клик левой кнопкой мыши вращает грань, клик правой кнопкой мыши вращает ось) diff --git a/mods/screwdriver/locale/screwdriver.sv.tr b/mods/screwdriver/locale/screwdriver.se.tr similarity index 69% rename from mods/screwdriver/locale/screwdriver.sv.tr rename to mods/screwdriver/locale/screwdriver.se.tr index be440a76..91973570 100644 --- a/mods/screwdriver/locale/screwdriver.sv.tr +++ b/mods/screwdriver/locale/screwdriver.se.tr @@ -1,3 +1,3 @@ # textdomain: screwdriver Screwdriver=Skruvmejsel -(left-click rotates face, right-click rotates axis)=(vänster-klick roterar ansikte, höger-klick roterar axeln) +(left-click rotates face, right-click rotates axis)=(vänster-klick roterar ansikte, höger-klick roterar axeln) \ No newline at end of file diff --git a/mods/screwdriver/locale/screwdriver.sk.tr b/mods/screwdriver/locale/screwdriver.sk.tr deleted file mode 100644 index 74cb4174..00000000 --- a/mods/screwdriver/locale/screwdriver.sk.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=Skrutkovač -(left-click rotates face, right-click rotates axis)=(Ľavý klik otáča stranu, pravý klik otáča os) diff --git a/mods/screwdriver/locale/screwdriver.uk.tr b/mods/screwdriver/locale/screwdriver.uk.tr deleted file mode 100644 index b88fc2a6..00000000 --- a/mods/screwdriver/locale/screwdriver.uk.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: screwdriver -Screwdriver=Викрутка -(left-click rotates face, right-click rotates axis)=(ЛКМ повертає грань, ПКМ — вісь) diff --git a/mods/sethome/init.lua b/mods/sethome/init.lua index 19de9581..71874a99 100644 --- a/mods/sethome/init.lua +++ b/mods/sethome/init.lua @@ -29,8 +29,7 @@ sethome.set = function(name, pos) if not player or not pos then return false end - local player_meta = player:get_meta() - player_meta:set_string("sethome:home", minetest.pos_to_string(pos)) + player:set_attribute("sethome:home", minetest.pos_to_string(pos)) -- remove `name` from the old storage file if not homepos[name] then @@ -52,11 +51,7 @@ end sethome.get = function(name) local player = minetest.get_player_by_name(name) - if not player then - return false, S("This command can only be executed in-game!") - end - local player_meta = player:get_meta() - local pos = minetest.string_to_pos(player_meta:get_string("sethome:home")) + local pos = minetest.string_to_pos(player:get_attribute("sethome:home")) if pos then return pos end @@ -89,10 +84,6 @@ minetest.register_chatcommand("home", { description = S("Teleport you to your home point"), privs = {home = true}, func = function(name) - local player = minetest.get_player_by_name(name) - if not player then - return false, S("This command can only be executed in-game!") - end if sethome.go(name) then return true, S("Teleported to home!") end diff --git a/mods/sethome/locale/sethome.bg.tr b/mods/sethome/locale/sethome.bg.tr deleted file mode 100755 index 1b60f5a0..00000000 --- a/mods/sethome/locale/sethome.bg.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!=Тази команда може да бъде изпълнявана само в играта! -Can use /sethome and /home=Може да използва командите /sethome и /home -Teleport you to your home point=Телепортира ви до домашното местоположение -Teleported to home!=Телепортирани сте вкъщи! -Set a home using /sethome=Задайте домашното местоположение с командата /sethome -Set your home point=Задава домашното местоположение -Home set!=Домашното местоположение е зададено! -Player not found!=Играчът не е намерен! diff --git a/mods/sethome/locale/sethome.de.tr b/mods/sethome/locale/sethome.de.tr index c59b26ef..46279dd5 100644 --- a/mods/sethome/locale/sethome.de.tr +++ b/mods/sethome/locale/sethome.de.tr @@ -1,5 +1,4 @@ # textdomain: sethome -This command can only be executed in-game!=Dieser Befehl kann nur im Spiel ausgeführt werden! 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! diff --git a/mods/sethome/locale/sethome.eo.tr b/mods/sethome/locale/sethome.eo.tr deleted file mode 100644 index 86ef8149..00000000 --- a/mods/sethome/locale/sethome.eo.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!= -Can use /sethome and /home=Povas uzi /sethome kaj /home -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 punkton -Home set!=Fiksita hejmo! -Player not found!=Ludanto ne troveblas! diff --git a/mods/sethome/locale/sethome.es.tr b/mods/sethome/locale/sethome.es.tr index 661bc621..7c04ee3c 100644 --- a/mods/sethome/locale/sethome.es.tr +++ b/mods/sethome/locale/sethome.es.tr @@ -1,5 +1,4 @@ # textdomain: sethome -This command can only be executed in-game!= Can use /sethome and /home=Puedes usar /sethome y /home Teleport you to your home point=Teletranspórtate a tu hogar Teleported to home!=¡Teletransportado a tu hogar! diff --git a/mods/sethome/locale/sethome.eu.tr b/mods/sethome/locale/sethome.eu.tr deleted file mode 100644 index 0f30d5a1..00000000 --- a/mods/sethome/locale/sethome.eu.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!=Komando hau jokaldian zehar bakarrik exekuta daiteke! -Can use /sethome and /home=/sethome eta /home erabil ditzakezu -Teleport you to your home point=Zure etxe-puntura telegarraiatzen zaitu -Teleported to home!=Etxera telegarraiatua! -Set a home using /sethome=Ezarri zure etxea /sethome erabiliz -Set your home point=Ezarri zure etxe-puntua -Home set!=Etxea ezarrita! -Player not found!=Jokalaria ez da aurkitu! diff --git a/mods/sethome/locale/sethome.fr.tr b/mods/sethome/locale/sethome.fr.tr index 01345e0e..852621d6 100644 --- a/mods/sethome/locale/sethome.fr.tr +++ b/mods/sethome/locale/sethome.fr.tr @@ -1,5 +1,4 @@ # textdomain: sethome -This command can only be executed in-game!=Cette commande peut seulement être exécutée en jeu ! Can use /sethome and /home=Peut utiliser /sethome et /home Teleport you to your home point=Vous téléporter à votre domicile Teleported to home!=Téléporté à votre domicile ! diff --git a/mods/sethome/locale/sethome.id.tr b/mods/sethome/locale/sethome.id.tr index f5c68ddb..1966978c 100644 --- a/mods/sethome/locale/sethome.id.tr +++ b/mods/sethome/locale/sethome.id.tr @@ -1,6 +1,5 @@ # textdomain: sethome -This command can only be executed in-game!=Perintah ini hanya bisa dijalankan dalam permainan! -Can use /sethome and /home=Boleh gunakan /sethome dan /home +Can use /sethome and /home=Boleh pakai /sethome dan /home Teleport you to your home point=Teleportasi ke rumah Anda Teleported to home!=Teleportasi ke rumah! Set a home using /sethome=Atur letak rumah dengan /sethome diff --git a/mods/sethome/locale/sethome.it.tr b/mods/sethome/locale/sethome.it.tr index 4f1d7575..bbf86b8d 100644 --- a/mods/sethome/locale/sethome.it.tr +++ b/mods/sethome/locale/sethome.it.tr @@ -1,9 +1,8 @@ -# textdomain: sethome -This command can only be executed in-game!= -Can use /sethome and /home=Può usare /sethome e /home -Teleport you to your home point=Ti teletrasporta al tuo punto di domicilio -Teleported to home!=Teletrasportato a casa! -Set a home using /sethome=Imposta un domicilio usando /sethome -Set your home point=Imposta il tuo punto di domicilio -Home set!=Domicilio impostato! -Player not found!=Giocatore non trovato! +# textdomain: sethome +Can use /sethome and /home=Può usare /sethome e /home +Teleport you to your home point=Ti teletrasporta al tuo punto di domicilio +Teleported to home!=Teletrasportato a casa! +Set a home using /sethome=Imposta un domicilio usando /sethome +Set your home point=Imposta il tuo punto di domicilio +Home set!=Domicilio impostato! +Player not found!=Giocatore non trovato! \ No newline at end of file diff --git a/mods/sethome/locale/sethome.ja.tr b/mods/sethome/locale/sethome.ja.tr deleted file mode 100644 index e6523878..00000000 --- a/mods/sethome/locale/sethome.ja.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!= -Can use /sethome and /home=/sethomeと/homeが使えます -Teleport you to your home point=ホーム地点にテレポートします -Teleported to home!=ホームにテレポート! -Set a home using /sethome=/sethomeを使ってホームを設定します -Set your home point=ホーム地点を設定します -Home set!=ホーム地点をセット! -Player not found!=プレーヤーが見つかりません! diff --git a/mods/sethome/locale/sethome.jbo.tr b/mods/sethome/locale/sethome.jbo.tr deleted file mode 100644 index 2fe7bf0d..00000000 --- a/mods/sethome/locale/sethome.jbo.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!= -Can use /sethome and /home=kakne lo nu pilno lo me zoi gy./sethome.gy. ku .e lo me zoi gy./home.gy. -Teleport you to your home point=sukmu'u lo do zdani mokca -Teleported to home!=puba'o sukmu'u lo zdani -Set a home using /sethome=ko tcimi'e fi lo zdani sepi'o lo me zoi gy./sethome.gy. -Set your home point=tcimi'e fi lo do zdani mokca -Home set!=puba'o tcimi'e fi lo zdani -Player not found!=lo kelci na te facki diff --git a/mods/sethome/locale/sethome.lv.tr b/mods/sethome/locale/sethome.lv.tr deleted file mode 100644 index e4b85972..00000000 --- a/mods/sethome/locale/sethome.lv.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!=Šī komanda var tikt izpildīta tikai atrodoties spēlē! -Can use /sethome and /home=Var izmantot /sethome un /home -Teleport you to your home point=Teleportēt jūs uz mājas punktu -Teleported to home!=Esiet teleportēts mājās! -Set a home using /sethome=Uzstādiet māju punktu izmantojot /sethome -Set your home point=Uzstādiet savu mājas punktu -Home set!=Mājas punkts uzstādīts! -Player not found!=Spēlētājs nav atrasts! diff --git a/mods/sethome/locale/sethome.ms.tr b/mods/sethome/locale/sethome.ms.tr index 09721fef..7e9ec760 100644 --- a/mods/sethome/locale/sethome.ms.tr +++ b/mods/sethome/locale/sethome.ms.tr @@ -1,5 +1,4 @@ # textdomain: sethome -This command can only be executed in-game!=Perintah ini hanya boleh dijalankan dalam permainan! Can use /sethome and /home=Boleh guna /sethome dan /home Teleport you to your home point=Teleportasikan anda ke titik rumah anda Teleported to home!=Diteleportasikan ke rumah! diff --git a/mods/sethome/locale/sethome.pl.tr b/mods/sethome/locale/sethome.pl.tr deleted file mode 100644 index b45cb463..00000000 --- a/mods/sethome/locale/sethome.pl.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!= -Can use /sethome and /home=Może używać /sethome i /home -Teleport you to your home point=Teleportuj się do swojego punktu domowego -Teleported to home!=Teleportowano do punktu domowego -Set a home using /sethome=Ustaw punkt domowy używając /sethome -Set your home point=Ustaw swój punkt domowy -Home set!=Punkt domowy ustawiony! -Player not found!=Gracz nie odnaleziony! diff --git a/mods/sethome/locale/sethome.pt_BR.tr b/mods/sethome/locale/sethome.pt_BR.tr deleted file mode 100644 index 6abd416d..00000000 --- a/mods/sethome/locale/sethome.pt_BR.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!= -Can use /sethome and /home=Pode usar /sethome e /home -Teleport you to your home point=Teletransportá-lo para seu ponto de origem -Teleported to home!=Teletransportado para o ponto de origem! -Set a home using /sethome=Defina um ponto de origem usando /sethome -Set your home point=Define seu ponto de origem -Home set!=Ponto de origem definido! -Player not found!=Jogador não encontrado! diff --git a/mods/sethome/locale/sethome.ru.tr b/mods/sethome/locale/sethome.ru.tr index d68cf6e4..67388245 100644 --- a/mods/sethome/locale/sethome.ru.tr +++ b/mods/sethome/locale/sethome.ru.tr @@ -1,9 +1,8 @@ # textdomain: sethome -This command can only be executed in-game!=Эта команда может быть использована только в игре! Can use /sethome and /home=Возможность использовать /sethome и /home Teleport you to your home point=Вы телепортируетесь в свою домашнюю точку Teleported to home!=Вы телепортировались домой! Set a home using /sethome=Установите домашнюю точку, используя /sethome Set your home point=Установите вашу домашнюю точку Home set!=Домашняя точка установлена! -Player not found!=Игрок не найден! +Player not found!=Игрок не обнаружен! diff --git a/mods/sethome/locale/sethome.sv.tr b/mods/sethome/locale/sethome.se.tr similarity index 64% rename from mods/sethome/locale/sethome.sv.tr rename to mods/sethome/locale/sethome.se.tr index 4e100b8b..6077e4a4 100644 --- a/mods/sethome/locale/sethome.sv.tr +++ b/mods/sethome/locale/sethome.se.tr @@ -1,9 +1,8 @@ # textdomain: sethome -This command can only be executed in-game!= -Can use /sethome and /home=Kan använda /sethome och /home +Can use /sethome and /home=Kan används /sethome och /home Teleport you to your home point=Teleportera dig till din hempunkt Teleported to home!=Teleporterad hem! Set a home using /sethome=Ställ in ett hem med /sethome Set your home point=Ställ in din hempunkt Home set!=Hem inställt! -Player not found!=Spelare finns inte! +Player not found!=Spelare inte hittad! \ No newline at end of file diff --git a/mods/sethome/locale/sethome.sk.tr b/mods/sethome/locale/sethome.sk.tr deleted file mode 100644 index c0e6cee8..00000000 --- a/mods/sethome/locale/sethome.sk.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!= -Can use /sethome and /home=Môžeš použivať /sethome a /home -Teleport you to your home point=Teleportuj sa domov -Teleported to home!=Teleportovaný domov! -Set a home using /sethome=Nastav si domov použitím /sethome -Set your home point=Nastaviť si domov -Home set!=Domov nastavený! -Player not found!=Hráč nenájdený! diff --git a/mods/sethome/locale/sethome.uk.tr b/mods/sethome/locale/sethome.uk.tr deleted file mode 100644 index f17ac777..00000000 --- a/mods/sethome/locale/sethome.uk.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: sethome -This command can only be executed in-game!=Ця команда може бути виконана тільки у грі! -Can use /sethome and /home=Можливість використання /sethome та /home -Teleport you to your home point=Телепортуватися до домашньої точки -Teleported to home!=Телепортовано додому! -Set a home using /sethome=Встановіть домашню точку, використовуючи /sethome -Set your home point=Встановити домашню точку -Home set!=Домашню точку встановлено! -Player not found!=Гравця не знайдено! diff --git a/mods/sethome/locale/sethome.zh_CN.tr b/mods/sethome/locale/sethome.zh_CN.tr index 6e05576b..9e3780a7 100644 --- a/mods/sethome/locale/sethome.zh_CN.tr +++ b/mods/sethome/locale/sethome.zh_CN.tr @@ -1,7 +1,6 @@ # textdomain: sethome -This command can only be executed in-game!=该指令只能在游戏内使用! Can use /sethome and /home=可以使用/sethome和/home -Teleport you to your home point=将您传送到家 +Teleport you to your home point=传送您到您家的地点 Teleported to home!=已传送到家! Set a home using /sethome=使用/sethome设定家 Set your home point=设定您家的地点 diff --git a/mods/sethome/locale/sethome.zh_TW.tr b/mods/sethome/locale/sethome.zh_TW.tr index c5e455cc..43e14aaa 100644 --- a/mods/sethome/locale/sethome.zh_TW.tr +++ b/mods/sethome/locale/sethome.zh_TW.tr @@ -1,5 +1,4 @@ # textdomain: sethome -This command can only be executed in-game!=此指令僅能在游戲内使用! Can use /sethome and /home=可以使用/sethome和/home Teleport you to your home point=傳送您到您家的地點 Teleported to home!=已傳送到家! diff --git a/mods/sethome/locale/template.txt b/mods/sethome/locale/template.txt index f91c719c..d04bd50a 100644 --- a/mods/sethome/locale/template.txt +++ b/mods/sethome/locale/template.txt @@ -1,5 +1,4 @@ # textdomain: sethome -This command can only be executed in-game!= Can use /sethome and /home= Teleport you to your home point= Teleported to home!= diff --git a/mods/sfinv/README.txt b/mods/sfinv/README.txt index 2ef83863..a69e3c32 100644 --- a/mods/sfinv/README.txt +++ b/mods/sfinv/README.txt @@ -3,10 +3,10 @@ Minetest Game mod: sfinv See license.txt for license information. Simple Fast Inventory. -A cleaner, simpler, solution to having an advanced inventory in Luanti. +A cleaner, simpler, solution to having an advanced inventory in Minetest. See game_api.txt for this mod's API. Available for use outside of MTG here: -https://forum.luanti.org/viewtopic.php?t=19765 +https://forum.minetest.net/viewtopic.php?t=19765 Authors of source code ---------------------- diff --git a/mods/sfinv/locale/sfinv.bg.tr b/mods/sfinv/locale/sfinv.bg.tr deleted file mode 100755 index 9d66bde5..00000000 --- a/mods/sfinv/locale/sfinv.bg.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Изработване diff --git a/mods/sfinv/locale/sfinv.de.tr b/mods/sfinv/locale/sfinv.de.tr index 044e9ba9..1ba6acbf 100644 --- a/mods/sfinv/locale/sfinv.de.tr +++ b/mods/sfinv/locale/sfinv.de.tr @@ -1,2 +1,2 @@ -# textdomain: sfinv +# textdomain:sfinv Crafting=Fertigung diff --git a/mods/sfinv/locale/sfinv.eo.tr b/mods/sfinv/locale/sfinv.eo.tr deleted file mode 100644 index 1fac1adc..00000000 --- a/mods/sfinv/locale/sfinv.eo.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Konstruado diff --git a/mods/sfinv/locale/sfinv.es.tr b/mods/sfinv/locale/sfinv.es.tr index d3d66091..b941f4e6 100644 --- a/mods/sfinv/locale/sfinv.es.tr +++ b/mods/sfinv/locale/sfinv.es.tr @@ -1,2 +1,2 @@ -# textdomain: sfinv +# textdomain:sfinv Crafting=Creación diff --git a/mods/sfinv/locale/sfinv.eu.tr b/mods/sfinv/locale/sfinv.eu.tr deleted file mode 100644 index 8dc8a98a..00000000 --- a/mods/sfinv/locale/sfinv.eu.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Artisautza diff --git a/mods/sfinv/locale/sfinv.fr.tr b/mods/sfinv/locale/sfinv.fr.tr index 58ead969..6d597353 100644 --- a/mods/sfinv/locale/sfinv.fr.tr +++ b/mods/sfinv/locale/sfinv.fr.tr @@ -1,2 +1,2 @@ -# textdomain: sfinv +# textdomain:sfinv Crafting=Artisanat diff --git a/mods/sfinv/locale/sfinv.it.tr b/mods/sfinv/locale/sfinv.it.tr index e449b752..85761bcc 100644 --- a/mods/sfinv/locale/sfinv.it.tr +++ b/mods/sfinv/locale/sfinv.it.tr @@ -1,2 +1,2 @@ -# textdomain: sfinv -Crafting=Assemblaggio +# textdomain:sfinv +Crafting=Assemblaggio \ No newline at end of file diff --git a/mods/sfinv/locale/sfinv.ja.tr b/mods/sfinv/locale/sfinv.ja.tr deleted file mode 100644 index 04122d72..00000000 --- a/mods/sfinv/locale/sfinv.ja.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=クラフト diff --git a/mods/sfinv/locale/sfinv.jbo.tr b/mods/sfinv/locale/sfinv.jbo.tr deleted file mode 100644 index 0ff0328e..00000000 --- a/mods/sfinv/locale/sfinv.jbo.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=nu zbasu diff --git a/mods/sfinv/locale/sfinv.lv.tr b/mods/sfinv/locale/sfinv.lv.tr deleted file mode 100644 index 58da91de..00000000 --- a/mods/sfinv/locale/sfinv.lv.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Taisīšana diff --git a/mods/sfinv/locale/sfinv.ms.tr b/mods/sfinv/locale/sfinv.ms.tr index f62ba8ab..cc416cab 100644 --- a/mods/sfinv/locale/sfinv.ms.tr +++ b/mods/sfinv/locale/sfinv.ms.tr @@ -1,2 +1,2 @@ -# textdomain: sfinv +# textdomain:sfinv Crafting=Pertukangan diff --git a/mods/sfinv/locale/sfinv.pl.tr b/mods/sfinv/locale/sfinv.pl.tr deleted file mode 100644 index 6230d82d..00000000 --- a/mods/sfinv/locale/sfinv.pl.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Konstruowanie diff --git a/mods/sfinv/locale/sfinv.pt_BR.tr b/mods/sfinv/locale/sfinv.pt_BR.tr deleted file mode 100644 index f9e57ae7..00000000 --- a/mods/sfinv/locale/sfinv.pt_BR.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Construir diff --git a/mods/sfinv/locale/sfinv.ru.tr b/mods/sfinv/locale/sfinv.ru.tr index d7c11b2f..a98c7087 100644 --- a/mods/sfinv/locale/sfinv.ru.tr +++ b/mods/sfinv/locale/sfinv.ru.tr @@ -1,2 +1,2 @@ -# textdomain: sfinv +# textdomain:sfinv Crafting=Крафтинг diff --git a/mods/sfinv/locale/sfinv.se.tr b/mods/sfinv/locale/sfinv.se.tr new file mode 100644 index 00000000..cf2924a9 --- /dev/null +++ b/mods/sfinv/locale/sfinv.se.tr @@ -0,0 +1,2 @@ +# textdomain:sfinv +Crafting=Tillverkning \ No newline at end of file diff --git a/mods/sfinv/locale/sfinv.sk.tr b/mods/sfinv/locale/sfinv.sk.tr deleted file mode 100644 index 18566f13..00000000 --- a/mods/sfinv/locale/sfinv.sk.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Vytváranie diff --git a/mods/sfinv/locale/sfinv.sv.tr b/mods/sfinv/locale/sfinv.sv.tr deleted file mode 100644 index df426b66..00000000 --- a/mods/sfinv/locale/sfinv.sv.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Tillverkning diff --git a/mods/sfinv/locale/sfinv.uk.tr b/mods/sfinv/locale/sfinv.uk.tr deleted file mode 100644 index aff94202..00000000 --- a/mods/sfinv/locale/sfinv.uk.tr +++ /dev/null @@ -1,2 +0,0 @@ -# textdomain: sfinv -Crafting=Майстрування diff --git a/mods/sfinv/locale/sfinv.zh_CN.tr b/mods/sfinv/locale/sfinv.zh_CN.tr index 3ec3c729..251362ff 100644 --- a/mods/sfinv/locale/sfinv.zh_CN.tr +++ b/mods/sfinv/locale/sfinv.zh_CN.tr @@ -1,2 +1,2 @@ -# textdomain: sfinv +# textdomain:sfinv Crafting=合成 diff --git a/mods/sfinv/locale/sfinv.zh_TW.tr b/mods/sfinv/locale/sfinv.zh_TW.tr index 3ec3c729..251362ff 100644 --- a/mods/sfinv/locale/sfinv.zh_TW.tr +++ b/mods/sfinv/locale/sfinv.zh_TW.tr @@ -1,2 +1,2 @@ -# textdomain: sfinv +# textdomain:sfinv Crafting=合成 diff --git a/mods/sfinv/textures/sfinv_crafting_arrow.png b/mods/sfinv/textures/sfinv_crafting_arrow.png index 42bba581..df1bbdb4 100644 Binary files a/mods/sfinv/textures/sfinv_crafting_arrow.png and b/mods/sfinv/textures/sfinv_crafting_arrow.png differ diff --git a/mods/spawn/api.lua b/mods/spawn/api.lua deleted file mode 100644 index bffe32a3..00000000 --- a/mods/spawn/api.lua +++ /dev/null @@ -1,49 +0,0 @@ -spawn = {} - --- provide empty default implementations - -function spawn.get_default_pos() - return nil -end - -function spawn.add_suitable_biome(biome) -end - --- Callback registration - -spawn.registered_on_spawn = {} - -function spawn.register_on_spawn(func) - table.insert(spawn.registered_on_spawn, func) -end - --- Logic run on spawn - -local use_engine_spawn = minetest.settings:get("static_spawnpoint") or - minetest.settings:get_bool("engine_spawn") - -local function on_spawn(player, is_new) - -- Ask all callbacks first - for _, cb in ipairs(spawn.registered_on_spawn) do - if cb(player, is_new) then - return true - end - end - -- Fall back to default spawn - if not use_engine_spawn then - local pos = spawn.get_default_pos() - if pos then - player:set_pos(pos) - return true - end - end - return false -end - -minetest.register_on_newplayer(function(player) - on_spawn(player, true) -end) - -minetest.register_on_respawnplayer(function(player) - return on_spawn(player, false) -end) diff --git a/mods/spawn/init.lua b/mods/spawn/init.lua index 9cad5f93..12c957f9 100644 --- a/mods/spawn/init.lua +++ b/mods/spawn/init.lua @@ -1,12 +1,12 @@ --- Always load the API ----------------------- -dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/api.lua") +-- spawn/init.lua --- Disable biome-search implementation on unsuitable mapgens ------------------------------------------------------------- +-- Disable by mapgen, setting or if 'static_spawnpoint' is set +-------------------------------------------------------------- local mg_name = minetest.get_mapgen_setting("mg_name") -if mg_name == "v6" or mg_name == "singlenode" then +if mg_name == "v6" or mg_name == "singlenode" or + minetest.settings:get("static_spawnpoint") or + minetest.settings:get_bool("engine_spawn") then return end @@ -23,35 +23,27 @@ local checks = 128 * 128 local pos = {x = 0, y = 8, z = 0} --- Table of suitable biomes and matching API function +-- Table of suitable biomes -local biome_ids = {} - -function spawn.add_suitable_biome(biome) - local id = minetest.get_biome_id(biome) - assert(id ~= nil) - biome_ids[id] = true -end - -for _, name in ipairs({ - "taiga", "coniferous_forest", "deciduous_forest", "grassland", "savanna" -}) do - local id = minetest.get_biome_id(name) - if id then - biome_ids[id] = true - end -end +local biome_ids = { + minetest.get_biome_id("taiga"), + minetest.get_biome_id("coniferous_forest"), + minetest.get_biome_id("deciduous_forest"), + minetest.get_biome_id("grassland"), + minetest.get_biome_id("savanna"), +} -- End of parameters -------------------- + -- Direction table local dirs = { - vector.new(0, 0, 1), - vector.new(-1, 0, 0), - vector.new(0, 0, -1), - vector.new(1, 0, 0), + {x = 0, y = 0, z = 1}, + {x = -1, y = 0, z = 0}, + {x = 0, y = 0, z = -1}, + {x = 1, y = 0, z = 0}, } @@ -66,8 +58,17 @@ local success = false local spawn_pos = {} --- Functions ------------- +-- Get world 'mapgen_limit' and 'chunksize' to calculate 'spawn_limit'. +-- This accounts for how mapchunks are not generated if they or their shell exceed +-- 'mapgen_limit'. + +local mapgen_limit = tonumber(minetest.get_mapgen_setting("mapgen_limit")) +local chunksize = tonumber(minetest.get_mapgen_setting("chunksize")) +local spawn_limit = math.max(mapgen_limit - (chunksize + 1) * 16, 0) + + +--Functions +----------- -- Get next position on square search spiral @@ -94,21 +95,24 @@ end -- Spawn position search local function search() - local edge1, edge2 = core.get_mapgen_edges() for iter = 1, checks do local biome_data = minetest.get_biome_data(pos) -- Sometimes biome_data is nil - if biome_data and biome_ids[biome_data.biome] then - local spawn_y = minetest.get_spawn_level(pos.x, pos.z) - if spawn_y then - spawn_pos = vector.new(pos.x, spawn_y, pos.z) - return true + local biome = biome_data and biome_data.biome + for id_ind = 1, #biome_ids do + local biome_id = biome_ids[id_ind] + if biome == biome_id then + local spawn_y = minetest.get_spawn_level(pos.x, pos.z) + if spawn_y then + spawn_pos = {x = pos.x, y = spawn_y, z = pos.z} + return true + end end end pos = next_pos() -- Check for position being outside world edge - if pos.x < edge1.x or pos.z < edge1.z or pos.x > edge2.x or pos.z > edge2.z then + if math.abs(pos.x) > spawn_limit or math.abs(pos.z) > spawn_limit then return false end end @@ -117,11 +121,38 @@ local function search() end -function spawn.get_default_pos() - -- Search for spawn position once per server session +-- On new player spawn and player respawn + +-- Search for spawn position once per server session. If successful, store +-- position and reposition players, otherwise leave them at engine spawn +-- position. + +local function on_spawn(player) if not searched then success = search() searched = true end - return success and spawn_pos + if success then + player:set_pos(spawn_pos) + end + return success end + +minetest.register_on_newplayer(function(player) + on_spawn(player) +end) + +local enable_bed_respawn = minetest.settings:get_bool("enable_bed_respawn") +if enable_bed_respawn == nil then + enable_bed_respawn = true +end + +minetest.register_on_respawnplayer(function(player) + -- Avoid respawn conflict with beds mod + if beds and enable_bed_respawn and + beds.spawn[player:get_player_name()] then + return + end + + return on_spawn(player) +end) diff --git a/mods/spawn/mod.conf b/mods/spawn/mod.conf index 7a09d4a5..ec3d5648 100644 --- a/mods/spawn/mod.conf +++ b/mods/spawn/mod.conf @@ -1,3 +1,4 @@ name = spawn description = Minetest Game mod: spawn depends = default +optional_depends = beds diff --git a/mods/stairs/README.txt b/mods/stairs/README.txt index e684aed9..26317f7f 100644 --- a/mods/stairs/README.txt +++ b/mods/stairs/README.txt @@ -6,7 +6,7 @@ Authors of source code ---------------------- Originally by Kahrl (LGPLv2.1+) and celeron55, Perttu Ahola (LGPLv2.1+) -Various Minetest Game developers and contributors (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) Authors of media (textures) --------------------------- diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index f3cddd14..bba6e62b 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -1,6 +1,6 @@ -- stairs/init.lua --- Minetest Game mod: stairs +-- Minetest 0.4 mod: stairs -- See README.txt for licensing and other information. @@ -10,8 +10,6 @@ stairs = {} -- Load support for MT game translation. local S = minetest.get_translator("stairs") --- Same as S, but will be ignored by translation file update scripts -local T = S -- Register aliases for new pine node names @@ -32,13 +30,7 @@ local function rotate_and_place(itemstack, placer, pointed_thing) if placer then local placer_pos = placer:get_pos() if placer_pos then - 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 + param2 = minetest.dir_to_facedir(vector.subtract(p1, placer_pos)) end local finepos = minetest.pointed_thing_to_face_pos(placer, pointed_thing) @@ -63,28 +55,33 @@ local function warn_if_exists(nodename) end end --- Set backface culling and world-aligned textures -local function set_textures(images, worldaligntex) - local stair_images = {} - for i, image in ipairs(images) do - stair_images[i] = type(image) == "string" and {name = image} or table.copy(image) - if stair_images[i].backface_culling == nil then - stair_images[i].backface_culling = true - end - if worldaligntex and stair_images[i].align_style == nil then - stair_images[i].align_style = "world" - end - end - return stair_images -end -- Register stair -- Node will be called stairs:stair_ function stairs.register_stair(subname, recipeitem, groups, images, description, sounds, worldaligntex) - local def = minetest.registered_nodes[recipeitem] or {} - local stair_images = set_textures(images, worldaligntex) + -- Set backface culling and world-aligned textures + local stair_images = {} + for i, image in ipairs(images) do + if type(image) == "string" then + stair_images[i] = { + name = image, + backface_culling = true, + } + if worldaligntex then + stair_images[i].align_style = "world" + end + else + stair_images[i] = table.copy(image) + if stair_images[i].backface_culling == nil then + stair_images[i].backface_culling = true + end + if worldaligntex and stair_images[i].align_style == nil then + stair_images[i].align_style = "world" + end + end + end local new_groups = table.copy(groups) new_groups.stair = 1 warn_if_exists("stairs:stair_" .. subname) @@ -92,14 +89,11 @@ function stairs.register_stair(subname, recipeitem, groups, images, description, description = description, drawtype = "nodebox", tiles = stair_images, - use_texture_alpha = def.use_texture_alpha, - sunlight_propagates = def.sunlight_propagates, - light_source = def.light_source, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, groups = new_groups, - sounds = sounds or def.sounds, + sounds = sounds, node_box = { type = "fixed", fixed = { @@ -166,8 +160,23 @@ end function stairs.register_slab(subname, recipeitem, groups, images, description, sounds, worldaligntex) - local def = minetest.registered_nodes[recipeitem] or {} - local slab_images = set_textures(images, worldaligntex) + -- Set world-aligned textures + local slab_images = {} + for i, image in ipairs(images) do + if type(image) == "string" then + slab_images[i] = { + name = image, + } + if worldaligntex then + slab_images[i].align_style = "world" + end + else + slab_images[i] = table.copy(image) + if worldaligntex and image.align_style == nil then + slab_images[i].align_style = "world" + end + end + end local new_groups = table.copy(groups) new_groups.slab = 1 warn_if_exists("stairs:slab_" .. subname) @@ -175,14 +184,11 @@ function stairs.register_slab(subname, recipeitem, groups, images, description, description = description, drawtype = "nodebox", tiles = slab_images, - use_texture_alpha = def.use_texture_alpha, - sunlight_propagates = def.sunlight_propagates, - light_source = def.light_source, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, groups = new_groups, - sounds = sounds or def.sounds, + sounds = sounds, node_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, @@ -191,6 +197,8 @@ function stairs.register_slab(subname, recipeitem, groups, images, description, local under = minetest.get_node(pointed_thing.under) local wield_item = itemstack:get_name() local player_name = placer and placer:get_player_name() or "" + local creative_enabled = (creative and creative.is_enabled_for + and creative.is_enabled_for(player_name)) if under and under.name:find("^stairs:slab_") then -- place slab using under node orientation @@ -209,7 +217,7 @@ function stairs.register_slab(subname, recipeitem, groups, images, description, -- else attempt to place node with proper param2 minetest.item_place_node(ItemStack(wield_item), placer, pointed_thing, p2) - if not minetest.is_creative_enabled(player_name) then + if not creative_enabled then itemstack:take_item() end return itemstack @@ -289,8 +297,27 @@ end function stairs.register_stair_inner(subname, recipeitem, groups, images, description, sounds, worldaligntex, full_description) - local def = minetest.registered_nodes[recipeitem] or {} - local stair_images = set_textures(images, worldaligntex) + -- Set backface culling and world-aligned textures + local stair_images = {} + for i, image in ipairs(images) do + if type(image) == "string" then + stair_images[i] = { + name = image, + backface_culling = true, + } + if worldaligntex then + stair_images[i].align_style = "world" + end + else + stair_images[i] = table.copy(image) + if stair_images[i].backface_culling == nil then + stair_images[i].backface_culling = true + end + if worldaligntex and stair_images[i].align_style == nil then + stair_images[i].align_style = "world" + end + end + end local new_groups = table.copy(groups) new_groups.stair = 1 if full_description then @@ -303,14 +330,11 @@ function stairs.register_stair_inner(subname, recipeitem, groups, images, description = description, drawtype = "nodebox", tiles = stair_images, - use_texture_alpha = def.use_texture_alpha, - sunlight_propagates = def.sunlight_propagates, - light_source = def.light_source, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, groups = new_groups, - sounds = sounds or def.sounds, + sounds = sounds, node_box = { type = "fixed", fixed = { @@ -360,8 +384,27 @@ end function stairs.register_stair_outer(subname, recipeitem, groups, images, description, sounds, worldaligntex, full_description) - local def = minetest.registered_nodes[recipeitem] or {} - local stair_images = set_textures(images, worldaligntex) + -- Set backface culling and world-aligned textures + local stair_images = {} + for i, image in ipairs(images) do + if type(image) == "string" then + stair_images[i] = { + name = image, + backface_culling = true, + } + if worldaligntex then + stair_images[i].align_style = "world" + end + else + stair_images[i] = table.copy(image) + if stair_images[i].backface_culling == nil then + stair_images[i].backface_culling = true + end + if worldaligntex and stair_images[i].align_style == nil then + stair_images[i].align_style = "world" + end + end + end local new_groups = table.copy(groups) new_groups.stair = 1 if full_description then @@ -374,14 +417,11 @@ function stairs.register_stair_outer(subname, recipeitem, groups, images, description = description, drawtype = "nodebox", tiles = stair_images, - use_texture_alpha = def.use_texture_alpha, - sunlight_propagates = def.sunlight_propagates, - light_source = def.light_source, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, groups = new_groups, - sounds = sounds or def.sounds, + sounds = sounds, node_box = { type = "fixed", fixed = { @@ -428,14 +468,13 @@ end -- Nodes will be called stairs:{stair,slab}_ function stairs.register_stair_and_slab(subname, recipeitem, groups, images, - desc_stair, desc_slab, sounds, worldaligntex, - desc_stair_inner, desc_stair_outer) + desc_stair, desc_slab, sounds, worldaligntex) stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds, worldaligntex) - stairs.register_stair_inner(subname, recipeitem, groups, images, - desc_stair, sounds, worldaligntex, desc_stair_inner) - stairs.register_stair_outer(subname, recipeitem, groups, images, - desc_stair, sounds, worldaligntex, desc_stair_outer) + stairs.register_stair_inner(subname, recipeitem, groups, images, desc_stair, + sounds, worldaligntex) + stairs.register_stair_outer(subname, recipeitem, groups, images, desc_stair, + sounds, worldaligntex) stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds, worldaligntex) end @@ -446,9 +485,9 @@ local function my_register_stair_and_slab(subname, recipeitem, groups, images, stairs.register_stair(subname, recipeitem, groups, images, S(desc_stair), sounds, worldaligntex) stairs.register_stair_inner(subname, recipeitem, groups, images, "", - sounds, worldaligntex, T("Inner " .. desc_stair)) + sounds, worldaligntex, S("Inner " .. desc_stair)) stairs.register_stair_outer(subname, recipeitem, groups, images, "", - sounds, worldaligntex, T("Outer " .. desc_stair)) + sounds, worldaligntex, S("Outer " .. desc_stair)) stairs.register_slab(subname, recipeitem, groups, images, S(desc_slab), sounds, worldaligntex) end @@ -815,7 +854,7 @@ my_register_stair_and_slab( {"default_ice.png"}, "Ice Stair", "Ice Slab", - default.node_sound_ice_defaults(), + default.node_sound_glass_defaults(), true ) diff --git a/mods/stairs/license.txt b/mods/stairs/license.txt index ec758cf4..57bd98cf 100644 --- a/mods/stairs/license.txt +++ b/mods/stairs/license.txt @@ -4,7 +4,7 @@ License of source code GNU Lesser General Public License, version 2.1 Copyright (C) 2011-2017 Kahrl Copyright (C) 2011-2017 celeron55, Perttu Ahola -Copyright (C) 2012-2017 Various Minetest Game developers and contributors +Copyright (C) 2012-2017 Various Minetest developers and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; diff --git a/mods/stairs/locale/stairs.bg.tr b/mods/stairs/locale/stairs.bg.tr deleted file mode 100755 index bff1ed8c..00000000 --- a/mods/stairs/locale/stairs.bg.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Slab=Стъклена плоча -Glass Stair=Стъклено стъпало -Inner Glass Stair=Вътрешно стъклено стъпало -Outer Glass Stair=Външно стъклено стъпало -Obsidian Glass Slab=Плоча от обсидианено стъкло -Obsidian Glass Stair=Стъпало от обсидианено стъкло -Inner Obsidian Glass Stair=Вътрешно стъпало от обсидианено стъкло -Outer Obsidian Glass Stair=Външно стъпало от обсидианено стъкло -Wooden Slab=Дървена плоча -Wooden Stair=Дървено стъпало -Inner Wooden Stair=Вътрешно дървено стъпало -Outer Wooden Stair=Външно дървено стъпало -Jungle Wood Slab=Плоча от боабаб -Jungle Wood Stair=Стъпало от боабаб -Inner Jungle Wood Stair=Вътрешно стъпало от боабаб -Outer Jungle Wood Stair=Външно стъпало от боабаб -Pine Wood Slab=Плоча от борово дърво -Pine Wood Stair=Стъпало от борово дърво -Inner Pine Wood Stair=Вътрешно стъпало от борово дърво -Outer Pine Wood Stair=Външно стъпало от борово дърво -Acacia Wood Slab=Плоча от акациево дърво -Acacia Wood Stair=Стъпало от акациево дърво -Inner Acacia Wood Stair=Вътрешно стъпало от акациево дърво -Outer Acacia Wood Stair=Външно стъпало от акациево дърво -Aspen Wood Slab=Плоча от трепетлика -Aspen Wood Stair=Стъпало от трепетлика -Inner Aspen Wood Stair=Вътрешно стъпало от трепетлика -Outer Aspen Wood Stair=Външно стъпало от трепетлика -Stone Slab=Каменна плоча -Stone Stair=Каменна стъпало -Inner Stone Stair=Вътрешно каменно стъпало -Outer Stone Stair=Външно каменна стъпало -Cobblestone Stair=Стъпало от речни камъни -Inner Cobblestone Stair=Вътрешно стъпало от речни камъни -Outer Cobblestone Stair=Външно стъпало от речни камъни -Cobblestone Slab=Плоча от речни камъни -Mossy Cobblestone Stair=Стъпало от речни камъни покрити с мъх -Inner Mossy Cobblestone Stair=Вътрешно стъпало от речни камъни покрити с мъх -Outer Mossy Cobblestone Stair=Външно стъпало от речни камъни покрити с мъх -Mossy Cobblestone Slab=Плоча от речни камъни покрити с мъх -Stone Brick Stair=Стъпало от тухли от речни камъни -Inner Stone Brick Stair=Вътрешно стъпало от тухли от речни камъни -Outer Stone Brick Stair=Външно стъпало от тухли от речни камъни -Stone Brick Slab=Плоча от тухли от речни камъни -Stone Block Stair=Стъпало от блок от речни камъни -Inner Stone Block Stair=Вътрешно стъпало от блок от речни камъни -Outer Stone Block Stair=Външно стъпало от блок от речни камъни -Stone Block Slab=Плоча от блок от речни камъни -Desert Stone Stair=Стъпало от пустинен камък -Inner Desert Stone Stair=Вътрешно стъпало от пустинен камък -Outer Desert Stone Stair=Външно стъпало от пустинен камък -Desert Stone Slab=Плоча от пустинен камък -Desert Cobblestone Stair=Стъпало от речен пустинен камък -Inner Desert Cobblestone Stair=Вътрешно стъпало от речен пустинен камък -Outer Desert Cobblestone Stair=Външно стъпало от речен пустинен камък -Desert Cobblestone Slab=Плоча от речен пустинен камък -Desert Stone Brick Stair=Стъпало от тухли от пустинен камък -Inner Desert Stone Brick Stair=Вътрешно стъпало от тухли от пустинен камък -Outer Desert Stone Brick Stair=Външно стъпало от тухли от пустинен камък -Desert Stone Brick Slab=Плоча от тухли от пустинен камък -Desert Stone Block Stair=Стъпало от блок от пустинен камък -Inner Desert Stone Block Stair=Вътрешно стъпало от блок от пустинен камък -Outer Desert Stone Block Stair=Външно стъпало от блок от пустинен камък -Desert Stone Block Slab=Плоча от блок от пустинен камък -Sandstone Stair=Стъпало от пясъчник -Inner Sandstone Stair=Вътрешно стъпало от пясъчник -Outer Sandstone Stair=Външно стъпало от пясъчник -Sandstone Slab=Плоча от пясъчник -Sandstone Brick Stair=Стъпало от пясъчникови тухли -Inner Sandstone Brick Stair=Вътрешно стъпало от пясъчникови тухли -Outer Sandstone Brick Stair=Външно стъпало от пясъчникови тухли -Sandstone Brick Slab=Плоча от пясъчникови тухли -Sandstone Block Stair=Стъпало от пясъчников блок -Inner Sandstone Block Stair=Вътрешно стъпало от пясъчников блок -Outer Sandstone Block Stair=Външно стъпало от пясъчников блок -Sandstone Block Slab=Плоча от пясъчников блок -Desert Sandstone Stair=Стъпало от пустинен пясъчник -Inner Desert Sandstone Stair=Вътрешно стъпало от пустинен пясъчник -Outer Desert Sandstone Stair=Външно стъпало от пустинен пясъчник -Desert Sandstone Slab=Плоча от пустинен пясъчник -Desert Sandstone Brick Stair=Стъпало от пустинни пясъчникови тухли -Inner Desert Sandstone Brick Stair=Вътрешно стъпало от пустинни пясъчникови тухли -Outer Desert Sandstone Brick Stair=Външно стъпало от пустинни пясъчникови тухли -Desert Sandstone Brick Slab=Плоча от пустинни пясъчникови тухли -Desert Sandstone Block Stair=Стъпало от пустинен пясъчников блок -Inner Desert Sandstone Block Stair=Вътрешно стъпало от пустинен пясъчников блок -Outer Desert Sandstone Block Stair=Външно стъпало от пустинен пясъчников блок -Desert Sandstone Block Slab=Плоча от пустинен пясъчников блок -Silver Sandstone Stair=Стъпало от сребърен пясъчник -Inner Silver Sandstone Stair=Вътрешно стъпало от сребърен пясъчник -Outer Silver Sandstone Stair=Външно стъпало от сребърен пясъчник -Silver Sandstone Slab=Плоча от сребърен пясъчник -Silver Sandstone Brick Stair=Стъпало от сребърни пясъчникови тухли -Inner Silver Sandstone Brick Stair=Вътрешно стъпало от сребърни пясъчникови тухли -Outer Silver Sandstone Brick Stair=Външно стъпало от сребърни пясъчникови тухли -Silver Sandstone Brick Slab=Плоча от сребърни пясъчникови тухли -Silver Sandstone Block Stair=Стъпало от сребърен пясъчников блок -Inner Silver Sandstone Block Stair=Вътрешно стъпало от сребърен пясъчников блок -Outer Silver Sandstone Block Stair=Външно стъпало от сребърен пясъчников блок -Silver Sandstone Block Slab=Плоча от сребърен пясъчников блок -Obsidian Stair=Стъпало от обсидиан -Inner Obsidian Stair=Вътрешно стъпало от обсидиан -Outer Obsidian Stair=Външно стъпало от обсидиан -Obsidian Slab=Плоча от обсидиан -Obsidian Brick Stair=Стъпало от обсидианени тухли -Inner Obsidian Brick Stair=Вътрешно стъпало от обсидианени тухли -Outer Obsidian Brick Stair=Външно стъпало от обсидианени тухли -Obsidian Brick Slab=Плоча от обсидианени тухли -Obsidian Block Stair=Стъпало от обсидианен блок -Inner Obsidian Block Stair=Вътрешно стъпало от обсидианен блок -Outer Obsidian Block Stair=Външно стъпало от обсидианен блок -Obsidian Block Slab=Плоча от обсидианен блок -Brick Stair=Тухлено стъпало -Inner Brick Stair=Вътрешно тухлено стъпало -Outer Brick Stair=Външно тохлено стъпало -Brick Slab=Тухлена плоча -Steel Block Stair=Стъпало от стоманен блок -Inner Steel Block Stair=Вътрешно стъпало от стоманен блок -Outer Steel Block Stair=Външно стъпало от стоманен блок -Steel Block Slab=Плоча от стоманен блок -Tin Block Stair=Стъпало от калаен блок -Inner Tin Block Stair=Вътрешно стъпало от калаен блок -Outer Tin Block Stair=Външно стъпало от калаен блок -Tin Block Slab=Плоча от калаен блок -Copper Block Stair=Стъпало от мед блок -Inner Copper Block Stair=Вътрешно стъпало от мед блок -Outer Copper Block Stair=Външно тъпало от мед блок -Copper Block Slab=Плоча от меден блок -Bronze Block Stair=Стъпало от бронзов къс -Inner Bronze Block Stair=Вътрешно стъпало от бронзов къс -Outer Bronze Block Stair=Външно стъпало от бронзов къс -Bronze Block Slab=Плоча от бронзов къс -Gold Block Stair=Стъпало от златен къс -Inner Gold Block Stair=Вътрешно стъпало от златен къс -Outer Gold Block Stair=Външно стъпало от златен къс -Gold Block Slab=Плоча от златен къс -Ice Stair=Ледено стъпало -Inner Ice Stair=Вътрешно ледено стъпало -Outer Ice Stair=Външно ледено стъпало -Ice Slab=Плоча от лед -Snow Block Stair=Стъпало от снежен къс -Inner Snow Block Stair=Вътрешно стъпало от снежен къс -Outer Snow Block Stair=Външно стъпало от снежен къс -Snow Block Slab=Плоча от снежен къс diff --git a/mods/stairs/locale/stairs.de.tr b/mods/stairs/locale/stairs.de.tr index beb45798..41c055b5 100644 --- a/mods/stairs/locale/stairs.de.tr +++ b/mods/stairs/locale/stairs.de.tr @@ -35,10 +35,10 @@ Cobblestone Stair=Kopfsteinpflastertreppe Inner Cobblestone Stair=Innere Kopfsteinpflastertreppe Outer Cobblestone Stair=Äußere Kopfsteinpflastertreppe Cobblestone Slab=Kopfsteinpflasterplatte -Mossy Cobblestone Stair=Moosige Kopfsteinpflastertreppe -Inner Mossy Cobblestone Stair=Innere moosige Kopfsteinpflastertreppe -Outer Mossy Cobblestone Stair=Äußere moosige Kopfsteinpflastertreppe -Mossy Cobblestone Slab=Moosige Kopfsteinpflasterplatte +Mossy Cobblestone Stair=Mosige Kopfsteinpflastertreppe +Inner Mossy Cobblestone Stair=Innere mosige Kopfsteinpflastertreppe +Outer Mossy Cobblestone Stair=Äußere mosige Kopfsteinpflastertreppe +Mossy Cobblestone Slab=Mosige Kopfsteinpflasterplatte Stone Brick Stair=Steinziegeltreppe Inner Stone Brick Stair=Innere Steinziegeltreppe Outer Stone Brick Stair=Äußere Steinziegeltreppe diff --git a/mods/stairs/locale/stairs.eo.tr b/mods/stairs/locale/stairs.eo.tr deleted file mode 100644 index f018dc9c..00000000 --- a/mods/stairs/locale/stairs.eo.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Vitra ŝtupo -Glass Slab=Vitra plato -Inner Glass Stair=Interna vitra ŝtupo -Outer Glass Stair=Ekstera vitra ŝtupo -Obsidian Glass Stair=Obsidiana vitra ŝtupo -Obsidian Glass Slab=Obsidiana vitra plato -Inner Obsidian Glass Stair=Interna obsidiana vitra ŝtupo -Outer Obsidian Glass Stair=Ekstera obsidiana vitra ŝtupo -Wooden Stair=Ligna ŝtupo -Inner Wooden Stair=Interna ligna ŝtupo -Outer Wooden Stair=Ekstera ligna ŝtupo -Wooden Slab=Ligna plato -Jungle Wood Stair=Ĝangala ligna ŝtupo -Inner Jungle Wood Stair=Interna ĝangala ligna ŝtupo -Outer Jungle Wood Stair=Ekstera ĝangala ligna ŝtupo -Jungle Wood Slab=Ĝangala ligna plato -Pine Wood Stair=Pina ligna ŝtupo -Inner Pine Wood Stair=Interna pina ligna ŝtupo -Outer Pine Wood Stair=Ekstera pina ligna ŝtupo -Pine Wood Slab=Pina ligna plato -Acacia Wood Stair=Akacia ligna ŝtupo -Inner Acacia Wood Stair=Interna akacia ligna ŝtupo -Outer Acacia Wood Stair=Ekstera akacia ligna ŝtupo -Acacia Wood Slab=Akacia ligna plato -Aspen Wood Stair=Tremola ligna ŝtupo -Inner Aspen Wood Stair=Interna tremola ligna ŝtupo -Outer Aspen Wood Stair=Ekstera tremola ligna ŝtupo -Aspen Wood Slab=Tremola ligna plato -Stone Stair=Ŝtona ŝtupo -Inner Stone Stair=Interna ŝtona ŝtupo -Outer Stone Stair=Ekstera ŝtona ŝtupo -Stone Slab=Ŝtona plato -Cobblestone Stair=Pavimŝtona ŝtupo -Inner Cobblestone Stair=Interna pavimŝtona ŝtupo -Outer Cobblestone Stair=Ekstera pavimŝtona ŝtupo -Cobblestone Slab=Pavimŝtona plato -Mossy Cobblestone Stair=Muska pavimŝtona ŝtupo -Inner Mossy Cobblestone Stair=Interna muska pavimŝtona ŝtupo -Outer Mossy Cobblestone Stair=Ekstera muska pavimŝtona ŝtupo -Mossy Cobblestone Slab=Muska pavimŝtona plato -Stone Brick Stair=Ŝtona brika ŝtupo -Inner Stone Brick Stair=Interna ŝtona brika ŝtupo -Outer Stone Brick Stair=Ekstera ŝtona brika ŝtupo -Stone Brick Slab=Ŝtona brika plato -Stone Block Stair=Ŝtona ŝtipa ŝtupo -Inner Stone Block Stair=Interna ŝtona ŝtipa ŝtupo -Outer Stone Block Stair=Ekstera ŝtona ŝtipa ŝtupo -Stone Block Slab=Ŝtona ŝtipa plato -Desert Stone Stair=Dezerta ŝtona ŝtupo -Inner Desert Stone Stair=Interna dezerta ŝtona ŝtupo -Outer Desert Stone Stair=Ekstera dezerta ŝtona ŝtupo -Desert Stone Slab=Dezerta ŝtona plato -Desert Cobblestone Stair=Dezerta pavimŝtona ŝtupo -Inner Desert Cobblestone Stair=Interna dezerta pavimŝtona ŝtupo -Outer Desert Cobblestone Stair=Ekstera dezerta pavimŝtona ŝtupo -Desert Cobblestone Slab=Dezerta pavimŝtona plato -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 bloko ŝtupo -Inner Desert Stone Block Stair=Interna dezerta ŝtona bloko ŝtupo -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 -Sandstone Slab=Ŝablŝtona plato -Sandstone Brick Stair=Ŝablŝtona brika ŝtupo -Inner Sandstone Brick Stair=Interna ŝablŝtona brika ŝtupo -Outer Sandstone Brick Stair=Ekstera ŝablŝtona brika ŝtupo -Sandstone Brick Slab=Ŝablŝtona brika plato -Sandstone Block Stair=Ŝablŝtona ŝtipa ŝtupo -Inner Sandstone Block Stair=Interna ŝablŝtona ŝtipa ŝtupo -Outer Sandstone Block Stair=Ekstera ŝablŝtona ŝtipa ŝtupo -Sandstone Block Slab=Ŝablŝtona ŝtipa plato -Desert Sandstone Stair=Dezerta ŝablŝtona ŝtupo -Inner Desert Sandstone Stair=Interna dezerta ŝablŝtona ŝtupo -Outer Desert Sandstone Stair=Ekstera dezerta ŝablŝtona ŝtupo -Desert Sandstone Slab=Dezerta ŝablŝtona plato -Desert Sandstone Brick Stair=Dezerta ŝablŝtona brika ŝtupo -Inner Desert Sandstone Brick Stair=Interna dezerta ŝablŝtona brika ŝtupo -Outer Desert Sandstone Brick Stair=Ekstera dezerta ŝablŝtona brika ŝtupo -Desert Sandstone Brick Slab=Dezerta ŝablŝtona brika plato -Desert Sandstone Block Stair=Dezerta ŝablŝtona ŝtipa ŝtupo -Inner Desert Sandstone Block Stair=Interna dezerta ŝablŝtona brika ŝtupo -Outer Desert Sandstone Block Stair=Ekstera dezerta ŝablŝtona brika ŝtupo -Desert Sandstone Block Slab=Dezerta ŝablŝtona ŝtipa plato -Silver Sandstone Stair=Arĝenta ŝablŝtona ŝtupo -Inner Silver Sandstone Stair=Interna arĝenta ŝablŝtona ŝtupo -Outer Silver Sandstone Stair=Ekstera arĝenta ŝablŝtona ŝtupo -Silver Sandstone Slab=Arĝenta ŝablŝtona plato -Silver Sandstone Brick Stair=Arĝenta ŝablŝtona brika ŝtupo -Inner Silver Sandstone Brick Stair=Interna arĝenta ŝablŝtona brika ŝtupo -Outer Silver Sandstone Brick Stair=Ekstera arĝenta ŝablŝtona brika ŝtupo -Silver Sandstone Brick Slab=Arĝenta ŝablŝtona brika plato -Silver Sandstone Block Stair=Arĝenta ŝablŝtona ŝtipa ŝtupo -Inner Silver Sandstone Block Stair=Interna arĝenta ŝablŝtona ŝtipa ŝtupo -Outer Silver Sandstone Block Stair=Ekstera arĝenta ŝablŝtona ŝtipa ŝtupo -Silver Sandstone Block Slab=Arĝenta ŝablŝtona ŝtipa plato -Obsidian Stair=Obsidiana ŝtupo -Inner Obsidian Stair=Interna obsidiana ŝtupo -Outer Obsidian Stair=Ekstera obsidiana ŝtupo -Obsidian Slab=Obsidiana plato -Obsidian Brick Stair=Obsidiana brika ŝtupo -Inner Obsidian Brick Stair=Interna obsidiana brika ŝtupo -Outer Obsidian Brick Stair=Ekstera obsidiana brika ŝtupo -Obsidian Brick Slab=Obsidiana brika plato -Obsidian Block Stair=Obsidiana ŝtipa ŝtupo -Inner Obsidian Block Stair=Interna obsidiana ŝtipa ŝtupo -Outer Obsidian Block Stair=Ekstera obsidiana ŝtipa ŝtupo -Obsidian Block Slab=Obsidiana ŝtipa plato -Brick Stair=Brika ŝtupo -Inner Brick Stair=Interna brika ŝtupo -Outer Brick Stair=Ekstera brika ŝtupo -Brick Slab=Brika plato -Steel Block Stair=Ŝtala ŝtipa ŝtupo -Inner Steel Block Stair=Interna ŝtala ŝtipa ŝtupo -Outer Steel Block Stair=Ekstera ŝtala ŝtipa ŝtupo -Steel Block Slab=Ŝtala ŝtipa plato -Tin Block Stair=Stana ŝtipa ŝtupo -Inner Tin Block Stair=Interna stana ŝtipa ŝtupo -Outer Tin Block Stair=Ekstera stana ŝtipa ŝtupo -Tin Block Slab=Stana ŝtipa plato -Copper Block Stair=Kupra ŝtipa ŝtupo -Inner Copper Block Stair=Interna kupra ŝtipa ŝtupo -Outer Copper Block Stair=Ekstera kupra ŝtipa ŝtupo -Copper Block Slab=Kupra ŝtipa plato -Bronze Block Stair=Bronza ŝtipa ŝtupo -Inner Bronze Block Stair=Interna bronza ŝtipa ŝtupo -Outer Bronze Block Stair=Ekstera bronza ŝtipa ŝtupo -Bronze Block Slab=Bronza ŝtipa plato -Gold Block Stair=Ora ŝtipa ŝtupo -Inner Gold Block Stair=Interna ora ŝtipa ŝtupo -Outer Gold Block Stair=Ekstera ora ŝtipa ŝtupo -Gold Block Slab=Ora ŝtipa plato -Ice Stair=Glacia ŝtupo -Inner Ice Stair=Interna glacia ŝtupo -Outer Ice Stair=Ekstera glacia ŝtupo -Ice Slab=Glacia plato -Snow Block Stair=Neĝa ŝtipa ŝtupo -Inner Snow Block Stair=Interna neĝa ŝtipa ŝtupo -Outer Snow Block Stair=Ekstera neĝa ŝtipa ŝtupo -Snow Block Slab=Neĝa ŝtipa plato diff --git a/mods/stairs/locale/stairs.eu.tr b/mods/stairs/locale/stairs.eu.tr deleted file mode 100644 index 3676759e..00000000 --- a/mods/stairs/locale/stairs.eu.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Beirazko eskailera -Glass Slab=Beirazko lauza -Inner Glass Stair=Beirazko barne-eskailera -Outer Glass Stair=Beirazko kanpo-eskailera -Obsidian Glass Stair=Obsidianazko beirazko eskailera -Obsidian Glass Slab=Obsidianazko beirazko lauza -Inner Obsidian Glass Stair=Obsidianazko beirazko barne-eskailera -Outer Obsidian Glass Stair=Obsidianazko beirazko kanpo-eskailera -Wooden Stair=Zurezko eskailera -Inner Wooden Stair=Zurezko barne-eskailera -Outer Wooden Stair=Zurezko kanpo-eskailera -Wooden Slab=Zurezko lauza -Jungle Wood Stair=Baso-egurrezko eskailera -Inner Jungle Wood Stair=Baso-egurrezko barne-eskailera -Outer Jungle Wood Stair=Baso-egurrezko kanpo-eskailera -Jungle Wood Slab=Baso-egurrezko lauza -Pine Wood Stair=Pinu-eskailera -Inner Pine Wood Stair=Pinuzko barne-eskailera -Outer Pine Wood Stair=Pinuzko kanpo-eskailera -Pine Wood Slab=Pinu-lauza -Acacia Wood Stair=Akaziako eskailera -Inner Acacia Wood Stair=Akaziako barne-eskailera -Outer Acacia Wood Stair=Akaziako kanpo-eskailera -Acacia Wood Slab=Akaziako lauza -Aspen Wood Stair=Makalezko eskailera -Inner Aspen Wood Stair=Makalezko barne-eskailera -Outer Aspen Wood Stair=Makalezko kanpo-eskailera -Aspen Wood Slab=Makal-lauza -Stone Stair=Harrizko eskailera -Inner Stone Stair=Harrizko barne-eskailera -Outer Stone Stair=Harrizko kanpo-eskailera -Stone Slab=Harrizko lauza -Cobblestone Stair=Galtzada-harrizko eskailera -Inner Cobblestone Stair=Galtzada-harrizko barne-eskailera -Outer Cobblestone Stair=Galtzada-harrizko kanpo-eskailera -Cobblestone Slab=Galtzada-harrizko lauza -Mossy Cobblestone Stair=Goroldiodun galtzada-harrizko eskailera -Inner Mossy Cobblestone Stair=Goroldiodun galtzada-harrizko barne-eskailera -Outer Mossy Cobblestone Stair=Goroldiodun galtzada-harrizko kanpo-eskailera -Mossy Cobblestone Slab=Goroldiodun galtzada-harrizko lauza -Stone Brick Stair=Harri-adreiluzko eskailera -Inner Stone Brick Stair=Harri-adreiluzko barne-eskailera -Outer Stone Brick Stair=Harri-adreiluzko kanpo-eskailera -Stone Brick Slab=Harri-adreiluzko lauza -Stone Block Stair=Harri-blokezko eskailera -Inner Stone Block Stair=Harri-blokezko barne-eskailera -Outer Stone Block Stair=Harri-blokezko kanpo-eskailera -Stone Block Slab=Harri-blokezko lauza -Desert Stone Stair=Basamortuko harrizko eskailera -Inner Desert Stone Stair=Basamortuko harrizko barne-eskailera -Outer Desert Stone Stair=Basamortuko harrizko kanpo-eskailera -Desert Stone Slab=Basamortuko harrizko lauza -Desert Cobblestone Stair=Basamortuko galtzada-harrizko eskailera -Inner Desert Cobblestone Stair=Basamortuko galtzada-harrizko barne-eskailera -Outer Desert Cobblestone Stair=Basamortuko galtzada-harrizko kanpo-eskailera -Desert Cobblestone Slab=Basamortuko galtzada-harrizko lauza -Desert Stone Brick Stair=Basamortuko adreiluzko eskailera -Inner Desert Stone Brick Stair=Basamortuko adreiluzko barne-eskailera -Outer Desert Stone Brick Stair=Basamortuko adreiluzko kanpo-eskailera -Desert Stone Brick Slab=Basamortuko adreiluzko lauza -Desert Stone Block Stair=Basamortuko harrizko bloke-eskailera -Inner Desert Stone Block Stair=Basamortuko harrizko blokezko barne-eskailera -Outer Desert Stone Block Stair=Basamortuko harrizko blokezko kanpo-eskailera -Desert Stone Block Slab=Basamortuko harrizko blokezko lauza -Sandstone Stair=Hareharrizko eskailera -Inner Sandstone Stair=Hareharrizko barne-eskailera -Outer Sandstone Stair=Hareharrizko kanpo-eskailera -Sandstone Slab=Hareharrizko lauza -Sandstone Brick Stair=Hareharri-adreiluzko eskailera -Inner Sandstone Brick Stair=Hareharri-adreiluzko barne-eskailera -Outer Sandstone Brick Stair=Hareharri-adreiluzko kanpo-eskailera -Sandstone Brick Slab=Hareharri-adreiluzko lauza -Sandstone Block Stair=Hareharrizko blokezko eskailera -Inner Sandstone Block Stair=Hareharrizko blokezko barne-eskailera -Outer Sandstone Block Stair=Hareharrizko blokezko kanpo-eskailera -Sandstone Block Slab=Hareharrizko blokezko lauza -Desert Sandstone Stair=Basamortuko hareharrizko eskailera -Inner Desert Sandstone Stair=Basamortuko hareharrizko barne-eskailera -Outer Desert Sandstone Stair=Basamortuko hareharrizko kanpo-eskailera -Desert Sandstone Slab=Basamortuko hareharrizko lauza -Desert Sandstone Brick Stair=Basamortuko hareharrizko adreiluzko eskailera -Inner Desert Sandstone Brick Stair=Basamortuko hareharrizko adreiluzko barne-eskailera -Outer Desert Sandstone Brick Stair=Basamortuko hareharri-adreiluzko kanpo-eskailera -Desert Sandstone Brick Slab=Basamortuko hareharri-adreiluzko lauza -Desert Sandstone Block Stair=Basamortuko hareharrizko bloke-eskailera -Inner Desert Sandstone Block Stair=Basamortuko hareharrizko blokezko barne-eskailera -Outer Desert Sandstone Block Stair=Basamortuko hareharrizko blokezko kanpo-eskailera -Desert Sandstone Block Slab=Basamortuko hareharrizko bloke-lauza -Silver Sandstone Stair=Zilar koloreko hareharrizko eskailera -Inner Silver Sandstone Stair=Zilarrezko hareharrizko barne-eskailera -Outer Silver Sandstone Stair=Hareharri zilarreztatuzko kanpo-eskailera -Silver Sandstone Slab=Zilar koloreko hareharrizko lauza -Silver Sandstone Brick Stair=Zilar koloreko hareharri-adreiluzko eskailera -Inner Silver Sandstone Brick Stair=Zilarrezko hareharri-adreiluzko barne-eskailera -Outer Silver Sandstone Brick Stair=Hareharri zilarreztatuzko adreiluzko kanpo-eskailera -Silver Sandstone Brick Slab=Zilar koloreko hareharri-adreiluzko lauza -Silver Sandstone Block Stair=Zilar koloreko hareharrizko bloke-eskailera -Inner Silver Sandstone Block Stair=Zilar koloreko hareharrizko blokezko barne-eskailera -Outer Silver Sandstone Block Stair=Hareharri zilarreztatuzko blokezko kanpo-eskailera -Silver Sandstone Block Slab=Zilar koloreko hareharrizko bloke-lauza -Obsidian Stair=Obsidiana-eskailera -Inner Obsidian Stair=Obsidianazko barne-eskailera -Outer Obsidian Stair=Obsidianazko kanpo-eskailera -Obsidian Slab=Obsidianazko lauza -Obsidian Brick Stair=Obsidiana-adreiluzko eskailera -Inner Obsidian Brick Stair=Obsidiana-adreiluzko barne-eskailera -Outer Obsidian Brick Stair=Obsidiana-adreiluzko kanpo-eskailera -Obsidian Brick Slab=Obsidiana-adreiluzko lauza -Obsidian Block Stair=Obsidiana-blokezko eskailera -Inner Obsidian Block Stair=Obsidiana-blokezko barne-eskailera -Outer Obsidian Block Stair=Obsidiana-blokezko kanpo-eskailera -Obsidian Block Slab=Obsidianazko bloke-lauza -Brick Stair=Adreiluzko eskailera -Inner Brick Stair=Adreiluzko barne-eskailera -Outer Brick Stair=Adreiluzko kanpo-eskailera -Brick Slab=Adreiluzko lauza -Steel Block Stair=Altzairuzko eskailera -Inner Steel Block Stair=Altzairuzko barne-eskailera -Outer Steel Block Stair=Altzairuzko kanpo-eskailera -Steel Block Slab=Altzairuzko lauza -Tin Block Stair=Eztainuzko eskailera -Inner Tin Block Stair=Eztainuzko barne-eskailera -Outer Tin Block Stair=Eztainuzko kanpo-eskailera -Tin Block Slab=Eztainuzko lauza -Copper Block Stair=Kobrezko eskailera -Inner Copper Block Stair=Kobrezko barne-eskailera -Outer Copper Block Stair=Kobrezko kanpo-eskailera -Copper Block Slab=Kobrezko lauza -Bronze Block Stair=Brontzezko eskailera -Inner Bronze Block Stair=Brontzezko barne-eskailera -Outer Bronze Block Stair=Brontzezko kanpo-eskailera -Bronze Block Slab=Brontzezko lauza -Gold Block Stair=Urrezko eskailera -Inner Gold Block Stair=Urrezko barne-eskailera -Outer Gold Block Stair=Kanpo-eskailera, urrezkoa -Gold Block Slab=Urrezko lauza -Ice Stair=Izotz-eskailera -Inner Ice Stair=Izotzezko barne-eskailera -Outer Ice Stair=Izotzekozko kanpo-eskailera -Ice Slab=Izotz-lauza -Snow Block Stair=Elur-eskailera -Inner Snow Block Stair=Elurrezko barne-eskailera -Outer Snow Block Stair=Elurrezko kanpo-eskailera -Snow Block Slab=Elur-lauza diff --git a/mods/stairs/locale/stairs.it.tr b/mods/stairs/locale/stairs.it.tr index 16945ec6..16dfed6e 100644 --- a/mods/stairs/locale/stairs.it.tr +++ b/mods/stairs/locale/stairs.it.tr @@ -1,145 +1,145 @@ -# textdomain: stairs -Glass Stair=Scala di vetro -Glass Slab=Lastra di vetro -Inner Glass Stair=Scala di vetro interna -Outer Glass Stair=Scala di vetro esterna -Obsidian Glass Stair=Scala di vetro d'ossidiana -Obsidian Glass Slab=Lastra di vetro d'ossidiana -Inner Obsidian Glass Stair=Scala di vetro d'ossidiana interna -Outer Obsidian Glass Stair=Scala di vetro d'ossidiana esterna -Wooden Stair=Scala di legno -Inner Wooden Stair=Scala di legno interna -Outer Wooden Stair=Scala di legno esterna -Wooden Slab=Lastra di legno -Jungle Wood Stair=Scala di legno della giungla -Inner Jungle Wood Stair=Scala di legno della giungla interna -Outer Jungle Wood Stair=Scala di legno della giungla esterna -Jungle Wood Slab=Lastra di legno della giungla -Pine Wood Stair=Scala di legno di pino -Inner Pine Wood Stair=Scala di legno di pino interna -Outer Pine Wood Stair=Scala di legno di pino esterna -Pine Wood Slab=Lastra di legno di pino -Acacia Wood Stair=Scala di legno d'acacia -Inner Acacia Wood Stair=Scala di legno d'acacia interna -Outer Acacia Wood Stair=Scala di legno d'acacia esterna -Acacia Wood Slab=Lastra di legno d'acacia -Aspen Wood Stair=Scala di legno di pioppo -Inner Aspen Wood Stair=Scala di legno di pioppo interna -Outer Aspen Wood Stair=Scala di legno di pioppo esterna -Aspen Wood Slab=Lastra di legno di pioppo -Stone Stair=Scala di pietra -Inner Stone Stair=Scala di pietra interna -Outer Stone Stair=Scala di pietra esterna -Stone Slab=Lastra di pietra -Cobblestone Stair=Scala di ciottoli -Inner Cobblestone Stair=Scala di ciottoli interna -Outer Cobblestone Stair=Scala di ciottoli esterna -Cobblestone Slab=Lastra di ciottoli -Mossy Cobblestone Stair=Scala di ciottoli muschiosi -Inner Mossy Cobblestone Stair=Scala di ciottoli muschiosi interna -Outer Mossy Cobblestone Stair=Scala di ciottoli muschiosi esterna -Mossy Cobblestone Slab=Lastra di ciottoli muschiosi -Stone Brick Stair=Scala di mattone di pietra -Inner Stone Brick Stair=Scala di mattone di pietra interna -Outer Stone Brick Stair=Scala di mattone di pietra esterna -Stone Brick Slab=Lastra di mattone di pietra -Stone Block Stair=Scala di blocco di pietra -Inner Stone Block Stair=Scala di blocco di pietra interna -Outer Stone Block Stair=Scala di blocco di pietra esterna -Stone Block Slab=Lastra di blocco di pietra -Desert Stone Stair=Scala di pietra del deserto -Inner Desert Stone Stair=Scala di pietra del deserto interna -Outer Desert Stone Stair=Scala di pietra del deserto esterna -Desert Stone Slab=Lastra di pietra del deserto -Desert Cobblestone Stair=Scala di ciottoli del deserto -Inner Desert Cobblestone Stair=Scala di ciottoli del deserto interna -Outer Desert Cobblestone Stair=Scala di ciottoli del deserto esterna -Desert Cobblestone Slab=Lastra di ciottoli del deserto -Desert Stone Brick Stair=Scala di mattone di pietra del deserto -Inner Desert Stone Brick Stair=Scala di mattone di pietra del deserto interna -Outer Desert Stone Brick Stair=Scala di mattone di pietra del deserto esterna -Desert Stone Brick Slab=Lastra di mattone di pietra del deserto -Desert Stone Block Stair=Scala di blocco di pietra del deserto -Inner Desert Stone Block Stair=Scala di blocco di pietra del deserto interna -Outer Desert Stone Block Stair=Scala di blocco di pietra del deserto esterna -Desert Stone Block Slab=Lastra di blocco di pietra del deserto -Sandstone Stair=Scala d'arenaria -Inner Sandstone Stair=Scala d'arenaria interna -Outer Sandstone Stair=Scala d'arenaria esterna -Sandstone Slab=Lastra d'arenaria -Sandstone Brick Stair=Scala di mattone d'arenaria -Inner Sandstone Brick Stair=Scala di mattone d'arenaria interna -Outer Sandstone Brick Stair=Scala di mattone d'arenaria esterna -Sandstone Brick Slab=Lastra di mattone d'arenaria -Sandstone Block Stair=Scala di blocco d'arenaria -Inner Sandstone Block Stair=Scala di blocco d'arenaria interna -Outer Sandstone Block Stair=Scala di blocco d'arenaria esterna -Sandstone Block Slab=Lastra di blocco d'arenaria -Desert Sandstone Stair=Scala d'arenaria del deserto -Inner Desert Sandstone Stair=Scala d'arenaria del deserto interna -Outer Desert Sandstone Stair=Scala d'arenaria del deserto esterna -Desert Sandstone Slab=Lastra d'arenaria del deserto -Desert Sandstone Brick Stair=Scala di mattone d'arenaria del deserto -Inner Desert Sandstone Brick Stair=Scala di mattone d'arenaria del deserto interna -Outer Desert Sandstone Brick Stair=Scala di mattone d'arenaria del deserto esterna -Desert Sandstone Brick Slab=Lastra di mattone d'arenaria del deserto -Desert Sandstone Block Stair=Scala di blocco d'arenaria del deserto -Inner Desert Sandstone Block Stair=Scala di blocco d'arenaria del deserto interna -Outer Desert Sandstone Block Stair=Scala di blocco d'arenaria del deserto esterna -Desert Sandstone Block Slab=Lastra di blocco d'arenaria del deserto -Silver Sandstone Stair=Scala d'arenaria argentata -Inner Silver Sandstone Stair=Scala d'arenaria argentata interna -Outer Silver Sandstone Stair=Scala d'arenaria argentata esterna -Silver Sandstone Slab=Lastra d'arenaria argentata -Silver Sandstone Brick Stair=Scala di mattone d'arenaria argentata -Inner Silver Sandstone Brick Stair=Scala di mattone d'arenaria argentata interna -Outer Silver Sandstone Brick Stair=Scala di mattone d'arenaria argentata esterna -Silver Sandstone Brick Slab=Lastra di mattone d'arenaria argentata -Silver Sandstone Block Stair=Scala di blocco d'arenaria argentata -Inner Silver Sandstone Block Stair=Scala di blocco d'arenaria argentata interna -Outer Silver Sandstone Block Stair=Scala di blocco d'arenaria argentata esterna -Silver Sandstone Block Slab=Lastra di blocco d'arenaria argentata -Obsidian Stair=Scala d'ossidiana -Inner Obsidian Stair=Scala d'ossidiana interna -Outer Obsidian Stair=Scala d'ossidiana esterna -Obsidian Slab=Lastra d'ossidiana -Obsidian Brick Stair=Scala di mattone d'ossidiana -Inner Obsidian Brick Stair=Scala di mattone d'ossidiana interna -Outer Obsidian Brick Stair=Scala di mattone d'ossidiana esterna -Obsidian Brick Slab=Lastra di mattone d'ossidiana -Obsidian Block Stair=Scala di blocco d'ossidiana -Inner Obsidian Block Stair=Scala di blocco d'ossidiana interna -Outer Obsidian Block Stair=Scala di blocco d'ossidiana esterna -Obsidian Block Slab=Lastra di blocco d'ossidiana -Brick Stair=Scala di mattone -Inner Brick Stair=Scala di mattone interna -Outer Brick Stair=Scala di mattone esterna -Brick Slab=Lastra di mattone -Steel Block Stair=Scala di blocco d'acciaio -Inner Steel Block Stair=Scala di blocco d'acciaio interna -Outer Steel Block Stair=Scala di blocco d'acciaio esterna -Steel Block Slab=Lastra di blocco d'acciaio -Tin Block Stair=Scala di blocco di stagno -Inner Tin Block Stair=Scala di blocco di stagno interna -Outer Tin Block Stair=Scala di blocco di stagno esterna -Tin Block Slab=Lastra di blocco di stagno -Copper Block Stair=Scala di blocco di rame -Inner Copper Block Stair=Scala di blocco di rame interna -Outer Copper Block Stair=Scala di blocco di rame esterna -Copper Block Slab=Lastra di blocco di rame -Bronze Block Stair=Scala di blocco di bronzo -Inner Bronze Block Stair=Scala di blocco di bronzo interna -Outer Bronze Block Stair=Scala di blocco di bronzo esterna -Bronze Block Slab=Lastra di blocco di bronzo -Gold Block Stair=Scala di blocco d'oro -Inner Gold Block Stair=Scala di blocco d'oro interna -Outer Gold Block Stair=Scala di blocco d'oro esterna -Gold Block Slab=Lastra di blocco d'oro -Ice Stair=Scala di ghiaccio -Inner Ice Stair=Scala di ghiaccio interna -Outer Ice Stair=Scala di ghiaccio esterna -Ice Slab=Lastra di ghiaccio -Snow Block Stair=Scala di blocco di neve -Inner Snow Block Stair=Scala di blocco di neve interna -Outer Snow Block Stair=Scala di blocco di neve esterna -Snow Block Slab=Lastra di blocco di neve +# textdomain: stairs +Glass Stair=Scala di vetro +Glass Slab=Lastra di vetro +Inner Glass Stair=Scala di vetro interna +Outer Glass Stair=Scala di vetro esterna +Obsidian Glass Stair=Scala di vetro d'ossidiana +Obsidian Glass Slab=Lastra di vetro d'ossidiana +Inner Obsidian Glass Stair=Scala di vetro d'ossidiana interna +Outer Obsidian Glass Stair=Scala di vetro d'ossidiana esterna +Wooden Stair=Scala di legno +Inner Wooden Stair=Scala di legno interna +Outer Wooden Stair=Scala di legno esterna +Wooden Slab=Lastra di legno +Jungle Wood Stair=Scala di legno della giungla +Inner Jungle Wood Stair=Scala di legno della giungla interna +Outer Jungle Wood Stair=Scala di legno della giungla esterna +Jungle Wood Slab=Lastra di legno della giungla +Pine Wood Stair=Scala di legno di pino +Inner Pine Wood Stair=Scala di legno di pino interna +Outer Pine Wood Stair=Scala di legno di pino esterna +Pine Wood Slab=Lastra di legno di pino +Acacia Wood Stair=Scala di legno d'acacia +Inner Acacia Wood Stair=Scala di legno d'acacia interna +Outer Acacia Wood Stair=Scala di legno d'acacia esterna +Acacia Wood Slab=Lastra di legno d'acacia +Aspen Wood Stair=Scala di legno di pioppo +Inner Aspen Wood Stair=Scala di legno di pioppo interna +Outer Aspen Wood Stair=Scala di legno di pioppo esterna +Aspen Wood Slab=Lastra di legno di pioppo +Stone Stair=Scala di pietra +Inner Stone Stair=Scala di pietra interna +Outer Stone Stair=Scala di pietra esterna +Stone Slab=Lastra di pietra +Cobblestone Stair=Scala di ciottoli +Inner Cobblestone Stair=Scala di ciottoli interna +Outer Cobblestone Stair=Scala di ciottoli esterna +Cobblestone Slab=Lastra di ciottoli +Mossy Cobblestone Stair=Scala di ciottoli muschiosi +Inner Mossy Cobblestone Stair=Scala di ciottoli muschiosi interna +Outer Mossy Cobblestone Stair=Scala di ciottoli muschiosi esterna +Mossy Cobblestone Slab=Lastra di ciottoli muschiosi +Stone Brick Stair=Scala di mattone di pietra +Inner Stone Brick Stair=Scala di mattone di pietra interna +Outer Stone Brick Stair=Scala di mattone di pietra esterna +Stone Brick Slab=Lastra di mattone di pietra +Stone Block Stair=Scala di blocco di pietra +Inner Stone Block Stair=Scala di blocco di pietra interna +Outer Stone Block Stair=Scala di blocco di pietra esterna +Stone Block Slab=Lastra di blocco di pietra +Desert Stone Stair=Scala di pietra del deserto +Inner Desert Stone Stair=Scala di pietra del deserto interna +Outer Desert Stone Stair=Scala di pietra del deserto esterna +Desert Stone Slab=Lastra di pietra del deserto +Desert Cobblestone Stair=Scala di ciottoli del deserto +Inner Desert Cobblestone Stair=Scala di ciottoli del deserto interna +Outer Desert Cobblestone Stair=Scala di ciottoli del deserto esterna +Desert Cobblestone Slab=Lastra di ciottoli del deserto +Desert Stone Brick Stair=Scala di mattone di pietra del deserto +Inner Desert Stone Brick Stair=Scala di mattone di pietra del deserto interna +Outer Desert Stone Brick Stair=Scala di mattone di pietra del deserto esterna +Desert Stone Brick Slab=Lastra di mattone di pietra del deserto +Desert Stone Block Stair=Scala di blocco di pietra del deserto +Inner Desert Stone Block Stair=Scala di blocco di pietra del deserto interna +Outer Desert Stone Block Stair=Scala di blocco di pietra del deserto esterna +Desert Stone Block Slab=Lastra di blocco di pietra del deserto +Sandstone Stair=Scala d'arenaria +Inner Sandstone Stair=Scala d'arenaria interna +Outer Sandstone Stair=Scala d'arenaria esterna +Sandstone Slab=Lastra d'arenaria +Sandstone Brick Stair=Scala di mattone d'arenaria +Inner Sandstone Brick Stair=Scala di mattone d'arenaria interna +Outer Sandstone Brick Stair=Scala di mattone d'arenaria esterna +Sandstone Brick Slab=Lastra di mattone d'arenaria +Sandstone Block Stair=Scala di blocco d'arenaria +Inner Sandstone Block Stair=Scala di blocco d'arenaria interna +Outer Sandstone Block Stair=Scala di blocco d'arenaria esterna +Sandstone Block Slab=Lastra di blocco d'arenaria +Desert Sandstone Stair=Scala d'arenaria del deserto +Inner Desert Sandstone Stair=Scala d'arenaria del deserto interna +Outer Desert Sandstone Stair=Scala d'arenaria del deserto esterna +Desert Sandstone Slab=Lastra d'arenaria del deserto +Desert Sandstone Brick Stair=Scala di mattone d'arenaria del deserto +Inner Desert Sandstone Brick Stair=Scala di mattone d'arenaria del deserto interna +Outer Desert Sandstone Brick Stair=Scala di mattone d'arenaria del deserto esterna +Desert Sandstone Brick Slab=Lastra di mattone d'arenaria del deserto +Desert Sandstone Block Stair=Scala di blocco d'arenaria del deserto +Inner Desert Sandstone Block Stair=Scala di blocco d'arenaria del deserto interna +Outer Desert Sandstone Block Stair=Scala di blocco d'arenaria del deserto esterna +Desert Sandstone Block Slab=Lastra di blocco d'arenaria del deserto +Silver Sandstone Stair=Scala d'arenaria argentata +Inner Silver Sandstone Stair=Scala d'arenaria argentata interna +Outer Silver Sandstone Stair=Scala d'arenaria argentata esterna +Silver Sandstone Slab=Lastra d'arenaria argentata +Silver Sandstone Brick Stair=Scala di mattone d'arenaria argentata +Inner Silver Sandstone Brick Stair=Scala di mattone d'arenaria argentata interna +Outer Silver Sandstone Brick Stair=Scala di mattone d'arenaria argentata esterna +Silver Sandstone Brick Slab=Lastra di mattone d'arenaria argentata +Silver Sandstone Block Stair=Scala di blocco d'arenaria argentata +Inner Silver Sandstone Block Stair=Scala di blocco d'arenaria argentata interna +Outer Silver Sandstone Block Stair=Scala di blocco d'arenaria argentata esterna +Silver Sandstone Block Slab=Lastra di blocco d'arenaria argentata +Obsidian Stair=Scala d'ossidiana +Inner Obsidian Stair=Scala d'ossidiana interna +Outer Obsidian Stair=Scala d'ossidiana esterna +Obsidian Slab=Lastra d'ossidiana +Obsidian Brick Stair=Scala di mattone d'ossidiana +Inner Obsidian Brick Stair=Scala di mattone d'ossidiana interna +Outer Obsidian Brick Stair=Scala di mattone d'ossidiana esterna +Obsidian Brick Slab=Lastra di mattone d'ossidiana +Obsidian Block Stair=Scala di blocco d'ossidiana +Inner Obsidian Block Stair=Scala di blocco d'ossidiana interna +Outer Obsidian Block Stair=Scala di blocco d'ossidiana esterna +Obsidian Block Slab=Lastra di blocco d'ossidiana +Brick Stair=Scala di mattone +Inner Brick Stair=Scala di mattone interna +Outer Brick Stair=Scala di mattone esterna +Brick Slab=Lastra di mattone +Steel Block Stair=Scala di blocco d'acciaio +Inner Steel Block Stair=Scala di blocco d'acciaio interna +Outer Steel Block Stair=Scala di blocco d'acciaio esterna +Steel Block Slab=Lastra di blocco d'acciaio +Tin Block Stair=Scala di blocco di stagno +Inner Tin Block Stair=Scala di blocco di stagno interna +Outer Tin Block Stair=Scala di blocco di stagno esterna +Tin Block Slab=Lastra di blocco di stagno +Copper Block Stair=Scala di blocco di rame +Inner Copper Block Stair=Scala di blocco di rame interna +Outer Copper Block Stair=Scala di blocco di rame esterna +Copper Block Slab=Lastra di blocco di rame +Bronze Block Stair=Scala di blocco di bronzo +Inner Bronze Block Stair=Scala di blocco di bronzo interna +Outer Bronze Block Stair=Scala di blocco di bronzo esterna +Bronze Block Slab=Lastra di blocco di bronzo +Gold Block Stair=Scala di blocco d'oro +Inner Gold Block Stair=Scala di blocco d'oro interna +Outer Gold Block Stair=Scala di blocco d'oro esterna +Gold Block Slab=Lastra di blocco d'oro +Ice Stair=Scala di ghiaccio +Inner Ice Stair=Scala di ghiaccio interna +Outer Ice Stair=Scala di ghiaccio esterna +Ice Slab=Lastra di ghiaccio +Snow Block Stair=Scala di blocco di neve +Inner Snow Block Stair=Scala di blocco di neve interna +Outer Snow Block Stair=Scala di blocco di neve esterna +Snow Block Slab=Lastra di blocco di neve diff --git a/mods/stairs/locale/stairs.ja.tr b/mods/stairs/locale/stairs.ja.tr deleted file mode 100644 index 02576cd6..00000000 --- a/mods/stairs/locale/stairs.ja.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=ガラスの階段 -Glass Slab=ガラスの厚板 -Inner Glass Stair=ガラスの凹階段 -Outer Glass Stair=ガラスの凸階段 -Obsidian Glass Stair=黒曜石ガラスの階段 -Obsidian Glass Slab=黒曜石ガラスの厚板 -Inner Obsidian Glass Stair=黒曜石ガラスの凹階段 -Outer Obsidian Glass Stair=黒曜石ガラスの凸階段 -Wooden Stair=木製の階段 -Inner Wooden Stair=木製の凹階段 -Outer Wooden Stair=木製の凸階段 -Wooden Slab=木製の厚板 -Jungle Wood Stair=ジャングル材の階段 -Inner Jungle Wood Stair=ジャングル材の凹階段 -Outer Jungle Wood Stair=ジャングル材の凸階段 -Jungle Wood Slab=ジャングル材の厚板 -Pine Wood Stair=マツ材の階段 -Inner Pine Wood Stair=マツ材の凹階段 -Outer Pine Wood Stair=マツ材の凸階段 -Pine Wood Slab=マツ材の厚板 -Acacia Wood Stair=アカシア材の階段 -Inner Acacia Wood Stair=アカシア材の凹階段 -Outer Acacia Wood Stair=アカシア材の凸階段 -Acacia Wood Slab=アカシア材の厚板 -Aspen Wood Stair=ポプラ材の階段 -Inner Aspen Wood Stair=ポプラ材の凹階段 -Outer Aspen Wood Stair=ポプラ材の凸階段 -Aspen Wood Slab=ポプラ材の厚板 -Stone Stair=石の階段 -Inner Stone Stair=石の凹階段 -Outer Stone Stair=石の凸階段 -Stone Slab=石の厚板 -Cobblestone Stair=丸石の階段 -Inner Cobblestone Stair=丸石の凹階段 -Outer Cobblestone Stair=丸石の凸階段 -Cobblestone Slab=丸石の厚板 -Mossy Cobblestone Stair=苔むした丸石の階段 -Inner Mossy Cobblestone Stair=苔むした丸石の凹階段 -Outer Mossy Cobblestone Stair=苔むした丸石の凸階段 -Mossy Cobblestone Slab=苔むした丸石の厚板 -Stone Brick Stair=石レンガの階段 -Inner Stone Brick Stair=石レンガの凹階段 -Outer Stone Brick Stair=石レンガの凸階段 -Stone Brick Slab=石レンガの厚板 -Stone Block Stair=石ブロックの階段 -Inner Stone Block Stair=石ブロックの凹階段 -Outer Stone Block Stair=石ブロックの凸階段 -Stone Block Slab=石ブロックの厚板 -Desert Stone Stair=砂漠の石の階段 -Inner Desert Stone Stair=砂漠の石の凹階段 -Outer Desert Stone Stair=砂漠の石の凸階段 -Desert Stone Slab=砂漠の石の厚板 -Desert Cobblestone Stair=砂漠の丸石の階段 -Inner Desert Cobblestone Stair=砂漠の丸石の凹階段 -Outer Desert Cobblestone Stair=砂漠の丸石の凸階段 -Desert Cobblestone Slab=砂漠の丸石の厚板 -Desert Stone Brick Stair=砂漠の石レンガの階段 -Inner Desert Stone Brick Stair=砂漠の石レンガの凹階段 -Outer Desert Stone Brick Stair=砂漠の石レンガの凸階段 -Desert Stone Brick Slab=砂漠の石レンガの厚板 -Desert Stone Block Stair=砂漠の石ブロックの階段 -Inner Desert Stone Block Stair=砂漠の石ブロックの凹階段 -Outer Desert Stone Block Stair=砂漠の石ブロックの凸階段 -Desert Stone Block Slab=砂漠の石ブロックの厚板 -Sandstone Stair=砂岩の階段 -Inner Sandstone Stair=砂岩の凹階段 -Outer Sandstone Stair=砂岩の凸階段 -Sandstone Slab=砂岩の厚板 -Sandstone Brick Stair=砂岩レンガの階段 -Inner Sandstone Brick Stair=砂岩レンガの凹階段 -Outer Sandstone Brick Stair=砂岩レンガの凸階段 -Sandstone Brick Slab=砂岩レンガの厚板 -Sandstone Block Stair=砂岩ブロックの階段 -Inner Sandstone Block Stair=砂岩ブロックの凹階段 -Outer Sandstone Block Stair=砂岩ブロックの凸階段 -Sandstone Block Slab=砂岩ブロックの厚板 -Desert Sandstone Stair=砂漠の砂岩の階段 -Inner Desert Sandstone Stair=砂漠の砂岩の凹階段 -Outer Desert Sandstone Stair=砂漠の砂岩の凸階段 -Desert Sandstone Slab=砂漠の砂岩の厚板 -Desert Sandstone Brick Stair=砂漠の砂岩レンガの階段 -Inner Desert Sandstone Brick Stair=砂漠の砂岩レンガの凹階段 -Outer Desert Sandstone Brick Stair=砂漠の砂岩レンガの凸階段 -Desert Sandstone Brick Slab=砂漠の砂岩レンガの厚板 -Desert Sandstone Block Stair=砂漠の砂岩ブロックの階段 -Inner Desert Sandstone Block Stair=砂漠の砂岩ブロックの凹階段 -Outer Desert Sandstone Block Stair=砂漠の砂岩ブロックの凸階段 -Desert Sandstone Block Slab=砂漠の砂岩ブロックの厚板 -Silver Sandstone Stair=銀色の砂岩の階段 -Inner Silver Sandstone Stair=銀色の砂岩の凹階段 -Outer Silver Sandstone Stair=銀色の砂岩の凸階段 -Silver Sandstone Slab=銀色の砂岩の厚板 -Silver Sandstone Brick Stair=銀色の砂岩レンガの階段 -Inner Silver Sandstone Brick Stair=銀色の砂岩レンガの凹階段 -Outer Silver Sandstone Brick Stair=銀色の砂岩レンガの凸階段 -Silver Sandstone Brick Slab=銀色の砂岩レンガの厚板 -Silver Sandstone Block Stair=銀色の砂岩ブロックの階段 -Inner Silver Sandstone Block Stair=銀色の砂岩ブロックの凹階段 -Outer Silver Sandstone Block Stair=銀色の砂岩ブロックの凸階段 -Silver Sandstone Block Slab=銀色の砂岩ブロックの厚板 -Obsidian Stair=黒曜石の階段 -Inner Obsidian Stair=黒曜石の凹階段 -Outer Obsidian Stair=黒曜石の凸階段 -Obsidian Slab=黒曜石の厚板 -Obsidian Brick Stair=黒曜石レンガの階段 -Inner Obsidian Brick Stair=黒曜石レンガの凹階段 -Outer Obsidian Brick Stair=黒曜石レンガの凸階段 -Obsidian Brick Slab=黒曜石レンガの厚板 -Obsidian Block Stair=黒曜石ブロックの階段 -Inner Obsidian Block Stair=黒曜石ブロックの凹階段 -Outer Obsidian Block Stair=黒曜石ブロックの凸階段 -Obsidian Block Slab=黒曜石ブロックの厚板 -Brick Stair=レンガの階段 -Inner Brick Stair=レンガの凹階段 -Outer Brick Stair=レンガの凸階段 -Brick Slab=レンガの厚板 -Steel Block Stair=鉄ブロックの階段 -Inner Steel Block Stair=鉄ブロックの凹階段 -Outer Steel Block Stair=鉄ブロックの凸階段 -Steel Block Slab=鉄ブロックの厚板 -Tin Block Stair=スズの階段 -Inner Tin Block Stair=スズの凹階段 -Outer Tin Block Stair=スズの凸階段 -Tin Block Slab=スズの厚板 -Copper Block Stair=銅ブロックの階段 -Inner Copper Block Stair=銅ブロックの凹階段 -Outer Copper Block Stair=銅ブロックの凸階段 -Copper Block Slab=銅ブロックの厚板 -Bronze Block Stair=青銅ブロックの階段 -Inner Bronze Block Stair=青銅ブロックの凹階段 -Outer Bronze Block Stair=青銅ブロックの凸階段 -Bronze Block Slab=青銅ブロックの厚板 -Gold Block Stair=金ブロックの階段 -Inner Gold Block Stair=金ブロックの凹階段 -Outer Gold Block Stair=金ブロックの凸階段 -Gold Block Slab=金ブロックの厚板 -Ice Stair=氷の階段 -Inner Ice Stair=氷の凹階段 -Outer Ice Stair=氷の凸階段 -Ice Slab=氷の厚板 -Snow Block Stair=雪の階段 -Inner Snow Block Stair=雪の凹階段 -Outer Snow Block Stair=雪の凸階段 -Snow Block Slab=雪の厚板 diff --git a/mods/stairs/locale/stairs.jbo.tr b/mods/stairs/locale/stairs.jbo.tr deleted file mode 100644 index 91d28060..00000000 --- a/mods/stairs/locale/stairs.jbo.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=lo blaci serti -Glass Slab=lo blaci xadba bliku -Inner Glass Stair=lo zo'i blaci serti -Outer Glass Stair=lo ze'o blaci serti -Obsidian Glass Stair=lo je'erma'ablaci blaci serti -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 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 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 -Acacia Wood Slab=lo atkaci,ia mudri ke xadba bliku -Aspen Wood Stair=lo mudrpopulu serti -Inner Aspen Wood Stair=lo zo'i mudrpopulu serti -Outer Aspen Wood Stair=lo ze'o mudrpopulu serti -Aspen Wood Slab=lo mudrpopulu ke xadba bliku -Stone Stair=lo rokci serti -Inner Stone Stair=lo zo'i rokci serti -Outer Stone Stair=lo ze'o rokci serti -Stone Slab=lo rokci ke xadba bliku -Cobblestone Stair=lo lolro'iboi serti -Inner Cobblestone Stair=lo zo'i lolro'iboi serti -Outer Cobblestone Stair=lo ze'o lolro'iboi serti -Cobblestone Slab=lo lolro'iboi xadba bliku -Mossy Cobblestone Stair=lo clika lolro'iboi serti -Inner Mossy Cobblestone Stair=lo zo'i clika lolro'iboi serti -Outer Mossy Cobblestone Stair=lo ze'o clika lolro'iboi serti -Mossy Cobblestone Slab=lo clika lolro'iboi ke xadba bliku -Stone Brick Stair=lo morna rokci serti -Inner Stone Brick Stair=lo zo'i morna rokci serti -Outer Stone Brick Stair=lo ze'o morna rokci serti -Stone Brick Slab=lo morna rokci ke xadba bliku -Stone Block Stair=lo rokci bliku serti -Inner Stone Block Stair=lo zo'i rokci bliku serti -Outer Stone Block Stair=lo ze'o rokci bliku serti -Stone Block Slab=lo rokci bliku ke xadba bliku -Desert Stone Stair=lo cantu'a rokci serti -Inner Desert Stone Stair=lo zo'i cantu'a rokci serti -Outer Desert Stone Stair=lo ze'o cantu'a rokci serti -Desert Stone Slab=lo cantu'a rokci ke xadba bliku -Desert Cobblestone Stair=lo cantu'a lolro'iboi serti -Inner Desert Cobblestone Stair=lo zo'i cantu'a lolro'iboi serti -Outer Desert Cobblestone Stair=lo ze'o cantu'a lolro'iboi serti -Desert Cobblestone Slab=lo cantu'a lolro'iboi ke xadba bliku -Desert Stone Brick Stair=lo morna ke cantu'a rokci serti -Inner Desert Stone Brick Stair=lo zo'i morna ke cantu'a rokci serti -Outer Desert Stone Brick Stair=lo ze'o morna ke cantu'a rokci serti -Desert Stone Brick Slab=lo morna ke cantu'a rokci ke xadba bliku -Desert Stone Block Stair=lo cantu'a rokci bliku serti -Inner Desert Stone Block Stair=lo zo'i cantu'a rokci bliku serti -Outer Desert Stone Block Stair=lo ze'o cantu'a rokci bliku serti -Desert Stone Block Slab=lo cantu'a rokci bliku ke xadba bliku -Sandstone Stair=lo canro'i serti -Inner Sandstone Stair=lo zo'i canro'i serti -Outer Sandstone Stair=lo ze'o canro'i serti -Sandstone Slab=lo canro'i ke xadba bliku -Sandstone Brick Stair=lo morna ke canro'i serti -Inner Sandstone Brick Stair=lo zo'i morna ke canro'i serti -Outer Sandstone Brick Stair=lo ze'o morna ke canro'i serti -Sandstone Brick Slab=lo morna canro'i ke xadba bliku -Sandstone Block Stair=lo canro'i bliku serti -Inner Sandstone Block Stair=lo zo'i canro'i bliku serti -Outer Sandstone Block Stair=lo ze'o canro'i bliku serti -Sandstone Block Slab=lo canro'i bliku ke xadba bliku -Desert Sandstone Stair=lo cantu'a canro'i serti -Inner Desert Sandstone Stair=lo zo'i cantu'a canro'i serti -Outer Desert Sandstone Stair=lo ze'o cantu'a canro'i serti -Desert Sandstone Slab=lo cantu'a canro'i ke xadba bliku -Desert Sandstone Brick Stair=lo morna ke cantu'a canro'i serti -Inner Desert Sandstone Brick Stair=lo zo'i morna ke cantu'a canro'i serti -Outer Desert Sandstone Brick Stair=lo ze'o morna ke cantu'a canro'i serti -Desert Sandstone Brick Slab=lo morna ke cantu'a canro'i ke xadba bliku -Desert Sandstone Block Stair=lo cantu'a canro'i bliku serti -Inner Desert Sandstone Block Stair=lo zo'i cantu'a canro'i bliku serti -Outer Desert Sandstone Block Stair=lo ze'o cantu'a canro'i bliku serti -Desert Sandstone Block Slab=lo cantu'a canro'i ke xadba bliku -Silver Sandstone Stair=lo rijyska canro'i serti -Inner Silver Sandstone Stair=lo zo'i rijyska canro'i serti -Outer Silver Sandstone Stair=lo ze'o rijyska canro'i serti -Silver Sandstone Slab=lo rijyska canro'i ke xadba bliku -Silver Sandstone Brick Stair=lo morna ke rijyska canro'i serti -Inner Silver Sandstone Brick Stair=lo zo'i morna ke rijyska canro'i serti -Outer Silver Sandstone Brick Stair=lo ze'o morna ke rijyska canro'i serti -Silver Sandstone Brick Slab=lo morna ke rijyska canro'i ke xadba bliku -Silver Sandstone Block Stair=lo rijyska canro'i bliku serti -Inner Silver Sandstone Block Stair=lo zo'i rijyska canro'i bliku serti -Outer Silver Sandstone Block Stair=lo ze'o rijyska canro'i bliku serti -Silver Sandstone Block Slab=lo rijyska canro'i bliku ke xadba bliku -Obsidian Stair=lo je'erma'ablaci serti -Inner Obsidian Stair=lo zo'i je'erma'ablaci serti -Outer Obsidian Stair=lo ze'o je'erma'ablaci serti -Obsidian Slab=lo je'erma'ablaci ke xadba bliku -Obsidian Brick Stair=lo morna ke je'erma'ablaci serti -Inner Obsidian Brick Stair=lo zo'i morna ke je'erma'ablaci serti -Outer Obsidian Brick Stair=lo ze'o morna ke je'erma'ablaci serti -Obsidian Brick Slab=lo morna je'erma'ablaci ke xadba bliku -Obsidian Block Stair=lo je'erma'ablaci bliku serti -Inner Obsidian Block Stair=lo zo'i je'erma'ablaci bliku serti -Outer Obsidian Block Stair=lo ze'o je'erma'ablaci bliku serti -Obsidian Block Slab=lo je'erma'ablaci bliku ke xadba bliku -Brick Stair=lo kitybli serti -Inner Brick Stair=lo zo'i kitybli serti -Outer Brick Stair=lo ze'o kitybli serti -Brick Slab=lo kitybli xadba bliku -Steel Block Stair=lo gasta bliku serti -Inner Steel Block Stair=lo zo'i gasta bliku serti -Outer Steel Block Stair=lo ze'o gasta bliku serti -Steel Block Slab=lo gasta bliku ke xadba bliku -Tin Block Stair=lo tinci bliku serti -Inner Tin Block Stair=lo zo'i tinci bliku serti -Outer Tin Block Stair=lo ze'o tinci bliku serti -Tin Block Slab=lo tinci bliku ke xadba bliku -Copper Block Stair=lo tunka bliku serti -Inner Copper Block Stair=lo zo'i tunka bliku serti -Outer Copper Block Stair=lo ze'o tunka bliku serti -Copper Block Slab=lo tunka xadba bliku -Bronze Block Stair=lo ransu bliku serti -Inner Bronze Block Stair=lo zo'i ransu bliku serti -Outer Bronze Block Stair=lo ze'o ransu bliku serti -Bronze Block Slab=lo ransu xadba bliku -Gold Block Stair=lo solji bliku serti -Inner Gold Block Stair=lo zo'i solji bliku serti -Outer Gold Block Stair=lo ze'o solji bliku serti -Gold Block Slab=lo solji bliku ke xadba bliku -Ice Stair=lo bisli serti -Inner Ice Stair=lo zo'i bisli serti -Outer Ice Stair=lo ze'o bisli serti -Ice Slab=lo bisli ke xadba bliku -Snow Block Stair=lo snime bliku serti -Inner Snow Block Stair=lo zo'i snime bliku serti -Outer Snow Block Stair=lo ze'o snime bliku serti -Snow Block Slab=lo snime bliku ke xadba bliku diff --git a/mods/stairs/locale/stairs.lv.tr b/mods/stairs/locale/stairs.lv.tr deleted file mode 100644 index 646040b3..00000000 --- a/mods/stairs/locale/stairs.lv.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Stikla pakāpiens -Glass Slab=Stikla plātne -Inner Glass Stair=Iekšējs stikla pakāpiens -Outer Glass Stair=Ārējs stikla pakāpiens -Obsidian Glass Stair=Obsidiāna stikla pakāpiens -Obsidian Glass Slab=Obsidiāna stikla plātne -Inner Obsidian Glass Stair=Iekšējs obsidiāna stikla pakāpiens -Outer Obsidian Glass Stair=Ārējs obsidiāna stikla pakāpiens -Wooden Stair=Koka pakāpiens -Inner Wooden Stair=Iekšējs koka pakāpiens -Outer Wooden Stair=Ārējs koka pakāpiens -Wooden Slab=Koka plātne -Jungle Wood Stair=Džungļu koka pakāpiens -Inner Jungle Wood Stair=Iekšējs džungļu koka pakāpiens -Outer Jungle Wood Stair=Ārējs džungļu koka pakāpiens -Jungle Wood Slab=Džungļu koka plātne -Pine Wood Stair=Skujkoka koka pakāpiens -Inner Pine Wood Stair=Iekšējs skujkoka koka pakāpiens -Outer Pine Wood Stair= Arējs skujkoka koka pakāpiens -Pine Wood Slab=Skujkoka koka plātne -Acacia Wood Stair=Akācijas koka pakāpiens -Inner Acacia Wood Stair=Iekšējs akācijas koka pakāpiens -Outer Acacia Wood Stair=Ārējs akācijas koka pakāpiens -Acacia Wood Slab=Akācijas koka plātne -Aspen Wood Stair=Apses koka pakāpiens -Inner Aspen Wood Stair=Iekšējs apses koka pakāpiens -Outer Aspen Wood Stair=Ārējs apses koka pakāpiens -Aspen Wood Slab=Apses koka plātne -Stone Stair=Akmens pakāpiens -Inner Stone Stair=Iekšējs akmens pakāpiens -Outer Stone Stair=Ārējs akmens pakāpiens -Stone Slab=Akmens plātne -Cobblestone Stair=Mūrakmens pakāpiens -Inner Cobblestone Stair=Iekšējs mūrakmens pakāpiens -Outer Cobblestone Stair=Ārējs mūrakmens pakāpiens -Cobblestone Slab=Mūrakmens plātne -Mossy Cobblestone Stair=Apsūnējuša mūrakmens pakāpiens -Inner Mossy Cobblestone Stair=Apsūnējuša mūrakmens iekšējs pakāpiens -Outer Mossy Cobblestone Stair=Apsūnējuša mūrakmens ārējs pakāpiens -Mossy Cobblestone Slab=Apsūnējuša mūrakmens plātne -Stone Brick Stair=Akmens ķieģeļu pakāpiens -Inner Stone Brick Stair=Iekšējs akmens ķieģeļu pakāpiens -Outer Stone Brick Stair=Ārējs akmens ķieģeļu pakāpiens -Stone Brick Slab=Akmens ķieģeļu plātne -Stone Block Stair=Akmens bloka pakāpiens -Inner Stone Block Stair=Iekšējs akmens bloka pakāpiens -Outer Stone Block Stair=Ārējs akmens bloka pakāpiens -Stone Block Slab=Akmens bloka plātne -Desert Stone Stair=Tuksneša akmens pakāpiens -Inner Desert Stone Stair=Iekšējs tuksneša akmens pakāpiens -Outer Desert Stone Stair=Ārējs tuksneša akmens pakāpiens -Desert Stone Slab=Tuksneša akmens plātne -Desert Cobblestone Stair=Tuksneša mūrakmens pakāpiens -Inner Desert Cobblestone Stair=Iekšējs tuksneša mūrakmens pakāpiens -Outer Desert Cobblestone Stair=Ārējs tuksneša mūrakmens pakāpiens -Desert Cobblestone Slab=Tuksneša mūrakmens plātne -Desert Stone Brick Stair=Tuksneša akmens ķieģeļu pakāpiens -Inner Desert Stone Brick Stair=Iekšējs tuksneša akmens ķieģeļu pakāpiens -Outer Desert Stone Brick Stair=Ārējs tuksneša ķieģeļu pakāpiens -Desert Stone Brick Slab=Tuksneša ķieģeļu plātne -Desert Stone Block Stair=Tuksneša akmens bloka pakāpiens -Inner Desert Stone Block Stair=Iekšējs tuksneša akmens bloka pakāpiens -Outer Desert Stone Block Stair=Ārējs tuksneša akmens bloka pakāpiens -Desert Stone Block Slab=Tuksneša akmens bloka plātne -Sandstone Stair=Smilšakmens pakāpiens -Inner Sandstone Stair=Iekšējs smilšakmens pakāpiens -Outer Sandstone Stair=Ārējs smilšakmens pakāpiens -Sandstone Slab=Smilšakmens plātne -Sandstone Brick Stair=Smilšakmens ķieģeļu pakāpiens -Inner Sandstone Brick Stair=Iekšējs smilšakmens ķieģeļu pakāpiens -Outer Sandstone Brick Stair=Ārējs smilšakmens ķieģeļu pakāpiens -Sandstone Brick Slab=Smilšakmens ķieģeļu plātne -Sandstone Block Stair=Smilšakmens bloka pakāpiens -Inner Sandstone Block Stair=Iekšējs smilšakmens bloka pakāpiens -Outer Sandstone Block Stair=Ārējs smilšakmens bloka pakāpiens -Sandstone Block Slab=Smilšakmens bloka plātne -Desert Sandstone Stair=Tuksneša smilšakmens pakāpiens -Inner Desert Sandstone Stair=Iekšējs tuksneša smilšakmens pakāpiens -Outer Desert Sandstone Stair=Ārējs tuksneša smilšakmens pakāpiens -Desert Sandstone Slab=Tuksneša smilšakmens plātne -Desert Sandstone Brick Stair=Tuksneša smilšakmens ķieģeļu pakāpiens -Inner Desert Sandstone Brick Stair=Iekšējs tuksneša smilšakmens ķieģeļu pakāpiens -Outer Desert Sandstone Brick Stair=Ārējs tuksneša smilšakmens ķieģeļu pakāpiens -Desert Sandstone Brick Slab=Tuksneša smilšakmens ķieģeļu plātne -Desert Sandstone Block Stair=Tuksneša smilšakmens bloka pakāpiens -Inner Desert Sandstone Block Stair=Iekšējs tuksneša smilšakmens bloka pakāpiens -Outer Desert Sandstone Block Stair=Ārējs tuksneša smilšakmens bloka pakāpiens -Desert Sandstone Block Slab=Tuksneša smilšakmens bloka plātne -Silver Sandstone Stair=Baltā smilšakmens pakāpiens -Inner Silver Sandstone Stair=Iekšējs baltā smilšakmens pakāpiens -Outer Silver Sandstone Stair=Ārējs baltā smilšakmens pakāpiens -Silver Sandstone Slab=Baltā smilšakmens plātne -Silver Sandstone Brick Stair=Baltā smilšakmens ķieģeļu pakāpiens -Inner Silver Sandstone Brick Stair=Iekšējs baltā smilšakmens ķieģeļu pakāpiens -Outer Silver Sandstone Brick Stair=Ārējs baltā smilšakmens ķieģeļu pakāpiens -Silver Sandstone Brick Slab=Baltā smilšakmens ķieģeļu plātne -Silver Sandstone Block Stair=Baltā smilšakmens bloka pakāpiens -Inner Silver Sandstone Block Stair=Iekšējs baltā smilšakmens bloka pakāpiens -Outer Silver Sandstone Block Stair=Ārējs baltā smilšakmens bloka pakāpiens -Silver Sandstone Block Slab=Baltā smilšakmens bloka plātne -Obsidian Stair=Obsidiāna pakāpiens -Inner Obsidian Stair=Iekšējs obsidiāna pakāpiens -Outer Obsidian Stair=Ārējs obsidiāna pakāpiens -Obsidian Slab=Obsidiāna plātne -Obsidian Brick Stair=Obsidiāna ķieģeļu pakāpiens -Inner Obsidian Brick Stair=Iekšējs obsidiāna ķieģeļu pakāpiens -Outer Obsidian Brick Stair=Ārējs obsidiāna ķieģeļu pakāpiens -Obsidian Brick Slab=Obsidiāna ķieģeļu plātne -Obsidian Block Stair=Obsidiāna bloka pakāpiens -Inner Obsidian Block Stair=Iekšējs obsidiāna bloka pakāpiens -Outer Obsidian Block Stair=Ārejs obsidiāna bloka pakāpiens -Obsidian Block Slab=Obsidiāna bloka plātne -Brick Stair=Ķieģeļu pakāpiens -Inner Brick Stair=Iekšējs ķieģeļu pakāpiens -Outer Brick Stair=Ārējs ķieģeļu pakāpiens -Brick Slab=Ķieģeļu plātne -Steel Block Stair=Tērauda pakāpiens -Inner Steel Block Stair=Iekšējs tērauda pakāpiens -Outer Steel Block Stair=Ārējs tērauda pakāpiens -Steel Block Slab=Tērauda plātne -Tin Block Stair=Alvas pakāpiens -Inner Tin Block Stair=Iekšējs alvas pakāpiens -Outer Tin Block Stair=Ārējs alvas pakāpiens -Tin Block Slab=Alvas plātne -Copper Block Stair=Vara pakāpiens -Inner Copper Block Stair=Iekšējs vara pakāpiens -Outer Copper Block Stair=Ārējs vara pakāpiens -Copper Block Slab=Vara plātne -Bronze Block Stair=Bronzas pakāpiens -Inner Bronze Block Stair=Iekšējs bronza pakāpiens -Outer Bronze Block Stair=Ārējs bronzas pakāpiens -Bronze Block Slab=Bronzas plātne -Gold Block Stair=Zelta pakāpiens -Inner Gold Block Stair=Iekšējs zelta pakāpiens -Outer Gold Block Stair=Ārējs zelta pakāpiens -Gold Block Slab=Zelta plātne -Ice Stair=Ledus pakāpiens -Inner Ice Stair=Iekšējs ledus pakāpiens -Outer Ice Stair=Ārējs ledus pakāpiens -Ice Slab=Ledus plātne -Snow Block Stair=Sniega pakāpiens -Inner Snow Block Stair=Iekšējs sniega pakāpiens -Outer Snow Block Stair=Ārējs sniega pakāpiens -Snow Block Slab=Sniega plātne diff --git a/mods/stairs/locale/stairs.pl.tr b/mods/stairs/locale/stairs.pl.tr deleted file mode 100644 index 14eed7b9..00000000 --- a/mods/stairs/locale/stairs.pl.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Schody ze szkła -Glass Slab=Półblok ze szkła -Inner Glass Stair=Wewnętrzne schody ze szkła -Outer Glass Stair=Zewnętrzne schody ze szkła -Obsidian Glass Stair=Schody z obsydianowego szkła -Obsidian Glass Slab=Półblok z obsydianowego szkła -Inner Obsidian Glass Stair=Wewnętrzne schody z obsydianowego szkła -Outer Obsidian Glass Stair=Zewnętrzne schody z obsydianowego szkła -Wooden Stair=Schody z drewna -Inner Wooden Stair=Wewnętrzne schody z drewna -Outer Wooden Stair=Zewnętrzne schody z drewna -Wooden Slab=Półblok z drewna -Jungle Wood Stair=Schody z dżunglowego drewna -Inner Jungle Wood Stair=Wewnętrzne schody z dżunglowego drewna -Outer Jungle Wood Stair=Zewnętrzne schody z dżunglowego drewna -Jungle Wood Slab=Półblok z dżunglowego drewna -Pine Wood Stair=Schody z sosnowego drzewa -Inner Pine Wood Stair=Wewnętrzne schody z sosnowego drewna -Outer Pine Wood Stair=Zewnętrzne schody z sosnowego drewna -Pine Wood Slab=Półblok z sosnowego drewna -Acacia Wood Stair=Schody z akacjowego drewna -Inner Acacia Wood Stair=Wewnętrzne schody z akacjowego drewna -Outer Acacia Wood Stair=Zewnętrzne schody z akacjowego drewna -Acacia Wood Slab=Półblok z akacjowego drewna -Aspen Wood Stair=Schody z brzozowego drewna -Inner Aspen Wood Stair=Wewnętrzne schody z brzozowego drewna -Outer Aspen Wood Stair=Zewnętrzne schody z brzozowego drewna -Aspen Wood Slab=Półblok z brzozowego drewna -Stone Stair=Schody z kamienia -Inner Stone Stair=Wewnętrzne schody z kamienia -Outer Stone Stair=Zewnętrzne schody z kamienia -Stone Slab=Półblok z kamienia -Cobblestone Stair=Schody z bruku -Inner Cobblestone Stair=Wewnętrzne schody z bruku -Outer Cobblestone Stair=Zewnętrzne schody z bruku -Cobblestone Slab=Półblok z bruku -Mossy Cobblestone Stair=Schody z bruku z mchem -Inner Mossy Cobblestone Stair=Wewnętrzne schody z bruku z mchem -Outer Mossy Cobblestone Stair=Zewnętrzne schody z bruku z mchem -Mossy Cobblestone Slab=Półblok z bruku z mchem -Stone Brick Stair=Schody z kamiennych cegieł -Inner Stone Brick Stair=Wewnętrzne schody z kamiennych cegieł -Outer Stone Brick Stair=Zewnętrzne schody z kamiennych cegieł -Stone Brick Slab=Półblok z kamiennych cegieł -Stone Block Stair=Schody z kamiennego bloku -Inner Stone Block Stair=Wewnętrzne schody z kamiennego bloku -Outer Stone Block Stair=Zewnętrzne schody z kamiennego bloku -Stone Block Slab=Półblok z kamiennego bloku -Desert Stone Stair=Schody z pustynnego kamienia -Inner Desert Stone Stair=Wewnętrzne schody z pustynnego kamienia -Outer Desert Stone Stair=Zewnętrzne schody z pustynnego kamienia -Desert Stone Slab=Półblok z pustynnego kamienia -Desert Cobblestone Stair=Schody z pustynnego bruku -Inner Desert Cobblestone Stair=Wewnętrzne schody z pustynnego bruku -Outer Desert Cobblestone Stair=Zewnętrzne schody z pustynnego bruku -Desert Cobblestone Slab=Półblok z pustynnego bruku -Desert Stone Brick Stair=Schody z pustynnych kamiennych cegieł -Inner Desert Stone Brick Stair=Wewnętrzne schody z pustynnych kamiennych cegieł -Outer Desert Stone Brick Stair=Zewnętrzne schody z pustynnych kamiennych cegieł -Desert Stone Brick Slab=Półblok z pustynnych kamiennych cegieł -Desert Stone Block Stair=Schody z pustynnego kamiennego bloku -Inner Desert Stone Block Stair=Wewnętrzne schody z pustynnego kamiennego bloku -Outer Desert Stone Block Stair=Zewnętrzne schody z pustynnego kamiennego bloku -Desert Stone Block Slab=Półblok z pustynnego kamiennego bloku -Sandstone Stair=Schody z piaskowca -Inner Sandstone Stair=Wewnętrzne schody z piaskowca -Outer Sandstone Stair=Zewnętrzne schody z piaskowca -Sandstone Slab=Półblok z piaskowca -Sandstone Brick Stair=Schody z piaskowcowych cegieł -Inner Sandstone Brick Stair=Wewnętrzne schody z piaskowcowych cegieł -Outer Sandstone Brick Stair=Zewnętrzne schody z piaskowcowych cegieł -Sandstone Brick Slab=Półblok z piaskowcowych cegieł -Sandstone Block Stair=Schody z piaskowcowego bloku -Inner Sandstone Block Stair=Wewnętrzne schody z piaskowcowego bloku -Outer Sandstone Block Stair=Zewnętrzne schody z piaskowcowego bloku -Sandstone Block Slab=Półblok z piaskowcowego bloku -Desert Sandstone Stair=Schody z pustynnego piaskowca -Inner Desert Sandstone Stair=Wewnętrzne schody z pustynnego piaskowca -Outer Desert Sandstone Stair=Zewnętrzne schody z pustynnego piaskowca -Desert Sandstone Slab=Półblok z pustynnego piaskowca -Desert Sandstone Brick Stair=Schody z pustynnych piaskowcowych cegieł -Inner Desert Sandstone Brick Stair=Wewnętrzne schody z pustynnych piaskowcowych cegieł -Outer Desert Sandstone Brick Stair=Zewnętrzne schody z pustynnych piaskowcowych cegieł -Desert Sandstone Brick Slab=Półblok z pustynnych piaskowcowych cegieł -Desert Sandstone Block Stair=Schody z pustynnego piaskowcowego bloku -Inner Desert Sandstone Block Stair=Wewnętrzne schody z pustynnego piaskowcowego bloku -Outer Desert Sandstone Block Stair=Zewnętrzne schody z pustynnego piaskowcowego bloku -Desert Sandstone Block Slab=Półblok z pustynnego piaskowcowego bloku -Silver Sandstone Stair=Schody z srebrnego piaskowca -Inner Silver Sandstone Stair=Wewnętrzne schody z srebrnego piaskowca -Outer Silver Sandstone Stair=Zewnętrzne schody z srebrnego piaskowca -Silver Sandstone Slab=Półblok z srebrnego piaskowca -Silver Sandstone Brick Stair=Schody z srebrnych piaskowcowych cegieł -Inner Silver Sandstone Brick Stair=Wewnętrzne schody z srebrnych piaskowcowych cegieł -Outer Silver Sandstone Brick Stair=Zewnętrzne schody z srebrnych piaskowcowych cegieł -Silver Sandstone Brick Slab=Półblok z srebrnych piaskowcowych cegieł -Silver Sandstone Block Stair=Schody z srebrnego piaskowcowego bloku -Inner Silver Sandstone Block Stair=Wewnętrzne schody z srebrnego piaskowcowego bloku -Outer Silver Sandstone Block Stair=Zewnętrzne schody z srebrnego piaskowcowego bloku -Silver Sandstone Block Slab=Półblok z srebrnego piaskowcowego bloku -Obsidian Stair=Schody z obsydianu -Inner Obsidian Stair=Wewnętrzne schody z obsydianu -Outer Obsidian Stair=Zewnętrzne schody z obsydianu -Obsidian Slab=Półblok z obsydianu -Obsidian Brick Stair=Schody z obsydianowych cegieł -Inner Obsidian Brick Stair=Wewnętrzne schody z obsydianowych cegieł -Outer Obsidian Brick Stair=Zewnętrzne schody z obsydianowych cegieł -Obsidian Brick Slab=Półblok z obsydianowych cegieł -Obsidian Block Stair=Schody z obsydianowego bloku -Inner Obsidian Block Stair=Wewnętrzne schody z obsydianowego bloku -Outer Obsidian Block Stair=Zewnętrzne schody z obsydianowego bloku -Obsidian Block Slab=Półblok z obsydianowego bloku -Brick Stair=Schody z cegieł -Inner Brick Stair=Wewnętrzne schody z cegieł -Outer Brick Stair=Zewnętrzne schody z cegieł -Brick Slab=Półblok z cegieł -Steel Block Stair=Schody z bloku stali -Inner Steel Block Stair=Wewnętrzne schody z bloku stali -Outer Steel Block Stair=Zewnętrzne schody z bloku stali -Steel Block Slab=Półblok z bloku stali -Tin Block Stair=Schody z bloku cyny -Inner Tin Block Stair=Wewnętrzne schody z bloku cyny -Outer Tin Block Stair=Zewnętrzne schody z bloku cyny -Tin Block Slab=Półblok z bloku cyny -Copper Block Stair=Schody z bloku miedzi -Inner Copper Block Stair=Wewnętrzne schody z bloku miedzi -Outer Copper Block Stair=Zewnętrzne schody z bloku miedzi -Copper Block Slab=Półblok z bloku miedzi -Bronze Block Stair=Schody z bloku brązu -Inner Bronze Block Stair=Wewnętrnze schody z bloku brązu -Outer Bronze Block Stair=Zewnętrzne schody z bloku brązu -Bronze Block Slab=Półblok z bloku brązu -Gold Block Stair=Schody z bloku złota -Inner Gold Block Stair=Wewnętrzne schody z block złota -Outer Gold Block Stair=Zewnętrzne schody z bloku złota -Gold Block Slab=Półblok z bloku złota -Ice Stair=Schody z lodu -Inner Ice Stair=Wewnętrzne schody z lodu -Outer Ice Stair=Zewnętrzne schody z lodu -Ice Slab=Półblok z lodu -Snow Block Stair=Schody ze śniegu -Inner Snow Block Stair=Wewnętrzne schody ze śniegu -Outer Snow Block Stair=Zewnętrzne schody ze śniegu -Snow Block Slab=Półblok ze śniegu diff --git a/mods/stairs/locale/stairs.pt_BR.tr b/mods/stairs/locale/stairs.pt_BR.tr deleted file mode 100644 index 41777a81..00000000 --- a/mods/stairs/locale/stairs.pt_BR.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Escada de vidro -Glass Slab=Placa de vidro -Inner Glass Stair=Escada interior de vidro -Outer Glass Stair=Escada exterior de vidro -Obsidian Glass Stair=Escada de vidro de obsidiana -Obsidian Glass Slab=Placa de vidro de obsidiana -Inner Obsidian Glass Stair=Escada interior de vidro de obsidiana -Outer Obsidian Glass Stair=Escada exterior de vidro de obsidiana -Wooden Stair=Escada de madeira -Inner Wooden Stair=Escada interior de madeira -Outer Wooden Stair=Escada exterior de madeira -Wooden Slab=Laje de madeira -Jungle Wood Stair=Escada de madeira da selva -Inner Jungle Wood Stair=Escada interior de madeira da selva -Outer Jungle Wood Stair=Escada exterior de madeira da selva -Jungle Wood Slab=Laje de madeira da selva -Pine Wood Stair=Escada de madeira de pinho -Inner Pine Wood Stair=Escada interior de madeira de pinho -Outer Pine Wood Stair=Escada exterior de madeira de pinho -Pine Wood Slab=Laje de madeira de pinho -Acacia Wood Stair=Escada de madeira de acácia -Inner Acacia Wood Stair=Escada interior de madeira de acácia -Outer Acacia Wood Stair=Escada exterior de madeira de acácia -Acacia Wood Slab=Placa de madeira de acácia -Aspen Wood Stair=Escada de Álamo -Inner Aspen Wood Stair=Escada interior de Álamo -Outer Aspen Wood Stair=Escada exterior de Álamo -Aspen Wood Slab=Laje de Álamo -Stone Stair=Escada de Pedra -Inner Stone Stair=Escada interior de Pedra -Outer Stone Stair=Escada exterior de Pedra -Stone Slab=Laje de pedra -Cobblestone Stair=Escada de paralelepípedo -Inner Cobblestone Stair=Escada interior de paralelepípedo -Outer Cobblestone Stair=Escada exterior de paralelepípedo -Cobblestone Slab=Laje de paralelepípedo -Mossy Cobblestone Stair=Escada de paralelepípedo com musgo -Inner Mossy Cobblestone Stair=Escada interior de paralelepípedo com musgo -Outer Mossy Cobblestone Stair=Escada exterior de paralelepípedo com musgo -Mossy Cobblestone Slab=Laje de paralelepípedo com musgo -Stone Brick Stair=Escada de tijolo de pedra -Inner Stone Brick Stair=Escada interior de tijolo de pedra -Outer Stone Brick Stair=Escada exterior de tijolo de pedra -Stone Brick Slab=Laje de tijolo de pedra -Stone Block Stair=Escada Bloco de Pedra -Inner Stone Block Stair=Escada Interna de Bloco de Pedra -Outer Stone Block Stair=Escada Externa de Bloco de Pedra -Stone Block Slab=Laje de bloco de pedra -Desert Stone Stair=Escada de Pedra do Deserto -Inner Desert Stone Stair=Escada Interior de Pedra do Deserto -Outer Desert Stone Stair=Escada Exterior de Pedra do Deserto -Desert Stone Slab=Laje de pedra do deserto -Desert Cobblestone Stair=Escada de paralelepípedo do deserto -Inner Desert Cobblestone Stair=Escada interior de paralelepípedo do deserto -Outer Desert Cobblestone Stair=Escada exterior de paralelepípedo do deserto -Desert Cobblestone Slab=Laje de paralelepípedo do deserto -Desert Stone Brick Stair=Escada de tijolo de pedra do deserto -Inner Desert Stone Brick Stair=Escada interior de tijolos de pedra do deserto -Outer Desert Stone Brick Stair=Escada exterior de tijolos de pedra do deserto -Desert Stone Brick Slab=Laje de tijolo de pedra do deserto -Desert Stone Block Stair=Escada de Bloco de Pedra do Deserto -Inner Desert Stone Block Stair=Escada interior de bloco de pedra do deserto -Outer Desert Stone Block Stair=Escada exterior de Bloco de Pedra do Deserto -Desert Stone Block Slab=Laje do bloco de pedra do deserto -Sandstone Stair=Escada de arenito -Inner Sandstone Stair=Escada interior de arenito -Outer Sandstone Stair=Escada Exterior de Arenito -Sandstone Slab=Laje de arenito -Sandstone Brick Stair=Escada de tijolo de arenito -Inner Sandstone Brick Stair=Escada interior de tijolos de arenito -Outer Sandstone Brick Stair=Escada Exterior de Tijolo de Arenito -Sandstone Brick Slab=Laje de tijolo de arenito -Sandstone Block Stair=Escada do Bloco de Arenito -Inner Sandstone Block Stair=Escada interior de bloco de arenito -Outer Sandstone Block Stair=Escada exterior de bloco de arenito -Sandstone Block Slab=Laje de bloco de arenito -Desert Sandstone Stair=Escada de arenito do deserto -Inner Desert Sandstone Stair=Escada interior de arenito do deserto -Outer Desert Sandstone Stair=Escada exterior de arenito do deserto -Desert Sandstone Slab=Laje de arenito do deserto -Desert Sandstone Brick Stair=Escada de tijolos de arenito do deserto -Inner Desert Sandstone Brick Stair=Escada interior de tijolos de arenito do deserto -Outer Desert Sandstone Brick Stair=Escada exterior de tijolos de arenito do deserto -Desert Sandstone Brick Slab=Laje de tijolo de arenito do deserto -Desert Sandstone Block Stair=Escada do bloco de arenito do deserto -Inner Desert Sandstone Block Stair=Escada interior do bloco de arenito do deserto -Outer Desert Sandstone Block Stair=Escada exterior de bloco de arenito do deserto -Desert Sandstone Block Slab=Laje de bloco de arenito do deserto -Silver Sandstone Stair=Escada de arenito prateado -Inner Silver Sandstone Stair=Escada interior de Arenito Prateado -Outer Silver Sandstone Stair=Escada exterior de Arenito Prateado -Silver Sandstone Slab=Laje de arenito prateado -Silver Sandstone Brick Stair=Escada de tijolos de arenito prateado -Inner Silver Sandstone Brick Stair=Escada interior de tijolos de arenito prateado -Outer Silver Sandstone Brick Stair=Escada exterior de tijolos de arenito prateado -Silver Sandstone Brick Slab=Laje de tijolo de arenito prateado -Silver Sandstone Block Stair=Escada de blocos de arenito prateado -Inner Silver Sandstone Block Stair=Escada interior de bloco de arenito prateado -Outer Silver Sandstone Block Stair=Escada exterior de bloco de arenito prateado -Silver Sandstone Block Slab=Laje de bloco de arenito prateado -Obsidian Stair=Escada de Obsidiana -Inner Obsidian Stair=Escada interior de Obsidiana -Outer Obsidian Stair=Escada exterior de Obsidiana -Obsidian Slab=Laje de Obsidiana -Obsidian Brick Stair=Escada de Tijolos de Obsidiana -Inner Obsidian Brick Stair=Escada interna de Tijolos de Obsidiana -Outer Obsidian Brick Stair=Escada externa de Tijolos de Obsidiana -Obsidian Brick Slab=Laje de tijolos de obsidiana -Obsidian Block Stair=Escada de Bloco de Obsidiana -Inner Obsidian Block Stair=Escada interior de Bloco de obsidiana -Outer Obsidian Block Stair=Escada exterior de Bloco de obsidiana -Obsidian Block Slab=Laje de bloco de obsidiana -Brick Stair=Escada de Tijolos -Inner Brick Stair=Escada interior de Tijolos -Outer Brick Stair=Escada exterior de Tijolos -Brick Slab=Laje de tijolos -Steel Block Stair=Escada de bloco de aço -Inner Steel Block Stair=Escada interior de bloco de aço -Outer Steel Block Stair=Escada exterior de bloco de aço -Steel Block Slab=Laje de bloco de aço -Tin Block Stair=Escada de bloco de estanho -Inner Tin Block Stair=Escada interior de bloco de estanho -Outer Tin Block Stair=Escada exterior de bloco de lata -Tin Block Slab=Laje de bloco de estanho -Copper Block Stair=Escada de bloco de cobre -Inner Copper Block Stair=Escada interior de Bloco de Cobre -Outer Copper Block Stair=Escada exterior do Bloco de Cobre -Copper Block Slab=Laje de bloco de cobre -Bronze Block Stair=Escada Bloco de Bronze -Inner Bronze Block Stair=Escada interior de bloco de bronze -Outer Bronze Block Stair=Escada exterior de Bloco de Bronze -Bronze Block Slab=Laje de bloco de bronze -Gold Block Stair=Escada Bloco de Ouro -Inner Gold Block Stair=Escada interior de Bloco de Ouro -Outer Gold Block Stair=Escada exterior de Bloco de Ouro -Gold Block Slab=Laje de Bloco de Ouro -Ice Stair=Escada de gelo -Inner Ice Stair=Escada de gelo interior -Outer Ice Stair=Escada de gelo exterior -Ice Slab=Laje de gelo -Snow Block Stair=Escada Bloco de Neve -Inner Snow Block Stair=Escada de bloco de neve interior -Outer Snow Block Stair=Escada de bloco de neve exterior -Snow Block Slab=Laje de bloco de neve diff --git a/mods/stairs/locale/stairs.ru.tr b/mods/stairs/locale/stairs.ru.tr index 1296d4a4..2d5850ea 100644 --- a/mods/stairs/locale/stairs.ru.tr +++ b/mods/stairs/locale/stairs.ru.tr @@ -1,145 +1,145 @@ # textdomain: stairs -Glass Stair=Стеклянные ступени -Glass Slab=Стеклянная плита -Inner Glass Stair=Внутренние стеклянные ступени -Outer Glass Stair=Внешние стеклянные ступени -Obsidian Glass Stair=Ступени из обсидианового стекла -Obsidian Glass Slab=Плита из обсидианового стекла -Inner Obsidian Glass Stair=Внутренние ступени из обсидианового стекла -Outer Obsidian Glass Stair=Внешние ступени из обсидианового стекла -Wooden Stair=Деревянные ступени -Inner Wooden Stair=Внутренние деревянные ступени -Outer Wooden Stair=Внешние деревянные ступени -Wooden Slab=Деревянная плита -Jungle Wood Stair=Ступени из тропического дерева -Inner Jungle Wood Stair=Внутренние ступени из тропического дерева -Outer Jungle Wood Stair=Внешние ступени из тропического дерева -Jungle Wood Slab=Плита из тропического дерева -Pine Wood Stair=Сосновые ступени -Inner Pine Wood Stair=Внутренние сосновые ступени -Outer Pine Wood Stair=Внешние сосновые ступени -Pine Wood Slab=Сосновая плита -Acacia Wood Stair=Акациевые ступени -Inner Acacia Wood Stair=Внутренние акациевые ступени -Outer Acacia Wood Stair=Внешние акациевые ступени -Acacia Wood Slab=Акациевая плита -Aspen Wood Stair=Осиновые ступени -Inner Aspen Wood Stair=Внутренние осиновые ступени -Outer Aspen Wood Stair=Внешние осиновые ступени -Aspen Wood Slab=Осиновая плита -Stone Stair=Каменные ступени -Inner Stone Stair=Внутренние каменные ступени -Outer Stone Stair=Внешние каменные ступени -Stone Slab=Каменная плита -Cobblestone Stair=Булыжниковые ступени -Inner Cobblestone Stair=Внутренние булыжниковые ступени -Outer Cobblestone Stair=Внешние булыжниковые ступени -Cobblestone Slab=Булыжниковая плита -Mossy Cobblestone Stair=Ступени из замшелого булыжника -Inner Mossy Cobblestone Stair=Внутренние ступени из замшелого булыжника -Outer Mossy Cobblestone Stair=Внешние ступени из замшелого булыжника -Mossy Cobblestone Slab=Плита из замшелого булыжника -Stone Brick Stair=Cтупени из каменных кирпичей -Inner Stone Brick Stair=Внутренние ступени из каменных кирпичей -Outer Stone Brick Stair=Внешние ступени из каменных кирпичей -Stone Brick Slab=Плита из каменных кирпичей -Stone Block Stair=Ступени из камня -Inner Stone Block Stair=Внутренние ступени из камня -Outer Stone Block Stair=Внешние ступени из камня -Stone Block Slab=Плита из камня -Desert Stone Stair=Ступени из пустынного камня -Inner Desert Stone Stair=Внутренние ступени из пустынного камня -Outer Desert Stone Stair=Внешние ступени из пустынного камня -Desert Stone Slab=Плита из пустынного камня -Desert Cobblestone Stair=Ступени из пустынного булыжника -Inner Desert Cobblestone Stair=Внутренние ступени из пустынного булыжника -Outer Desert Cobblestone Stair=Внешние ступени из пустынного булыжника -Desert Cobblestone Slab=Плита из пустынного булыжника -Desert Stone Brick Stair=Ступени из пустынных каменных кирпичей -Inner Desert Stone Brick Stair=Внутренние ступени из пустынных каменных кирпичей -Outer Desert Stone Brick Stair=Внешние ступени из пустынных каменных кирпичей -Desert Stone Brick Slab=Плита из пустынных каменных кирпичей -Desert Stone Block Stair=Ступени из пустынного каменного блока -Inner Desert Stone Block Stair=Внутренние ступени из пустынного каменного блока -Outer Desert Stone Block Stair=Внешние ступени из пустынного каменного блока -Desert Stone Block Slab=Плита из пустынного каменного блока -Sandstone Stair=Песчаниковые ступени -Inner Sandstone Stair=Внутренние песчаниковые ступени -Outer Sandstone Stair=Внешние песчаниковые ступени -Sandstone Slab=Песчаниковая плита -Sandstone Brick Stair=Ступени из песчаниковых кирпичей -Inner Sandstone Brick Stair=Внутренние ступени из песчаниковых кирпичей -Outer Sandstone Brick Stair=Внешние ступени из песчаниковых кирпичей -Sandstone Brick Slab=Плита из песчаниковых кирпичей -Sandstone Block Stair=Ступени из песчаникового блока -Inner Sandstone Block Stair=Внутренние ступени из песчаникового блока -Outer Sandstone Block Stair=Внешние ступени из песчаникового блока -Sandstone Block Slab=Плита из песчаникового блока -Desert Sandstone Stair=Ступени из пустынного песчаника -Inner Desert Sandstone Stair=Внутренние ступени из пустынного песчаника -Outer Desert Sandstone Stair=Внешние ступени из пустынного песчаника -Desert Sandstone Slab=Плита из пустынного песчаника -Desert Sandstone Brick Stair=Ступени из пустынных песчаниковых кирпичей -Inner Desert Sandstone Brick Stair=Внутренние ступени из пустынных песчаниковых кирпичей -Outer Desert Sandstone Brick Stair=Внешние ступени из пустынных песчаниковых кирпичей -Desert Sandstone Brick Slab=Плита из пустынных песчаниковых кирпичей -Desert Sandstone Block Stair=Ступени из пустынного песчаникового блока -Inner Desert Sandstone Block Stair=Внутренние ступени из пустынного песчаникового блока -Outer Desert Sandstone Block Stair=Внешние ступени из пустынного песчаникового блока -Desert Sandstone Block Slab=Плита из пустынного песчаникового блока -Silver Sandstone Stair=Ступени из серебристого песчаника -Inner Silver Sandstone Stair=Внутренние ступени из серебристого песчаника -Outer Silver Sandstone Stair=Внешние ступени из серебристого песчаника -Silver Sandstone Slab=Плита из серебристого песчаника -Silver Sandstone Brick Stair=Ступени из серебристых песчаниковых кирпичей -Inner Silver Sandstone Brick Stair=Внутренние ступени из серебристых песчаниковых кирпичей -Outer Silver Sandstone Brick Stair=Внешние ступени из серебристых песчаниковых кирпичей -Silver Sandstone Brick Slab=Плита из серебристых песчаниковых кирпичей -Silver Sandstone Block Stair=Ступени из серебристого песчаникового блока -Inner Silver Sandstone Block Stair=Внутренние ступени из серебристого песчаникового блока -Outer Silver Sandstone Block Stair=Внешние ступени из серебристого песчаникового блока -Silver Sandstone Block Slab=Плита из серебристого песчаникового блока -Obsidian Stair=Обсидиановые ступени -Inner Obsidian Stair=Внутренние обсидиановые ступени -Outer Obsidian Stair=Внешние обсидиановые ступени -Obsidian Slab=Обсидиановая плита -Obsidian Brick Stair=Ступени из обсидиановых кирпичей -Inner Obsidian Brick Stair=Внутренние ступени из обсидиановых кирпичей -Outer Obsidian Brick Stair=Внешние ступени из обсидиановых кирпичей -Obsidian Brick Slab=Плита из обсидиановых кирпичей -Obsidian Block Stair=Ступени из обсидианового блока -Inner Obsidian Block Stair=Внутренние ступени из обсидианового блока -Outer Obsidian Block Stair=Внешние ступени из обсидианового блока -Obsidian Block Slab=Плита из обсидианового блока -Brick Stair=Кирпичные ступени -Inner Brick Stair=Внутренние кирпичные ступени -Outer Brick Stair=Внешние кирпичные ступени -Brick Slab=Кирпичная плита -Steel Block Stair=Стальные ступени -Inner Steel Block Stair=Внутренние стальные ступени -Outer Steel Block Stair=Внешние стальные ступени -Steel Block Slab=Стальная плита -Tin Block Stair=Оловянные ступени -Inner Tin Block Stair=Внутренние оловянные ступени -Outer Tin Block Stair=Внешние оловянные ступени -Tin Block Slab=Оловянная плита -Copper Block Stair=Медные ступени -Inner Copper Block Stair=Внутренние медные ступени -Outer Copper Block Stair=Внешние медные ступени -Copper Block Slab=Медная плита -Bronze Block Stair=Бронзовые ступени -Inner Bronze Block Stair=Внутренние бронзовые ступени -Outer Bronze Block Stair=Внешние бронзовые ступени -Bronze Block Slab=Бронзовая плита -Gold Block Stair=Золотые ступени -Inner Gold Block Stair=Внутренние золотые ступени -Outer Gold Block Stair=Внешние золотые ступени -Gold Block Slab=Золотая плита -Ice Stair=Ледяные ступени -Inner Ice Stair=Внутренние ледяные ступени -Outer Ice Stair=Внешние ледяные ступени -Ice Slab=Ледяная плита -Snow Block Stair=Снежные ступени -Inner Snow Block Stair=Внутренние снежные ступени -Outer Snow Block Stair=Внешние снежные ступени -Snow Block Slab=Снежная плита +Glass Stair=Стеклянная Ступень +Glass Slab=Стеклянная Плита +Inner Glass Stair=Угловая Стеклянная Ступень (Внутренний Угол) +Outer Glass Stair=Угловая Стеклянная Ступень (Внешний Угол) +Obsidian Glass Stair=Стеклянная Ступень Из Обсидиана +Obsidian Glass Slab=Стеклянная Плита Из Обсидиана +Inner Obsidian Glass Stair=Угловая Стеклянная Ступень Из Обсидиана (Внутренний Угол) +Outer Obsidian Glass Stair=Угловая Стеклянная Ступень Из Обсидиана (Внешний Угол) +Wooden Stair=Яблоневая Деревянная Ступень +Inner Wooden Stair=Угловая Яблоневая Деревянная Ступень (Внутренний Угол) +Outer Wooden Stair=Угловая Яблоневая Деревянная Ступень (Внешний Угол) +Wooden Slab=Яблоневая Деревянная Плита +Jungle Wood Stair=Тропическая Деревянная Ступень +Inner Jungle Wood Stair=Угловая Тропическая Деревянная Ступень (Внутренний Угол) +Outer Jungle Wood Stair=Угловая Тропическая Деревянная Ступень (Внешний Угол) +Jungle Wood Slab=Тропическая Деревянная Плита +Pine Wood Stair=Сосновая Деревянная Ступень +Inner Pine Wood Stair=Угловая Сосновая Деревянная Ступень (Внутренний Угол) +Outer Pine Wood Stair=Угловая Сосновая Деревянная Ступень (Внешний Угол) +Pine Wood Slab=Сосновая Деревянная Плита +Acacia Wood Stair=Деревянная Ступень Из Акации +Inner Acacia Wood Stair=Угловая Деревянная Ступень Из Акации (Внутренний Угол) +Outer Acacia Wood Stair=Угловая Деревянная Ступень Из Акации (Внешний Угол) +Acacia Wood Slab=Деревянная Плита Из Акации +Aspen Wood Stair=Осиновая Деревянная Ступень +Inner Aspen Wood Stair=Угловая Осиновая Деревянная Ступень (Внутренний Угол) +Outer Aspen Wood Stair=Угловая осиновая Деревянная Ступень (Внешний Угол) +Aspen Wood Slab=Осиновая Деревянная Плита +Stone Stair=Каменная Ступень +Inner Stone Stair=Угловая Каменная Ступень (Внутренний Угол) +Outer Stone Stair=Угловая Каменная Ступень (Внешний Угол) +Stone Slab=Каменная Плита +Cobblestone Stair=Булыжниковая Ступень +Inner Cobblestone Stair=Угловая Булыжниковая Ступень (Внутренний Угол) +Outer Cobblestone Stair=Угловая Булыжниковая Ступень (Внешний Угол) +Cobblestone Slab=Булыжниковая Плита +Mossy Cobblestone Stair=Мшистая Булыжниковая Ступень +Inner Mossy Cobblestone Stair=Угловая Мшистая Булыжниковая Ступень (Внутренний Угол) +Outer Mossy Cobblestone Stair=Угловая Мшистая Булыжниковая Ступень (Внешний Угол) +Mossy Cobblestone Slab=Мшистая Булыжниковая Плита +Stone Brick Stair=Cтупень Из Каменных Кирпичей +Inner Stone Brick Stair=Угловая Ступень Из Каменных Кирпичей (Внутренний Угол) +Outer Stone Brick Stair=Угловая Ступень Из Каменных Кирпичей (Внешний Угол) +Stone Brick Slab=Плита Из Каменных Кирпичей +Stone Block Stair=Ступень Из Каменного Блока +Inner Stone Block Stair=Угловая Ступень Из Каменного Блока (Внутренний Угол) +Outer Stone Block Stair=Угловая Ступень Из Каменного Блока (Внешний Угол) +Stone Block Slab=Плита Из Каменного Блока +Desert Stone Stair=Ступень Из Пустынного Камня +Inner Desert Stone Stair=Угловая Ступень Из Пустынного Камня (Внутренний Угол) +Outer Desert Stone Stair=Угловая Ступень Из Пустынного Камня (Внешний Угол) +Desert Stone Slab=Плита Из Пустынного Камня +Desert Cobblestone Stair=Ступень Из Пустынного Булыжника +Inner Desert Cobblestone Stair=Угловая Ступень Из Пустынного Булыжника (Внутренний Угол) +Outer Desert Cobblestone Stair=Угловая Ступень Из Пустынного Булыжника (Внешний Угол) +Desert Cobblestone Slab=Плита Из Пустынного Камня +Desert Stone Brick Stair=Ступень Из Кирпичей Пустынного Камня +Inner Desert Stone Brick Stair=Угловая Ступень Из Кирпичей Пустынного Камня (Внутренний Угол) +Outer Desert Stone Brick Stair=Угловая Ступень Из Кирпичей Пустынного Камня (Внешний Угол) +Desert Stone Brick Slab=Плита Из Кирпичей Пустынного Камня +Desert Stone Block Stair=Ступень Из Пустынного Каменного Блока +Inner Desert Stone Block Stair=Угловая Ступень Из Пустынного Каменного Блока (Внутренний Угол) +Outer Desert Stone Block Stair=Угловая Ступень Из Пустынного Каменного Блока (Внешний Угол) +Desert Stone Block Slab=Плита Из Пустынного Каменного Блока +Sandstone Stair=Песчаниковая Ступень +Inner Sandstone Stair=Угловая Песчаниковая Ступень (Внутренний Угол) +Outer Sandstone Stair=Угловая Песчаниковая Ступень (Внешний Угол) +Sandstone Slab=Песчаниковая Плита +Sandstone Brick Stair=Ступень Из Песчаниковых Кирпичей +Inner Sandstone Brick Stair=Угловая Ступень Из Песчаниковых Кирпичей (Внутренний Угол) +Outer Sandstone Brick Stair=Угловая Ступень Из Песчаниковых Кирпичей (Внешний Угол) +Sandstone Brick Slab=Плита Из Песчаниковых Кирпичей +Sandstone Block Stair=Ступень Из Песчаникового Блока +Inner Sandstone Block Stair=Угловая Ступень Из Песчаникового Блока (Внутренний Угол) +Outer Sandstone Block Stair=Угловая Ступень Из Песчаникового Блока (Внешний Угол) +Sandstone Block Slab=Плита Из Песчаникового Блока +Desert Sandstone Stair=Ступень Из Пустынного Песчаника +Inner Desert Sandstone Stair=Угловая Ступень Из Пустынного Песчаника (Внутренний Угол) +Outer Desert Sandstone Stair=Угловая Ступень Из Пустынного Песчаника (Внешний Угол) +Desert Sandstone Slab=Плита Из Пустынного Песчаника +Desert Sandstone Brick Stair=Ступень Из Кирпичей Пустынного Песчаника +Inner Desert Sandstone Brick Stair=Угловая Ступень Из Кирпичей Пустынного Песчаника (Внутренний Угол) +Outer Desert Sandstone Brick Stair=Угловая Ступень Из Кирпичей Пустынного Песчаника (Внешний Угол) +Desert Sandstone Brick Slab=Плита Из Кирпичей Пустынного Песчаника +Desert Sandstone Block Stair=Ступень Из Пустынного Песчаникового Блока +Inner Desert Sandstone Block Stair=Угловая Ступень Из Пустынного Песчаникового Блока (Внутренний Угол) +Outer Desert Sandstone Block Stair=Угловая Ступень Из Пустынного Песчаникового Блока (Внешний Угол) +Desert Sandstone Block Slab=Плита Из Пустынного Песчаникового Блока +Silver Sandstone Stair=Ступень Из Серебрянного Песчаника +Inner Silver Sandstone Stair=Угловая Ступень Из Серебряного Песчаника (Внутренний Угол) +Outer Silver Sandstone Stair=Угловая Ступень Из Серебряного Песчаника (Внешний Угол) +Silver Sandstone Slab=Плита Из Серебряного Песчаника +Silver Sandstone Brick Stair=Ступень Из Кирпичей Серебряного Песчаника +Inner Silver Sandstone Brick Stair=Угловая Ступень Из Кирпичей Серебряного Песчаника (Внутренний Угол) +Outer Silver Sandstone Brick Stair=Угловая Ступень Из Кирпичей Серебряного Песчаника (Внешний Угол) +Silver Sandstone Brick Slab=Плита Из Кирпичей Серебряного Песчаника +Silver Sandstone Block Stair=Ступень Из Серебряного Песчаникового Блока +Inner Silver Sandstone Block Stair=Угловая Ступень Из Серебряного Песчаникового Блока (Внутренний Угол) +Outer Silver Sandstone Block Stair=Угловая Ступень Из Серебряного Песчаникового Блока (Внешний Угол) +Silver Sandstone Block Slab=Плита Из Серебряного Песчаникового Блока +Obsidian Stair=Обсидиановая Ступень +Inner Obsidian Stair=Угловая Обсидиановая Ступень (Внутренний Угол) +Outer Obsidian Stair=Угловая Обсидиановая Ступень (Внешний Угол) +Obsidian Slab=Обсидиановая Плита +Obsidian Brick Stair=Ступень Из Обсидиановых Кирпичей +Inner Obsidian Brick Stair=Угловая Ступень Из Обсидиановых Кирпичей (Внутренний Угол) +Outer Obsidian Brick Stair=Угловая Ступень Из Обсидиановых Кирпичей (Внешний Угол) +Obsidian Brick Slab=Плита Из Обсидиановых Кирпичей +Obsidian Block Stair=Ступень Из Обсидианового Блока +Inner Obsidian Block Stair=Угловая Ступень Из Обсидианового Блока (Внутренний Угол) +Outer Obsidian Block Stair=Угловая Ступень Из Обсидианового Блока (Внешний Угол) +Obsidian Block Slab=Плита Из Обсидианового Блока +Brick Stair=Ступень Из Кирпичей +Inner Brick Stair=Угловая Ступень Из Кирпичей (Внутренний Угол) +Outer Brick Stair=Угловая Ступень Из Кирпичей (Внешний Угол) +Brick Slab=Плита Из Кирпичей +Steel Block Stair=Ступень Из Стального Блока +Inner Steel Block Stair=Угловая Ступень Из Стального Блока (Внутренний Угол) +Outer Steel Block Stair=Угловая Ступень Из Стального Блока (Внешний Угол) +Steel Block Slab=Плита Из Стального Блока +Tin Block Stair=Ступень Из Оловянного Блока +Inner Tin Block Stair=Угловая Ступень Из Оловянного Блока (Внутренний Угол) +Outer Tin Block Stair=Угловая Ступень Из Оловянного Блока (Внешний Угол) +Tin Block Slab=Плита Из Оловянного Блока +Copper Block Stair=Ступень Из Медного Блока +Inner Copper Block Stair=Угловая Ступень Из Медного Блока (Внутренний Угол) +Outer Copper Block Stair=Угловая Ступень Из Медного Блока (Внешний Угол) +Copper Block Slab=Плита Из Медного Блока +Bronze Block Stair=Ступень Из Бронзового Блока +Inner Bronze Block Stair=Угловая Ступень Из Бронзового Блока (Внутренний Угол) +Outer Bronze Block Stair=Угловая Ступень Из Бронзового Блока (Внешний Угол) +Bronze Block Slab=Плита Из Бронзового Блока +Gold Block Stair=Ступень Из Золотого Блока +Inner Gold Block Stair=Угловая Ступень Из Золотого Блока (Внутренний Угол) +Outer Gold Block Stair=Угловая Ступень Из Золотого Блока (Внешний Угол) +Gold Block Slab=Плита Из Золотого Блока +Ice Stair=Ледяная Ступень +Inner Ice Stair=Угловая Ледяная Ступень (Внутренний Угол) +Outer Ice Stair=Угловая Ледяная Ступень (Внешний Угол) +Ice Slab=Ледяная Плита +Snow Block Stair=Ступень Из Снежного Блока +Inner Snow Block Stair=Угловая Ступень Из Снежного Блока (Внутренний Угол) +Outer Snow Block Stair=Угловая Ступень Из Снежного Блока (Внешний Угол) +Snow Block Slab=Плита Из Снежного Блока diff --git a/mods/stairs/locale/stairs.se.tr b/mods/stairs/locale/stairs.se.tr new file mode 100644 index 00000000..0bc0bbc3 --- /dev/null +++ b/mods/stairs/locale/stairs.se.tr @@ -0,0 +1,144 @@ +# textdomain: stairs +Glass Stair=Glastrappa +Glass Slab=Glasplatta +Inner Glass Stair=Inre glasstrappa +Outer Glass Stair=Yttre glasstrappa +Obsidian Glass Stair=Obsidian Glass Trappa +Obsidian Glass Slab=Obsidian glasplatta +Inner Obsidian Glass Stair=Inre Obsidian Glass Trappa +Outer Obsidian Glass Stair=Yttre Obsidian Glass Trappa +Wooden Stair=Trätrappa +Inner Wooden Stair=Inre trätrappa +Outer Wooden Stair=Yttre trätrappa +Wooden Slab=Träplatta +Jungle Wood Stair=Jungle Wood Stair +Inner Jungle Wood Stair=Inre Jungle Wood Stair +Outer Jungle Wood Stair=Ytter Jungle Wood Stair +Jungle Wood Slab=Jungle Wood Platta +Pine Wood Stair=Pine Wood Stair +Inner Pine Wood Stair=Inre tall trä trappa +Outer Pine Wood Stair=Ytter tall Trätrappa +Pine Wood Slab=Tallskiva +Acacia Wood Stair=Acacia Wood Stair +Inner Acacia Wood Stair=Inre Acacia Trätrappa +Outer Acacia Wood Stair=Yttre Acacia Trätrappa +Acacia Wood Slab=Acacia träplatta +Aspen Wood Stair=Asp Trä Stair +Inner Aspen Wood Stair=Inre Aspen Trätrappa +Outer Aspen Wood Stair=Yttre Aspen Trätrappa +Aspen Wood Slab=Asp Trä Platta +Stone Stair=Stentrappa +Inner Stone Stair=Inre stentrappa +Outer Stone Stair=Yttre stentrappa +Stone Slab=Stenplatta +Cobblestone Stair=Kullersten trappa +Inner Cobblestone Stair=Inre kullerstensTrappa +Outer Cobblestone Stair=Yttre kullerstensTrappa +Cobblestone Slab=Kullerstenplatta +Mossy Cobblestone Stair=Mossig kullerstensTrappa +Inner Mossy Cobblestone Stair=Inre mossiga kullerstensTrappa +Outer Mossy Cobblestone Stair=Yttre mossiga kullerstensTrappa +Mossy Cobblestone Slab=Mossig kullerstenplatta +Stone Brick Stair=Sten Brick Trappa +Inner Stone Brick Stair=Inre sten tegel trappa +Outer Stone Brick Stair=Yttre sten tegel trappa +Stone Brick Slab=Sten tegelplatta +Stone Block Stair=Sten Block Trappa +Inner Stone Block Stair=Inre stenblock trappa +Outer Stone Block Stair=Yttre stenblock trappa +Stone Block Slab=Stenblockplatta +Desert Stone Stair=Öken Sten Trappa +Inner Desert Stone Stair=Inre Öken Sten Stair +Outer Desert Stone Stair=Outer Öken Sten Stair +Desert Stone Slab=Öken Sten Platta +Desert Cobblestone Stair=Öken Kullersten Trappa +Inner Desert Cobblestone Stair=Inre Öken Kullersten Trappa +Outer Desert Cobblestone Stair=Outer Öken Kullersten Trappa +Desert Cobblestone Slab=Öken Kullersten Platta +Desert Stone Brick Stair=Öken Sten Brick Trappa +Inner Desert Stone Brick Stair=Inre Öken Sten Brick Trappa +Outer Desert Stone Brick Stair=Outer Öken Sten Brick Trappa +Desert Stone Brick Slab=Öken Sten tegelplatta +Desert Stone Block Stair=Öken Sten Block Trappa +Inner Desert Stone Block Stair=Inre Öken Sten Block Stair +Outer Desert Stone Block Stair=Outer Öken Sten Block Trappa +Desert Stone Block Slab=Öken Sten Block Platta +Sandstone Stair=Sandstenstrappa +Inner Sandstone Stair=Inre Sandstenstrappa +Outer Sandstone Stair=Yttre Sandstenstrappa +Sandstone Slab=Sandstenplatta +Sandstone Brick Stair=Sandsten tegel trappa +Inner Sandstone Brick Stair=Inre Sandsten tegel trappa +Outer Sandstone Brick Stair=Yttre Sandsten tegel trappa +Sandstone Brick Slab=Sandsten tegelplatta +Sandstone Block Stair=Sandsten block trappa +Inner Sandstone Block Stair=Inre Sandsten block trappa +Outer Sandstone Block Stair=Yttre Sandsten block trappa +Sandstone Block Slab=Sandsten Block Platta +Desert Sandstone Stair=Öken Sandsten Trappa +Inner Desert Sandstone Stair=Inre Öken Sandsten Trappa +Outer Desert Sandstone Stair=Outer Öken Sandsten Trappa +Desert Sandstone Slab=Öken Sandsten Platta +Desert Sandstone Brick Stair=Öken Sandsten Brick Trappa +Inner Desert Sandstone Brick Stair=Inre Öken Sandsten Brick Trappa +Outer Desert Sandstone Brick Stair=Outer Öken Sandsten Brick Trappa +Desert Sandstone Brick Slab=Öken Sandsten Tegelplatta +Desert Sandstone Block Stair=Öken Sandsten Block Trappa +Inner Desert Sandstone Block Stair=Inre Öken Sandsten Block Trappa +Outer Desert Sandstone Block Stair=Outer Öken Sandsten Block Trappa +Desert Sandstone Block Slab=Öken Sandsten Block Platta +Silver Sandstone Stair=Silver Sandsten trappa +Inner Silver Sandstone Stair=Inre silver Sandsten trappa +Outer Silver Sandstone Stair=Yttre silver Sandsten trappa +Silver Sandstone Slab=Silver Sandsten platta +Silver Sandstone Brick Stair=Silver Sandsten tegel trappa +Inner Silver Sandstone Brick Stair=Inre silver Sandsten tegel trappa +Outer Silver Sandstone Brick Stair=Yttre silver Sandsten tegel trappa +Silver Sandstone Brick Slab=Silver Sandsten tegelplatta +Silver Sandstone Block Stair=Silver Sandsten block trappa +Inner Silver Sandstone Block Stair=Inre silver Sandsten block trappa +Outer Silver Sandstone Block Stair=Yttre silver Sandsten block trappa +Silver Sandstone Block Slab=Silver Sandsten block platta +Obsidian Stair=Obsidian Trappa +Inner Obsidian Stair=Inre Obsidian Trappa +Outer Obsidian Stair=Yttre Obsidian Trappa +Obsidian Slab=Obsidian Platta +Obsidian Brick Stair=Obsidian Brick Stair +Inner Obsidian Brick Stair=Inre Obsidian Brick Trappa +Outer Obsidian Brick Stair=Yttre Obsidian Brick Trappa +Obsidian Brick Slab=Obsidian tegelplatta +Obsidian Block Stair=Obsidian Block Stair +Inner Obsidian Block Stair=Inre Obsidian Block Trappa +Outer Obsidian Block Stair=Yttre Obsidian Block Trappa +Obsidian Block Slab=Obsidian Block Slab +Brick Stair=Tegel trappa +Inner Brick Stair=Inre tegel trappa +Outer Brick Stair=Yttre tegel trappa +Brick Slab=Tegelplatta +Steel Block Stair=Stålblock trappa +Inner Steel Block Stair=Inre stålblock trappa +Outer Steel Block Stair=Yttre stålblocktrappa +Steel Block Slab=Stålblockplatta +Tin Block Stair=Tinn Block Trappa +Inner Tin Block Stair=Inre tennblock trappa +Outer Tin Block Stair=Yttre tennblock trappa +Tin Block Slab=Tennblockplatta +Copper Block Stair=Kopparblock trappa +Inner Copper Block Stair=Inre kopparblock trappa +Outer Copper Block Stair=Yttre kopparblock trappa +Copper Block Slab=Kopparblockplatta +Bronze Block Stair=Bronze Block Trappa +Inner Bronze Block Stair=Inre bronsblock trappa +Outer Bronze Block Stair=Yttre bronsblock trappa +Bronze Block Slab=Bronsblockplatta +Gold Block Stair=Guldblockstrappa +Inner Gold Block Stair=Inre guldblock trappa +Outer Gold Block Stair=Yttre guldblock trappa +Gold Block Slab=Guldblockplatta +Ice Stair=Ice Stair +Inner Ice Stair=Inre istrappa +Outer Ice Stair=Yttre istrappa +Ice Slab=Isplatta +Snow Block Stair=Snow Block Stair +Inner Snow Block Stair=Inre snöblock trappa +Outer Snow Block Stair=Yttre snöblock trappa \ No newline at end of file diff --git a/mods/stairs/locale/stairs.sk.tr b/mods/stairs/locale/stairs.sk.tr deleted file mode 100644 index b006fdb5..00000000 --- a/mods/stairs/locale/stairs.sk.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Sklenené schod -Glass Slab=Sklenený stupienok -Inner Glass Stair=Vnútorný sklenené schod -Outer Glass Stair=Vonkajší sklenené schod -Obsidian Glass Stair=Obsidiánové sklenené schod -Obsidian Glass Slab=Obsidiánový sklenený stupienok -Inner Obsidian Glass Stair=Vnútorný obsidiánové sklenené schod -Outer Obsidian Glass Stair=Vonkajší obsidiánové sklenené schod -Wooden Stair=Drevené schod -Inner Wooden Stair=Vnútorný drevené schod -Outer Wooden Stair=Vonkajší drevené schod -Wooden Slab=Drevený stupienok -Jungle Wood Stair=Drevené schod z džungľového dreva -Inner Jungle Wood Stair=Vnútorný drevené schod z džungľového dreva -Outer Jungle Wood Stair=Vonkajší drevené schod z džungľového dreva -Jungle Wood Slab=Stupienok z džungľového dreva -Pine Wood Stair=Drevené schod z borovicového dreva -Inner Pine Wood Stair=Vnútorný drevené schod z borovicového dreva -Outer Pine Wood Stair=Vonkajší drevené schod z borovicového dreva -Pine Wood Slab=Stupienok z borovicového dreva -Acacia Wood Stair=Drevené schod z akáciového dreva -Inner Acacia Wood Stair=Vnútorný drevené schod z akáciového dreva -Outer Acacia Wood Stair=Vonkajší drevené schod z akáciového dreva -Acacia Wood Slab=Stupienok z akáciového dreva -Aspen Wood Stair=Drevené schod z osiky -Inner Aspen Wood Stair=Vnútorný drevené schod z osiky -Outer Aspen Wood Stair=Vonkajší drevené schod z osiky -Aspen Wood Slab=Stupienok z osiky -Stone Stair=Kamenné schod -Inner Stone Stair=Vnútorný kamenné schod -Outer Stone Stair=Vonkajší kamenné schod -Stone Slab=Kamenný stupienok -Cobblestone Stair=Schod z dlažbového kameňa -Inner Cobblestone Stair=Vnútorný schod z dlažbového kameňa -Outer Cobblestone Stair=Vonkajší schod z dlažbového kameňa -Cobblestone Slab=Stupienok z dlažbového kameňa -Mossy Cobblestone Stair=Schod dlažbového kameňa obrastené machom -Inner Mossy Cobblestone Stair=Vnútorný schod dlažbového kameňa obrastené machom -Outer Mossy Cobblestone Stair=Vonkajší schod dlažbového kameňa obrastené machom -Mossy Cobblestone Slab=Stupienok z dlažbového kameňa obrastený machom -Stone Brick Stair=Schod z kamenných tehál -Inner Stone Brick Stair=Vnútorný schod z kamenných tehál -Outer Stone Brick Stair=Vonkajší schod z kamenných tehál -Stone Brick Slab=Stupienok z kamenných tehál -Stone Block Stair=Schod z kameňa -Inner Stone Block Stair=Vnútorný schod z kameňa -Outer Stone Block Stair=Vonkajší schod z kameňa -Stone Block Slab=Stupienok z kameňa -Desert Stone Stair=Schod z púštneho kameňa -Inner Desert Stone Stair=Vnútorný schod z púštneho kameňa -Outer Desert Stone Stair=Vonkajší schod z púštneho kameňa -Desert Stone Slab=Stupienok z púštneho kameňa -Desert Cobblestone Stair=Schod z púštneho dlažbového kameňa -Inner Desert Cobblestone Stair=Vnútorný schod z púštneho dlažbového kameňa -Outer Desert Cobblestone Stair=Vonkajší schod z púštneho dlažbového kameňa -Desert Cobblestone Slab=Stupienok z púštneho dlažbového kameňa -Desert Stone Brick Stair=Schod z tehiel z púštneho kameňa -Inner Desert Stone Brick Stair=Vnútorný schod z tehiel z púštneho kameňa -Outer Desert Stone Brick Stair=Vonkajší schod z tehiel z púštneho kameňa -Desert Stone Brick Slab=Stupienok z tehiel z púštneho kameňa -Desert Stone Block Stair=Schod z blokov púštneho kameňa -Inner Desert Stone Block Stair=Vnútorný schod z blokov púštneho kameňa -Outer Desert Stone Block Stair=Vonkajší schod z blokov púštneho kameňa -Desert Stone Block Slab=Stupienok z blokov púštneho kameňa -Sandstone Stair=Schod z pieskovca -Inner Sandstone Stair=Vnútorný schod z pieskovca -Outer Sandstone Stair=Vonkajší schod z pieskovca -Sandstone Slab=Stupienok z pieskovca -Sandstone Brick Stair=Schod z tehál pieskovca -Inner Sandstone Brick Stair=Vnútorný schod z tehál pieskovca -Outer Sandstone Brick Stair=Vonkajší schod z tehál pieskovca -Sandstone Brick Slab=Stupienok z tehál pieskovca -Sandstone Block Stair=Schod z blokov pieskovca -Inner Sandstone Block Stair=Vnútorný schod z blokov pieskovca -Outer Sandstone Block Stair=Vonkajší schod z blokov pieskovca -Sandstone Block Slab=Stupienok z blokov pieskovca -Desert Sandstone Stair=Schod z púštneho pieskovca -Inner Desert Sandstone Stair=Vnútorný schod z púštneho pieskovca -Outer Desert Sandstone Stair=Vonkajší schod z púštneho pieskovca -Desert Sandstone Slab=Stupienok z púštneho pieskovca -Desert Sandstone Brick Stair=Schod z tehál z púštneho pieskovca -Inner Desert Sandstone Brick Stair=Vnútorný schod z tehál z púštneho pieskovca -Outer Desert Sandstone Brick Stair=Vonkajší schod z tehál z púštneho pieskovca -Desert Sandstone Brick Slab=Stupienok z tehál z púštneho pieskovca -Desert Sandstone Block Stair=Schod z blokov púštneho pieskovca -Inner Desert Sandstone Block Stair=Vnútorný schod z blokov púštneho pieskovca -Outer Desert Sandstone Block Stair=Vonkajší schod z blokov púštneho pieskovca -Desert Sandstone Block Slab=Stupienok z blokov púštneho pieskovca -Silver Sandstone Stair=Schod zo strieborného pieskovca -Inner Silver Sandstone Stair=Vnútorný schod zo strieborného pieskovca -Outer Silver Sandstone Stair=Vonkajší schod zo strieborného pieskovca -Silver Sandstone Slab=Stupienok zo strieborného pieskovca -Silver Sandstone Brick Stair=Schod z tehál zo strieborného pieskovca -Inner Silver Sandstone Brick Stair=Vnútorný schod z tehál zo strieborného pieskovca -Outer Silver Sandstone Brick Stair=Vonkajší schod z tehál zo strieborného pieskovca -Silver Sandstone Brick Slab=Stupienok z tehál zo strieborného pieskovca -Silver Sandstone Block Stair=Schod z blokov strieborného pieskovca -Inner Silver Sandstone Block Stair=Vnútorný schod z blokov strieborného pieskovca -Outer Silver Sandstone Block Stair=Vonkajší schod z blokov strieborného pieskovca -Silver Sandstone Block Slab=Stupienok z blokov strieborného pieskovca -Obsidian Stair=Schod z obsidiánu -Inner Obsidian Stair=Vnútorný schod z obsidiánu -Outer Obsidian Stair=Vonkajší schod z obsidiánu -Obsidian Slab=Stupienok z obsidiánu -Obsidian Brick Stair=Schod z tehál obsidiánu -Inner Obsidian Brick Stair=Vnútorný schod z tehál obsidiánu -Outer Obsidian Brick Stair=Vonkajší schod z tehál obsidiánu -Obsidian Brick Slab=Stupienok z tehál obsidiánu -Obsidian Block Stair=Schod z bloku obsidiánu -Inner Obsidian Block Stair=Vnútorný schod z bloku obsidiánu -Outer Obsidian Block Stair=Vonkajší schod z bloku obsidiánu -Obsidian Block Slab=Stupienok z bloku obsidiánu -Brick Stair=Schod z tehál -Inner Brick Stair=Vnútorný schod z tehál -Outer Brick Stair=Vonkajší schod z tehál -Brick Slab=Stupienok z tehál -Steel Block Stair=Oceľový schod -Inner Steel Block Stair=Vnútorný oceľový schod -Outer Steel Block Stair=Vonkajší oceľový schod -Steel Block Slab=Oceľový stupienok -Tin Block Stair=Cínový schod -Inner Tin Block Stair=Vnútorný cínový schod -Outer Tin Block Stair=Vonkajší cínový schod -Tin Block Slab=Cínový stupienok -Copper Block Stair=Medený schod -Inner Copper Block Stair=Vnútorný medený schod -Outer Copper Block Stair=Vonkajší medený schod -Copper Block Slab=Medený stupienok -Bronze Block Stair=Bronzový schod -Inner Bronze Block Stair=Vnútorný bronzový schod -Outer Bronze Block Stair=Vonkajší bronzový schod -Bronze Block Slab=Bronzový stupienok -Gold Block Stair=Zlatý schod -Inner Gold Block Stair=Vnútorný zlatý schod -Outer Gold Block Stair=Vonkajší zlatý schod -Gold Block Slab=Zlatý stupienok -Ice Stair=Ľadový schod -Inner Ice Stair=Vnútorný ľadový schod -Outer Ice Stair=Vonkajší ľadový schod -Ice Slab=Ľadový stupienok -Snow Block Stair=Snehový schod -Inner Snow Block Stair=Vnútorný snehový schod -Outer Snow Block Stair=Vonkajší snehový schod -Snow Block Slab=Snehový stupienok diff --git a/mods/stairs/locale/stairs.sv.tr b/mods/stairs/locale/stairs.sv.tr deleted file mode 100644 index 8044af81..00000000 --- a/mods/stairs/locale/stairs.sv.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Glastrappa -Glass Slab=Glasplatta -Inner Glass Stair=Inre glasstrappa -Outer Glass Stair=Yttre glasstrappa -Obsidian Glass Stair=Obsidianglasstrappa -Obsidian Glass Slab=Obsidianglasplatta -Inner Obsidian Glass Stair=Inre obsidianglastrappa -Outer Obsidian Glass Stair=Yttre obsidianglastrappa -Wooden Stair=Trätrappa -Inner Wooden Stair=Inre trätrappa -Outer Wooden Stair=Yttre trätrappa -Wooden Slab=Träplatta -Jungle Wood Stair=Djungelträtrappa -Inner Jungle Wood Stair=Inre djungelträtrappa -Outer Jungle Wood Stair=Ytter djungelträtrappa -Jungle Wood Slab=Djungelträplatta -Pine Wood Stair=Tallträplatta -Inner Pine Wood Stair=Inre tallträplatta -Outer Pine Wood Stair=Ytter tallträplatta -Pine Wood Slab=Tallskiva -Acacia Wood Stair=Acaciatrappa -Inner Acacia Wood Stair=Inre acaciatrappa -Outer Acacia Wood Stair=Yttre acaciatrappa -Acacia Wood Slab=Acaciaplatta -Aspen Wood Stair=Aspträtrappa -Inner Aspen Wood Stair=Inre aspträtrappa -Outer Aspen Wood Stair=Yttre aspträtrappa -Aspen Wood Slab=Aspträplatta -Stone Stair=Stentrappa -Inner Stone Stair=Inre stentrappa -Outer Stone Stair=Yttre stentrappa -Stone Slab=Stenplatta -Cobblestone Stair=Kullerstenstrappa -Inner Cobblestone Stair=Inre kullerstenstrappa -Outer Cobblestone Stair=Yttre kullerstenstrappa -Cobblestone Slab=Kullerstenplatta -Mossy Cobblestone Stair=Mossig kullerstenstrappa -Inner Mossy Cobblestone Stair=Inre mossig kullerstenstrappa -Outer Mossy Cobblestone Stair=Yttre mossig kullerstenstrappa -Mossy Cobblestone Slab=Mossig kullerstenplatta -Stone Brick Stair=Stentegeltrappa -Inner Stone Brick Stair=Inre stentegeltrappa -Outer Stone Brick Stair=Yttre stentegeltrappa -Stone Brick Slab=Stentegelplatta -Stone Block Stair=Stenblockstrappa -Inner Stone Block Stair=Inre stenblockstrappa -Outer Stone Block Stair=Yttre stenblockstrappa -Stone Block Slab=Stenblocksplatta -Desert Stone Stair=Ökenstentrappa -Inner Desert Stone Stair=Inre ökenstentrappa -Outer Desert Stone Stair=Yttre ökenstentrappa -Desert Stone Slab=Ökenstenplatta -Desert Cobblestone Stair=Ökenkullerstenstrappa -Inner Desert Cobblestone Stair=Inre ökenkullerstenstrappa -Outer Desert Cobblestone Stair=Yttre ökenkullerstenstrappa -Desert Cobblestone Slab=Ökenkullerstensplatta -Desert Stone Brick Stair=Ökentegelstenstrappa -Inner Desert Stone Brick Stair=Inre Ökentegelstenstrappa -Outer Desert Stone Brick Stair=Yttre Ökentegelstenstrappa -Desert Stone Brick Slab=Ökentegelstensplatta -Desert Stone Block Stair=Ökenstenblockstrappa -Inner Desert Stone Block Stair=Inre ökenstenblockstrappa -Outer Desert Stone Block Stair=Yttre ökenstenblockstrappa -Desert Stone Block Slab=Ökenstenblocksplatta -Sandstone Stair=Sandstenstrappa -Inner Sandstone Stair=Inre Sandstenstrappa -Outer Sandstone Stair=Yttre Sandstenstrappa -Sandstone Slab=Sandstenplatta -Sandstone Brick Stair=Sandstentegeltrappa -Inner Sandstone Brick Stair=Inre Sandstentegeltrappa -Outer Sandstone Brick Stair=Yttre Sandstentegeltrappa -Sandstone Brick Slab=Sandstentegelplatta -Sandstone Block Stair=Sandstenblockstrappa -Inner Sandstone Block Stair=Inre Sandstenblockstrappa -Outer Sandstone Block Stair=Yttre Sandstenblockstrappa -Sandstone Block Slab=Sandstenblocksplatta -Desert Sandstone Stair=Ökensandstenstrappa -Inner Desert Sandstone Stair=Inre ökensandstenstrappa -Outer Desert Sandstone Stair=Yttre ökensandstenstrappa -Desert Sandstone Slab=Ökensandstensplatta -Desert Sandstone Brick Stair=Ökensandstentegeltrappa -Inner Desert Sandstone Brick Stair=Inre ökensandstentegeltrappa -Outer Desert Sandstone Brick Stair=Yttre ökensandstentegeltrappa -Desert Sandstone Brick Slab=Ökensandstentegelplatta -Desert Sandstone Block Stair=Ökensandstentegeltrappa -Inner Desert Sandstone Block Stair=Inre ökensandstentegeltrappa -Outer Desert Sandstone Block Stair=Yttre ökensandstentegeltrappa -Desert Sandstone Block Slab=Ökensandstentegelplatta -Silver Sandstone Stair=Silversandstenstrappa -Inner Silver Sandstone Stair=Inre silversandstenstrappa -Outer Silver Sandstone Stair=Yttre silversandstenstrappa -Silver Sandstone Slab=Silversandstenstrappa -Silver Sandstone Brick Stair=Silversandstenstegeltrappa -Inner Silver Sandstone Brick Stair=Inre silversandstenstegeltrappa -Outer Silver Sandstone Brick Stair=Yttre silversandstenstegeltrappa -Silver Sandstone Brick Slab=Silversandstenstegelplatta -Silver Sandstone Block Stair=Silversandstenblockstrappa -Inner Silver Sandstone Block Stair=Inre silversandstenblockstrappa -Outer Silver Sandstone Block Stair=Yttre silversandstenblockstrappa -Silver Sandstone Block Slab=Silversandstenblocksplatta -Obsidian Stair=Obsidiantrappa -Inner Obsidian Stair=Inre obsidiantrappa -Outer Obsidian Stair=Yttre obsidiantrappa -Obsidian Slab=Obsidianplatta -Obsidian Brick Stair=Obsidiantegeltrappa -Inner Obsidian Brick Stair=Inre obsidiantegeltrappa -Outer Obsidian Brick Stair=Yttre obsidiantegeltrappa -Obsidian Brick Slab=Obsidiantegelplatta -Obsidian Block Stair=Obsidianblocktrappa -Inner Obsidian Block Stair=Inre Obsidianblocktrappa -Outer Obsidian Block Stair=Yttre Obsidianblocktrappa -Obsidian Block Slab=Obsidianblockplatta -Brick Stair=Tegeltrappa -Inner Brick Stair=Inre tegeltrappa -Outer Brick Stair=Yttre tegeltrappa -Brick Slab=Tegelplatta -Steel Block Stair=Ståltrappa -Inner Steel Block Stair=Inre ståltrappa -Outer Steel Block Stair=Yttre ståltrappa -Steel Block Slab=Stålplatta -Tin Block Stair=Tenntrappa -Inner Tin Block Stair=Inre tenntrappa -Outer Tin Block Stair=Yttre tenntrappa -Tin Block Slab=Tennplatta -Copper Block Stair=Koppartrappa -Inner Copper Block Stair=Inre koppartrappa -Outer Copper Block Stair=Yttre koppartrappa -Copper Block Slab=Kopparplatta -Bronze Block Stair=Bronstrappa -Inner Bronze Block Stair=Inre bronstrappa -Outer Bronze Block Stair=Yttre bronstrappa -Bronze Block Slab=Bronsplatta -Gold Block Stair=Guldtrappa -Inner Gold Block Stair=Inre guldtrappa -Outer Gold Block Stair=Yttre guldtrappa -Gold Block Slab=Guldplatta -Ice Stair=Istrappa -Inner Ice Stair=Inre istrappa -Outer Ice Stair=Yttre istrappa -Ice Slab=Isplatta -Snow Block Stair=Snöblockstrappa -Inner Snow Block Stair=Inre snöblockstrappa -Outer Snow Block Stair=Yttre snöblockstrappa -Snow Block Slab=Snöblocksplatta diff --git a/mods/stairs/locale/stairs.uk.tr b/mods/stairs/locale/stairs.uk.tr deleted file mode 100644 index bf729a03..00000000 --- a/mods/stairs/locale/stairs.uk.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Скляна сходинка -Glass Slab=Скляна плита -Inner Glass Stair=Кутова скляна сходинка (внутрішній кут) -Outer Glass Stair=Кутова скляна сходинка (зовнішній кут) -Obsidian Glass Stair=Сходинка з обсидіанового скла -Obsidian Glass Slab=Плита з обсидіанового скла -Inner Obsidian Glass Stair=Кутова сходинка з обсидіанового скла (внутрішній кут) -Outer Obsidian Glass Stair=Кутова сходинка з обсидіанового скла (зовнішній кут) -Wooden Stair=Дерев'яна сходинка -Inner Wooden Stair=Кутова дерев'яна сходинка (внутрішній кут) -Outer Wooden Stair=Кутова дерев'яна сходинка (зовнішній кут) -Wooden Slab=Дерев'яна плита -Jungle Wood Stair=Сходинка з тропічного дерева -Inner Jungle Wood Stair=Кутова сходинка з тропічного дерева (внутрішній кут) -Outer Jungle Wood Stair=Кутова сходинка з тропічного дерева (зовнішній кут) -Jungle Wood Slab=Плита з тропічного дерева -Pine Wood Stair=Соснова сходинка -Inner Pine Wood Stair=Кутова соснова сходинка (внутрішній кут) -Outer Pine Wood Stair=Кутова соснова сходинка (зовнішній кут) -Pine Wood Slab=Соснова плита -Acacia Wood Stair=Акацієва сходинка -Inner Acacia Wood Stair=Кутова акацієва сходинка (внутрішній кут) -Outer Acacia Wood Stair=Кутова акацієва сходинка (зовнішній кут) -Acacia Wood Slab=Акацієва плита -Aspen Wood Stair=Осикова сходинка -Inner Aspen Wood Stair=Кутова осикова сходинка (внутрішній кут) -Outer Aspen Wood Stair=Кутова осикова сходинка (зовнішній кут) -Aspen Wood Slab=Осикова плита -Stone Stair=Кам'яна сходинка -Inner Stone Stair=Кутова кам'яна сходинка (внутрішній кут) -Outer Stone Stair=Кутова кам'яна сходинка (зовнішній кут) -Stone Slab=Кам'яна плита -Cobblestone Stair=Круглякова сходинка -Inner Cobblestone Stair=Кутова круглякова сходинка (внутрішній кут) -Outer Cobblestone Stair=Кутова круглякова сходинка (зовнішній кут) -Cobblestone Slab=Круглякова плита -Mossy Cobblestone Stair=Сходинка з моховитого кругляку -Inner Mossy Cobblestone Stair=Кутова сходинка з моховитого кругляку (внутрішній кут) -Outer Mossy Cobblestone Stair=Кутова сходинка з моховитого кругляку (зовнішній кут) -Mossy Cobblestone Slab=Плита з моховитого кругляку -Stone Brick Stair=Сходинка з кам'яної цегли -Inner Stone Brick Stair=Кутова сходинка з кам'яної цегли (внутрішній кут) -Outer Stone Brick Stair=Кутова сходинка з кам'яної цегли (зовнішній кут) -Stone Brick Slab=Плита з кам'яної цегли -Stone Block Stair=Сходинка з блоку каменю -Inner Stone Block Stair=Кутова сходинка з блоку каменю (внутрішній кут) -Outer Stone Block Stair=Кутова сходинка з блоку каменю (зовнішній кут) -Stone Block Slab=Плита з блоку каменю -Desert Stone Stair=Сходинка з пустельного каменю -Inner Desert Stone Stair=Кутова сходинка з пустельного каменю (внутрішній кут) -Outer Desert Stone Stair=Кутова сходинка з пустельного каменю (зовнішній кут) -Desert Stone Slab=Плита з пустельного каменю -Desert Cobblestone Stair=Сходинка з пустельного кругляку -Inner Desert Cobblestone Stair=Кутова сходинка з пустельного кругляку (внутрішній кут) -Outer Desert Cobblestone Stair=Кутова сходинка з пустельного кругляку (зовнішній кут) -Desert Cobblestone Slab=Плита з пустельного кругляку -Desert Stone Brick Stair=Сходинка з цегли з пустельного каменю -Inner Desert Stone Brick Stair=Кутова сходинка з цегли з пустельного каменю (внутрішній кут) -Outer Desert Stone Brick Stair=Кутова сходинка з цегли з пустельного каменю (зовнішній кут) -Desert Stone Brick Slab=Плита з цегли з пустельного каменю -Desert Stone Block Stair=Сходинка з блоку пустельного каменю -Inner Desert Stone Block Stair=Кутова сходинка з блоку пустельного каменю (внутрішній кут) -Outer Desert Stone Block Stair=Кутова сходинка з блоку пустельного каменю (зовнішній кут) -Desert Stone Block Slab=Плита з блоку пустельного каменю -Sandstone Stair=Пісковикова сходинка -Inner Sandstone Stair=Кутова пісковикова сходинка (внутрішній кут) -Outer Sandstone Stair=Кутова пісковикова сходинка (зовнішній кут) -Sandstone Slab=Пісковикова плита -Sandstone Brick Stair=Сходинка з пісковикової цегли -Inner Sandstone Brick Stair=Кутова сходинка з пісковикової цегли (внутрішній кут) -Outer Sandstone Brick Stair=Кутова сходинка з пісковикової цегли (зовнішній кут) -Sandstone Brick Slab=Плита з пісковикової цегли -Sandstone Block Stair=Сходинка з блоку пісковику -Inner Sandstone Block Stair=Кутова сходинка з блоку пісковику (внутрішній кут) -Outer Sandstone Block Stair=Кутова сходинка з блоку пісковику (зовнішній кут) -Sandstone Block Slab=Плита з блоку пісковику -Desert Sandstone Stair=Сходинка з пустельного пісковику -Inner Desert Sandstone Stair=Кутова сходинка з пустельного пісковику (внутрішній кут) -Outer Desert Sandstone Stair=Кутова сходинка з пустельного пісковику (зовнішній кут) -Desert Sandstone Slab=Плита з пустельного пісковику -Desert Sandstone Brick Stair=Сходинка з цегли з пустельного пісковику -Inner Desert Sandstone Brick Stair=Кутова сходинка з цегли з пустельного пісковику (внутрішній кут) -Outer Desert Sandstone Brick Stair=Кутова сходинка з цегли з пустельного пісковику (зовнішній кут) -Desert Sandstone Brick Slab=Плита з цегли з пустельного пісковику -Desert Sandstone Block Stair=Сходинка з блоку пустельного пісковику -Inner Desert Sandstone Block Stair=Кутова сходинка з блоку пустельного пісковику (внутрішній кут) -Outer Desert Sandstone Block Stair=Кутова сходинка з блоку пустельного пісковику (зовнішній кут) -Desert Sandstone Block Slab=Плита з блоку пустельного пісковику -Silver Sandstone Stair=Сходинка зі срібного пісковику -Inner Silver Sandstone Stair=Кутова сходинка зі срібного пісковику (внутрішній кут) -Outer Silver Sandstone Stair=Кутова сходинка зі срібного пісковику (зовнішній кут) -Silver Sandstone Slab=Плита зі срібного пісковику -Silver Sandstone Brick Stair=Сходинка з цегли зі срібного пісковику -Inner Silver Sandstone Brick Stair=Кутова сходинка з цегли зі срібного пісковику (внутрішній кут) -Outer Silver Sandstone Brick Stair=Кутова сходинка з цегли зі срібного пісковику (зовнішній кут) -Silver Sandstone Brick Slab=Плита з цегли зі срібного пісковику -Silver Sandstone Block Stair=Сходинка з блоку срібного пісковику -Inner Silver Sandstone Block Stair=Кутова сходинка з блоку срібного пісковику (внутрішній кут) -Outer Silver Sandstone Block Stair=Кутова сходинка з блоку срібного пісковику (зовнішній кут) -Silver Sandstone Block Slab=Плита з блоку срібного пісковику -Obsidian Stair=Обсидіанова сходинка -Inner Obsidian Stair=Кутова обсидіанова сходинка (внутрішній кут) -Outer Obsidian Stair=Кутова обсидіанова сходинка (зовнішній кут) -Obsidian Slab=Обсидіанова плита -Obsidian Brick Stair=Сходинка з обсидіанової цегли -Inner Obsidian Brick Stair=Кутова сходинка з обсидіанової цегли (внутрішній кут) -Outer Obsidian Brick Stair=Кутова сходинка з обсидіанової цегли (зовнішній кут) -Obsidian Brick Slab=Плита з обсидіанової цегли -Obsidian Block Stair=Сходинка з блоку обсидіану -Inner Obsidian Block Stair=Кутова сходинка з блоку обсидіану (внутрішній кут) -Outer Obsidian Block Stair=Кутова сходинка з блоку обсидіану (зовнішній кут) -Obsidian Block Slab=Плита з блоку обсидіану -Brick Stair=Цегляна сходинка -Inner Brick Stair=Кутова цегляна сходинка (внутрішній кут) -Outer Brick Stair=Кутова цегляна сходинка (зовнішній кут) -Brick Slab=Цегляна плита -Steel Block Stair=Сходинка з блоку сталі -Inner Steel Block Stair=Кутова сходинка з блоку сталі (внутрішній кут) -Outer Steel Block Stair=Кутова сходинка з блоку сталі (зовнішній кут) -Steel Block Slab=Плита з блоку сталі -Tin Block Stair=Сходинка з блоку олова -Inner Tin Block Stair=Кутова сходинка з блоку олова (внутрішній кут) -Outer Tin Block Stair=Кутова сходинка з блоку олова (зовнішній кут) -Tin Block Slab=Плита з блоку олова -Copper Block Stair=Сходинка з блоку міді -Inner Copper Block Stair=Кутова сходинка з блоку міді (внутрішній кут) -Outer Copper Block Stair=Кутова сходинка з блоку міді (зовнішній кут) -Copper Block Slab=Плита з блоку міді -Bronze Block Stair=Сходинка з блоку бронзи -Inner Bronze Block Stair=Кутова сходинка з блоку бронзи (внутрішній кут) -Outer Bronze Block Stair=Кутова сходинка з блоку бронзи (зовнішній кут) -Bronze Block Slab=Плита з блоку бронзи -Gold Block Stair=Сходинка з блоку золота -Inner Gold Block Stair=Кутова сходинка з блоку золота (внутрішній кут) -Outer Gold Block Stair=Кутова сходинка з блоку золота (зовнішній кут) -Gold Block Slab=Плита з блоку золота -Ice Stair=Крижана сходинка -Inner Ice Stair=Кутова крижана сходинка (внутрішній кут) -Outer Ice Stair=Кутова крижана сходинка (зовнішній кут) -Ice Slab=Крижана плита -Snow Block Stair=Сходинка з блоку снігу -Inner Snow Block Stair=Кутова сходинка з блоку снігу (внутрішній кут) -Outer Snow Block Stair=Кутова сходинка з блоку снігу (зовнішній кут) -Snow Block Slab=Плита з блоку снігу diff --git a/mods/stairs/locale/stairs.zh_CN.tr b/mods/stairs/locale/stairs.zh_CN.tr index e37ebcbb..060ccaf7 100644 --- a/mods/stairs/locale/stairs.zh_CN.tr +++ b/mods/stairs/locale/stairs.zh_CN.tr @@ -7,10 +7,10 @@ Obsidian Glass Stair=黑曜石玻璃楼梯 Obsidian Glass Slab=黑曜石玻璃台阶 Inner Obsidian Glass Stair=黑曜石玻璃楼梯(内) Outer Obsidian Glass Stair=黑曜石玻璃楼梯(外) -Wooden Stair=木楼梯 +Wooden Stair=木制楼梯 Inner Wooden Stair=木楼梯(内) Outer Wooden Stair=木楼梯(外) -Wooden Slab=木台阶 +Wooden Slab=木制台阶 Jungle Wood Stair=丛林木楼梯 Inner Jungle Wood Stair=丛林木楼梯(内) Outer Jungle Wood Stair=丛林木楼梯(外) @@ -27,18 +27,22 @@ Aspen Wood Stair=白杨木楼梯 Inner Aspen Wood Stair=白杨木楼梯(内) Outer Aspen Wood Stair=白杨木楼梯(外) Aspen Wood Slab=白杨木台阶 +Blue Stained Stair=蓝木楼梯 +Inner Blue Stained Stair=蓝木楼梯(内) +Outer Blue Stained Stair=蓝木楼梯(外) +Blue Stained Slab=蓝木台阶 Stone Stair=石楼梯 Inner Stone Stair=石楼梯(内) Outer Stone Stair=石楼梯(外) Stone Slab=石台阶 -Cobblestone Stair=鹅卵石楼梯 -Inner Cobblestone Stair=鹅卵石楼梯(内) -Outer Cobblestone Stair=鹅卵石楼梯(外) -Cobblestone Slab=鹅卵石台阶 -Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯 -Inner Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯(内) -Outer Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯(外) -Mossy Cobblestone Slab=苔藓覆盖的鹅卵石台阶 +Cobblestone Stair=圆石楼梯 +Inner Cobblestone Stair=圆石楼梯(内) +Outer Cobblestone Stair=圆石楼梯(外) +Cobblestone Slab=圆石台阶 +Mossy Cobblestone Stair=苔石楼梯 +Inner Mossy Cobblestone Stair=苔石楼梯(内) +Outer Mossy Cobblestone Stair=苔石楼梯(外) +Mossy Cobblestone Slab=苔石台阶 Stone Brick Stair=石砖楼梯 Inner Stone Brick Stair=石砖楼梯(内) Outer Stone Brick Stair=石砖楼梯(外) @@ -51,10 +55,10 @@ Desert Stone Stair=沙漠石楼梯 Inner Desert Stone Stair=沙漠石楼梯(内) Outer Desert Stone Stair=沙漠石楼梯(外) Desert Stone Slab=沙漠石台阶 -Desert Cobblestone Stair=沙漠鹅卵石楼梯 -Inner Desert Cobblestone Stair=沙漠鹅卵石楼梯(内) -Outer Desert Cobblestone Stair=沙漠鹅卵石楼梯(外) -Desert Cobblestone Slab=沙漠鹅卵石台阶 +Desert Cobblestone Stair=沙漠圆石楼梯 +Inner Desert Cobblestone Stair=沙漠圆石楼梯(内) +Outer Desert Cobblestone Stair=沙漠圆石楼梯(外) +Desert Cobblestone Slab=沙漠圆石台阶 Desert Stone Brick Stair=沙漠石砖楼梯 Inner Desert Stone Brick Stair=沙漠石砖楼梯(内) Outer Desert Stone Brick Stair=沙漠石砖楼梯(外) @@ -114,7 +118,7 @@ Obsidian Block Slab=黑曜石块台阶 Brick Stair=砖楼梯 Inner Brick Stair=砖楼梯(内) Outer Brick Stair=砖楼梯(外) -Brick Slab=砖台阶 +Brick Slab=砖制台阶 Steel Block Stair=铁块楼梯 Inner Steel Block Stair=铁块楼梯(内) Outer Steel Block Stair=铁块楼梯(外) @@ -135,7 +139,7 @@ Gold Block Stair=金块楼梯 Inner Gold Block Stair=金块楼梯(内) Outer Gold Block Stair=金块楼梯(外) Gold Block Slab=金块台阶 -Ice Stair=冰楼梯 +Ice Stair=冰阶梯 Inner Ice Stair=冰块楼梯(内) Outer Ice Stair=冰块楼梯(外) Ice Slab=冰台阶 @@ -143,11 +147,3 @@ Snow Block Stair=雪块楼梯 Inner Snow Block Stair=雪块楼梯(内) Outer Snow Block Stair=雪块楼梯(外) Snow Block Slab=雪块台阶 - - -##### not used anymore ##### - -Blue Stained Stair=蓝木楼梯 -Inner Blue Stained Stair=蓝木楼梯(内) -Outer Blue Stained Stair=蓝木楼梯(外) -Blue Stained Slab=蓝木台阶 diff --git a/mods/stairs/locale/stairs.zh_TW.tr b/mods/stairs/locale/stairs.zh_TW.tr index eaed61f9..00c43e22 100644 --- a/mods/stairs/locale/stairs.zh_TW.tr +++ b/mods/stairs/locale/stairs.zh_TW.tr @@ -27,6 +27,10 @@ Aspen Wood Stair=白楊木樓梯 Inner Aspen Wood Stair=白楊木樓梯(內) Outer Aspen Wood Stair=白楊木樓梯(外) Aspen Wood Slab=白楊木臺階 +Blue Stained Stair=藍木樓梯 +Inner Blue Stained Stair=藍木樓梯(內) +Outer Blue Stained Stair=藍木樓梯(外) +Blue Stained Slab=藍木臺階 Stone Stair=石樓梯 Inner Stone Stair=石樓梯(內) Outer Stone Stair=石樓梯(外) @@ -143,11 +147,3 @@ Snow Block Stair=雪塊樓梯 Inner Snow Block Stair=雪塊樓梯(內) Outer Snow Block Stair=雪塊樓梯(外) Snow Block Slab=雪塊臺階 - - -##### not used anymore ##### - -Blue Stained Stair=藍木樓梯 -Inner Blue Stained Stair=藍木樓梯(內) -Outer Blue Stained Stair=藍木樓梯(外) -Blue Stained Slab=藍木臺階 diff --git a/mods/stairs/textures/stairs_obsidian_glass_outer_stairside.png b/mods/stairs/textures/stairs_obsidian_glass_outer_stairside.png index 0098f683..63db4a2d 100644 Binary files a/mods/stairs/textures/stairs_obsidian_glass_outer_stairside.png and b/mods/stairs/textures/stairs_obsidian_glass_outer_stairside.png differ diff --git a/mods/stairs/textures/stairs_obsidian_glass_stairside.png b/mods/stairs/textures/stairs_obsidian_glass_stairside.png index 40b17545..850f4c61 100644 Binary files a/mods/stairs/textures/stairs_obsidian_glass_stairside.png and b/mods/stairs/textures/stairs_obsidian_glass_stairside.png differ diff --git a/mods/tnt/README.txt b/mods/tnt/README.txt index ad9ca0e7..df244fe4 100644 --- a/mods/tnt/README.txt +++ b/mods/tnt/README.txt @@ -7,7 +7,7 @@ Authors of source code PilzAdam (MIT) ShadowNinja (MIT) sofar (sofar@foo-projects.org) (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media ---------------- @@ -45,7 +45,8 @@ by frankelmedico (CC0 1.0) Introduction ------------ -This mod adds TNT. TNT is a tool to help the player in mining. +This mod adds TNT to Minetest. TNT is a tool to help the player +in mining. How to use the mod: diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index 82306121..ae28191a 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -12,6 +12,12 @@ if enable_tnt == nil then enable_tnt = minetest.is_singleplayer() end +-- loss probabilities array (one in X will be lost) +local loss_prob = {} + +loss_prob["default:cobble"] = 3 +loss_prob["default:dirt"] = 4 + local tnt_radius = tonumber(minetest.settings:get("tnt_radius") or 3) -- Fill a list with data for content IDs, after all nodes are registered @@ -21,20 +27,12 @@ minetest.register_on_mods_loaded(function() cid_data[minetest.get_content_id(name)] = { name = name, drops = def.drops, - flammable = def.groups and (def.groups.flammable or 0) ~= 0, + flammable = def.groups.flammable, on_blast = def.on_blast, } end end) -local function particle_texture(name) - local ret = {name = name} - if minetest.features.particle_blend_clip then - ret.blend = "clip" - end - return ret -end - local function rand_pos(center, pos, radius) local def local reg_nodes = minetest.registered_nodes @@ -78,14 +76,11 @@ end local function add_drop(drops, item) item = ItemStack(item) - -- Note that this needs to be set on the dropped item, not the node. - -- Value represents "one in X will be lost" - local lost = item:get_definition()._tnt_loss or 0 - if lost > 0 and (lost == 1 or math.random(1, lost) == 1) then + local name = item:get_name() + if loss_prob[name] ~= nil and math.random(1, loss_prob[name]) == 1 then return end - local name = item:get_name() local drop = drops[name] if drop == nil then drops[name] = item @@ -164,14 +159,13 @@ local function entity_physics(pos, radius, drops) local objs = minetest.get_objects_inside_radius(pos, radius) for _, obj in pairs(objs) do local obj_pos = obj:get_pos() - if obj_pos then local dist = math.max(1, vector.distance(pos, obj_pos)) local damage = (4 / dist) * radius if obj:is_player() then local dir = vector.normalize(vector.subtract(obj_pos, pos)) local moveoff = vector.multiply(dir, 2 / dist * radius) - obj:add_velocity(moveoff) + obj:add_player_velocity(moveoff) obj:set_hp(obj:get_hp() - damage) else @@ -206,7 +200,6 @@ local function entity_physics(pos, radius, drops) end end end - end end end @@ -219,7 +212,7 @@ local function add_effects(pos, radius, drops) size = radius * 10, collisiondetection = false, vertical = false, - texture = particle_texture("tnt_boom.png"), + texture = "tnt_boom.png", glow = 15, }) minetest.add_particlespawner({ @@ -235,12 +228,12 @@ local function add_effects(pos, radius, drops) maxexptime = 2.5, minsize = radius * 3, maxsize = radius * 5, - texture = particle_texture("tnt_smoke.png"), + texture = "tnt_smoke.png", }) - -- we just dropped some items. Look at the items and pick - -- one of them to use as texture. - local texture = "tnt_blast.png" -- fallback + -- we just dropped some items. Look at the items entities and pick + -- one of them to use as texture + local texture = "tnt_blast.png" --fallback texture local node local most = 0 for name, stack in pairs(drops) do @@ -250,9 +243,9 @@ local function add_effects(pos, radius, drops) local def = minetest.registered_nodes[name] if def then node = { name = name } - if def.tiles and type(def.tiles[1]) == "string" then - texture = def.tiles[1] - end + end + if def and def.tiles and def.tiles[1] then + texture = def.tiles[1] end end end @@ -286,7 +279,7 @@ function tnt.burn(pos, nodename) def.on_ignite(pos) elseif minetest.get_item_group(name, "tnt") > 0 then minetest.swap_node(pos, {name = name .. "_burning"}) - minetest.sound_play("tnt_ignite", {pos = pos, gain = 1.0}, true) + minetest.sound_play("tnt_ignite", {pos = pos}, true) minetest.get_node_timer(pos):start(1) end end @@ -304,8 +297,7 @@ 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.CONTENT_AIR - local c_ignore = minetest.CONTENT_IGNORE + local c_air = minetest.get_content_id("air") if enable_tnt then c_tnt = minetest.get_content_id("tnt:tnt") else @@ -332,9 +324,6 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne vm1:set_data(data) vm1:write_to_map() - if vm1.close ~= nil then - vm1:close() - end -- recalculate new radius radius = math.floor(radius * math.pow(count, 1/3)) @@ -353,13 +342,6 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne local on_construct_queue = {} basic_flame_on_construct = minetest.registered_nodes["fire:basic_flame"].on_construct - -- Used to efficiently remove metadata of nodes that were destroyed. - -- Metadata is probably sparse, so this may save us some work. - local has_meta = {} - for _, p in ipairs(minetest.find_nodes_with_meta(p1, p2)) do - has_meta[a:indexp(p)] = true - end - local c_fire = minetest.get_content_id("fire:basic_flame") for z = -radius, radius do for y = -radius, radius do @@ -369,17 +351,10 @@ 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 and cid ~= c_ignore then - local new_cid = destroy(drops, p, cid, c_air, c_fire, + if cid ~= c_air then + data[vi] = destroy(drops, p, cid, c_air, c_fire, on_blast_queue, on_construct_queue, ignore_protection, ignore_on_blast, owner) - - if new_cid ~= data[vi] then - data[vi] = new_cid - if has_meta[vi] then - minetest.get_meta(p):from_table(nil) - end - end end end vi = vi + 1 @@ -389,10 +364,8 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne vm:set_data(data) vm:write_to_map() + vm:update_map() vm:update_liquids() - if vm.close ~= nil then - vm:close() - end -- call check_single_for_falling for everything within 1.5x blast radius for y = -radius * 1.5, radius * 1.5 do @@ -456,12 +429,10 @@ end minetest.register_node("tnt:boom", { drawtype = "airlike", - inventory_image = "tnt_boom.png", - wield_image = "tnt_boom.png", light_source = default.LIGHT_MAX, walkable = false, drop = "", - groups = {dig_immediate = 3, not_in_creative_inventory = 1}, + groups = {dig_immediate = 3}, -- unaffected by explosions on_blast = function() end, }) @@ -492,7 +463,9 @@ 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"}) - default.log_player_action(puncher, "ignites tnt:gunpowder at", pos) + minetest.log("action", puncher:get_player_name() .. + " ignites tnt:gunpowder at " .. + minetest.pos_to_string(pos)) end end, on_blast = function(pos, intensity) @@ -556,8 +529,7 @@ minetest.register_node("tnt:gunpowder_burning", { groups = { dig_immediate = 2, attached_node = 1, - connect_to_raillike = minetest.raillike_group("gunpowder"), - not_in_creative_inventory = 1 + connect_to_raillike = minetest.raillike_group("gunpowder") }, sounds = default.node_sound_leaves_defaults(), on_timer = function(pos, elapsed) @@ -580,7 +552,7 @@ minetest.register_node("tnt:gunpowder_burning", { on_blast = function() end, on_construct = function(pos) minetest.sound_play("tnt_gunpowder_burning", {pos = pos, - gain = 1.0}, true) + gain = 2}, true) minetest.get_node_timer(pos):start(1) end, }) @@ -651,7 +623,7 @@ function tnt.register_tnt(def) groups = {dig_immediate = 2, mesecon = 2, tnt = 1, flammable = 5}, sounds = default.node_sound_wood_defaults(), after_place_node = function(pos, placer) - if placer and placer:is_player() then + if placer:is_player() then local meta = minetest.get_meta(pos) meta:set_string("owner", placer:get_player_name()) end @@ -660,7 +632,9 @@ 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) - default.log_player_action(puncher, "ignites", node.name, "at", pos) + minetest.log("action", puncher:get_player_name() .. + " ignites " .. node.name .. " at " .. + minetest.pos_to_string(pos)) end end, on_blast = function(pos, intensity) @@ -702,7 +676,7 @@ function tnt.register_tnt(def) light_source = 5, drop = "", sounds = default.node_sound_wood_defaults(), - groups = {falling_node = 1, not_in_creative_inventory = 1}, + groups = {falling_node = 1}, on_timer = function(pos, elapsed) tnt.boom(pos, def) end, diff --git a/mods/tnt/license.txt b/mods/tnt/license.txt index 903d4b09..e59ec6ef 100644 --- a/mods/tnt/license.txt +++ b/mods/tnt/license.txt @@ -5,7 +5,7 @@ The MIT License (MIT) Copyright (C) 2014-2016 PilzAdam Copyright (C) 2014-2016 ShadowNinja Copyright (C) 2016 sofar (sofar@foo-projects.org) -Copyright (C) 2014-2016 Various Minetest Game developers and contributors +Copyright (C) 2014-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/tnt/locale/tnt.bg.tr b/mods/tnt/locale/tnt.bg.tr deleted file mode 100755 index 294c8bd0..00000000 --- a/mods/tnt/locale/tnt.bg.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=Барут -TNT Stick=Пръчка динамит -TNT=Динамит diff --git a/mods/tnt/locale/tnt.eo.tr b/mods/tnt/locale/tnt.eo.tr deleted file mode 100644 index b467d2f5..00000000 --- a/mods/tnt/locale/tnt.eo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=Pulvo -TNT Stick=Dinamita bastono -TNT=Dinamito diff --git a/mods/tnt/locale/tnt.eu.tr b/mods/tnt/locale/tnt.eu.tr deleted file mode 100644 index af6e1ad1..00000000 --- a/mods/tnt/locale/tnt.eu.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=Bolbora -TNT Stick=TNT kartutxoa -TNT=TNT diff --git a/mods/tnt/locale/tnt.it.tr b/mods/tnt/locale/tnt.it.tr index 6437c003..bc4ef140 100644 --- a/mods/tnt/locale/tnt.it.tr +++ b/mods/tnt/locale/tnt.it.tr @@ -1,4 +1,4 @@ -# textdomain: tnt -Gun Powder=Polvere da sparo -TNT Stick=Candelotto di TNT -TNT=TNT +# textdomain: tnt +Gun Powder=Polvere da sparo +TNT Stick=Candelotto di TNT +TNT=TNT \ No newline at end of file diff --git a/mods/tnt/locale/tnt.ja.tr b/mods/tnt/locale/tnt.ja.tr deleted file mode 100644 index d7af9f58..00000000 --- a/mods/tnt/locale/tnt.ja.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=火薬 -TNT Stick=ダイナマイト -TNT=TNT diff --git a/mods/tnt/locale/tnt.jbo.tr b/mods/tnt/locale/tnt.jbo.tr deleted file mode 100644 index b1b425ac..00000000 --- a/mods/tnt/locale/tnt.jbo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=lo tercelpu'o -TNT Stick=lo granrti'enti -TNT=lo bamrti'enti diff --git a/mods/tnt/locale/tnt.lv.tr b/mods/tnt/locale/tnt.lv.tr deleted file mode 100644 index 2af9c2e0..00000000 --- a/mods/tnt/locale/tnt.lv.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=Šaujampulveris -TNT Stick=Dinamīta kociņš -TNT=Dinamīts diff --git a/mods/tnt/locale/tnt.ms.tr b/mods/tnt/locale/tnt.ms.tr index 8f537c79..c4c5fddc 100644 --- a/mods/tnt/locale/tnt.ms.tr +++ b/mods/tnt/locale/tnt.ms.tr @@ -1,4 +1,4 @@ # textdomain: tnt -Gun Powder=Serbuk Letupan +Gun Powder=Serbuk Senjata Api TNT Stick=Batang TNT TNT=TNT diff --git a/mods/tnt/locale/tnt.pl.tr b/mods/tnt/locale/tnt.pl.tr deleted file mode 100644 index 1ede267d..00000000 --- a/mods/tnt/locale/tnt.pl.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=Proch strzelniczy -TNT Stick=Dynamit -TNT=TNT diff --git a/mods/tnt/locale/tnt.pt_BR.tr b/mods/tnt/locale/tnt.pt_BR.tr deleted file mode 100644 index d4fc1742..00000000 --- a/mods/tnt/locale/tnt.pt_BR.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=Pólvora -TNT Stick=Banana de Dinamite -TNT=Dinamite diff --git a/mods/tnt/locale/tnt.ru.tr b/mods/tnt/locale/tnt.ru.tr index d8f55f1e..a8cee43b 100644 --- a/mods/tnt/locale/tnt.ru.tr +++ b/mods/tnt/locale/tnt.ru.tr @@ -1,4 +1,4 @@ # textdomain: tnt Gun Powder=Порох -TNT Stick=Динамитная шашка -TNT=Динамит +TNT Stick=Тротиловая Палка +TNT=Тротил diff --git a/mods/tnt/locale/tnt.sv.tr b/mods/tnt/locale/tnt.se.tr similarity index 82% rename from mods/tnt/locale/tnt.sv.tr rename to mods/tnt/locale/tnt.se.tr index fd08913f..21fbbd01 100644 --- a/mods/tnt/locale/tnt.sv.tr +++ b/mods/tnt/locale/tnt.se.tr @@ -1,4 +1,4 @@ # textdomain: tnt Gun Powder=Krut TNT Stick=Dynamitpinne -TNT=Dynamit +TNT=Dynamit \ No newline at end of file diff --git a/mods/tnt/locale/tnt.sk.tr b/mods/tnt/locale/tnt.sk.tr deleted file mode 100644 index 639b8c87..00000000 --- a/mods/tnt/locale/tnt.sk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=Pušný prach -TNT Stick=Časť TNT -TNT=TNT diff --git a/mods/tnt/locale/tnt.uk.tr b/mods/tnt/locale/tnt.uk.tr deleted file mode 100644 index 51865497..00000000 --- a/mods/tnt/locale/tnt.uk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: tnt -Gun Powder=Порох -TNT Stick=Тротилова шашка -TNT=Тротил diff --git a/mods/tnt/locale/tnt.zh_CN.tr b/mods/tnt/locale/tnt.zh_CN.tr index 4cb2e949..0a3294e5 100644 --- a/mods/tnt/locale/tnt.zh_CN.tr +++ b/mods/tnt/locale/tnt.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: tnt Gun Powder=火药粉 -TNT Stick=三硝基甲苯棒 -TNT=三硝基甲苯 +TNT Stick=炸药棒 +TNT=炸药包 diff --git a/mods/tnt/textures/tnt_blast.png b/mods/tnt/textures/tnt_blast.png index 92be28ba..bbb1096f 100644 Binary files a/mods/tnt/textures/tnt_blast.png and b/mods/tnt/textures/tnt_blast.png differ diff --git a/mods/tnt/textures/tnt_gunpowder_burning_crossing_animated.png b/mods/tnt/textures/tnt_gunpowder_burning_crossing_animated.png index efab2a9e..a901f7bd 100644 Binary files a/mods/tnt/textures/tnt_gunpowder_burning_crossing_animated.png and b/mods/tnt/textures/tnt_gunpowder_burning_crossing_animated.png differ diff --git a/mods/tnt/textures/tnt_gunpowder_burning_curved_animated.png b/mods/tnt/textures/tnt_gunpowder_burning_curved_animated.png index bd1437fe..bc018065 100644 Binary files a/mods/tnt/textures/tnt_gunpowder_burning_curved_animated.png and b/mods/tnt/textures/tnt_gunpowder_burning_curved_animated.png differ diff --git a/mods/tnt/textures/tnt_gunpowder_burning_straight_animated.png b/mods/tnt/textures/tnt_gunpowder_burning_straight_animated.png index 654e5396..c860acef 100644 Binary files a/mods/tnt/textures/tnt_gunpowder_burning_straight_animated.png and b/mods/tnt/textures/tnt_gunpowder_burning_straight_animated.png differ diff --git a/mods/tnt/textures/tnt_gunpowder_burning_t_junction_animated.png b/mods/tnt/textures/tnt_gunpowder_burning_t_junction_animated.png index 5b567e38..a556072c 100644 Binary files a/mods/tnt/textures/tnt_gunpowder_burning_t_junction_animated.png and b/mods/tnt/textures/tnt_gunpowder_burning_t_junction_animated.png differ diff --git a/mods/tnt/textures/tnt_gunpowder_crossing.png b/mods/tnt/textures/tnt_gunpowder_crossing.png index c0487a09..916c84ee 100644 Binary files a/mods/tnt/textures/tnt_gunpowder_crossing.png and b/mods/tnt/textures/tnt_gunpowder_crossing.png differ diff --git a/mods/tnt/textures/tnt_gunpowder_curved.png b/mods/tnt/textures/tnt_gunpowder_curved.png index 8ed01db8..cb8b4eac 100644 Binary files a/mods/tnt/textures/tnt_gunpowder_curved.png and b/mods/tnt/textures/tnt_gunpowder_curved.png differ diff --git a/mods/tnt/textures/tnt_gunpowder_straight.png b/mods/tnt/textures/tnt_gunpowder_straight.png index 427feb90..8ab0e3c8 100644 Binary files a/mods/tnt/textures/tnt_gunpowder_straight.png and b/mods/tnt/textures/tnt_gunpowder_straight.png differ diff --git a/mods/tnt/textures/tnt_gunpowder_t_junction.png b/mods/tnt/textures/tnt_gunpowder_t_junction.png index b30c2b46..ac997a7a 100644 Binary files a/mods/tnt/textures/tnt_gunpowder_t_junction.png and b/mods/tnt/textures/tnt_gunpowder_t_junction.png differ diff --git a/mods/tnt/textures/tnt_smoke.png b/mods/tnt/textures/tnt_smoke.png index 6788974a..488b50fe 100644 Binary files a/mods/tnt/textures/tnt_smoke.png and b/mods/tnt/textures/tnt_smoke.png differ diff --git a/mods/vessels/README.txt b/mods/vessels/README.txt index c101c0c6..a54e330f 100644 --- a/mods/vessels/README.txt +++ b/mods/vessels/README.txt @@ -6,7 +6,7 @@ Authors of source code ---------------------- Originally by Vanessa Ezekowitz (LGPLv2.1+) Modified by Perttu Ahola (LGPLv2.1+) -Various Minetest Game developers and contributors (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) Authors of media (textures) --------------------------- diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua index a2f24716..71a06893 100644 --- a/mods/vessels/init.lua +++ b/mods/vessels/init.lua @@ -1,6 +1,6 @@ -- vessels/init.lua --- Minetest Game mod: vessels +-- Minetest 0.4 mod: vessels -- See README.txt for licensing and other information. -- Load support for MT game translation. @@ -49,7 +49,7 @@ local function update_vessels_shelf(pos) end end -local vessels_shelf_def = { +minetest.register_node("vessels:shelf", { description = S("Vessels Shelf"), tiles = {"default_wood.png", "default_wood.png", "default_wood.png", "default_wood.png", "vessels_shelf.png", "vessels_shelf.png"}, @@ -74,6 +74,21 @@ local vessels_shelf_def = { 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) @@ -81,18 +96,7 @@ local vessels_shelf_def = { minetest.remove_node(pos) return drops end, - on_metadata_inventory_put = function(pos) - update_vessels_shelf(pos) - end, - on_metadata_inventory_take = function(pos) - update_vessels_shelf(pos) - end, - on_metadata_inventory_move = function(pos) - update_vessels_shelf(pos) - end, -} -default.set_inventory_action_loggers(vessels_shelf_def, "vessels shelf") -minetest.register_node("vessels:shelf", vessels_shelf_def) +}) minetest.register_craft({ output = "vessels:shelf", diff --git a/mods/vessels/license.txt b/mods/vessels/license.txt index 3bd2951e..de16a3b0 100644 --- a/mods/vessels/license.txt +++ b/mods/vessels/license.txt @@ -4,7 +4,7 @@ License of source code GNU Lesser General Public License, version 2.1 Copyright (C) 2012-2016 Vanessa Ezekowitz Copyright (C) 2012-2016 celeron55, Perttu Ahola -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; diff --git a/mods/vessels/locale/vessels.bg.tr b/mods/vessels/locale/vessels.bg.tr deleted file mode 100755 index 4024e9be..00000000 --- a/mods/vessels/locale/vessels.bg.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Полица с празни съдове -Vessels Shelf (@1 items)=Полица със съдове (@1 предмета) -Vessels Shelf=Полица със съдове -Empty Glass Bottle=Празно стъклено шише -Empty Drinking Glass=Празна чаша за вода -Empty Heavy Steel Bottle=Празно тежко стоманено шише -Glass Fragments=Стъклено парче diff --git a/mods/vessels/locale/vessels.de.tr b/mods/vessels/locale/vessels.de.tr index 162e3595..66ca5ef1 100644 --- a/mods/vessels/locale/vessels.de.tr +++ b/mods/vessels/locale/vessels.de.tr @@ -1,8 +1,8 @@ # textdomain: vessels -Empty Vessels Shelf=Leeres Gefäßregal -Vessels Shelf (@1 items)=Gefäßregal (@1 Gegenstände) Vessels Shelf=Gefäßregal Empty Glass Bottle=Leere Glasflasche Empty Drinking Glass=Leeres Trinkglas Empty Heavy Steel Bottle=Leere schwere Stahlflasche Glass Fragments=Glasfragmente +Empty Vessels Shelf=Leeres Gefäßregal +Vessels Shelf (@1 items)=Gefäßregal (@1 Gegenstände) diff --git a/mods/vessels/locale/vessels.eo.tr b/mods/vessels/locale/vessels.eo.tr deleted file mode 100644 index 63a955d8..00000000 --- a/mods/vessels/locale/vessels.eo.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -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 -Empty Heavy Steel Bottle=Malplena peza ŝtala botelo -Glass Fragments=Vitraj eroj diff --git a/mods/vessels/locale/vessels.es.tr b/mods/vessels/locale/vessels.es.tr index d6131d89..859ea407 100644 --- a/mods/vessels/locale/vessels.es.tr +++ b/mods/vessels/locale/vessels.es.tr @@ -1,8 +1,8 @@ # textdomain: vessels -Empty Vessels Shelf=Estante de vasijas vacío -Vessels Shelf (@1 items)=Estante de vasijas (@1 objetos) Vessels Shelf=Estante de vasijas Empty Glass Bottle=Botella de vidrio vacía Empty Drinking Glass=Vaso para beber vacío Empty Heavy Steel Bottle=Botella de acero vacía Glass Fragments=Fragmentos de vidrio +Empty Vessels Shelf=Estante de vasijas vacío +Vessels Shelf (@1 items)=Estante de vasijas (@1 objetos) diff --git a/mods/vessels/locale/vessels.eu.tr b/mods/vessels/locale/vessels.eu.tr deleted file mode 100644 index 5b5301af..00000000 --- a/mods/vessels/locale/vessels.eu.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Ontzi-apal hutsa -Vessels Shelf (@1 items)=Ontzi-apala (@1 objektu) -Vessels Shelf=Ontzi-apala -Empty Glass Bottle=Beirazko botila hutsa -Empty Drinking Glass=Edateko edalontzi hutsa -Empty Heavy Steel Bottle=Altzairu astunezko botila hutsa -Glass Fragments=Beira-zatiak diff --git a/mods/vessels/locale/vessels.fr.tr b/mods/vessels/locale/vessels.fr.tr index f099c197..4e073dca 100644 --- a/mods/vessels/locale/vessels.fr.tr +++ b/mods/vessels/locale/vessels.fr.tr @@ -1,8 +1,8 @@ # textdomain: vessels -Empty Vessels Shelf=Etagère à récipient vide -Vessels Shelf (@1 items)=Etagère à récipient (@1 articles) Vessels Shelf=Etagère à récipient Empty Glass Bottle=Bouteille de verre vide Empty Drinking Glass=Verre vide Empty Heavy Steel Bottle=Bouteille d'acier lourde vide Glass Fragments=Fragments de verre +Empty Vessels Shelf=Etagère à récipient vide +Vessels Shelf (@1 items)=Etagère à récipient (@1 articles) diff --git a/mods/vessels/locale/vessels.it.tr b/mods/vessels/locale/vessels.it.tr index 70ea5759..09a66675 100644 --- a/mods/vessels/locale/vessels.it.tr +++ b/mods/vessels/locale/vessels.it.tr @@ -1,8 +1,8 @@ -# textdomain: vessels -Empty Vessels Shelf=Scaffale per contenitori vuoto -Vessels Shelf (@1 items)=Scaffale per contenitori (@1 oggetti) -Vessels Shelf=Scaffale per contenitori -Empty Glass Bottle=Bottiglia di vetro vuota -Empty Drinking Glass=Bicchiere di vetro vuoto -Empty Heavy Steel Bottle=Bottigia di metallo pesante vuota -Glass Fragments=Frammenti di vetro +# textdomain: vessels +Vessels Shelf=Scaffale per contenitori +Empty Glass Bottle=Bottiglia di vetro vuota +Empty Drinking Glass=Bicchiere di vetro vuoto +Empty Heavy Steel Bottle=Bottigia di metallo pesante vuota +Glass Fragments=Frammenti di vetro +Empty Vessels Shelf=Scaffale per contenitori vuoto +Vessels Shelf (@1 items)=Scaffale per contenitori (@1 oggetti) diff --git a/mods/vessels/locale/vessels.ja.tr b/mods/vessels/locale/vessels.ja.tr deleted file mode 100644 index 451489a5..00000000 --- a/mods/vessels/locale/vessels.ja.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=空の瓶の棚 -Vessels Shelf (@1 items)=瓶の棚(@1 本) -Vessels Shelf=瓶の棚 -Empty Glass Bottle=空のガラス瓶 -Empty Drinking Glass=空のガラスコップ -Empty Heavy Steel Bottle=空の重い鉄瓶 -Glass Fragments=ガラスの破片 diff --git a/mods/vessels/locale/vessels.jbo.tr b/mods/vessels/locale/vessels.jbo.tr deleted file mode 100644 index 6e1145e6..00000000 --- a/mods/vessels/locale/vessels.jbo.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=.i ti kunti ke vasru kajna -Vessels Shelf (@1 items)=.i lo ti vasru kajna cu vasru lo @1 dacti -Vessels Shelf=lo vasru kajna -Empty Glass Bottle=lo blacybo'i be no da -Empty Drinking Glass=lo blacykabri be no da -Empty Heavy Steel Bottle=lo tilju ke gasta botpi be no da -Glass Fragments=lo derxi be lo blaci spisa diff --git a/mods/vessels/locale/vessels.lv.tr b/mods/vessels/locale/vessels.lv.tr deleted file mode 100644 index 2e5127f7..00000000 --- a/mods/vessels/locale/vessels.lv.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Tukšs trauku plaukts -Vessels Shelf (@1 items)=Trauku plaukts ar @1 priekšmetiem -Vessels Shelf=Trauku plaukts -Empty Glass Bottle=Tukša stikla pudele -Empty Drinking Glass=Tukša glāze -Empty Heavy Steel Bottle=Tukša tērauda pudele -Glass Fragments=Stikla skaidas diff --git a/mods/vessels/locale/vessels.ms.tr b/mods/vessels/locale/vessels.ms.tr index db6e62f4..6d8348af 100644 --- a/mods/vessels/locale/vessels.ms.tr +++ b/mods/vessels/locale/vessels.ms.tr @@ -1,8 +1,8 @@ # textdomain: vessels -Empty Vessels Shelf=Rak Bekas Kaca Kosong -Vessels Shelf (@1 items)=Rak Bekas Kaca (@1 item) Vessels Shelf=Rak Bekas Kaca Empty Glass Bottle=Botol Kaca Kosong Empty Drinking Glass=Gelas Minuman Kosong Empty Heavy Steel Bottle=Botol Keluli Berat Kosong Glass Fragments=Serpihan Kaca +Empty Vessels Shelf=Rak Bekas Kaca Kosong +Vessels Shelf (@1 items)=Rak Bekas Kaca (@1 barang) diff --git a/mods/vessels/locale/vessels.pl.tr b/mods/vessels/locale/vessels.pl.tr deleted file mode 100644 index 5e91da9f..00000000 --- a/mods/vessels/locale/vessels.pl.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Pusta półka na naczynia -Vessels Shelf (@1 items)=Półka na naczynia (@1 przedmiotów) -Vessels Shelf=Półka na naczynia -Empty Glass Bottle=Pusta szklana butelka -Empty Drinking Glass=Pusta butelka do picia -Empty Heavy Steel Bottle=Pusta stalowa butelka -Glass Fragments=Odłamki szkła diff --git a/mods/vessels/locale/vessels.pt_BR.tr b/mods/vessels/locale/vessels.pt_BR.tr deleted file mode 100644 index c22cb062..00000000 --- a/mods/vessels/locale/vessels.pt_BR.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Prateleira de Vasos Vazia -Vessels Shelf (@1 items)=Prateleira de Vasos (@1 itens) -Vessels Shelf=Prateleira de Vasos -Empty Glass Bottle=Garrafa de Vidro Vazia -Empty Drinking Glass=Copo Vazio -Empty Heavy Steel Bottle=Garrafa de Aço Pesada Vazia -Glass Fragments=Cacos de Vidro diff --git a/mods/vessels/locale/vessels.ru.tr b/mods/vessels/locale/vessels.ru.tr index e9f276af..76dde6a1 100644 --- a/mods/vessels/locale/vessels.ru.tr +++ b/mods/vessels/locale/vessels.ru.tr @@ -1,8 +1,8 @@ # textdomain: vessels -Empty Vessels Shelf=Полка с пустыми сосудами -Vessels Shelf (@1 items)=Полка с сосудами (@1 штук) -Vessels Shelf=Полка с сосудами -Empty Glass Bottle=Пустая стеклянная бутылка -Empty Drinking Glass=Пустой стакан -Empty Heavy Steel Bottle=Пустая стальная бутылка -Glass Fragments=Стеклянные осколки +Vessels Shelf=Полка с Сосудами +Empty Glass Bottle=Пустая Стеклянная Бутылка +Empty Drinking Glass=Пустая Питьевая Бутылка +Empty Heavy Steel Bottle=Пустая Стальная Бутылка +Glass Fragments=Стеклянные Осколки +Empty Vessels Shelf=Полка с Пустыми Сосудами +Vessels Shelf (@1 items)=Полка с Сосудами (@1 предметы) diff --git a/mods/vessels/locale/vessels.se.tr b/mods/vessels/locale/vessels.se.tr new file mode 100644 index 00000000..8277b33b --- /dev/null +++ b/mods/vessels/locale/vessels.se.tr @@ -0,0 +1,8 @@ +# textdomain: vessels +Vessels Shelf=Fartygshylla +Empty Glass Bottle=Tom Glasflska +Empty Drinking Glass=Tom Drycksflaska +Empty Heavy Steel Bottle=Tom Tung Stål Flaska +Glass Fragments=Glasbitar +Empty Vessels Shelf=Tom Fartygshylla +Vessels Shelf (@1 items)=Fartygshylla (@1 saker) diff --git a/mods/vessels/locale/vessels.sk.tr b/mods/vessels/locale/vessels.sk.tr deleted file mode 100644 index 6ec640b1..00000000 --- a/mods/vessels/locale/vessels.sk.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Prázdna polica na fľašky -Vessels Shelf (@1 items)=Polica na fľašky (@1 položka/y) -Vessels Shelf=Polica na fľašky -Empty Glass Bottle=Prázdna sklenená fľaša -Empty Drinking Glass=Prázdny pohár na pitie -Empty Heavy Steel Bottle=Prázdna oceľová fľaša -Glass Fragments=Časti skla diff --git a/mods/vessels/locale/vessels.sv.tr b/mods/vessels/locale/vessels.sv.tr deleted file mode 100644 index 48e76e29..00000000 --- a/mods/vessels/locale/vessels.sv.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Tom kärlhylla -Vessels Shelf (@1 items)=Kärlhylla (@1 saker) -Vessels Shelf=Kärlhylla -Empty Glass Bottle=Tom glasflaska -Empty Drinking Glass=Tom drycksflaska -Empty Heavy Steel Bottle=Tom tungstålsflaska -Glass Fragments=Glasbitar diff --git a/mods/vessels/locale/vessels.uk.tr b/mods/vessels/locale/vessels.uk.tr deleted file mode 100644 index 34165d97..00000000 --- a/mods/vessels/locale/vessels.uk.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Пуста полиця для посуду -Vessels Shelf (@1 items)=Полиця для посуду (@1 предм.) -Vessels Shelf=Полиця для посуду -Empty Glass Bottle=Порожня скляна пляшка -Empty Drinking Glass=Порожня склянка -Empty Heavy Steel Bottle=Порожня важка сталева пляшка -Glass Fragments=Скляні уламки diff --git a/mods/vessels/locale/vessels.zh_CN.tr b/mods/vessels/locale/vessels.zh_CN.tr index e303e24f..f91ccd85 100644 --- a/mods/vessels/locale/vessels.zh_CN.tr +++ b/mods/vessels/locale/vessels.zh_CN.tr @@ -1,8 +1,8 @@ # textdomain: vessels -Empty Vessels Shelf=空容器架 -Vessels Shelf (@1 items)=容器架(@1项) Vessels Shelf=容器架 Empty Glass Bottle=空玻璃瓶 Empty Drinking Glass=空水杯 Empty Heavy Steel Bottle=空重型钢瓶 Glass Fragments=玻璃碎片 +Empty Vessels Shelf=空容器架 +Vessels Shelf (@1 items)=容器架(@1项) diff --git a/mods/vessels/locale/vessels.zh_TW.tr b/mods/vessels/locale/vessels.zh_TW.tr index 6aecb357..7936c88c 100644 --- a/mods/vessels/locale/vessels.zh_TW.tr +++ b/mods/vessels/locale/vessels.zh_TW.tr @@ -1,8 +1,8 @@ # textdomain: vessels -Empty Vessels Shelf=空容器架 -Vessels Shelf (@1 items)=容器架(@1項) Vessels Shelf=容器架 Empty Glass Bottle=空玻璃瓶 Empty Drinking Glass=空水杯 Empty Heavy Steel Bottle=空重型鋼瓶 Glass Fragments=玻璃碎片 +Empty Vessels Shelf=空容器架 +Vessels Shelf (@1 items)=容器架(@1項) diff --git a/mods/vessels/textures/vessels_drinking_glass.png b/mods/vessels/textures/vessels_drinking_glass.png index aef73296..d5037b85 100644 Binary files a/mods/vessels/textures/vessels_drinking_glass.png and b/mods/vessels/textures/vessels_drinking_glass.png differ diff --git a/mods/vessels/textures/vessels_drinking_glass_inv.png b/mods/vessels/textures/vessels_drinking_glass_inv.png index e50c8c72..9992bd9c 100644 Binary files a/mods/vessels/textures/vessels_drinking_glass_inv.png and b/mods/vessels/textures/vessels_drinking_glass_inv.png differ diff --git a/mods/vessels/textures/vessels_glass_bottle.png b/mods/vessels/textures/vessels_glass_bottle.png index 2a46aafd..6ea37db6 100644 Binary files a/mods/vessels/textures/vessels_glass_bottle.png and b/mods/vessels/textures/vessels_glass_bottle.png differ diff --git a/mods/vessels/textures/vessels_glass_fragments.png b/mods/vessels/textures/vessels_glass_fragments.png index acf2d380..7c6c4888 100644 Binary files a/mods/vessels/textures/vessels_glass_fragments.png and b/mods/vessels/textures/vessels_glass_fragments.png differ diff --git a/mods/vessels/textures/vessels_shelf_slot.png b/mods/vessels/textures/vessels_shelf_slot.png index 93a729e5..ff29082a 100644 Binary files a/mods/vessels/textures/vessels_shelf_slot.png and b/mods/vessels/textures/vessels_shelf_slot.png differ diff --git a/mods/vessels/textures/vessels_steel_bottle.png b/mods/vessels/textures/vessels_steel_bottle.png index 169930a3..61d30719 100644 Binary files a/mods/vessels/textures/vessels_steel_bottle.png and b/mods/vessels/textures/vessels_steel_bottle.png differ diff --git a/mods/walls/init.lua b/mods/walls/init.lua index 0f7425c8..b2a163fc 100644 --- a/mods/walls/init.lua +++ b/mods/walls/init.lua @@ -35,7 +35,7 @@ walls.register = function(wall_name, wall_desc, wall_texture_table, wall_mat, wa connect_back = {-1/4,-1/2,1/4,1/4,1/2 + fence_collision_extra,1/2}, connect_right = {1/4,-1/2,-1/4,1/2,1/2 + fence_collision_extra,1/4}, }, - connects_to = { "group:wall", "group:stone", "group:fence", "group:wall_connected" }, + connects_to = { "group:wall", "group:stone", "group:fence" }, paramtype = "light", is_ground_content = false, tiles = wall_texture_table, @@ -45,12 +45,6 @@ walls.register = function(wall_name, wall_desc, wall_texture_table, wall_mat, wa }) -- crafting recipe - -- HACK: - -- Walls have no crafts, when register new wall via API from another mod, but in the same namespace (`walls`). - -- So we should remove `":"` at the beginning of the name. - if wall_name:sub(1, 1) == ":" then - wall_name = wall_name:sub(2) - end minetest.register_craft({ output = wall_name .. " 6", recipe = { diff --git a/mods/walls/locale/walls.bg.tr b/mods/walls/locale/walls.bg.tr deleted file mode 100755 index fd108d30..00000000 --- a/mods/walls/locale/walls.bg.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Стена от речни камъни -Mossy Cobblestone Wall=Стена от речни камъни покрити с мъх -Desert Cobblestone Wall=Стена от пустинни камъни diff --git a/mods/walls/locale/walls.de.tr b/mods/walls/locale/walls.de.tr index c31d4f67..76449f6c 100644 --- a/mods/walls/locale/walls.de.tr +++ b/mods/walls/locale/walls.de.tr @@ -1,4 +1,4 @@ # textdomain: walls Cobblestone Wall=Kopfsteinpflastermauer -Mossy Cobblestone Wall=Moosige Kopfsteinpflastermauer +Mossy Cobblestone Wall=Mosige Kopfsteinpflastermauer Desert Cobblestone Wall=Wüstenkopfsteinpflastermauer diff --git a/mods/walls/locale/walls.eo.tr b/mods/walls/locale/walls.eo.tr deleted file mode 100644 index 95b8ceda..00000000 --- a/mods/walls/locale/walls.eo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Pavimŝtona muro -Mossy Cobblestone Wall=Muska pavimŝtona muro -Desert Cobblestone Wall=Dezerta pavimŝtona muro diff --git a/mods/walls/locale/walls.eu.tr b/mods/walls/locale/walls.eu.tr deleted file mode 100644 index 30a2b395..00000000 --- a/mods/walls/locale/walls.eu.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Galtzada-harrizko pareta -Mossy Cobblestone Wall=Goroldiodun galtzada-harrizko pareta -Desert Cobblestone Wall=Basamortuko galtzada-harrizko pareta diff --git a/mods/walls/locale/walls.it.tr b/mods/walls/locale/walls.it.tr index 4babad23..1ca3f888 100644 --- a/mods/walls/locale/walls.it.tr +++ b/mods/walls/locale/walls.it.tr @@ -1,4 +1,4 @@ -# textdomain: walls -Cobblestone Wall=Muro di ciottoli -Mossy Cobblestone Wall=Muro di ciottoli muschiosi -Desert Cobblestone Wall=Muro di ciottoli del deserto +# textdomain: walls +Cobblestone Wall=Muro di ciottoli +Mossy Cobblestone Wall=Muro di ciottoli muschiosi +Desert Cobblestone Wall=Muro di ciottoli del deserto \ No newline at end of file diff --git a/mods/walls/locale/walls.ja.tr b/mods/walls/locale/walls.ja.tr deleted file mode 100644 index c907aed5..00000000 --- a/mods/walls/locale/walls.ja.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=丸石の塀 -Mossy Cobblestone Wall=苔むした丸石の塀 -Desert Cobblestone Wall=砂漠の丸石の塀 diff --git a/mods/walls/locale/walls.jbo.tr b/mods/walls/locale/walls.jbo.tr deleted file mode 100644 index aba765cf..00000000 --- a/mods/walls/locale/walls.jbo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=lo lolro'iboi bitmu -Mossy Cobblestone Wall=lo clika lolro'iboi bitmu -Desert Cobblestone Wall=lo cantu'a lolro'iboi bitmu diff --git a/mods/walls/locale/walls.lv.tr b/mods/walls/locale/walls.lv.tr deleted file mode 100644 index 5d50ddfe..00000000 --- a/mods/walls/locale/walls.lv.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Mūrakmens siena -Mossy Cobblestone Wall=Apsūnējuša mūrakmens siena -Desert Cobblestone Wall=Tuksneša mūrakmens siena diff --git a/mods/walls/locale/walls.pl.tr b/mods/walls/locale/walls.pl.tr deleted file mode 100644 index ff544e20..00000000 --- a/mods/walls/locale/walls.pl.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Brukowa ściana -Mossy Cobblestone Wall=Brukowa ściana z mchem -Desert Cobblestone Wall=Pustynno-brukowa ściana diff --git a/mods/walls/locale/walls.pt_BR.tr b/mods/walls/locale/walls.pt_BR.tr deleted file mode 100644 index 58c3d122..00000000 --- a/mods/walls/locale/walls.pt_BR.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Parede de Paralelepípedo -Mossy Cobblestone Wall=Parede de Paralelepípedo com Musgo -Desert Cobblestone Wall=Parede de Paralelepípedo do Deserto diff --git a/mods/walls/locale/walls.ru.tr b/mods/walls/locale/walls.ru.tr index 2f615368..1ed653f0 100644 --- a/mods/walls/locale/walls.ru.tr +++ b/mods/walls/locale/walls.ru.tr @@ -1,4 +1,4 @@ # textdomain: walls -Cobblestone Wall=Стена из булыжника -Mossy Cobblestone Wall=Стена из замшелого булыжника -Desert Cobblestone Wall=Стена из пустынного булыжника +Cobblestone Wall=Булыжниковая Ограда +Mossy Cobblestone Wall=Мшистая Булыжниковая Ограда +Desert Cobblestone Wall=Ограда Из Пустынного Булыжника diff --git a/mods/walls/locale/walls.se.tr b/mods/walls/locale/walls.se.tr new file mode 100644 index 00000000..8cca00e5 --- /dev/null +++ b/mods/walls/locale/walls.se.tr @@ -0,0 +1,4 @@ +# textdomain: walls +Cobblestone Wall=Kullerstens Vägg +Mossy Cobblestone Wall=Mossig Kullerstens Vägg +Desert Cobblestone Wall=Öken Kullerstens Vägg \ No newline at end of file diff --git a/mods/walls/locale/walls.sk.tr b/mods/walls/locale/walls.sk.tr deleted file mode 100644 index 69cf3a93..00000000 --- a/mods/walls/locale/walls.sk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Múr z dlažbových kociek -Mossy Cobblestone Wall=Múr z dlažbových kociek obrastených machom -Desert Cobblestone Wall=Múr z púštnych dlažbových kociek diff --git a/mods/walls/locale/walls.sv.tr b/mods/walls/locale/walls.sv.tr deleted file mode 100644 index 1ad4a29e..00000000 --- a/mods/walls/locale/walls.sv.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Kullerstensvägg -Mossy Cobblestone Wall=Mossig kullerstensvägg -Desert Cobblestone Wall=Ökenkullerstensvägg diff --git a/mods/walls/locale/walls.uk.tr b/mods/walls/locale/walls.uk.tr deleted file mode 100644 index 25bdd268..00000000 --- a/mods/walls/locale/walls.uk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Кругляковий паркан -Mossy Cobblestone Wall=Паркан з моховитого кругляку -Desert Cobblestone Wall=Паркан з пустельного кругляку diff --git a/mods/weather/api.lua b/mods/weather/api.lua deleted file mode 100644 index 818e26a3..00000000 --- a/mods/weather/api.lua +++ /dev/null @@ -1,32 +0,0 @@ -local CYCLE = 8 -- Time period of cyclic clouds update in seconds - -weather = {} - --- default implementation is empty -function weather.get(player) - return {} -end - -local function do_update() - for _, player in ipairs(minetest.get_connected_players()) do - local params = weather.get(player) - assert(params ~= nil, "weather.get() must not return nil") - if params.clouds then - player:set_clouds(params.clouds) - end - if params.lighting then - player:set_lighting(params.lighting) - end - end -end - -local function cyclic_update() - do_update() - minetest.after(CYCLE, cyclic_update) -end -minetest.after(0, cyclic_update) - --- Update on player join to instantly alter clouds from the default -minetest.register_on_joinplayer(function(player) - do_update() -end) diff --git a/mods/weather/init.lua b/mods/weather/init.lua index 68743285..3b9a305a 100644 --- a/mods/weather/init.lua +++ b/mods/weather/init.lua @@ -1,29 +1,16 @@ --- Always load the API -dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/api.lua") - -- Disable by mapgen or setting -if minetest.settings:get_bool("enable_weather") == false then - return -end - local mg_name = minetest.get_mapgen_setting("mg_name") -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 }, - bloom = { intensity = 0.05 }, - volumetric_light = { strength = 0.2 }, - }) - end) - +if mg_name == "v6" or mg_name == "singlenode" or + minetest.settings:get_bool("enable_weather") == false then return end --- Default implementation for noise based cloud appearance + +-- Parameters local TSCALE = 600 -- Time scale of noise variation in seconds +local CYCLE = 8 -- Time period of cyclic clouds update in seconds local np_density = { offset = 0.5, @@ -65,30 +52,30 @@ local np_speedz = { lacunarity = 2, } +-- End parameters + + +-- Initialise noise objects to nil + local nobj_density = nil local nobj_thickness = nil local nobj_speedx = nil local nobj_speedz = nil + +-- Update clouds function + local function rangelim(value, lower, upper) return math.min(math.max(value, lower), upper) end -local t_offset -do - local meta = minetest.get_mod_storage() - if meta:contains("time_offset") then - t_offset = meta:get_int("time_offset") - else - -- Use random offset so not each new world behaves the same. - t_offset = math.random(0, 300000) - meta:set_int("time_offset", t_offset) - end -end +local os_time_0 = os.time() +local t_offset = math.random(0, 300000) -function weather.get(player) - -- Adjusted time in seconds - local time = math.floor(minetest.get_gametime() - t_offset) +local function update_clouds() + -- Time in seconds. + -- Add random time offset to avoid identical behaviour each server session. + local time = os.difftime(os.time(), os_time_0) - t_offset nobj_density = nobj_density or minetest.get_perlin(np_density) nobj_thickness = nobj_thickness or minetest.get_perlin(np_thickness) @@ -100,30 +87,38 @@ function weather.get(player) local n_speedx = nobj_speedx:get_2d({x = time, y = 0}) -- -1 to 1 local n_speedz = nobj_speedz:get_2d({x = time, y = 0}) -- -1 to 1 - -- Fallback to mid-value 50 for very old worlds - local humid = minetest.get_humidity(player:get_pos()) or 50 - -- Default and classic density value is 0.4, make this happen - -- at humidity midvalue 50 when n_density is at midvalue 0.5. - -- density_max = 0.25 at humid = 0. - -- density_max = 0.8 at humid = 50. - -- density_max = 1.35 at humid = 100. - local density_max = 0.8 + ((humid - 50) / 50) * 0.55 - -- Range limit density_max to always have occasional - -- small scattered clouds at extreme low humidity. - local density = rangelim(density_max, 0.2, 1.0) * n_density - - return { - clouds = { - density = density, + for _, player in ipairs(minetest.get_connected_players()) do + local humid = minetest.get_humidity(player:get_pos()) + -- Default and classic density value is 0.4, make this happen + -- at humidity midvalue 50 when n_density is at midvalue 0.5. + -- density_max = 0.25 at humid = 0. + -- density_max = 0.8 at humid = 50. + -- density_max = 1.35 at humid = 100. + local density_max = 0.8 + ((humid - 50) / 50) * 0.55 + 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, thickness = math.max(math.floor( rangelim(32 * humid / 100, 8, 32) * n_thickness ), 2), speed = {x = n_speedx * 4, z = n_speedz * 4}, - }, - lighting = { - shadows = { intensity = 0.7 * (1 - density) }, - bloom = { intensity = 0.05 }, - volumetric_light = { strength = 0.2 }, - } - } + }) + end end + + +local function cyclic_update() + update_clouds() + minetest.after(CYCLE, cyclic_update) +end + + +minetest.after(0, cyclic_update) + + +-- Update on player join to instantly alter clouds from the default + +minetest.register_on_joinplayer(function(player) + update_clouds() +end) diff --git a/mods/wool/README.txt b/mods/wool/README.txt index 31febdf2..a66677dd 100644 --- a/mods/wool/README.txt +++ b/mods/wool/README.txt @@ -5,7 +5,7 @@ See license.txt for license information. Authors of source code ---------------------- Originally by Perttu Ahola (celeron55) (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) --------------------------- diff --git a/mods/wool/init.lua b/mods/wool/init.lua index 87bd4274..4cf7dc3a 100644 --- a/mods/wool/init.lua +++ b/mods/wool/init.lua @@ -8,21 +8,19 @@ local dyes = dye.dyes for i = 1, #dyes do local name, desc = unpack(dyes[i]) - local color_group = "color_" .. name - minetest.register_node("wool:" .. name, { description = S(desc .. " Wool"), tiles = {"wool_" .. name .. ".png"}, is_ground_content = false, groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, - flammable = 3, wool = 1, [color_group] = 1}, + flammable = 3, wool = 1}, sounds = default.node_sound_defaults(), }) minetest.register_craft{ type = "shapeless", output = "wool:" .. name, - recipe = {"group:dye," .. color_group, "group:wool"}, + recipe = {"group:dye,color_" .. name, "group:wool"}, } end diff --git a/mods/wool/license.txt b/mods/wool/license.txt index 5dfc7519..93101636 100644 --- a/mods/wool/license.txt +++ b/mods/wool/license.txt @@ -3,7 +3,7 @@ License of source code The MIT License (MIT) Copyright (C) 2012-2016 Perttu Ahola (celeron55) -Copyright (C) 2012-2016 Various Minetest Game developers and contributors +Copyright (C) 2012-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/wool/locale/wool.bg.tr b/mods/wool/locale/wool.bg.tr deleted file mode 100755 index c9b75aa5..00000000 --- a/mods/wool/locale/wool.bg.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Бяла вълна -Grey Wool=Сива вълна -Dark Grey Wool=Тъмно-сива вълна -Black Wool=Черна вълна -Violet Wool=Лилава вълна -Blue Wool=Синя вълна -Cyan Wool=Светло-синя вълна -Dark Green Wool=Масленозелена вълна -Green Wool=Зелена вълна -Yellow Wool=Жълта вълна -Brown Wool=Кафява вълна -Orange Wool=Оранжева вълна -Red Wool=Червена вълна -Magenta Wool=Пурпурна вълна -Pink Wool=Розова вълна diff --git a/mods/wool/locale/wool.eo.tr b/mods/wool/locale/wool.eo.tr deleted file mode 100644 index 78242cd7..00000000 --- a/mods/wool/locale/wool.eo.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Blanka lano -Grey Wool=Griza lano -Dark Grey Wool=Malhela griza lano -Black Wool=Nigra 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ĝkolora lano -Red Wool=Ruĝa lano -Magenta Wool=Fuksina lano -Pink Wool=Rozkolora lano diff --git a/mods/wool/locale/wool.eu.tr b/mods/wool/locale/wool.eu.tr deleted file mode 100644 index 2da17995..00000000 --- a/mods/wool/locale/wool.eu.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Artile zuria -Grey Wool=Artile grisa -Dark Grey Wool=Artile gris iluna -Black Wool=Artile beltza -Violet Wool=Artile morea -Blue Wool=Artile urdina -Cyan Wool=Artile ziana -Dark Green Wool=Artile berde iluna -Green Wool=Artile berdea -Yellow Wool=Artile horia -Brown Wool=Artile marroia -Orange Wool=Artile laranja -Red Wool=Artile gorria -Magenta Wool=Artile magenta -Pink Wool=Artile arrosa diff --git a/mods/wool/locale/wool.id.tr b/mods/wool/locale/wool.id.tr index 603277fd..60e917c7 100644 --- a/mods/wool/locale/wool.id.tr +++ b/mods/wool/locale/wool.id.tr @@ -13,4 +13,4 @@ Brown Wool=Wol Cokelat Orange Wool=Wol Oranye Red Wool=Wol Merah Magenta Wool=Wol Magenta -Pink Wool=Wol Merah Muda +Pink Wool=Wol Jambon diff --git a/mods/wool/locale/wool.it.tr b/mods/wool/locale/wool.it.tr index 8108f2fc..628faf7b 100644 --- a/mods/wool/locale/wool.it.tr +++ b/mods/wool/locale/wool.it.tr @@ -1,16 +1,16 @@ -# textdomain: wool -White Wool=Lana bianca -Grey Wool=Lana grigia -Dark Grey Wool=Lana grigia scura -Black Wool=Lana nera -Violet Wool=Lana viola -Blue Wool=Lana blu -Cyan Wool=Lana ciano -Dark Green Wool=Lana verde scura -Green Wool=Lana verde -Yellow Wool=Lana gialla -Brown Wool=Lana marrone -Orange Wool=Lana arancione -Red Wool=Lana rossa -Magenta Wool=Lana magenta -Pink Wool=Lana rosa +# textdomain: wool +White Wool=Lana bianca +Grey Wool=Lana grigia +Dark Grey Wool=Lana grigia scura +Black Wool=Lana nera +Violet Wool=Lana viola +Blue Wool=Lana blu +Cyan Wool=Lana ciano +Dark Green Wool=Lana verde scura +Green Wool=Lana verde +Yellow Wool=Lana gialla +Brown Wool=Lana marrone +Orange Wool=Lana arancione +Red Wool=Lana rossa +Magenta Wool=Lana magenta +Pink Wool=Lana rosa \ No newline at end of file diff --git a/mods/wool/locale/wool.ja.tr b/mods/wool/locale/wool.ja.tr deleted file mode 100644 index 5051f9e7..00000000 --- a/mods/wool/locale/wool.ja.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=白色の羊毛 -Grey Wool=灰色の羊毛 -Dark Grey Wool=濃灰色の羊毛 -Black Wool=黒色の羊毛 -Violet Wool=紫色の羊毛 -Blue Wool=青色の羊毛 -Cyan Wool=青緑色の羊毛 -Dark Green Wool=濃緑色の羊毛 -Green Wool=緑色の羊毛 -Yellow Wool=黄色の羊毛 -Brown Wool=茶色の羊毛 -Orange Wool=橙色の羊毛 -Red Wool=赤色の羊毛 -Magenta Wool=赤紫色の羊毛 -Pink Wool=桃色の羊毛 diff --git a/mods/wool/locale/wool.jbo.tr b/mods/wool/locale/wool.jbo.tr deleted file mode 100644 index 4bf44ecf..00000000 --- a/mods/wool/locale/wool.jbo.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=lo blabi sunla -Grey Wool=lo grusi sunla -Dark Grey Wool=lo xekri grusi sunla -Black Wool=lo xekri sunla -Violet Wool=lo zirpu sunla -Blue Wool=lo blanu sunla -Cyan Wool=lo cicna sunla -Dark Green Wool=lo xekri crino sunla -Green Wool=lo crino sunla -Yellow Wool=lo pelxu sunla -Brown Wool=lo bunre sunla -Orange Wool=lo narju sunla -Red Wool=lo xunre sunla -Magenta Wool=lo nukni sunla -Pink Wool=lo xunblabi sunla diff --git a/mods/wool/locale/wool.lv.tr b/mods/wool/locale/wool.lv.tr deleted file mode 100644 index 72e514e4..00000000 --- a/mods/wool/locale/wool.lv.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Balta vilna -Grey Wool=Pelēka vilna -Dark Grey Wool=Tumšpelēka vilna -Black Wool=Melna vilna -Violet Wool=Violeta vilna -Blue Wool=Zila vilna -Cyan Wool=Ciānkrāsas vilna -Dark Green Wool=Tumšzaļa vilna -Green Wool=Zaļa vilna -Yellow Wool=Dzeltena vilna -Brown Wool=Brūna vilna -Orange Wool=Oranža vilna -Red Wool=Sarkana vilna -Magenta Wool=Fuksīna krāsas vilna -Pink Wool=Rozā vilna diff --git a/mods/wool/locale/wool.ms.tr b/mods/wool/locale/wool.ms.tr index 8b597d14..18b54805 100644 --- a/mods/wool/locale/wool.ms.tr +++ b/mods/wool/locale/wool.ms.tr @@ -1,16 +1,16 @@ # textdomain: wool White Wool=Bulu Biri-Biri Putih Grey Wool=Bulu Biri-Biri Kelabu -Dark Grey Wool=Bulu Biri-Biri Kelabu Tua +Dark Grey Wool=Bulu Biri-Biri Kelabu Gelap Black Wool=Bulu Biri-Biri Hitam Violet Wool=Bulu Biri-Biri Ungu Blue Wool=Bulu Biri-Biri Biru Cyan Wool=Bulu Biri-Biri Biru Kehijauan -Dark Green Wool=Bulu Biri-Biri Hijau Tua +Dark Green Wool=Bulu Biri-Biri Hijau Gelap Green Wool=Bulu Biri-Biri Hijau Yellow Wool=Bulu Biri-Biri Kuning Brown Wool=Bulu Biri-Biri Perang Orange Wool=Bulu Biri-Biri Jingga Red Wool=Bulu Biri-Biri Merah -Magenta Wool=Bulu Biri-Biri Magenta +Magenta Wool=Bulu Biri-Biri Merah Lembayung Pink Wool=Bulu Biri-Biri Merah Jambu diff --git a/mods/wool/locale/wool.pl.tr b/mods/wool/locale/wool.pl.tr deleted file mode 100644 index 9c411c81..00000000 --- a/mods/wool/locale/wool.pl.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Biała wełna -Grey Wool=Szara wełna -Dark Grey Wool=Ciemnoszara wełna -Black Wool=Czarna wełna -Violet Wool=Fioletowa wełna -Blue Wool=Niebieska wełna -Cyan Wool=Cyjanowa wełna -Dark Green Wool=Ciemnozielona wełna -Green Wool=Zielona wełna -Yellow Wool=Żółta wełna -Brown Wool=Brązowa wełna -Orange Wool=Pomarańczowa wełna -Red Wool=Czerwona wełna -Magenta Wool=Karmazynowa wełna -Pink Wool=Różowa wełna diff --git a/mods/wool/locale/wool.pt.tr b/mods/wool/locale/wool.pt.tr deleted file mode 100644 index 9b4232f7..00000000 --- a/mods/wool/locale/wool.pt.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Tecido Branco -Grey Wool=Tecido Cinza -Dark Grey Wool=Tecido Cinza-escuro -Black Wool=Tecido Preto -Violet Wool=Tecido Violeta -Blue Wool=Tecido Azul -Cyan Wool=Tecido Ciano -Dark Green Wool=Tecido Verde-escuro -Green Wool=Tecido Verde -Yellow Wool=Tecido Amarelo -Brown Wool=Tecido Marrom -Orange Wool=Tecido Laranja -Red Wool=Tecido Vermelho -Magenta Wool=Tecido Magenta -Pink Wool=Tecido Rosa diff --git a/mods/wool/locale/wool.pt_BR.tr b/mods/wool/locale/wool.pt_BR.tr deleted file mode 100644 index 9b4232f7..00000000 --- a/mods/wool/locale/wool.pt_BR.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Tecido Branco -Grey Wool=Tecido Cinza -Dark Grey Wool=Tecido Cinza-escuro -Black Wool=Tecido Preto -Violet Wool=Tecido Violeta -Blue Wool=Tecido Azul -Cyan Wool=Tecido Ciano -Dark Green Wool=Tecido Verde-escuro -Green Wool=Tecido Verde -Yellow Wool=Tecido Amarelo -Brown Wool=Tecido Marrom -Orange Wool=Tecido Laranja -Red Wool=Tecido Vermelho -Magenta Wool=Tecido Magenta -Pink Wool=Tecido Rosa diff --git a/mods/wool/locale/wool.ru.tr b/mods/wool/locale/wool.ru.tr index 9893a085..cd8c60b3 100644 --- a/mods/wool/locale/wool.ru.tr +++ b/mods/wool/locale/wool.ru.tr @@ -1,16 +1,16 @@ # textdomain: wool -White Wool=Белая шерсть -Grey Wool=Серая шерсть -Dark Grey Wool=Тёмно-Серая шерсть -Black Wool=Чёрная шерсть -Violet Wool=Фиолетовая шерсть -Blue Wool=Синяя шерсть -Cyan Wool=Бирюзовая шерсть -Dark Green Wool=Тёмно-Зелёная шерсть -Green Wool=Зелёная шерсть -Yellow Wool=Жёлтая шерсть -Brown Wool=Коричневая шерсть -Orange Wool=Оранжевая шерсть -Red Wool=Красная шерсть -Magenta Wool=Сиреневая шерсть -Pink Wool=Розовая шерсть +White Wool=Белая Шерсть +Grey Wool=Серая Шерсть +Dark Grey Wool=Тёмно-Серая Шерсть +Black Wool=Чёрная Шерсть +Violet Wool=Фиолетовая Шерсть +Blue Wool=Синяя Шерсть +Cyan Wool=Голубая Шерсть +Dark Green Wool=Тёмно-Зелёная Шерсть +Green Wool=Зелёная Шерсть +Yellow Wool=Жёлтая Шерсть +Brown Wool=Бурая Шерсть +Orange Wool=Оранжевая Шерсть +Red Wool=Красная Шерсть +Magenta Wool=Пурпурная Шерсть +Pink Wool=Розовая Шерсть diff --git a/mods/wool/locale/wool.se.tr b/mods/wool/locale/wool.se.tr new file mode 100644 index 00000000..1d82e697 --- /dev/null +++ b/mods/wool/locale/wool.se.tr @@ -0,0 +1,16 @@ +# textdomain: wool +White Wool=Vit Ull +Grey Wool=Grå Ull +Dark Grey Wool=Mörk Grå Ull +Black Wool=Svart Ull +Violet Wool=Violett Ull +Blue Wool=Blå Ull +Cyan Wool=Cyan Ull +Dark Green Wool=Mörk Grön Ull +Green Wool=Grön Ull +Yellow Wool=Gul Ull +Brown Wool=Brun Ull +Orange Wool=Orange Ull +Red Wool=Röd Ull +Magenta Wool=Magenta Ull +Pink Wool=Rosa Ull \ No newline at end of file diff --git a/mods/wool/locale/wool.sk.tr b/mods/wool/locale/wool.sk.tr deleted file mode 100644 index 755370e8..00000000 --- a/mods/wool/locale/wool.sk.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Biela vlna -Grey Wool=Šedá vlna -Dark Grey Wool=Tmavošedá vlna -Black Wool=Čierna vlna -Violet Wool=Fialová vlna -Blue Wool=Modrá vlna -Cyan Wool=Tyrkysová vlna -Dark Green Wool=Tmavozelená vlna -Green Wool=Zelená vlna -Yellow Wool=Žltá vlna -Brown Wool=Hnedá vlna -Orange Wool=Oranžová vlna -Red Wool=Červená vlna -Magenta Wool=Purpurová vlna -Pink Wool=Ružová vlna diff --git a/mods/wool/locale/wool.sv.tr b/mods/wool/locale/wool.sv.tr deleted file mode 100644 index bfce2140..00000000 --- a/mods/wool/locale/wool.sv.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Vit ull -Grey Wool=Grå ull -Dark Grey Wool=Mörkgrå ull -Black Wool=Svart ull -Violet Wool=Violett ull -Blue Wool=Blå ull -Cyan Wool=Cyan ull -Dark Green Wool=Mörkgrön ull -Green Wool=Grön ull -Yellow Wool=Gul ull -Brown Wool=Brun ull -Orange Wool=Orange ull -Red Wool=Röd ull -Magenta Wool=Magenta ull -Pink Wool=Rosa ull diff --git a/mods/wool/locale/wool.uk.tr b/mods/wool/locale/wool.uk.tr deleted file mode 100644 index 24dbed7f..00000000 --- a/mods/wool/locale/wool.uk.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Біла вовна -Grey Wool=Сіра вовна -Dark Grey Wool=Темно-сіра вовна -Black Wool=Чорна вовна -Violet Wool=Фіолетова вовна -Blue Wool=Синя вовна -Cyan Wool=Синьо-зелена вовна -Dark Green Wool=Темно-зелена вовна -Green Wool=Зелена вовна -Yellow Wool=Жовта вовна -Brown Wool=Коричнева вовна -Orange Wool=Помаранчева вовна -Red Wool=Червона вовна -Magenta Wool=Пурпурна вовна -Pink Wool=Рожева вовна diff --git a/mods/xpanes/README.txt b/mods/xpanes/README.txt index 7e2a1bed..0e34d232 100644 --- a/mods/xpanes/README.txt +++ b/mods/xpanes/README.txt @@ -7,7 +7,7 @@ Authors of source code Originally by xyz (MIT) BlockMen (MIT) sofar (MIT) -Various Minetest Game developers and contributors (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) --------------------------- diff --git a/mods/xpanes/init.lua b/mods/xpanes/init.lua index a02dbfe4..e195dbbc 100644 --- a/mods/xpanes/init.lua +++ b/mods/xpanes/init.lua @@ -116,7 +116,7 @@ function xpanes.register_pane(name, def) groups = flatgroups, drop = "xpanes:" .. name .. "_flat", sounds = def.sounds, - use_texture_alpha = def.use_texture_alpha and "blend" or "clip", + use_texture_alpha = def.use_texture_alpha or false, node_box = { type = "fixed", fixed = {{-1/2, -1/2, -1/32, 1/2, 1/2, 1/32}}, @@ -145,7 +145,7 @@ function xpanes.register_pane(name, def) groups = groups, drop = "xpanes:" .. name .. "_flat", sounds = def.sounds, - use_texture_alpha = def.use_texture_alpha and "blend" or "clip", + use_texture_alpha = def.use_texture_alpha or false, node_box = { type = "connected", fixed = {{-1/32, -1/2, -1/32, 1/32, 1/2, 1/32}}, @@ -227,8 +227,6 @@ if minetest.get_modpath("doors") then sounds = default.node_sound_metal_defaults(), sound_open = "xpanes_steel_bar_door_open", sound_close = "xpanes_steel_bar_door_close", - gain_open = 0.15, - gain_close = 0.13, recipe = { {"xpanes:bar_flat", "xpanes:bar_flat"}, {"xpanes:bar_flat", "xpanes:bar_flat"}, @@ -247,8 +245,6 @@ if minetest.get_modpath("doors") then sounds = default.node_sound_metal_defaults(), sound_open = "xpanes_steel_bar_door_open", sound_close = "xpanes_steel_bar_door_close", - gain_open = 0.15, - gain_close = 0.13, }) minetest.register_craft({ diff --git a/mods/xpanes/license.txt b/mods/xpanes/license.txt index c1f31e34..7e922b9a 100644 --- a/mods/xpanes/license.txt +++ b/mods/xpanes/license.txt @@ -5,7 +5,7 @@ The MIT License (MIT) Copyright (C) 2014-2016 xyz Copyright (C) 2014-2016 BlockMen Copyright (C) 2016 Auke Kok -Copyright (C) 2014-2016 Various Minetest Game developers and contributors +Copyright (C) 2014-2016 Various Minetest developers and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software diff --git a/mods/xpanes/locale/xpanes.bg.tr b/mods/xpanes/locale/xpanes.bg.tr deleted file mode 100755 index e11e834f..00000000 --- a/mods/xpanes/locale/xpanes.bg.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Стъклен прозорец -Obsidian Glass Pane=Прозорец от обсидианово стъкло -Steel Bars=Стоманени решетки -Steel Bar Door=Стоманени решетки за врата -Steel Bar Trapdoor=Стоманени решетки за капак diff --git a/mods/xpanes/locale/xpanes.eo.tr b/mods/xpanes/locale/xpanes.eo.tr deleted file mode 100644 index cfbbfb56..00000000 --- a/mods/xpanes/locale/xpanes.eo.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Vitra vitraĵo -Obsidian Glass Pane=Obsidiana vitra vitraĵo -Steel Bars=Ŝtalaj baraĵoj -Steel Bar Door=Ŝtala baraĵa pordo -Steel Bar Trapdoor=Ŝtala baraĵa plankpordo diff --git a/mods/xpanes/locale/xpanes.eu.tr b/mods/xpanes/locale/xpanes.eu.tr deleted file mode 100644 index c41c448f..00000000 --- a/mods/xpanes/locale/xpanes.eu.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Beirazko panela -Obsidian Glass Pane=Obsidiana-beirazko panela -Steel Bars=Altzairuzko barrak -Steel Bar Door=Altzairu-barrazko atea -Steel Bar Trapdoor=Altzairu-barrazko tranpola diff --git a/mods/xpanes/locale/xpanes.it.tr b/mods/xpanes/locale/xpanes.it.tr index 63c8b62a..7b739680 100644 --- a/mods/xpanes/locale/xpanes.it.tr +++ b/mods/xpanes/locale/xpanes.it.tr @@ -1,6 +1,6 @@ -# textdomain: xpanes -Glass Pane=Pannello di vetro -Obsidian Glass Pane=Pannello di vetro d'ossidiana -Steel Bars=Sbarre d'acciaio -Steel Bar Door=Porta con sbarre d'acciaio -Steel Bar Trapdoor=Botola con sbarre d'acciaio +# textdomain: xpanes +Glass Pane=Pannello di vetro +Obsidian Glass Pane=Pannello di vetro d'ossidiana +Steel Bars=Sbarre d'acciaio +Steel Bar Door=Porta con sbarre d'acciaio +Steel Bar Trapdoor=Botola con sbarre d'acciaio \ No newline at end of file diff --git a/mods/xpanes/locale/xpanes.ja.tr b/mods/xpanes/locale/xpanes.ja.tr deleted file mode 100644 index 06e0bed5..00000000 --- a/mods/xpanes/locale/xpanes.ja.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=板ガラス -Obsidian Glass Pane=黒曜石の板ガラス -Steel Bars=鉄棒の柵 -Steel Bar Door=鉄棒のドア -Steel Bar Trapdoor=鉄棒のトラップドア diff --git a/mods/xpanes/locale/xpanes.jbo.tr b/mods/xpanes/locale/xpanes.jbo.tr deleted file mode 100644 index 333b5313..00000000 --- a/mods/xpanes/locale/xpanes.jbo.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=lo blaci plita -Obsidian Glass Pane=lo je'erma'ablaci blaci plita -Steel Bars=lo gasta garna -Steel Bar Door=lo gasta garna vrogai -Steel Bar Trapdoor=lo gasta garna lolvrogai diff --git a/mods/xpanes/locale/xpanes.lv.tr b/mods/xpanes/locale/xpanes.lv.tr deleted file mode 100644 index c75849c3..00000000 --- a/mods/xpanes/locale/xpanes.lv.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Stikla panelis -Obsidian Glass Pane=Obsidiāna stikla panelis -Steel Bars=Tērauda režģis -Steel Bar Door=Tērauda režģa durvis -Steel Bar Trapdoor=Tērauda režģa lūka diff --git a/mods/xpanes/locale/xpanes.pl.tr b/mods/xpanes/locale/xpanes.pl.tr deleted file mode 100644 index 0ebb386e..00000000 --- a/mods/xpanes/locale/xpanes.pl.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Szyba -Obsidian Glass Pane=Obsydianowa szyba -Steel Bars=Stalowe kraty -Steel Bar Door=Drzwi ze stalowych krat -Steel Bar Trapdoor=Właz ze stalowych krat diff --git a/mods/xpanes/locale/xpanes.pt_BR.tr b/mods/xpanes/locale/xpanes.pt_BR.tr deleted file mode 100644 index c1ca3b26..00000000 --- a/mods/xpanes/locale/xpanes.pt_BR.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Painel de Vidro -Obsidian Glass Pane=Painel de Vidro de Obsidiana -Steel Bars=Barras de Aço -Steel Bar Door=Porta de Barras de Aço -Steel Bar Trapdoor=Alçapão de Barras de Aço diff --git a/mods/xpanes/locale/xpanes.ru.tr b/mods/xpanes/locale/xpanes.ru.tr index cd7173e7..166c62de 100644 --- a/mods/xpanes/locale/xpanes.ru.tr +++ b/mods/xpanes/locale/xpanes.ru.tr @@ -1,6 +1,6 @@ # textdomain: xpanes -Glass Pane=Стеклянная панель -Obsidian Glass Pane=Панель из обсидианового стекла -Steel Bars=Стальная решетка -Steel Bar Door=Стальная решётчатая дверь -Steel Bar Trapdoor=Стальной решётчатый люк +Glass Pane=Стеклянная Панель +Obsidian Glass Pane=Стеклянная Панель Из Обсидиана +Steel Bars=Стальная Решётка +Steel Bar Door=Стальная Решётчатая Дверь +Steel Bar Trapdoor=Стальной Решётчатый Люк diff --git a/mods/xpanes/locale/xpanes.se.tr b/mods/xpanes/locale/xpanes.se.tr new file mode 100644 index 00000000..fc3bbfe0 --- /dev/null +++ b/mods/xpanes/locale/xpanes.se.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Glasruta +Obsidian Glass Pane=Obsidian Glasruta +Steel Bars=Stålgaller +Steel Bar Door=Stålgallers Dörr +Steel Bar Trapdoor=Stålgallers Fallucka \ No newline at end of file diff --git a/mods/xpanes/locale/xpanes.sk.tr b/mods/xpanes/locale/xpanes.sk.tr deleted file mode 100644 index 0d07e08a..00000000 --- a/mods/xpanes/locale/xpanes.sk.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Tabuľa skla -Obsidian Glass Pane=Tabuľa obsidiánového skla -Steel Bars=Oceľové mreže -Steel Bar Door=Dvere z oceľových mreží -Steel Bar Trapdoor=Padajúce dvere z oceľových mreží diff --git a/mods/xpanes/locale/xpanes.sv.tr b/mods/xpanes/locale/xpanes.sv.tr deleted file mode 100644 index 7b615dd3..00000000 --- a/mods/xpanes/locale/xpanes.sv.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Glasruta -Obsidian Glass Pane=Obsidianglasruta -Steel Bars=Stålgaller -Steel Bar Door=Stålgallerdörr -Steel Bar Trapdoor=Stålgallerfallucka diff --git a/mods/xpanes/locale/xpanes.uk.tr b/mods/xpanes/locale/xpanes.uk.tr deleted file mode 100644 index 41033bd6..00000000 --- a/mods/xpanes/locale/xpanes.uk.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Скляна панель -Obsidian Glass Pane=Панель з обсидіанового скла -Steel Bars=Ґрати -Steel Bar Door=Двері з ґратами -Steel Bar Trapdoor=Люк з ґратами diff --git a/mods/xpanes/textures/xpanes_door_steel_bar.png b/mods/xpanes/textures/xpanes_door_steel_bar.png index 39f45c30..435af148 100644 Binary files a/mods/xpanes/textures/xpanes_door_steel_bar.png and b/mods/xpanes/textures/xpanes_door_steel_bar.png differ diff --git a/mods/xpanes/textures/xpanes_item_steel_bar.png b/mods/xpanes/textures/xpanes_item_steel_bar.png index 46e4d9c6..d1ddaddd 100644 Binary files a/mods/xpanes/textures/xpanes_item_steel_bar.png and b/mods/xpanes/textures/xpanes_item_steel_bar.png differ diff --git a/mods/xpanes/textures/xpanes_trapdoor_steel_bar.png b/mods/xpanes/textures/xpanes_trapdoor_steel_bar.png index a56c5ee3..de4b4946 100644 Binary files a/mods/xpanes/textures/xpanes_trapdoor_steel_bar.png and b/mods/xpanes/textures/xpanes_trapdoor_steel_bar.png differ diff --git a/schematic_tables.txt b/schematic_tables.txt index e8765d5d..eff2d359 100644 --- a/schematic_tables.txt +++ b/schematic_tables.txt @@ -10,7 +10,7 @@ convert the Lua tables into .mts files. Such mods often have two functions to process two formats of the 'data' table: The standard table format is described in the 'Schematic specifier' section of -the lua_api.txt file in Luanti. +the lua_api.txt file in the Minetest Engine. The 'data' table appears as a sequence of vertical slices through the structure the schematic describes. Each XY-plane slice has the X-rows formatted in order of increasing Y, so the @@ -2045,9 +2045,9 @@ mts_save("aspen_log", { -- Large cactus -local C = {name = "default:cactus", prob = 255} -local R = {name = "default:cactus", prob = 255, force_place = true} -local E = {name = "default:cactus", prob = 127} +local C = {name = "default:cactus", prob = 255, param2 = 20} +local R = {name = "default:cactus", prob = 255, param2 = 20, force_place = true} +local E = {name = "default:cactus", prob = 127, param2 = 20} mts_save("large_cactus", { size = {x = 5, y = 7, z = 5}, diff --git a/screenshot.png b/screenshot.png index d648ea4b..5498b601 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/settingtypes.txt b/settingtypes.txt index 7f72aff1..eff1e902 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -72,10 +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 -# If enabled, the 'weather' mod will control cloud parameters, shadow intensity, -# bloom and volumetric lighting. +# Enable cloud 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 diff --git a/utils/optimize_textures.sh b/utils/optimize_textures.sh deleted file mode 100644 index 4dbe93ae..00000000 --- a/utils/optimize_textures.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# Colors with 0 alpha need to be preserved, because opaque leaves ignore alpha. -# For that purpose, the use of indexed colors is disabled (-nc). - -find .. -name '*.png' -print0 | xargs -0 optipng -o7 -zm1-9 -nc -strip all -clobber diff --git a/utils/test/minetest.conf b/utils/test/minetest.conf deleted file mode 100644 index 395319bd..00000000 --- a/utils/test/minetest.conf +++ /dev/null @@ -1,2 +0,0 @@ -minetest_game_smoke_test = true -random_mod_load_order = true diff --git a/utils/test/run.sh b/utils/test/run.sh deleted file mode 100755 index 652bed9f..00000000 --- a/utils/test/run.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -e -world=$(mktemp -d) -trap 'rm -rf "$world" || :' EXIT - -[ -f game.conf ] || { echo "Must be run in game root folder." >&2; exit 1; } -[ -n "$DOCKER_IMAGE" ] || { echo "Specify a docker image." >&2; exit 1; } - -chmod -R 777 "$world" # container uses unprivileged user inside - -vol=( - -v "$PWD/utils/test/minetest.conf":/etc/minetest/minetest.conf - --tmpfs /var/lib/minetest/.minetest - -v "$PWD":/var/lib/minetest/.minetest/games/minetest_game - -v "$world":/var/lib/minetest/.minetest/world -) -docker run --rm -i "${vol[@]}" "$DOCKER_IMAGE" --config /etc/minetest/minetest.conf --gameid minetest - -test -f "$world/map.sqlite" || exit 1 -exit 0