From e0bf848c5787362195973e57c0c9b4aa833027f5 Mon Sep 17 00:00:00 2001
From: Zweihorn <none@nowhere>
Date: Mon, 13 May 2019 23:37:39 +0200
Subject: [PATCH] ref luacheck whitespace warnings

---
 mods/beds/beds.lua          | 2 +-
 mods/boats/init.lua         | 2 +-
 mods/bones/init.lua         | 9 ++-------
 mods/butterflies/init.lua   | 2 +-
 mods/carts/cart_entity.lua  | 2 +-
 mods/carts/rails.lua        | 2 +-
 mods/creative/init.lua      | 2 +-
 mods/creative/inventory.lua | 2 +-
 mods/default/chests.lua     | 5 ++---
 mods/default/craftitems.lua | 2 +-
 mods/default/furnace.lua    | 5 ++---
 mods/default/nodes.lua      | 5 ++---
 mods/default/tools.lua      | 2 +-
 mods/default/torch.lua      | 2 +-
 mods/default/trees.lua      | 6 ++----
 mods/doors/init.lua         | 2 +-
 mods/farming/hoes.lua       | 2 +-
 mods/farming/init.lua       | 2 +-
 mods/farming/nodes.lua      | 2 +-
 mods/fire/init.lua          | 2 +-
 mods/fireflies/init.lua     | 2 +-
 mods/flowers/init.lua       | 2 +-
 mods/game_commands/init.lua | 2 +-
 mods/map/init.lua           | 2 +-
 mods/screwdriver/init.lua   | 2 +-
 mods/stairs/init.lua        | 2 +-
 mods/tnt/init.lua           | 2 +-
 mods/vessels/init.lua       | 2 +-
 mods/walls/init.lua         | 2 +-
 mods/wool/init.lua          | 3 +++
 mods/xpanes/init.lua        | 2 +-
 31 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/mods/beds/beds.lua b/mods/beds/beds.lua
