Merge remote-tracking branch 'upstream/master'

This avoids warnings shown by Minetest and improves the nodes' look when a bilinear filter is enabled.
Since the textures are also used as inventory images, I didn't remove the transparency from the texture files.

moremesecons_adjustable_blinkyplant/init.lua

@@ -64,3 +64,5 @@ minetest.register_craft({
 	recipe = {	{"mesecons_blinkyplant:blinky_plant_off"},
 			{"default:mese_crystal_fragment"},}
 })
+
+minetest.log("action", "[moremesecons_adjustable_blinky_plant] loaded.")

moremesecons_adjustable_blinkyplant/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_adjustable_blinkyplant
-depends = mesecons,moremesecons_utils,default
+depends = mesecons,moremesecons_utils
 optional_depends = craft_guide

moremesecons_adjustable_player_detector/init.lua

@@ -2,8 +2,6 @@
 -- Detects players in a certain radius
 -- The radius can be changes by right-click (by default 6)
 
-local MAX_RADIUS = moremesecons.setting("adjustable_player_detector", "max_radius", 16, 0)
-
 local function make_formspec(meta)
 	meta:set_string("formspec", "size[9,5]" ..
 		"field[0.3,  0;9,2;scanname;Comma-separated list of the names of players to scan for (empty for any):;${scanname}]"..
@@ -38,7 +36,7 @@ local object_detector_scan = function (pos)
 	local scanname = meta:get_string("scanname")
 	local scan_all = scanname == ""
 	local scan_names = scanname:split(',')
-	local radius = math.min(meta:get_int("radius"), MAX_RADIUS)
+	local radius = meta:get_int("radius")
 	if radius <= 0 then
 		radius = 6
 	end
@@ -78,11 +76,11 @@ local object_detector_digiline = {
 						make_formspec(meta)
 					end
 				end
-				if type(msg.scanname) == "string" then
+				if msg.scanname then
 					meta:set_string("scanname", msg.scanname)
 					make_formspec(meta)
 				end
-				if msg.command == "get" then
+				if msg.command and msg.command == "get" then
 					local found, name = object_detector_scan(pos)
 					if not found then
 						name = ""
@@ -158,3 +156,5 @@ minetest.register_abm({
 		end
 	end,
 })
+
+minetest.log("action", "[moremesecons_adjustable_player_detector] loaded.")

moremesecons_adjustable_player_detector/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_adjustable_player_detector
-depends = mesecons,moremesecons_utils,default
+depends = mesecons
 optional_depends = craft_guide

moremesecons_commandblock/init.lua

@@ -5,7 +5,7 @@ local function initialize_data(meta)
 
 	local commands = meta:get_string("commands")
 	meta:set_string("formspec",
-		"size[9,5]" ..
+		"invsize[9,5;]" ..
 		"textarea[0.5,0.5;8.5,4;commands;Commands;"..minetest.formspec_escape(commands).."]" ..
 		"label[1,3.8;@nearest is replaced by the nearest player name ("..tostring(NEAREST_MAX_DISTANCE).." nodes max for the nearest distance)".."]" ..
 		"button_exit[3.3,4.5;2,1;submit;Submit]")
@@ -178,3 +178,5 @@ minetest.register_craft({
 		{"group:mesecon_conductor_craftable","default:mese_crystal","group:mesecon_conductor_craftable"}
 	}
 })
+
+minetest.log("action", "[moremesecons_commandblock] loaded.")

moremesecons_commandblock/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_commandblock
-depends = mesecons,moremesecons_utils,default
+depends = mesecons,moremesecons_utils
 optional_depends = craft_guide

moremesecons_conductor_signalchanger/init.lua

@@ -79,3 +79,5 @@ minetest.register_craft({
 	output = "moremesecons_conductor_signalchanger:conductor_signalchanger_off",
 	recipe = {{"group:mesecon_conductor_craftable","moremesecons_signalchanger:signalchanger_off"}}
 })
+
+minetest.log("action", "[moremesecons_conductor_signalchanger] loaded.")

moremesecons_dual_delayer/init.lua

@@ -98,3 +98,5 @@ minetest.register_craft({
 	output = "moremesecons_dual_delayer:dual_delayer_00 2",
 	recipe = {"mesecons_delayer:delayer_off_1", "mesecons_delayer:delayer_off_1"}
 })
+
+minetest.log("action", "[moremesecons_dual_delayer] loaded.")

moremesecons_entity_detector/init.lua

@@ -2,8 +2,6 @@
 -- Detects entitys in a certain radius
 -- The radius can be changes by right-click (by default 6)
 
-local MAX_RADIUS = moremesecons.setting("entity_detector", "max_radius", 16, 0)
-
 local function make_formspec(meta)
 	meta:set_string("formspec", "size[9,5]" ..
 		"field[0.3,  0;9,2;scanname;Comma-separated list of the names (itemstring) of entities to scan for (empty for any):;${scanname}]"..
@@ -28,7 +26,8 @@ local function object_detector_on_receive_fields(pos, _, fields, player)
 	meta:set_string("digiline_channel", fields.digiline_channel)
 	local r = tonumber(fields.radius)
 	if r then
-		meta:set_int("radius", math.min(r, MAX_RADIUS))
+		local max_radius = moremesecons.setting("entity_detector", "max_radius", 16, 0)
+		meta:set_int("radius", math.min(r, max_radius))
 	end
 end
 
@@ -38,7 +37,8 @@ local object_detector_scan = function (pos)
 	local scanname = meta:get_string("scanname")
 	local scan_all = scanname == ""
 	local scan_names = scanname:split(',')
-	local radius = math.min(tonumber(meta:get("radius")) or 6, MAX_RADIUS)
+	local max_radius = moremesecons.setting("entity_detector", "max_radius", 16, 0)
+	local radius = math.min(tonumber(meta:get("radius")) or 6, max_radius)
 	for _,obj in pairs(minetest.get_objects_inside_radius(pos, radius)) do
 		local luaentity = obj:get_luaentity()
 		if luaentity then
@@ -62,7 +62,7 @@ local object_detector_digiline = {
 		action = function (pos, node, channel, msg)
 			local meta = minetest.get_meta(pos)
 			local active_channel = meta:get_string("digiline_channel")
-			if channel ~= active_channel or type(msg) ~= "string" then
+			if channel ~= active_channel then
 				return
 			end
 			meta:set_string("scanname", msg)
@@ -136,3 +136,5 @@ minetest.register_abm({
 		end
 	end,
 })
+
+minetest.log("action", "[moremesecons_entity_detector] loaded.")

moremesecons_entity_detector/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_entity_detector
-depends = mesecons,moremesecons_utils,default
+depends = mesecons
 optional_depends = craft_guide

moremesecons_igniter/init.lua

@@ -46,3 +46,5 @@ minetest.register_craft({
 	recipe = {	{"default:torch"},
 			{"default:mese_crystal_fragment"},}
 })
+
+minetest.log("action", "[moremesecons_igniter] loaded.")

moremesecons_induction_transmitter/init.lua

@@ -98,3 +98,5 @@ minetest.register_craft({
 		{"", "default:mese_crystal_fragment", ""}
 	}
 })
+
+minetest.log("action", "[moremesecons_induction_transmitter] loaded.")

moremesecons_injector_controller/init.lua

@@ -82,3 +82,5 @@ minetest.register_craft({
 	output = "moremesecons_injector_controller:injector_controller_off",
 	recipe = {{"mesecons_blinkyplant:blinky_plant_off","mesecons_gates:and_off"}}
 })
+
+minetest.log("action", "[moremesecons_injector_controller] loaded.")

moremesecons_jammer/init.lua

@@ -131,3 +131,5 @@ if moremesecons.setting("jammer", "enable_lbm", false) then
 		action = add_jammer
 	})
 end
