Merge branch 'master' into nalc-1.2

init.lua

@@ -1,42 +1,29 @@
---[[
-=====================================================================
-** Map Tools **
-By Calinou.
-
-Copyright (c) 2012-2015 Calinou and contributors.
-Licensed under the zlib license. See LICENSE.md for more information.
-=====================================================================
---]]
-
-maptools = {}
-
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
-maptools.intllib = S
-
-local modpath = minetest.get_modpath("maptools")
-
-maptools.drop_msg = function(itemstack, player)
-	local name = player:get_player_name()
-	minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!"))
-end
-
-dofile(modpath .. "/config.lua")
-dofile(modpath .. "/aliases.lua")
-dofile(modpath .. "/craftitems.lua")
-dofile(modpath .. "/default_nodes.lua")
-dofile(modpath .. "/nodes.lua")
-dofile(modpath .. "/tools.lua")
-
---[[
-Map Tools by Calinou
-Licensed under the zlib license for code and CC BY-SA 3.0 for textures, see LICENSE.txt for info.
---]]
-
-if minetest.setting_getbool("log_mods") then
-	minetest.log("action", S("[maptools] loaded."))
-end
+--[[
+=====================================================================
+** Map Tools **
+By Calinou.
+
+Copyright © 2012-2019 Hugo Locurcio and contributors.
+Licensed under the zlib license. See LICENSE.md for more information.
+=====================================================================
+--]]
+
+maptools = {}
+
+local modpath = minetest.get_modpath("maptools")
+
+local S, NS = dofile(modpath .. "/intllib.lua")
+maptools.S = S
+maptools.NS = NS
+
+dofile(modpath .. "/config.lua")
+dofile(modpath .. "/aliases.lua")
+dofile(modpath .. "/craftitems.lua")
+dofile(modpath .. "/default_nodes.lua")
+dofile(modpath .. "/nodes.lua")
+dofile(modpath .. "/tools.lua")
+
+maptools.drop_msg = function(itemstack, player)
+	local name = player:get_player_name()
+	minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!"))
+end