ref luacheck whitespace warnings
This commit is contained in:
parent
8c2d3f0b1f
commit
e0bf848c57
|
@ -6,7 +6,6 @@
|
|||
-- Load support for MT game translation.
|
||||
local S = minetest.get_translator()
|
||||
|
||||
|
||||
bones = {}
|
||||
|
||||
local function is_owner(pos, name)
|
||||
|
@ -236,9 +235,7 @@ minetest.register_on_dieplayer(function(player)
|
|||
minetest.log("action", player_name .. " dies at " .. pos_string ..
|
||||
". Inventory dropped")
|
||||
if bones_position_message then
|
||||
minetest.chat_send_player(player_name,
|
||||
S("@1 died at @2, and dropped their inventory.",
|
||||
player_name, pos_string))
|
||||
minetest.chat_send_player(player_name, S("@1 died at @2, and dropped their inventory.", player_name, pos_string))
|
||||
end
|
||||
return
|
||||
end
|
||||
|
@ -249,9 +246,7 @@ minetest.register_on_dieplayer(function(player)
|
|||
minetest.log("action", player_name .. " dies at " .. pos_string ..
|
||||
". Bones placed")
|
||||
if bones_position_message then
|
||||
minetest.chat_send_player(player_name,
|
||||
S("@1 died at @2, and bones were placed.",
|
||||
player_name, pos_string))
|
||||
minetest.chat_send_player(player_name, S("@1 died at @2, and bones were placed.", player_name, pos_string))
|
||||
end
|
||||
|
||||
local meta = minetest.get_meta(pos)
|
||||
|
|
|
@ -95,8 +95,7 @@ function default.chest.register_chest(name, d)
|
|||
def.after_place_node = function(pos, placer)
|
||||
local meta = minetest.get_meta(pos)
|
||||
meta:set_string("owner", placer:get_player_name() or "")
|
||||
meta:set_string("infotext", S("Locked Chest (owned by @1)",
|
||||
meta:get_string("owner")))
|
||||
meta:set_string("infotext", S("Locked Chest (owned by @1)", meta:get_string("owner")))
|
||||
end
|
||||
def.can_dig = function(pos,player)
|
||||
local meta = minetest.get_meta(pos);
|
||||
|
|
|
@ -237,8 +237,7 @@ local function furnace_node_timer(pos, elapsed)
|
|||
|
||||
-- local infotext = "Furnace " .. active .. "\n(Item: " .. item_state ..
|
||||
-- "; Fuel: " .. fuel_state .. ")"
|
||||
local infotext = S("Furnace @1 \n(Item: @2; Fuel: @3)", active,
|
||||
item_state, fuel_state)
|
||||
local infotext = S("Furnace @1 \n(Item: @2; Fuel: @3)", active, item_state, fuel_state)
|
||||
|
||||
--
|
||||
-- Set meta values
|
||||
|
|
|
@ -2514,8 +2514,7 @@ local function update_bookshelf(pos)
|
|||
else
|
||||
-- meta:set_string("infotext", "Bookshelf (" .. n_written ..
|
||||
-- " written, " .. n_empty .. " empty books)")
|
||||
meta:set_string("infotext", S("Bookshelf (@1 written, @2 empty books)",
|
||||
n_written, n_empty))
|
||||
meta:set_string("infotext", S("Bookshelf (@1 written, @2 empty books)", n_written, n_empty))
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -569,9 +569,7 @@ function default.sapling_on_place(itemstack, placer, pointed_thing,
|
|||
-- 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))
|
||||
minetest.chat_send_player(player_name, S("@1 will intersect protection on growth.", itemstack:get_definition().description))
|
||||
return itemstack
|
||||
end
|
||||
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
<<<<<<< HEAD
|
||||
local dyes = dye.dyes
|
||||
=======
|
||||
>>>>>>> ref luacheck whitespace warnings
|
||||
|
||||
for i = 1, #dyes do
|
||||
local name, desc = unpack(dyes[i])
|
||||
|
|
Loading…
Reference in New Issue