index a78d2d4..dead76a 100644
--- a/mods/beds/beds.lua
+++ b/mods/beds/beds.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 -- Fancy shaped bed
 
 beds.register_bed("beds:fancy_bed", {
diff --git a/mods/boats/init.lua b/mods/boats/init.lua
index 03355b2..80860b3 100644
--- a/mods/boats/init.lua
+++ b/mods/boats/init.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 --
 -- Helper functions
 --
diff --git a/mods/bones/init.lua b/mods/bones/init.lua
index bf9e30a..861ec27 100644
--- a/mods/bones/init.lua
+++ b/mods/bones/init.lua
@@ -5,7 +5,6 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
 
 bones = {}
 
@@ -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)
diff --git a/mods/butterflies/init.lua b/mods/butterflies/init.lua
index b66a08a..4cbbdb4 100644
--- a/mods/butterflies/init.lua
+++ b/mods/butterflies/init.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 -- register butterflies
 local butter_list = {
 	{"white", S("White")},
diff --git a/mods/carts/cart_entity.lua b/mods/carts/cart_entity.lua
index a80c2a2..7cb3dae 100644
--- a/mods/carts/cart_entity.lua
+++ b/mods/carts/cart_entity.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 local cart_entity = {
 	initial_properties = {
diff --git a/mods/carts/rails.lua b/mods/carts/rails.lua
index 098d839..6fdb614 100644
--- a/mods/carts/rails.lua
+++ b/mods/carts/rails.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 carts:register_rail("carts:rail", {
 	description = S("Rail"),
 	tiles = {
diff --git a/mods/creative/init.lua b/mods/creative/init.lua
index 4cf9af8..f17d6d1 100644
--- a/mods/creative/init.lua
+++ b/mods/creative/init.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 creative = {}
 
diff --git a/mods/creative/inventory.lua b/mods/creative/inventory.lua
index ad7e81e..656183f 100644
--- a/mods/creative/inventory.lua
+++ b/mods/creative/inventory.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 local player_inventory = {}
 local inventory_cache = {}
diff --git a/mods/default/chests.lua b/mods/default/chests.lua
index a7a2f76..a4e092d 100644
--- a/mods/default/chests.lua
+++ b/mods/default/chests.lua
@@ -2,7 +2,7 @@ default.chest = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 function default.chest.get_chest_formspec(pos)
 	local spos = pos.x .. "," .. pos.y .. "," .. pos.z
 	local formspec =
@@ -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);
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index d2a1ee6..aa71606 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 minetest.register_craftitem("default:stick", {
 	description = S("Stick"),
 	inventory_image = "default_stick.png",
diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua
index 7a64190..d7aa3d7 100644
--- a/mods/default/furnace.lua
+++ b/mods/default/furnace.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 --
 -- Formspecs
@@ -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
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 7f010b0..90ee4c0 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 --[[ Node name convention:
 
@@ -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
 
diff --git a/mods/default/tools.lua b/mods/default/tools.lua
index 4b2c1ef..ae5df49 100644
--- a/mods/default/tools.lua
+++ b/mods/default/tools.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 -- The hand
 minetest.register_item(":", {
 	type = "none",
diff --git a/mods/default/torch.lua b/mods/default/torch.lua
index a0be162..59c73a3 100644
--- a/mods/default/torch.lua
+++ b/mods/default/torch.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 local function on_flood(pos, oldnode, newnode)
 	minetest.add_item(pos, ItemStack("default:torch 1"))
 	-- Play flame-extinguish sound if liquid is not an 'igniter'
diff --git a/mods/default/trees.lua b/mods/default/trees.lua
index 65b31e2..d46b24b 100644
--- a/mods/default/trees.lua
+++ b/mods/default/trees.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 local random = math.random
 
@@ -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
 
diff --git a/mods/doors/init.lua b/mods/doors/init.lua
index 3a0598f..80b549e 100644
--- a/mods/doors/init.lua
+++ b/mods/doors/init.lua
@@ -8,7 +8,7 @@ doors.registered_trapdoors = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 local function replace_old_owner_information(pos)
 	local meta = minetest.get_meta(pos)
diff --git a/mods/farming/hoes.lua b/mods/farming/hoes.lua
index b37d3fd..41e7cc0 100644
--- a/mods/farming/hoes.lua
+++ b/mods/farming/hoes.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 farming.register_hoe(":farming:hoe_wood", {
 	description = S("Wooden Hoe"),
 	inventory_image = "farming_tool_woodhoe.png",
diff --git a/mods/farming/init.lua b/mods/farming/init.lua
index 7108289..3548df5 100644
--- a/mods/farming/init.lua
+++ b/mods/farming/init.lua
@@ -15,7 +15,7 @@ dofile(farming.path .. "/hoes.lua")
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 -- WHEAT
 
diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua
index 37141e4..8886eda 100644
--- a/mods/farming/nodes.lua
+++ b/mods/farming/nodes.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 minetest.override_item("default:dirt", {
 	soil = {
diff --git a/mods/fire/init.lua b/mods/fire/init.lua
index 8fa4534..9d7c4d1 100644
--- a/mods/fire/init.lua
+++ b/mods/fire/init.lua
@@ -6,7 +6,7 @@ fire = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 -- 'Enable fire' setting
 
diff --git a/mods/fireflies/init.lua b/mods/fireflies/init.lua
index c655065..99f7d56 100644
--- a/mods/fireflies/init.lua
+++ b/mods/fireflies/init.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 minetest.register_node("fireflies:firefly", {
 	description = S("Firefly"),
diff --git a/mods/flowers/init.lua b/mods/flowers/init.lua
index 152dd5f..e15e166 100644
--- a/mods/flowers/init.lua
+++ b/mods/flowers/init.lua
@@ -10,7 +10,7 @@ flowers = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 -- Map Generation
 
diff --git a/mods/game_commands/init.lua b/mods/game_commands/init.lua
index 1510c05..ea41c1e 100644
--- a/mods/game_commands/init.lua
+++ b/mods/game_commands/init.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 minetest.register_chatcommand("killme", {
 	description = S("Kill yourself to respawn"),
diff --git a/mods/map/init.lua b/mods/map/init.lua
index cd06a9c..5439e47 100644
--- a/mods/map/init.lua
+++ b/mods/map/init.lua
@@ -7,7 +7,7 @@ map = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 -- Cache creative mode setting
 
diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua
index 0ee52a2..74b1ad2 100644
--- a/mods/screwdriver/init.lua
+++ b/mods/screwdriver/init.lua
@@ -4,7 +4,7 @@ screwdriver = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 screwdriver.ROTATE_FACE = 1
 screwdriver.ROTATE_AXIS = 2
diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index 43b6999..9e84440 100644
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -10,7 +10,7 @@ stairs = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 -- Register aliases for new pine node names
 
diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua
index c98fc67..8dd0dc3 100644
--- a/mods/tnt/init.lua
+++ b/mods/tnt/init.lua
@@ -4,7 +4,7 @@ tnt = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 -- Default to enabled when in singleplayer
 local enable_tnt = minetest.settings:get_bool("enable_tnt")
diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua
index be0a2d9..c339fd2 100644
--- a/mods/vessels/init.lua
+++ b/mods/vessels/init.lua
@@ -5,7 +5,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 local vessels_shelf_formspec =
 	"size[8,7;]" ..
diff --git a/mods/walls/init.lua b/mods/walls/init.lua
index 61084b5..d5c1b1b 100644
--- a/mods/walls/init.lua
+++ b/mods/walls/init.lua
@@ -4,7 +4,7 @@ walls = {}
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 walls.register = function(wall_name, wall_desc, wall_texture_table, wall_mat, wall_sounds)
 	--make wall_texture_table paramenter backwards compatible for mods passing single texture
diff --git a/mods/wool/init.lua b/mods/wool/init.lua
index fbdd87e..3c3c371 100644
--- a/mods/wool/init.lua
+++ b/mods/wool/init.lua
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 local dyes = dye.dyes
+=======
+>>>>>>> ref luacheck whitespace warnings
 
 for i = 1, #dyes do
 	local name, desc = unpack(dyes[i])
diff --git a/mods/xpanes/init.lua b/mods/xpanes/init.lua
index dd37aae..64098ac 100644
--- a/mods/xpanes/init.lua
+++ b/mods/xpanes/init.lua
@@ -2,7 +2,7 @@
 
 -- Load support for MT game translation.
 local S = minetest.get_translator()
- 
+
 
 local function is_pane(pos)
 	return minetest.get_item_group(minetest.get_node(pos).name, "pane") > 0