+
+minetest.log("action", "[moremesecons_jammer] loaded.")

moremesecons_luablock/init.lua

@@ -158,3 +158,5 @@ minetest.register_node("moremesecons_luablock:luablock", {
 		end
 	}}
 })
+
+minetest.log("action", "[moremesecons_luablock] loaded.")

moremesecons_luacontroller_tool/init.lua

@@ -355,3 +355,5 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		return
 	end
 end)
+
+minetest.log("action", "[moremesecons_luacontroller_tool] loaded.")

moremesecons_mesechest/init.lua

@@ -118,3 +118,5 @@ minetest.register_alias("default:mesechest", "moremesecons_mesechest:mesechest")
 minetest.register_alias("mesechest", "moremesecons_mesechest:mesechest")
 minetest.register_alias("default:mesechest_locked", "moremesecons_mesechest:mesechest")
 minetest.register_alias("mesechest_locked", "moremesecons_mesechest:mesechest_locked")
+
+minetest.log("action", "[moremesecons_mesechest] loaded.")

moremesecons_playerkiller/init.lua

@@ -60,3 +60,5 @@ minetest.register_node("moremesecons_playerkiller:playerkiller", {
 	end,
 	sounds = default.node_sound_stone_defaults(),
 })
+
+minetest.log("action", "[moremesecons_playerkiller] loaded.")

