Merge branch 'master' of http://github.com/Ombridride/minetest-minetestforfun-server

mods/WorldEdit/worldedit_commands/init.lua

@@ -819,6 +819,8 @@ minetest.register_chatcommand("/hide", {
 	end),
 })
 
+local check_set -- Actual garbage for an unknown global variable
+
 minetest.register_chatcommand("/suppress", {
 	params = "<node>",
 	description = "Suppress all <node> in the current WorldEdit region non-destructively",

mods/homedecor_modpack/building_blocks/depends.txt

@@ -1,2 +1,2 @@
-default
+default
 moreblocks?

mods/homedecor_modpack/computer/depends.txt

@@ -1 +1,3 @@
 default
+intllib?
+

mods/homedecor_modpack/computer/miscitems.lua

@@ -5,12 +5,11 @@
 -- This file defines some items in order to not have to depend on other mods.
 
 -- Boilerplate to support localized strings if intllib mod is installed.
-local S;
-if (minetest.get_modpath("intllib")) then
-    dofile(minetest.get_modpath("intllib").."/intllib.lua");
-    S = intllib.Getter(minetest.get_current_modname());
+local S
+if minetest.get_modpath("intllib") then
+	S = intllib.Getter()
 else
-    S = function ( s ) return s; end
+	S = function(s) return s end
 end
 
 if (not minetest.get_modpath("homedecor")) then