moremesecons_playerkiller/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_playerkiller
-depends = mesecons,mesecons_materials,moremesecons_utils,default
+depends = mesecons,mesecons_materials,moremesecons_utils
 optional_depends = craft_guide

moremesecons_sayer/init.lua

@@ -121,3 +121,5 @@ minetest.register_craft({
 	recipe = {{"mesecons_luacontroller:luacontroller0000", "mesecons_noteblock:noteblock"},
 		{"group:wood", "group:wood"}}
 })
+
+minetest.log("action", "[moremesecons_sayer] loaded.")

moremesecons_signalchanger/init.lua

@@ -79,3 +79,5 @@ minetest.register_craft({
 	output = "moremesecons_signalchanger:signalchanger_off",
 	recipe = {{"group:mesecon_conductor_craftable","moremesecons_switchtorch:switchtorch_off","group:mesecon_conductor_craftable"}}
 })
+
+minetest.log("action", "[moremesecons_signalchanger] loaded.")

moremesecons_switchtorch/init.lua

@@ -127,3 +127,5 @@ minetest.register_abm({
 -- 2 = x+1
 -- 0 = y+1
 -- 1 = y-1
+
+minetest.log("action", "[moremesecons_switchtorch] loaded.")

moremesecons_teleporter/init.lua

@@ -106,3 +106,5 @@ if moremesecons.setting("teleporter", "enable_lbm", false) then
 		action = register
 	})
 end
+
+minetest.log("action", "[moremesecons_teleporter] loaded.")

moremesecons_teleporter/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_teleporter
-depends = mesecons,moremesecons_utils,default
+depends = mesecons,moremesecons_utils
 optional_depends = craft_guide

moremesecons_timegate/init.lua

@@ -134,3 +134,5 @@ minetest.register_craft({
 
 minetest.register_alias("moremesecons_temporarygate:temporarygate_off", "moremesecons_timegate:timegate_off")
 minetest.register_alias("moremesecons_temporarygate:temporarygate_on", "moremesecons_timegate:timegate_on")
+
+minetest.log("action", "[moremesecons_timegate] loaded.")

moremesecons_timegate/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_timegate
-depends = mesecons,default
+depends = mesecons
 optional_depends = craft_guide

moremesecons_utils/init.lua

@@ -379,3 +379,4 @@ local function do_test()
 end
 do_test()
 --]]
+minetest.log("action", "[moremesecons_utils] loaded.")

moremesecons_wireless/init.lua

@@ -498,3 +498,5 @@ if storage:get_string("wireless_meta_2") == "" then
 	end
 	minetest.log("action", "[moremesecons_wireless] Done!")
 end
+
+minetest.log("action", "[moremesecons_wireless] loaded.")

moremesecons_wireless/mod.conf

@@ -1,3 +1,3 @@
 name = moremesecons_wireless
-depends = mesecons,moremesecons_utils,default
+depends = mesecons,moremesecons_utils
 optional_depends = digilines,craft_guide

settingtypes.txt

@@ -3,10 +3,6 @@
 # Minimal interval authorized. Any lower will be set to it.
 moremesecons_adjustable_blinky_plant.min_interval (Minimum Interval) float 0.5
 
-[Adjustable Player Detector]
-
-moremesecons_adjustable_player_detector.max_radius (Maximum adjustable player detector radius) float 16 0
-
 [Craftable Commandblock]
 
 # Space-separated list of authorized commands