Never postpone action_on or action_off

There is no more need for that since VoxelManip caching makes sure we
always get an answer to get_node_force.

COPYING.txt

@@ -0,0 +1,30 @@
+The Mesecons Mod for Minetest is
+	Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+See the version control system log for information about other authors.
+
+License of source code
+----------------------
+Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+This program is free software; you can redistribute the Mesecons Mod and/or
+modify it under the terms of the GNU Lesser General Public License version 3
+published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+
+License of media (textures, sounds and documentation)
+-----------------------------------------------------
+Copyright (C) 2011-2016 Mesecons Mod Developer Team and contributors
+
+All textures, sounds and documentation files are licensed under the
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+http://creativecommons.org/licenses/by-sa/3.0/

README.md

@@ -22,7 +22,7 @@ OK, I want in.
 --------------
 Go get it!
 
-[DOWNLOADS PAGE](http://mesecons.net/downloads.php)
+[DOWNLOAD IT NOW](https://github.com/Jeija/minetest-mod-mesecons/archive/master.zip)
 
 Now go ahead and install it like any other Minetest mod. Don't know how? Check out [the wonderful page about it](http://wiki.minetest.com/wiki/Mods) over at the Minetest Wiki. For your convenience, here's a quick summary:
 
@@ -39,7 +39,7 @@ How do I use this thing?
 ------------------------
 How about a [quick overview video](https://www.youtube.com/watch?v=6kmeQj6iW5k)?
 
-Or maybe a [comprehensive reference](http://mesecons.net/items.php) is your style?
+Or maybe a [comprehensive reference](http://mesecons.net/items.html) is your style?
 
 An overview for the very newest of new beginners? How does [this one](http://uberi.mesecons.net/projects/MeseconsBasics/index.html) look?
 
@@ -53,6 +53,7 @@ These awesome people made Mesecons possible!
 
 | Contributor     | Contribution                     |
 | --------------- | -------------------------------- |
+| Hawk777         | Code for VoxelManip caching      |
 | Jat15           | Various tweaks.                  |
 | Jeija           | **Main developer! Everything.**  |
 | Jordach         | Noteblock sounds.                |

documentation.json

@@ -0,0 +1,62 @@
+{
+	"Conductors" : {
+		"Mesecon" : "mesecons_wires/doc/mesecon",
+		"Insulated Wire" : "mesecons_insulated/doc/insulated",
+		"T-Junction" : "mesecons_extrawires/doc/tjunction",
+		"Crossing" : "mesecons_extrawires/doc/crossing",
+		"Corner" : "mesecons_extrawires/doc/corner",
+		"Vertical Wire" : "mesecons_extrawires/doc/vertical",
+		"Mese" : "mesecons_extrawires/doc/mese"
+	},
+	"Receptors" : {
+		"Power Plant" : "mesecons_powerplant/doc/powerplant",
+		"Blinky Plant" : "mesecons_blinkyplant/doc/blinkyplant",
+		"Switch" : "mesecons_switch/doc/switch",
+		"Object Detector" : "mesecons_detector/doc/objectdetector",
+		"Node Detector" : "mesecons_detector/doc/nodedetector",
+		"Wall Lever" : "mesecons_walllever/doc/walllever",
+		"Pressure Plate" : "mesecons_pressureplates/doc/pressureplate_wood",
+		"Pressure Plate" : "mesecons_pressureplates/doc/pressureplate_stone",
+		"Water Turbine" : "mesecons_hydroturbine/doc/waterturbine",
+		"Solar Panel" : "mesecons_solarpanel/doc/solarpanel",
+		"Wall Button" : "mesecons_button/doc/button"
+	},
+	"Effectors" : {
+		"Noteblock" : "mesecons_noteblock/doc/noteblock",
+		"Lamp" : "mesecons_lamp/doc/lamp",
+		"Piston" : "mesecons_pistons/doc/piston",
+		"Sticky Piston" : "mesecons_pistons/doc/piston_sticky",
+		"Movestone" : "mesecons_movestones/doc/movestone",
+		"Sticky Movestone" : "mesecons_movestones/doc/movestone_sticky",
+		"Removestone" : "mesecons_random/doc/removestone",
+		"Ghoststone" : "mesecons_random/doc/ghoststone",
+		"Command Block" : "mesecons_commandblock/doc/commandblock",
+		"Lightstones" : {
+			"Dark Grey" : "mesecons_lightstone/doc/lightstone_darkgrey",
+			"Light Grey" : "mesecons_lightstone/doc/lightstone_lightgrey",
+			"Green" : "mesecons_lightstone/doc/lightstone_green",
+			"Red" : "mesecons_lightstone/doc/lightstone_red",
+			"Blue" : "mesecons_lightstone/doc/lightstone_blue",
+			"Yellow" : "mesecons_lightstone/doc/lightstone_yellow"
+		}
+	},
+	"Logic" : {
+		"Luacontroller" : "mesecons_luacontroller/doc/luacontroller",
+		"Torch" : "mesecons_torch/doc/torch",
+		"Delayer" : "mesecons_delayer/doc/delayer",
+		"Gates" : {
+			"Diode" : "mesecons_gates/doc/diode",
+			"NOT Gate" : "mesecons_gates/doc/not",
+			"AND Gate" : "mesecons_gates/doc/and",
+			"NAND Gate" : "mesecons_gates/doc/nand",
+			"OR Gate" : "mesecons_gates/doc/or",
+			"NOR Gate" : "mesecons_gates/doc/nor",
+			"XOR Gate" : "mesecons_gates/doc/xor"
+		}
+	},
+	"Crafts" : {
+		"Silicon" : "mesecons_materials/doc/silicon",
+		"Glue" : "mesecons_materials/doc/glue",
+		"Fiber" : "mesecons_materials/doc/fiber"
+	}
+}

mesecons/VERSION

@@ -1 +0,0 @@
-0.41 DEV

mesecons/actionqueue.lua

@@ -23,7 +23,7 @@ function mesecon.queue:add_action(pos, func, params, time, overwritecheck, prior
 	-- Otherwise, add the action to the queue
 	if overwritecheck then -- check if old action has to be overwritten / removed:
 		for i, ac in ipairs(mesecon.queue.actions) do
-			if(mesecon.cmpPos(pos, ac.pos)
+			if(vector.equals(pos, ac.pos)
 			and mesecon.cmpAny(overwritecheck, ac.owcheck)) then
 				toremove = i
 				break
@@ -87,32 +87,19 @@ minetest.register_globalstep(function (dtime)
 end)
 
 function mesecon.queue:execute(action)
+	-- ignore if action queue function name doesn't exist,
+	-- (e.g. in case the action queue savegame was written by an old mesecons version)
+	if mesecon.queue.funcs[action.func] then
 		mesecon.queue.funcs[action.func](action.pos, unpack(action.params))
 	end
+end
 
 
 -- Store and read the ActionQueue to / from a file
 -- so that upcoming actions are remembered when the game
 -- is restarted
-
-local wpath = minetest.get_worldpath()
-local function file2table(filename)
-	local f = io.open(filename, "r")
-	if f==nil then return {} end
-	local t = f:read("*all")
-	f:close()
-	if t=="" or t==nil then return {} end
-	return minetest.deserialize(t)
-end
-
-local function table2file(filename, table)
-	local f = io.open(filename, "w")
-	f:write(minetest.serialize(table))
-	f:close()
-end
-
-mesecon.queue.actions = file2table(wpath.."/mesecon_actionqueue")
+mesecon.queue.actions = mesecon.file2table("mesecon_actionqueue")
 
 minetest.register_on_shutdown(function()
-	mesecon.queue.actions = table2file(wpath.."/mesecon_actionqueue", mesecon.queue.actions)
+	mesecon.table2file("mesecon_actionqueue", mesecon.queue.actions)
 end)

mesecons/init.lua

@@ -3,7 +3,7 @@
 -- |  \/  | |___ ____  |___ |      |    | | \  | |____
 -- |      | |        | |    |      |    | |  \ |     |
 -- |      | |___ ____| |___ |____  |____| |   \| ____|
--- by Jeija, Uberi (Temperest), sfan5, VanessaE
+-- by Jeija, Uberi (Temperest), sfan5, VanessaE, Hawk777 and contributors
 --
 --
 --
@@ -11,7 +11,7 @@
 -- See the documentation on the forum for additional information, especially about crafting
 --
 --
--- For developer documentation see the Developers' section on mesecons.TK
+-- For basic development resources, see http://mesecons.net/developers.html
 --
 --
 --
@@ -70,26 +70,20 @@ dofile(minetest.get_modpath("mesecons").."/internal.lua");
 -- these are the only functions you need to remember
 
 mesecon.queue:add_function("receptor_on", function (pos, rules)
+	mesecon.vm_begin()
+
 	rules = rules or mesecon.rules.default
 
-	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
+	-- Call turnon on all linking positions
 	for _, rule in ipairs(mesecon.flattenrules(rules)) do
-		local np = mesecon.addPosRule(pos, rule)
-		-- if area is not loaded, keep trying
-		if minetest.get_node_or_nil(np) == nil then
-			mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
-			return
-		end
-	end
-
-	-- execute action
-	for _, rule in ipairs(mesecon.flattenrules(rules)) do
-		local np = mesecon.addPosRule(pos, rule)
+		local np = vector.add(pos, rule)
 		local rulenames = mesecon.rules_link_rule_all(pos, rule)
 		for _, rulename in ipairs(rulenames) do
 			mesecon.turnon(np, rulename)
 		end
 	end
+
+	mesecon.vm_commit()
 end)
 
 function mesecon.receptor_on(pos, rules)
@@ -99,23 +93,21 @@ end
 mesecon.queue:add_function("receptor_off", function (pos, rules)
 	rules = rules or mesecon.rules.default
 
-	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
+	-- Call turnoff on all linking positions
 	for _, rule in ipairs(mesecon.flattenrules(rules)) do
-		local np = mesecon.addPosRule(pos, rule)
-		if minetest.get_node_or_nil(np) == nil then
-			mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
-			return
-		end
-	end
-
-	for _, rule in ipairs(mesecon.flattenrules(rules)) do
-		local np = mesecon.addPosRule(pos, rule)
+		local np = vector.add(pos, rule)
 		local rulenames = mesecon.rules_link_rule_all(pos, rule)
 		for _, rulename in ipairs(rulenames) do
-			if not mesecon.connected_to_receptor(np, mesecon.invertRule(rule)) then
-				mesecon.turnoff(np, rulename)
-			else
+			mesecon.vm_begin()
 			mesecon.changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
+
+			-- Turnoff returns true if turnoff process was successful, no onstate receptor
+			-- was found along the way. Commit changes that were made in voxelmanip. If turnoff
+			-- returns true, an onstate receptor was found, abort voxelmanip transaction.
+			if (mesecon.turnoff(np, rulename)) then
+				mesecon.vm_commit()
+			else
+				mesecon.vm_abort()
 			end
 		end
 	end
@@ -132,8 +124,5 @@ print("[OK] Mesecons")
 -- To be removed in future releases
 dofile(minetest.get_modpath("mesecons").."/legacy.lua");
 
---The actual wires
-dofile(minetest.get_modpath("mesecons").."/wires.lua");
-
 --Services like turnoff receptor on dignode and so on
 dofile(minetest.get_modpath("mesecons").."/services.lua");

mesecons/internal.lua

@@ -37,11 +37,6 @@
 -- HIGH-LEVEL Internals
 -- mesecon.is_power_on(pos)				--> Returns true if pos emits power in any way
 -- mesecon.is_power_off(pos)				--> Returns true if pos does not emit power in any way
--- mesecon.turnon(pos, link) 				--> link is the input rule that caused calling turnon, turns on every connected node, iterative
--- mesecon.turnoff(pos, link)				--> link is the input rule that caused calling turnoff, turns off every connected node, iterative
--- mesecon.connected_to_receptor(pos, link)		--> Returns true if pos is connected to a receptor directly or via conductors, iterative
--- mesecon.rules_link(output, input, dug_outputrules)	--> Returns true if outputposition + outputrules = inputposition and inputposition + inputrules = outputposition (if the two positions connect)
--- mesecon.rules_link_anydir(outp., inp., d_outpr.)	--> Same as rules mesecon.rules_link but also returns true if output and input are swapped
 -- mesecon.is_powered(pos)				--> Returns true if pos is powered by a receptor or a conductor
 
 -- RULES ROTATION helpers
@@ -77,6 +72,8 @@ function mesecon.get_conductor(nodename)
 end
 
 function mesecon.get_any_outputrules(node)
+	if not node then return nil end
+
 	if mesecon.is_conductor(node.name) then
 		return mesecon.conductor_get_rules(node)
 	elseif mesecon.is_receptor(node.name) then
@@ -85,6 +82,8 @@ function mesecon.get_any_outputrules (node)
 end
 
 function mesecon.get_any_inputrules(node)
+	if not node then return nil end
+
 	if mesecon.is_conductor(node.name) then
 		return mesecon.conductor_get_rules(node)
 	elseif mesecon.is_effector(node.name) then
@@ -182,7 +181,9 @@ end
 
 -- Activation:
 mesecon.queue:add_function("activate", function (pos, rulename)
-	local node = minetest.get_node(pos)
+	local node = mesecon.get_node_force(pos)
+	if not node then return end
+
 	local effector = mesecon.get_effector(node.name)
 
 	if effector and effector.action_on then
@@ -203,7 +204,9 @@ end
 
 -- Deactivation
 mesecon.queue:add_function("deactivate", function (pos, rulename)
-	local node = minetest.get_node(pos)
+	local node = mesecon.get_node_force(pos)
+	if not node then return end
+
 	local effector = mesecon.get_effector(node.name)
 
 	if effector and effector.action_off then
@@ -224,7 +227,9 @@ end
 
 -- Change
 mesecon.queue:add_function("change", function (pos, rulename, changetype)
-	local node = minetest.get_node(pos)
+	local node = mesecon.get_node_force(pos)
+	if not node then return end
+
 	local effector = mesecon.get_effector(node.name)
 
 	if effector and effector.action_change then
@@ -249,6 +254,8 @@ end
 -- Conductors
 
 function mesecon.is_conductor_on(node, rulename)
+	if not node then return false end
+
 	local conductor = mesecon.get_conductor(node.name)
 	if conductor then
 		if conductor.state then
@@ -263,10 +270,13 @@ function mesecon.is_conductor_on(node, rulename)
 			return mesecon.get_bit(binstate, bit)
 		end
 	end
+
 	return false
 end
 
 function mesecon.is_conductor_off(node, rulename)
+	if not node then return false end
+
 	local conductor = mesecon.get_conductor(node.name)
 	if conductor then
 		if conductor.state then
@@ -281,6 +291,7 @@ function mesecon.is_conductor_off(node, rulename)
 			return not mesecon.get_bit(binstate, bit)
 		end
 	end
+
 	return false
 end
 
@@ -340,53 +351,47 @@ end
 -- some more general high-level stuff
 
 function mesecon.is_power_on(pos, rulename)
-	local node = minetest.get_node(pos)
-	if mesecon.is_conductor_on(node, rulename) or mesecon.is_receptor_on(node.name) then
+	local node = mesecon.get_node_force(pos)
+	if node and (mesecon.is_conductor_on(node, rulename) or mesecon.is_receptor_on(node.name)) then
 		return true
 	end
 	return false
 end
 
 function mesecon.is_power_off(pos, rulename)
-	local node = minetest.get_node(pos)
-	if mesecon.is_conductor_off(node, rulename) or mesecon.is_receptor_off(node.name) then
+	local node = mesecon.get_node_force(pos)
+	if node and (mesecon.is_conductor_off(node, rulename) or mesecon.is_receptor_off(node.name)) then
 		return true
 	end
 	return false
 end
 
+-- Turn off an equipotential section starting at `pos`, which outputs in the direction of `link`.
+-- Breadth-first search. Map is abstracted away in a voxelmanip.
+-- Follow all all conductor paths replacing conductors that were already
+-- looked at, activating / changing all effectors along the way.
 function mesecon.turnon(pos, link)
 	local frontiers = {{pos = pos, link = link}}
 
 	local depth = 1
-	while frontiers[depth] do
-		local f = frontiers[depth]
-		local node = minetest.get_node_or_nil(f.pos)
+	while frontiers[1] do
+		local f = table.remove(frontiers, 1)
+		local node = mesecon.get_node_force(f.pos)
 
-		-- area not loaded, postpone action
 		if not node then
-			mesecon.queue:add_action(f.pos, "turnon", {link}, nil, true)
+			-- Area does not exist; do nothing
 		elseif mesecon.is_conductor_off(node, f.link) then
 			local rules = mesecon.conductor_get_rules(node)
 
-			minetest.swap_node(f.pos, {name = mesecon.get_conductor_on(node, f.link),
-				param2 = node.param2})
-
-			-- call turnon on neighbors: normal rules
+			-- Call turnon on neighbors
 			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
-				local np = mesecon.addPosRule(f.pos, r)
-
-				-- area not loaded, postpone action
-				if not minetest.get_node_or_nil(np) then
-					mesecon.queue:add_action(np, "turnon", {rulename},
-						nil, true)
-				else
-					local links = mesecon.rules_link_rule_all(f.pos, r)
-					for _, l in ipairs(links) do
+				local np = vector.add(f.pos, r)
+				for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
 					table.insert(frontiers, {pos = np, link = l})
 				end
 			end
-			end
+
+			mesecon.swap_node_force(f.pos, mesecon.get_conductor_on(node, f.link))
 		elseif mesecon.is_effector(node.name) then
 			mesecon.changesignal(f.pos, node, f.link, mesecon.state.on, depth)
 			if mesecon.is_effector_off(node.name) then
@@ -397,137 +402,80 @@ function mesecon.turnon(pos, link)
 	end
 end
 
-mesecon.queue:add_function("turnon", function (pos, rulename, recdepth)
-	mesecon.turnon(pos, rulename, recdepth)
-end)
-
+-- Turn on an equipotential section starting at `pos`, which outputs in the direction of `link`.
+-- Breadth-first search. Map is abstracted away in a voxelmanip.
+-- Follow all all conductor paths replacing conductors that were already
+-- looked at, deactivating / changing all effectors along the way.
+-- In case an onstate receptor is discovered, abort the process by returning false, which will
+-- cause `receptor_off` to discard all changes made in the voxelmanip.
+-- Contrary to turnon, turnoff has to cache all change and deactivate signals so that they will only
+-- be called in the very end when we can be sure that no conductor was found along the path.
+--
+-- Signal table entry structure:
+-- {
+--	pos = position of effector,
+--	node = node descriptor (name, param1 and param2),
+--	link = link the effector is connected to,
+--	depth = indicates order in which signals wire fired, higher is later
+-- }
 function mesecon.turnoff(pos, link)
 	local frontiers = {{pos = pos, link = link}}
+	local signals = {}
 
 	local depth = 1
-	while frontiers[depth] do
-		local f = frontiers[depth]
-		local node = minetest.get_node_or_nil(f.pos)
+	while frontiers[1] do
+		local f = table.remove(frontiers, 1)
+		local node = mesecon.get_node_force(f.pos)
 
-		-- area not loaded, postpone action
 		if not node then
-			mesecon.queue:add_action(f.pos, "turnoff", {link}, nil, true)
+			-- Area does not exist; do nothing
 		elseif mesecon.is_conductor_on(node, f.link) then
 			local rules = mesecon.conductor_get_rules(node)
-
-			minetest.swap_node(f.pos, {name = mesecon.get_conductor_off(node, f.link),
-				param2 = node.param2})
-
-			-- call turnoff on neighbors: normal rules
 			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
-				local np = mesecon.addPosRule(f.pos, r)
+				local np = vector.add(f.pos, r)
 
-				-- area not loaded, postpone action
-				if not minetest.get_node_or_nil(np) then
-					mesecon.queue:add_action(np, "turnoff", {rulename},
-						nil, true)
-				else
-					local links = mesecon.rules_link_rule_all(f.pos, r)
-					for _, l in ipairs(links) do
+				-- Check if an onstate receptor is connected. If that is the case,
+				-- abort this turnoff process by returning false. `receptor_off` will
+				-- discard all the changes that we made in the voxelmanip:
+				for _, l in ipairs(mesecon.rules_link_rule_all_inverted(f.pos, r)) do
+					if mesecon.is_receptor_on(mesecon.get_node_force(np).name) then
+						return false
+					end
+				end
+
+				-- Call turnoff on neighbors
+				for _, l in ipairs(mesecon.rules_link_rule_all(f.pos, r)) do
 					table.insert(frontiers, {pos = np, link = l})
 				end
 			end
-			end
+
+			mesecon.swap_node_force(f.pos, mesecon.get_conductor_off(node, f.link))
 		elseif mesecon.is_effector(node.name) then
-			mesecon.changesignal(f.pos, node, f.link, mesecon.state.off, depth)
-			if mesecon.is_effector_on(node.name) and not mesecon.is_powered(f.pos) then
-				mesecon.deactivate(f.pos, node, f.link, depth)
-			end
+			table.insert(signals, {
+				pos = f.pos,
+				node = node,
+				link = f.link,
+				depth = depth
+			})
 		end
 		depth = depth + 1
 	end
+
+	for _, sig in ipairs(signals) do
+		mesecon.changesignal(sig.pos, sig.node, sig.link, mesecon.state.off, sig.depth)
+		if mesecon.is_effector_on(sig.node.name) and not mesecon.is_powered(sig.pos) then
+			mesecon.deactivate(sig.pos, sig.node, sig.link, sig.depth)
+		end
 	end
 
-mesecon.queue:add_function("turnoff", function (pos, rulename, recdepth)
-	mesecon.turnoff(pos, rulename, recdepth)
-end)
-
-
-function mesecon.connected_to_receptor(pos, link)
-	local node = minetest.get_node(pos)
-
-	-- Check if conductors around are connected
-	local rules = mesecon.get_any_inputrules(node)
-	if not rules then return false end
-
-	for _, rule in ipairs(mesecon.rule2meta(link, rules)) do
-		local links = mesecon.rules_link_rule_all_inverted(pos, rule)
-		for _, l in ipairs(links) do
-			local np = mesecon.addPosRule(pos, l)
-			if mesecon.find_receptor_on(np, mesecon.invertRule(l)) then
 	return true
 end
-		end
-	end
-
-	return false
-end
-
-function mesecon.find_receptor_on(pos, link)
-	local frontiers = {{pos = pos, link = link}}
-	local checked = {}
-
-	-- List of positions that have been searched for onstate receptors
-	local depth = 1
-	while frontiers[depth] do
-		local f = frontiers[depth]
-		local node = minetest.get_node_or_nil(f.pos)
-
-		if not node then return false end
-		if mesecon.is_receptor_on(node.name) then return true end
-		if mesecon.is_conductor_on(node, f.link) then
-			local rules = mesecon.conductor_get_rules(node)
-
-			-- call turnoff on neighbors: normal rules
-			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
-				local np = mesecon.addPosRule(f.pos, r)
-
-				local links = mesecon.rules_link_rule_all_inverted(f.pos, r)
-				for _, l in ipairs(links) do
-					local checkedstring = np.x..np.y..np.z..l.x..l.y..l.z
-					if not checked[checkedstring] then
-						table.insert(frontiers, {pos = np, link = l})
-						checked[checkedstring] = true
-					end
-				end
-			end
-			
-		end
-		depth = depth + 1
-	end
-end
-
-function mesecon.rules_link(output, input, dug_outputrules) --output/input are positions (outputrules optional, used if node has been dug), second return value: the name of the affected input rule
-	local outputnode = minetest.get_node(output)
-	local inputnode = minetest.get_node(input)
-	local outputrules = dug_outputrules or mesecon.get_any_outputrules (outputnode)
-	local inputrules = mesecon.get_any_inputrules (inputnode)
-	if not outputrules or not inputrules then
-		return
-	end
-
-	for _, outputrule in ipairs(mesecon.flattenrules(outputrules)) do
-		-- Check if output sends to input
-		if mesecon.cmpPos(mesecon.addPosRule(output, outputrule), input) then
-			for _, inputrule in ipairs(mesecon.flattenrules(inputrules)) do
-				-- Check if input accepts from output
-				if  mesecon.cmpPos(mesecon.addPosRule(input, inputrule), output) then
-					return true, inputrule
-				end
-			end
-		end
-	end
-	return false
-end
 
+-- Get all linking inputrules of inputnode (effector or conductor) that is connected to
+-- outputnode (receptor or conductor) at position `output` and has an output in direction `rule`
 function mesecon.rules_link_rule_all(output, rule)
-	local input = mesecon.addPosRule(output, rule)
-	local inputnode = minetest.get_node(input)
+	local input = vector.add(output, rule)
+	local inputnode = mesecon.get_node_force(input)
 	local inputrules = mesecon.get_any_inputrules(inputnode)
 	if not inputrules then
 		return {}
@@ -536,17 +484,19 @@ function mesecon.rules_link_rule_all(output, rule)
 
 	for _, inputrule in ipairs(mesecon.flattenrules(inputrules)) do
 		-- Check if input accepts from output
-		if  mesecon.cmpPos(mesecon.addPosRule(input, inputrule), output) then
+		if  vector.equals(vector.add(input, inputrule), output) then
 			table.insert(rules, inputrule)
 		end
 	end
+
 	return rules
 end
 
+-- Get all linking outputnodes of outputnode (receptor or conductor) that is connected to
+-- inputnode (effector or conductor) at position `input` and has an input in direction `rule`
 function mesecon.rules_link_rule_all_inverted(input, rule)
-	--local irule = mesecon.invertRule(rule)
-	local output = mesecon.addPosRule(input, rule)
-	local outputnode = minetest.get_node(output)
+	local output = vector.add(input, rule)
+	local outputnode = mesecon.get_node_force(output)
 	local outputrules = mesecon.get_any_outputrules(outputnode)
 	if not outputrules then
 		return {}
@@ -554,19 +504,15 @@ function mesecon.rules_link_rule_all_inverted(input, rule)
 	local rules = {}
 
 	for _, outputrule in ipairs(mesecon.flattenrules(outputrules)) do
-		if  mesecon.cmpPos(mesecon.addPosRule(output, outputrule), input) then
+		if  vector.equals(vector.add(output, outputrule), input) then
 			table.insert(rules, mesecon.invertRule(outputrule))
 		end
 	end
 	return rules
 end
 
-function mesecon.rules_link_anydir(pos1, pos2)
-	return mesecon.rules_link(pos1, pos2) or mesecon.rules_link(pos2, pos1)
-end
-
 function mesecon.is_powered(pos, rule)
-	local node = minetest.get_node(pos)
+	local node = mesecon.get_node_force(pos)
 	local rules = mesecon.get_any_inputrules(node)
 	if not rules then return false end
 
@@ -577,8 +523,9 @@ function mesecon.is_powered(pos, rule)
 		for _, rule in ipairs(mesecon.flattenrules(rules)) do
 			local rulenames = mesecon.rules_link_rule_all_inverted(pos, rule)
 			for _, rname in ipairs(rulenames) do
-				local np = mesecon.addPosRule(pos, rname)
-				local nn = minetest.get_node(np)
+				local np = vector.add(pos, rname)
+				local nn = mesecon.get_node_force(np)
+
 				if (mesecon.is_conductor_on(nn, mesecon.invertRule(rname))
 				or mesecon.is_receptor_on(nn.name)) then
 					table.insert(sourcepos, np)
@@ -588,8 +535,8 @@ function mesecon.is_powered(pos, rule)
 	else
 		local rulenames = mesecon.rules_link_rule_all_inverted(pos, rule)
 		for _, rname in ipairs(rulenames) do
-			local np = mesecon.addPosRule(pos, rname)
-			local nn = minetest.get_node(np)
+			local np = vector.add(pos, rname)
+			local nn = mesecon.get_node_force(np)
 			if (mesecon.is_conductor_on (nn, mesecon.invertRule(rname))
 			or mesecon.is_receptor_on (nn.name)) then
 				table.insert(sourcepos, np)

mesecons/legacy.lua

@@ -1,30 +1,14 @@
--- Ugly hack to prevent breaking compatibility with other mods
--- Just remove the following two functions to delete the hack, to be done when other mods have updated
-function mesecon.receptor_on(self, pos, rules)
-	if (self.receptor_on) then
-		print("[Mesecons] Warning: A mod with mesecon support called mesecon:receptor_on.")
-		print("[Mesecons]          If you are the programmer of this mod, please update it ")
-		print("[Mesecons]          to use mesecon.receptor_on instead. mesecon:* is deprecated")
-		print("[Mesecons]          Otherwise, please make sure you're running the latest version")
-		print("[Mesecons]          of that mod and inform the mod creator.")
-	else
-		rules = pos
-		pos = self
-	end
-	mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
+-- Un-forceload any forceloaded mapblocks from older versions of Mesecons which
+-- used forceloading instead of VoxelManipulators.
+local BLOCKSIZE = 16
+
+-- convert block hash --> node position
+local function unhash_blockpos(hash)
+	return vector.multiply(minetest.get_position_from_hash(hash), BLOCKSIZE)
 end
 
-function mesecon.receptor_off(self, pos, rules)
-	if (self.receptor_off) then
-		print("[Mesecons] Warning: A mod with mesecon support called mesecon:receptor_off.")
-		print("[Mesecons]          If you are the programmer of this mod, please update it ")
-		print("[Mesecons]          to use mesecon.receptor_off instead. mesecon:* is deprecated")
-		print("[Mesecons]          Otherwise, please make sure you're running the latest version")
-		print("[Mesecons]          of that mod and inform the mod creator.")
-	else
-		rules = pos
-		pos = self
+local old_forceloaded_blocks = mesecon.file2table("mesecon_forceloaded")
+for hash, _ in pairs(old_forceloaded_blocks) do
+	minetest.forceload_free_block(unhash_blockpos(hash))
 end
-	mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
-end
-
+os.remove(minetest.get_worldpath()..DIR_DELIM.."mesecon_forceloaded")

mesecons/oldwires.lua

@@ -30,7 +30,7 @@ minetest.register_node("mesecons:mesecon_on", {
 	},
 	groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
 	drop = "mesecons:mesecon_off 1",
-	light_source = LIGHT_MAX-11,
+	light_source = default.LIGHT_MAX-11,
 	mesecons = {conductor={
 		state = mesecon.state.on,
 		offstate = "mesecons:mesecon_off"

mesecons/presets.lua

@@ -31,6 +31,14 @@ mesecon.rules.flat =
  {x = 0, y = 0, z = 1},
  {x = 0, y = 0, z =-1}}
 
+mesecon.rules.alldirs =
+{{x= 1, y= 0,  z= 0},
+ {x=-1, y= 0,  z= 0},
+ {x= 0, y= 1,  z= 0},
+ {x= 0, y=-1,  z= 0},
+ {x= 0, y= 0,  z= 1},
+ {x= 0, y= 0,  z=-1}}
+
 mesecon.rules.buttonlike_get = function(node)
 	local rules = mesecon.rules.buttonlike
 	if node.param2 == 2 then

mesecons/services.lua

@@ -1,7 +1,7 @@
 -- Dig and place services
 
 mesecon.on_placenode = function(pos, node)
-	mesecon.update_autoconnect(pos, node)
+	mesecon.execute_autoconnect_hooks_now(pos, node)
 
 	-- Receptors: Send on signal when active
 	if mesecon.is_receptor_on(node.name) then
@@ -16,7 +16,7 @@ mesecon.on_placenode = function (pos, node)
 			-- also call receptor_on if itself is powered already, so that neighboring
 			-- conductors will be activated (when pushing an on-conductor with a piston)
 			for _, s in ipairs(sources) do
-				local rule = {x = pos.x - s.x, y = pos.y - s.y, z = pos.z - s.z}
+				local rule = vector.subtract(pos, s)
 				mesecon.turnon(pos, rule)
 			end
 			--mesecon.receptor_on (pos, mesecon.conductor_get_rules(node))
@@ -28,11 +28,13 @@ mesecon.on_placenode = function (pos, node)
 	-- Effectors: Send changesignal and activate or deactivate
 	if mesecon.is_effector(node.name) then
 		local powered_rules = {}
+		local unpowered_rules = {}
 
 		-- for each input rule, check if powered
 		for _, r in ipairs(mesecon.effector_get_rules(node)) do
 			local powered = mesecon.is_powered(pos, r)
-			if powered then table.insert(powered_rules, r) end
+			if powered then table.insert(powered_rules, r)
+			else table.insert(unpowered_rules, r) end
 
 			local state = powered and mesecon.state.on or mesecon.state.off
 			mesecon.changesignal(pos, node, r, state, 1)
@@ -42,6 +44,10 @@ mesecon.on_placenode = function (pos, node)
 			for _, r in ipairs(powered_rules) do
 				mesecon.activate(pos, node, r, 1)
 			end
+		else
+			for _, r in ipairs(unpowered_rules) do
+				mesecon.deactivate(pos, node, r, 1)
+			end
 		end
 	end
 end
@@ -52,10 +58,9 @@ mesecon.on_dignode = function (pos, node)
 	elseif mesecon.is_receptor_on(node.name) then
 		mesecon.receptor_off(pos, mesecon.receptor_get_rules(node))
 	end
-	mesecon.queue:add_action(pos, "update_autoconnect", {node})
-end
 
-mesecon.queue:add_function("update_autoconnect", mesecon.update_autoconnect)
+	mesecon.execute_autoconnect_hooks_queue(pos, node)
+end
 
 minetest.register_on_placenode(mesecon.on_placenode)
 minetest.register_on_dignode(mesecon.on_dignode)
@@ -81,10 +86,6 @@ end
 
 
 mesecon.queue:add_function("cooldown", function (pos)
-	if minetest.get_item_group(minetest.get_node(pos).name, "overheat") == 0 then
-		return -- node has been moved, this one does not use overheating - ignore
-	end
-
 	local meta = minetest.get_meta(pos)
 	local heat = meta:get_int("heat")
 

mesecons/settings.lua

@@ -1,7 +1,12 @@
 -- SETTINGS
 function mesecon.setting(setting, default)
-	if type(default) == "bool" then
-		return minetest.setting_getbool("mesecon."..setting) or default
+	if type(default) == "boolean" then
+		local read = minetest.setting_getbool("mesecon."..setting)
+		if read == nil then
+			return default
+		else
+			return read
+		end
 	elseif type(default) == "string" then
 		return minetest.setting_get("mesecon."..setting) or default
 	elseif type(default) == "number" then

mesecons/util.lua

@@ -2,7 +2,7 @@ function mesecon.move_node(pos, newpos)
 	local node = minetest.get_node(pos)
 	local meta = minetest.get_meta(pos):to_table()
 	minetest.remove_node(pos)
-	minetest.add_node(newpos, node)
+	minetest.set_node(newpos, node)
 	minetest.get_meta(pos):from_table(meta)
 end
 
@@ -50,7 +50,7 @@ function mesecon.rule2bit(findrule, allrules)
 	end
 	for m,metarule in ipairs( allrules) do
 	for _,    rule in ipairs(metarule ) do
-		if mesecon.cmpPos(findrule, rule) then
+		if vector.equals(findrule, rule) then
 			return m
 		end
 	end
@@ -69,7 +69,7 @@ function mesecon.rule2metaindex(findrule, allrules)
 
 	for m, metarule in ipairs( allrules) do
 	for _,     rule in ipairs(metarule ) do
-		if mesecon.cmpPos(findrule, rule) then
+		if vector.equals(findrule, rule) then
 			return m
 		end
 	end
@@ -133,15 +133,7 @@ function mesecon.set_bit(binary,bit,value)
 end
 
 function mesecon.invertRule(r)
-	return {x = -r.x, y = -r.y, z = -r.z}
-end
-
-function mesecon.addPosRule(p, r)
-	return {x = p.x + r.x, y = p.y + r.y, z = p.z + r.z}
-end
-
-function mesecon.cmpPos(p1, p2)
-	return (p1.x == p2.x and p1.y == p2.y and p1.z == p2.z)
+	return vector.multiply(r, -1)
 end
 
 function mesecon.tablecopy(table) -- deep table copy
@@ -209,3 +201,195 @@ function mesecon.flipstate(pos, node)
 
 	return newstate
 end
+
+-- File writing / reading utilities
+local wpath = minetest.get_worldpath()
+function mesecon.file2table(filename)
+	local f = io.open(wpath..DIR_DELIM..filename, "r")
+	if f == nil then return {} end
+	local t = f:read("*all")
+	f:close()
+	if t == "" or t == nil then return {} end
+	return minetest.deserialize(t)
+end
+
+function mesecon.table2file(filename, table)
+	local f = io.open(wpath..DIR_DELIM..filename, "w")
+	f:write(minetest.serialize(table))
+	f:close()
+end
+
+-- Block position "hashing" (convert to integer) functions for voxelmanip cache
+local BLOCKSIZE = 16
+
+-- convert node position --> block hash
+local function hash_blockpos(pos)
+	return minetest.hash_node_position({
+		x = math.floor(pos.x/BLOCKSIZE),
+		y = math.floor(pos.y/BLOCKSIZE),
+		z = math.floor(pos.z/BLOCKSIZE)
+	})
+end
+
+-- convert block hash --> node position
+local function unhash_blockpos(hash)
+	return vector.multiply(minetest.get_position_from_hash(hash), BLOCKSIZE)
+end
+
+-- Maps from a hashed mapblock position (as returned by hash_blockpos) to a
+-- table.
+--
+-- Contents of the table are:
+-- “vm” → the VoxelManipulator
+-- “va” → the VoxelArea
+-- “data” → the data array
+-- “param1” → the param1 array
+-- “param2” → the param2 array
+-- “dirty” → true if data has been modified
+--
+-- Nil if no VM-based transaction is in progress.
+local vm_cache = nil
+
+-- Starts a VoxelManipulator-based transaction.
+--
+-- During a VM transaction, calls to vm_get_node and vm_swap_node operate on a
+-- cached copy of the world loaded via VoxelManipulators. That cache can later
+-- be committed to the real map by means of vm_commit or discarded by means of
+-- vm_abort.
+function mesecon.vm_begin()
+	vm_cache = {}
+end
+
+-- Finishes a VoxelManipulator-based transaction, freeing the VMs and map data
+-- and writing back any modified areas.
+function mesecon.vm_commit()
+	for hash, tbl in pairs(vm_cache) do
+		if tbl.dirty then
+			local vm = tbl.vm
+			vm:set_data(tbl.data)
+			vm:write_to_map()
+			vm:update_map()
+		end
+	end
+	vm_cache = nil
+end
+
+-- Finishes a VoxelManipulator-based transaction, freeing the VMs and throwing
+-- away any modified areas.
+function mesecon.vm_abort()
+	vm_cache = nil
+end
+
+-- Gets the cache entry covering a position, populating it if necessary.
+local function vm_get_or_create_entry(pos)
+	local hash = hash_blockpos(pos)
+	local tbl = vm_cache[hash]
+	if not tbl then
+		local vm = minetest.get_voxel_manip(pos, pos)
+		local min_pos, max_pos = vm:get_emerged_area()
+		local va = VoxelArea:new{MinEdge = min_pos, MaxEdge = max_pos}
+		tbl = {vm = vm, va = va, data = vm:get_data(), param1 = vm:get_light_data(), param2 = vm:get_param2_data(), dirty = false}
+		vm_cache[hash] = tbl
+	end
+	return tbl
+end
+
+-- Gets the node at a given position during a VoxelManipulator-based
+-- transaction.
+function mesecon.vm_get_node(pos)
+	local tbl = vm_get_or_create_entry(pos)
+	local index = tbl.va:indexp(pos)
+	local node_value = tbl.data[index]
+	if node_value == core.CONTENT_IGNORE then
+		return nil
+	else
+		local node_param1 = tbl.param1[index]
+		local node_param2 = tbl.param2[index]
+		return {name = minetest.get_name_from_content_id(node_value), param1 = node_param1, param2 = node_param2}
+	end
+end
+
+-- Sets a node’s name during a VoxelManipulator-based transaction.
+--
+-- Existing param1, param2, and metadata are left alone.
+function mesecon.vm_swap_node(pos, name)
+	local tbl = vm_get_or_create_entry(pos)
+	local index = tbl.va:indexp(pos)
+	tbl.data[index] = minetest.get_content_id(name)
+	tbl.dirty = true
+end
+
+-- Gets the node at a given position, regardless of whether it is loaded or
+-- not, respecting a transaction if one is in progress.
+--
+-- Outside a VM transaction, if the mapblock is not loaded, it is pulled into
+-- the server’s main map data cache and then accessed from there.
+--
+-- Inside a VM transaction, the transaction’s VM cache is used.
+function mesecon.get_node_force(pos)
+	if vm_cache then
+		return mesecon.vm_get_node(pos)
+	else
+		local node = minetest.get_node_or_nil(pos)
+		if node == nil then
+			-- Node is not currently loaded; use a VoxelManipulator to prime
+			-- the mapblock cache and try again.
+			minetest.get_voxel_manip(pos, pos)
+			node = minetest.get_node_or_nil(pos)
+		end
+		return node
+	end
+end
+
+-- Swaps the node at a given position, regardless of whether it is loaded or
+-- not, respecting a transaction if one is in progress.
+--
+-- Outside a VM transaction, if the mapblock is not loaded, it is pulled into
+-- the server’s main map data cache and then accessed from there.
+--
+-- Inside a VM transaction, the transaction’s VM cache is used.
+--
+-- This function can only be used to change the node’s name, not its parameters
+-- or metadata.
+function mesecon.swap_node_force(pos, name)
+	if vm_cache then
+		return mesecon.vm_swap_node(pos, name)
+	else
+		-- This serves to both ensure the mapblock is loaded and also hand us
+		-- the old node table so we can preserve param2.
+		local node = mesecon.get_node_force(pos)
+		node.name = name
+		minetest.swap_node(pos, node)
+	end
+end
+
+-- Autoconnect Hooks
+-- Nodes like conductors may change their appearance and their connection rules
+-- right after being placed or after being dug, e.g. the default wires use this
+-- to automatically connect to linking nodes after placement.
+-- After placement, the update function will be executed immediately so that the
+-- possibly changed rules can be taken into account when recalculating the circuit.
+-- After digging, the update function will be queued and executed after
+-- recalculating the circuit. The update function must take care of updating the
+-- node at the given position itself, but also all of the other nodes the given
+-- position may have (had) a linking connection to.
+mesecon.autoconnect_hooks = {}
+
+-- name: A unique name for the hook, e.g. "foowire". Used to name the actionqueue function.
+-- fct: The update function with parameters function(pos, node)
+function mesecon.register_autoconnect_hook(name, fct)
+	mesecon.autoconnect_hooks[name] = fct
+	mesecon.queue:add_function("autoconnect_hook_"..name, fct)
+end
+
+function mesecon.execute_autoconnect_hooks_now(pos, node)
+	for _, fct in pairs(mesecon.autoconnect_hooks) do
+		fct(pos, node)
+	end
+end
+
+function mesecon.execute_autoconnect_hooks_queue(pos, node)
+	for name in pairs(mesecon.autoconnect_hooks) do
+		mesecon.queue:add_action(pos, "autoconnect_hook_"..name, {node})
+	end
+end

mesecons_blinkyplant/doc/blinkyplant/description.html

@@ -0,0 +1 @@
+The blinky plants toggles between on and off state every three seconds. Can be used to make clocks. Also works after having restarted the game.

mesecons_button/doc/button/description.html

@@ -0,0 +1 @@
+This receptor can be attached to walls. It turns on for 1 second if it's punched.

mesecons_button/init.lua

@@ -40,7 +40,7 @@ minetest.register_node("mesecons_button:button_off", {
 	},
 	groups = {dig_immediate=2, mesecon_needs_receiver = 1},
 	description = "Button",
-	on_punch = function (pos, node)
+	on_rightclick = function (pos, node)
 		minetest.swap_node(pos, {name = "mesecons_button:button_on", param2=node.param2})
 		mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
 		minetest.sound_play("mesecons_button_push", {pos=pos})
@@ -67,7 +67,7 @@ minetest.register_node("mesecons_button:button_on", {
 	paramtype2 = "facedir",
 	legacy_wallmounted = true,
 	walkable = false,
-	light_source = LIGHT_MAX-7,
+	light_source = default.LIGHT_MAX-7,
 	sunlight_propagates = true,
 	selection_box = {
 		type = "fixed",

mesecons_commandblock/doc/commandblock/description.html

@@ -0,0 +1 @@
+There is no crafting recipe as this should only be available for server admins. Quite similar to the Minecraft counterpart. Executes server commands.

mesecons_commandblock/init.lua

@@ -43,7 +43,7 @@ minetest.register_chatcommand("hp", {
 })
 
 local function initialize_data(meta)
-	local commands = meta:get_string("commands")
+	local commands = minetest.formspec_escape(meta:get_string("commands"))
 	meta:set_string("formspec",
 		"invsize[9,5;]" ..
 		"textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" ..
@@ -93,9 +93,22 @@ local function receive_fields(pos, formname, fields, sender)
 end
 
 local function resolve_commands(commands, pos)
+	local players = minetest.get_connected_players()
+
+	-- No players online: remove all commands containing
+	-- @nearest, @farthest and @random
+	if #players == 0 then
+		commands = commands:gsub("[^\r\n]+", function (line)
+			if line:find("@nearest") then return "" end
+			if line:find("@farthest") then return "" end
+			if line:find("@random") then return "" end
+			return line
+		end)
+		return commands
+	end
+
 	local nearest, farthest = nil, nil
 	local min_distance, max_distance = math.huge, -1
-	local players = minetest.get_connected_players()
 	for index, player in pairs(players) do
 		local distance = vector.distance(pos, player:getpos())
 		if distance < min_distance then

mesecons_delayer/doc/delayer/description.html

@@ -0,0 +1 @@
+The delayer delays the signal from the input for a determined time. The time can be set by punching the delayer. Possible delays are: 0.1 seconds, 0.3 seconds, 0.5 seconds and 1 second. You may try to use it for creating songs with the noteblock.

mesecons_detector/doc/nodedetector/description.html

@@ -0,0 +1,6 @@
+The node detector is a receptor. It changes its state when either any node
+or a specific node is detected. Right-click it to set a nodename to scan for.
+It can also receive digiline signals. You can either send "GET" and it will
+respond with the detected nodename or you can send any other string and it will
+set this string as the node to scan for.
+Nodenames must include the mod they reside in, so for instance default:dirt, not just dirt.

mesecons_detector/doc/objectdetector/description.html

@@ -0,0 +1,3 @@
+The object detector is a receptor. It changes its state when a player approaches.
+Right-click it to set a name to scan for.
+It can also receive digiline signals which are the name to scan for on the specified channel in the right-click menu.

mesecons_detector/init.lua

@@ -4,16 +4,15 @@ local GET_COMMAND = "GET"
 -- Detects players in a certain radius
 -- The radius can be specified in mesecons/settings.lua
 
-local object_detector_make_formspec = function (pos)
-	local meta = minetest.get_meta(pos)
-	meta:set_string("formspec", "size[9,2.5]" ..
+local function object_detector_make_formspec(pos)
+	minetest.get_meta(pos):set_string("formspec", "size[9,2.5]" ..
 		"field[0.3,  0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]"..
 		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
 		"button_exit[7,0.75;2,3;;Save]")
 end
 
-local object_detector_on_receive_fields = function(pos, formname, fields)
-	if not fields.scanname or not fields.digiline_channel then return end;
+local function object_detector_on_receive_fields(pos, _, fields)
+	if not fields.scanname or not fields.digiline_channel then return end
 
 	local meta = minetest.get_meta(pos)
 	meta:set_string("scanname", fields.scanname)
@@ -22,15 +21,26 @@ local object_detector_on_receive_fields = function(pos, formname, fields)
 end
 
 -- returns true if player was found, false if not
-local object_detector_scan = function (pos)
+local function object_detector_scan(pos)
 	local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6))
-	for k, obj in pairs(objs) do
-		local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil!
+
+	-- abort if no scan results were found
+	if next(objs) == nil then return false end
+
 	local scanname = minetest.get_meta(pos):get_string("scanname")
-		if (isname == scanname and isname ~= "") or (isname  ~= "" and scanname == "") then -- player with scanname found or not scanname specified
+	local every_player = scanname == ""
+	for _, obj in pairs(objs) do
+		-- "" is returned if it is not a player; "" ~= nil; so only handle objects with foundname ~= ""
+		local foundname = obj:get_player_name()
+
+		if foundname ~= "" then
+			-- return true if scanning for any player or if specific playername was detected
+			if scanname == "" or foundname == scanname then
 				return true
 			end
 		end
+	end
+
 	return false
 end
 
@@ -39,8 +49,7 @@ local object_detector_digiline = {
 	effector = {
 		action = function(pos, node, channel, msg)
 			local meta = minetest.get_meta(pos)
-			local active_channel = meta:get_string("digiline_channel")
-			if channel == active_channel then
+			if channel == meta:get_string("digiline_channel") then
 				meta:set_string("scanname", msg)
 				object_detector_make_formspec(pos)
 			end
@@ -89,43 +98,44 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_abm(
-	{nodenames = {"mesecons_detector:object_detector_off"},
-	interval = 1.0,
+minetest.register_abm({
+	nodenames = {"mesecons_detector:object_detector_off"},
+	interval = 1,
 	chance = 1,
-	action = function(pos)
-		if object_detector_scan(pos) then
-			minetest.swap_node(pos, {name = "mesecons_detector:object_detector_on"})
+	action = function(pos, node)
+		if not object_detector_scan(pos) then return end
+
+		node.name = "mesecons_detector:object_detector_on"
+		minetest.swap_node(pos, node)
 		mesecon.receptor_on(pos, mesecon.rules.pplate)
-		end
 	end,
 })
 
-minetest.register_abm(
-	{nodenames = {"mesecons_detector:object_detector_on"},
-	interval = 1.0,
+minetest.register_abm({
+	nodenames = {"mesecons_detector:object_detector_on"},
+	interval = 1,
 	chance = 1,
-	action = function(pos)
-		if not object_detector_scan(pos) then
-			minetest.swap_node(pos, {name = "mesecons_detector:object_detector_off"})
+	action = function(pos, node)
+		if object_detector_scan(pos) then return end
+
+		node.name = "mesecons_detector:object_detector_off"
+		minetest.swap_node(pos, node)
 		mesecon.receptor_off(pos, mesecon.rules.pplate)
-		end
 	end,
 })
 
 -- Node detector
 -- Detects the node in front of it
 
-local node_detector_make_formspec = function (pos)
-	local meta = minetest.get_meta(pos)
-	meta:set_string("formspec", "size[9,2.5]" ..
+local function node_detector_make_formspec(pos)
+	minetest.get_meta(pos):set_string("formspec", "size[9,2.5]" ..
 		"field[0.3,  0;9,2;scanname;Name of node to scan for (empty for any):;${scanname}]"..
 		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
 		"button_exit[7,0.75;2,3;;Save]")
 end
 
-local node_detector_on_receive_fields = function(pos, formname, fields)
-	if not fields.scanname or not fields.digiline_channel then return end;
+local function node_detector_on_receive_fields(pos, _, fields)
+	if not fields.scanname or not fields.digiline_channel then return end
 
 	local meta = minetest.get_meta(pos)
 	meta:set_string("scanname", fields.scanname)
@@ -133,14 +143,18 @@ local node_detector_on_receive_fields = function(pos, formname, fields)
 	node_detector_make_formspec(pos)
 end
 
--- returns true if player was found, false if not
-local node_detector_scan = function (pos)
-	local node = minetest.get_node(pos)
-	local frontpos = vector.subtract(pos, minetest.facedir_to_dir(node.param2))
-	local frontnode = minetest.get_node(frontpos)
-	local meta = minetest.get_meta(pos)
-	return (frontnode.name == meta:get_string("scanname")) or
-		(frontnode.name ~= "air" and frontnode.name ~= "ignore" and meta:get_string("scanname") == "")
+-- returns true if node was found, false if not
+local function node_detector_scan(pos)
+	local node = minetest.get_node_or_nil(pos)
+	if not node then return end
+
+	local frontname = minetest.get_node(
+		vector.subtract(pos, minetest.facedir_to_dir(node.param2))
+	).name
+	local scanname = minetest.get_meta(pos):get_string("scanname")
+
+	return (frontname == scanname) or
+		(frontname ~= "air" and frontname ~= "ignore" and scanname == "")
 end
 
 -- set player name when receiving a digiline signal on a specific channel
@@ -148,22 +162,40 @@ local node_detector_digiline = {
 	effector = {
 		action = function(pos, node, channel, msg)
 			local meta = minetest.get_meta(pos)
-			local active_channel = meta:get_string("digiline_channel")
-			if channel == active_channel then
+			if channel ~= meta:get_string("digiline_channel") then return end
+
 			if msg == GET_COMMAND then
-					local frontpos = vector.subtract(pos, minetest.facedir_to_dir(node.param2))
-					local name = minetest.get_node(frontpos).name
-					digiline:receptor_send(pos, digiline.rules.default, channel, name)
+				local nodename = minetest.get_node(
+					vector.subtract(pos, minetest.facedir_to_dir(node.param2))
+				).name
+
+				digiline:receptor_send(pos, digiline.rules.default, channel, nodename)
 			else
 				meta:set_string("scanname", msg)
 				node_detector_make_formspec(pos)
 			end
-			end
 		end,
 	},
 	receptor = {}
 }
 
+local function after_place_node_detector(pos, placer)
+	local placer_pos = placer:getpos()
+	if not placer_pos then
+		return
+	end
+
+	--correct for the player's height
+	if placer:is_player() then
+		placer_pos.y = placer_pos.y + 1.625
+	end
+
+	--correct for 6d facedir
+	local node = minetest.get_node(pos)
+	node.param2 = minetest.dir_to_facedir(vector.subtract(pos, placer_pos), true)
+	minetest.set_node(pos, node)
+end
+
 minetest.register_node("mesecons_detector:node_detector_off", {
 	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_off.png"},
 	paramtype = "light",
@@ -176,25 +208,7 @@ minetest.register_node("mesecons_detector:node_detector_off", {
 	}},
 	on_construct = node_detector_make_formspec,
 	on_receive_fields = node_detector_on_receive_fields,
-	after_place_node = function (pos, placer)
-		local placer_pos = placer:getpos()
-		
-		--correct for the player's height
-		if placer:is_player() then placer_pos.y = placer_pos.y + 1.5 end
-		
-		--correct for 6d facedir
-		if placer_pos then
-			local dir = {
-				x = pos.x - placer_pos.x,
-				y = pos.y - placer_pos.y,
-				z = pos.z - placer_pos.z
-			}
-			local node = minetest.get_node(pos)
-			node.param2 = minetest.dir_to_facedir(dir, true)
-			minetest.set_node(pos, node)
-			minetest.log("action", "real (6d) facedir: " .. node.param2)
-		end
-	end,
+	after_place_node = after_place_node_detector,
 	sounds = default.node_sound_stone_defaults(),
 	digiline = node_detector_digiline
 })
@@ -211,25 +225,7 @@ minetest.register_node("mesecons_detector:node_detector_on", {
 	}},
 	on_construct = node_detector_make_formspec,
 	on_receive_fields = node_detector_on_receive_fields,
-	after_place_node = function (pos, placer)
-		local placer_pos = placer:getpos()
-		
-		--correct for the player's height
-		if placer:is_player() then placer_pos.y = placer_pos.y + 1.5 end
-		
-		--correct for 6d facedir
-		if placer_pos then
-			local dir = {
-				x = pos.x - placer_pos.x,
-				y = pos.y - placer_pos.y,
-				z = pos.z - placer_pos.z
-			}
-			local node = minetest.get_node(pos)
-			node.param2 = minetest.dir_to_facedir(dir, true)
-			minetest.set_node(pos, node)
-			minetest.log("action", "real (6d) facedir: " .. node.param2)
-		end
-	end,
+	after_place_node = after_place_node_detector,
 	sounds = default.node_sound_stone_defaults(),
 	digiline = node_detector_digiline
 })
@@ -243,26 +239,28 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_abm(
-	{nodenames = {"mesecons_detector:node_detector_off"},
-	interval = 1.0,
+minetest.register_abm({
+	nodenames = {"mesecons_detector:node_detector_off"},
+	interval = 1,
 	chance = 1,
 	action = function(pos, node)
-		if node_detector_scan(pos) then
-			minetest.swap_node(pos, {name = "mesecons_detector:node_detector_on", param2 = node.param2})
+		if not node_detector_scan(pos) then return end
+
+		node.name = "mesecons_detector:node_detector_on"
+		minetest.swap_node(pos, node)
 		mesecon.receptor_on(pos)
-		end
 	end,
 })
 
-minetest.register_abm(
-	{nodenames = {"mesecons_detector:node_detector_on"},
-	interval = 1.0,
+minetest.register_abm({
+	nodenames = {"mesecons_detector:node_detector_on"},
+	interval = 1,
 	chance = 1,
 	action = function(pos, node)
-		if not node_detector_scan(pos) then
-			minetest.swap_node(pos, {name = "mesecons_detector:node_detector_off", param2 = node.param2})
+		if node_detector_scan(pos) then return end
+
+		node.name = "mesecons_detector:node_detector_off"
+		minetest.swap_node(pos, node)
 		mesecon.receptor_off(pos)
-		end
 	end,
 })

mesecons_doors/init.lua

@@ -13,13 +13,15 @@ local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
 	minetest.swap_node(pos, {name = replace, param2 = p2})
 
 	if (minetest.get_meta(pos):get_int("right") ~= 0) == (params[1] ~= 3) then
-		minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
 	else
-		minetest.sound_play("door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
 	end
 end
 
 local function meseconify_door(name)
+	if minetest.registered_items[name .. "_b_1"] then
+		-- old style double-node doors
 		local function toggle_state1 (pos, node)
 			on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
 		end
@@ -33,7 +35,7 @@ local function meseconify_door(name)
 				action_on = toggle_state1,
 				action_off = toggle_state1,
 				rules = mesecon.rules.pplate
-		}},
+			}}
 		})
 
 		minetest.override_item(name.."_b_2", {
@@ -41,8 +43,30 @@ local function meseconify_door(name)
 				action_on = toggle_state2,
 				action_off = toggle_state2,
 				rules = mesecon.rules.pplate
-		}},
+			}}
 		})
+	elseif minetest.registered_items[name .. "_a"] then
+		-- new style mesh node based doors
+		local override = {
+			mesecons = {effector = {
+				action_on = function(pos, node)
+					local door = doors.get(pos)
+					if door then
+						door:open()
+					end
+				end,
+				action_off = function(pos, node)
+					local door = doors.get(pos)
+					if door then
+						door:close()
+					end
+				end,
+				rules = mesecon.rules.pplate
+			}}
+		}
+		minetest.override_item(name .. "_a", override)
+		minetest.override_item(name .. "_b", override)
+	end
 end
 
 meseconify_door("doors:door_wood")
@@ -65,6 +89,29 @@ local function trapdoor_switch(pos, node)
 	minetest.get_meta(pos):set_int("state", state == 1 and 0 or 1)
 end
 
+if doors and doors.get then
+	local override = {
+		mesecons = {effector = {
+			action_on = function(pos, node)
+				local door = doors.get(pos)
+				if door then
+					door:open()
+				end
+			end,
+			action_off = function(pos, node)
+				local door = doors.get(pos)
+				if door then
+					door:close()
+				end
+			end,
+		}},
+	}
+	minetest.override_item("doors:trapdoor", override)
+	minetest.override_item("doors:trapdoor_open", override)
+	minetest.override_item("doors:trapdoor_steel", override)
+	minetest.override_item("doors:trapdoor_steel_open", override)
+else
+	if minetest.registered_nodes["doors:trapdoor"] then
 		minetest.override_item("doors:trapdoor", {
 			mesecons = {effector = {
 				action_on = trapdoor_switch,
@@ -78,3 +125,5 @@ minetest.override_item("doors:trapdoor_open", {
 				action_off = trapdoor_switch
 			}},
 		})
+	end
+end

mesecons_extrawires/crossover.lua

@@ -41,7 +41,7 @@ minetest.register_node("mesecons_extrawires:crossover_off", {
 			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
 		},
 	},
-	groups = {dig_immediate=3, mesecon=3, mesecon_conductor_craftable=1},
+	groups = {dig_immediate=3, mesecon=3},
 	mesecons = {
 		conductor = {
 			states = crossover_states,

mesecons_extrawires/doc/corner/description.html

@@ -0,0 +1 @@
+Insulated corners are conductors that only conduct between the inputs (also not up or down). When placing they always point to the left in direction of your vision.

mesecons_extrawires/doc/crossing/description.html

@@ -0,0 +1 @@
+Insulated crossing are conductors that conduct two signals between the opposing sides, the signals are insulated to each other.

mesecons_extrawires/doc/mese/description.html

@@ -0,0 +1 @@
+The basic prerequesite for mesecons, can be crafted into wires and other stuff. Have a look at the <a href="http://wiki.minetest.net/Mese">Minetest Wiki</a> for more information. Mese is a conductor. It conducts in all six directions: Up/Down/Left/Right/Forward/Backward

mesecons_extrawires/doc/tjunction/description.html

@@ -0,0 +1 @@
+Insulated T-Junctions are conductors that only conduct between the inputs (also not up or down).

mesecons_extrawires/doc/vertical/description.html

@@ -0,0 +1 @@
+Vertical Mesecons only conduct up and down. Plates appear at the ends, at that place they also conduct to the side.

mesecons_extrawires/mesewire.lua

@@ -16,15 +16,21 @@ minetest.override_item("default:mese", {
 	}}
 })
 
-minetest.register_node("mesecons_extrawires:mese_powered", {
-	tiles = {minetest.registered_nodes["default:mese"].tiles[1].."^[brighten"},
-	is_ground_content = true,
-	groups = {cracky=1, not_in_creative_inventory = 1},
-	sounds = default.node_sound_stone_defaults(),
+-- Copy node definition of powered mese from normal mese
+-- and brighten texture tiles to indicate mese is powered
+local powered_def = mesecon.mergetable(minetest.registered_nodes["default:mese"], {
+	drop = "default:mese",
+	light_source = 5,
 	mesecons = {conductor = {
 		state = mesecon.state.on,
 		offstate = "default:mese",
 		rules = mesewire_rules
 	}},
-	drop = "default:mese"
+	groups = {cracky = 1, not_in_creative_inventory = 1}
 })
+
+for i, v in pairs(powered_def.tiles) do
+	powered_def.tiles[i] = v .. "^[brighten"
+end
+
+minetest.register_node("mesecons_extrawires:mese_powered", powered_def)

mesecons_extrawires/tjunction.lua

@@ -65,7 +65,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
 	sunlight_propagates = true,
 	selection_box = tjunction_selectionbox,
 	node_box = tjunction_nodebox,
-	groups = {dig_immediate = 3, mesecon_conductor_craftable=1},
+	groups = {dig_immediate = 3},
 	mesecons = {conductor =
 	{
 		state = mesecon.state.off,

mesecons_extrawires/vertical.lua

@@ -42,33 +42,37 @@ local vertical_updatepos = function (pos)
 	local node = minetest.get_node(pos)
 	if minetest.registered_nodes[node.name]
 	and minetest.registered_nodes[node.name].is_vertical_conductor then
-		local node_above = minetest.get_node(mesecon.addPosRule(pos, vertical_rules[1]))
-		local node_below = minetest.get_node(mesecon.addPosRule(pos, vertical_rules[2]))
-		local namestate = minetest.registered_nodes[node.name].vertical_conductor_state
+		local node_above = minetest.get_node(vector.add(pos, vertical_rules[1]))
+		local node_below = minetest.get_node(vector.add(pos, vertical_rules[2]))
 
 		local above = minetest.registered_nodes[node_above.name]
 			and minetest.registered_nodes[node_above.name].is_vertical_conductor
 		local below = minetest.registered_nodes[node_below.name]
 			and minetest.registered_nodes[node_below.name].is_vertical_conductor
 
-		local basename = "mesecons_extrawires:vertical_"
+		mesecon.on_dignode(pos, node)
+
+		-- Always place offstate conductor and let mesecon.on_placenode take care
+		local newname = "mesecons_extrawires:vertical_"
 		if above and below then -- above and below: vertical mesecon
-			minetest.add_node(pos, {name = basename .. namestate})
+			newname = newname .. "off"
 		elseif above and not below then -- above only: bottom
-			minetest.add_node(pos, {name = basename .. "bottom_" .. namestate})
+			newname = newname .. "bottom_off"
 		elseif not above and below then -- below only: top
-			minetest.add_node(pos, {name = basename .. "top_" .. namestate})
+			newname = newname .. "top_off"
 		else -- no vertical wire above, no vertical wire below: use bottom
-			minetest.add_node(pos, {name = basename .. "bottom_" .. namestate})
+			newname = newname .. "bottom_off"
 		end
-		mesecon.update_autoconnect(pos)
+
+		minetest.set_node(pos, {name = newname})
+		mesecon.on_placenode(pos, {name = newname})
 	end
 end
 
 local vertical_update = function (pos, node)
 	vertical_updatepos(pos) -- this one
-	vertical_updatepos(mesecon.addPosRule(pos, vertical_rules[1])) -- above
-	vertical_updatepos(mesecon.addPosRule(pos, vertical_rules[2])) -- below
+	vertical_updatepos(vector.add(pos, vertical_rules[1])) -- above
+	vertical_updatepos(vector.add(pos, vertical_rules[2])) -- below
 end
 
 -- Vertical wire
@@ -87,7 +91,6 @@ mesecon.register_node("mesecons_extrawires:vertical", {
 },{
 	tiles = {"mesecons_wire_off.png"},
 	groups = {dig_immediate=3},
-	vertical_conductor_state = "off",
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:vertical_on",
@@ -96,7 +99,6 @@ mesecon.register_node("mesecons_extrawires:vertical", {
 },{
 	tiles = {"mesecons_wire_on.png"},
 	groups = {dig_immediate=3, not_in_creative_inventory=1},
-	vertical_conductor_state = "on",
 	mesecons = {conductor = {
 		state = mesecon.state.on,
 		offstate = "mesecons_extrawires:vertical_off",
@@ -120,7 +122,6 @@ mesecon.register_node("mesecons_extrawires:vertical_top", {
 	after_dig_node = vertical_update
 },{
 	tiles = {"mesecons_wire_off.png"},
-	vertical_conductor_state = "off",
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:vertical_top_on",
@@ -128,7 +129,6 @@ mesecon.register_node("mesecons_extrawires:vertical_top", {
 	}}
 },{
 	tiles = {"mesecons_wire_on.png"},
-	vertical_conductor_state = "on",
 	mesecons = {conductor = {
 		state = mesecon.state.on,
 		offstate = "mesecons_extrawires:vertical_top_off",
@@ -152,7 +152,6 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", {
 	after_dig_node = vertical_update
 },{
 	tiles = {"mesecons_wire_off.png"},
-	vertical_conductor_state = "off",
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:vertical_bottom_on",
@@ -160,7 +159,6 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", {
 	}}
 },{
 	tiles = {"mesecons_wire_on.png"},
-	vertical_conductor_state = "on",
 	mesecons = {conductor = {
 		state = mesecon.state.on,
 		offstate = "mesecons_extrawires:vertical_bottom_off",

mesecons_gates/doc/and/description.html

@@ -0,0 +1 @@
+And gates power their output if both inputs (from left and right) are powered.

mesecons_gates/doc/diode/description.html

@@ -0,0 +1 @@
+Mesecon diodes, just like real ones, only transfer power (signals) in one direction only.

mesecons_gates/doc/nand/description.html

@@ -0,0 +1 @@
+Nand gates do not power their output if both inputs (from left and right) are powered, but power it in every other case.

mesecons_gates/doc/nor/description.html

@@ -0,0 +1 @@
+Nor gates only power their output if none of their two inputs is powered. They are basically or gates with a not gate at their output.

mesecons_gates/doc/not/description.html

@@ -0,0 +1 @@
+Not gates invert signals, just like a mesecon torch does, but faster. The input is at the opposite side of the output.

mesecons_gates/doc/or/description.html

@@ -0,0 +1 @@
+Or gates power their output if either of their inputs (or both) are powered. You could basically get the same behaviour with two diodes, but or gates save some space.

mesecons_gates/doc/xor/description.html

@@ -0,0 +1 @@
+XOR gates power their output if only one input is powered, they're off if either both or none of the inputs is powered.

mesecons_gates/init.lua

@@ -122,3 +122,13 @@ register_gate("xor", 2, function (val1, val2) return (val1 or val2) and not (val
 	{{"mesecons:mesecon", "", ""},
 	 {"", "mesecons_materials:silicon", "mesecons_materials:silicon"},
 	 {"mesecons:mesecon", "", ""}})
+
+register_gate("nor", 2, function (val1, val2) return not (val1 or val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons:mesecon", "mesecons_torch:mesecon_torch_on"},
+	 {"mesecons:mesecon", "", ""}})
+
+register_gate("or", 2, function (val1, val2) return (val1 or val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons:mesecon", "mesecons:mesecon"},
+	 {"mesecons:mesecon", "", ""}})

mesecons_hydroturbine/doc/waterturbine/description.html

@@ -0,0 +1 @@
+Water turbines are receptors that turn on if flowing water is above them.

mesecons_hydroturbine/init.lua

@@ -6,7 +6,12 @@
 minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
 	drawtype = "mesh",
 	mesh = "jeija_hydro_turbine.obj",
-	tiles = {"jeija_hydro_turbine_off.png"},
+	tiles = {
+		"jeija_hydro_turbine_sides_off.png",
+		"jeija_hydro_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_misc.png"
+	},
 	inventory_image = "jeija_hydro_turbine_inv.png",
 	wield_scale = {x=0.75, y=0.75, z=0.75},
 	groups = {dig_immediate=2},
@@ -26,7 +31,12 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
 	drawtype = "mesh",
 	mesh = "jeija_hydro_turbine.obj",
 	wield_scale = {x=0.75, y=0.75, z=0.75},
-	tiles = {"jeija_hydro_turbine_on.png"},
+	tiles = {
+		"jeija_hydro_turbine_sides_on.png",
+		"jeija_hydro_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_misc.png"
+	},
 	inventory_image = "jeija_hydro_turbine_inv.png",
 	drop = "mesecons_hydroturbine:hydro_turbine_off 1",
 	groups = {dig_immediate=2,not_in_creative_inventory=1},
@@ -50,7 +60,7 @@ nodenames = {"mesecons_hydroturbine:hydro_turbine_off"},
 	action = function(pos, node, active_object_count, active_object_count_wider)
 		local waterpos={x=pos.x, y=pos.y+1, z=pos.z}
 		if minetest.get_node(waterpos).name=="default:water_flowing" then
-			minetest.add_node(pos, {name="mesecons_hydroturbine:hydro_turbine_on"})
+			minetest.set_node(pos, {name="mesecons_hydroturbine:hydro_turbine_on"})
 			nodeupdate(pos)
 			mesecon.receptor_on(pos)
 		end
@@ -64,7 +74,7 @@ nodenames = {"mesecons_hydroturbine:hydro_turbine_on"},
 	action = function(pos, node, active_object_count, active_object_count_wider)
 		local waterpos={x=pos.x, y=pos.y+1, z=pos.z}
 		if minetest.get_node(waterpos).name~="default:water_flowing" then
-			minetest.add_node(pos, {name="mesecons_hydroturbine:hydro_turbine_off"})
+			minetest.set_node(pos, {name="mesecons_hydroturbine:hydro_turbine_off"})
 			nodeupdate(pos)
 			mesecon.receptor_off(pos)
 		end

mesecons_hydroturbine/models/jeija_hydro_turbine.obj

@@ -1,4 +1,4 @@
-# Blender v2.69 (sub 0) OBJ File: 'mesecons-water-turbine.blend'
+# Blender v2.73 (sub 0) OBJ File: 'mesecons-water-turbine.blend'
 # www.blender.org
 o Cylinder.002_Cylinder.003
 v 0.000000 0.500000 -0.150000
@@ -161,256 +161,269 @@ v -0.061863 0.559630 -0.025624
 v -0.061863 1.481372 -0.025624
 v -0.025624 0.559630 -0.061863
 v -0.025624 1.481372 -0.061863
-v 0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 0.500000 -0.500000
-v 0.500000 0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 0.500000 -0.500000
-vt 0.416667 0.625000
-vt 0.416667 0.645833
-vt 0.395833 0.645833
-vt 0.395833 0.625000
-vt 0.375000 0.645833
-vt 0.375000 0.625000
-vt 0.291667 0.625000
-vt 0.291667 0.645833
-vt 0.312500 0.645833
+v 0.499775 -0.499550 -0.499775
+v 0.499775 -0.499550 0.499775
+v -0.499775 -0.499550 0.499775
+v -0.499775 -0.499550 -0.499775
+v 0.499775 0.500000 -0.499775
+v 0.499775 0.500000 0.499775
+v -0.499775 0.500000 0.499775
+v -0.499775 0.500000 -0.499775
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.400544 1.000000
+vt 0.599456 1.000000
+vt 0.783227 0.923880
+vt 0.923880 0.783227
+vt 1.000000 0.599456
+vt 1.000000 0.400544
+vt 0.923880 0.216773
+vt 0.783227 0.076120
+vt 0.599456 0.000000
+vt 0.400544 0.000000
+vt 0.216773 0.076121
+vt 0.076120 0.216773
+vt 0.000000 0.400544
+vt 0.000000 0.599456
+vt 0.076121 0.783227
+vt 0.216773 0.923880
+vt 0.500000 0.343750
+vt 0.531250 0.343750
+vt 0.531250 0.375000
+vt 0.500000 0.375000
+vt 0.531250 0.406250
+vt 0.500000 0.406250
+vt 0.500000 0.531250
+vt 0.531250 0.531250
+vt 0.531250 0.500000
+vt 0.500000 0.500000
+vt 0.531250 0.468750
+vt 0.500000 0.468750
+vt 0.531250 0.437500
+vt 0.500000 0.437500
+vt 0.593750 0.468750
+vt 0.625000 0.437500
+vt 0.656250 0.437500
+vt 0.687500 0.468750
+vt 0.687500 0.500000
+vt 0.656250 0.531250
+vt 0.625000 0.531250
+vt 0.593750 0.500000
+vt 0.500000 0.312500
+vt 0.531250 0.312500
+vt 0.500000 0.281250
+vt 0.531250 0.281250
+vt 0.156250 0.750000
+vt 0.156250 0.875000
+vt 0.125000 0.875000
+vt 0.125000 0.750000
+vt 0.156250 0.625000
+vt 0.125000 0.625000
+vt 0.156250 0.500000
+vt 0.125000 0.500000
+vt 0.156250 0.375000
+vt 0.125000 0.375000
+vt 0.156250 0.250000
+vt 0.125000 0.250000
+vt 0.250000 0.500000
+vt 0.250000 0.625000
+vt 0.218750 0.625000
+vt 0.218750 0.500000
+vt 0.156250 0.125000
+vt 0.125000 0.125000
+vt 0.156250 -0.000000
+vt 0.125000 -0.000000
+vt 0.250000 0.375000
+vt 0.218750 0.375000
+vt 0.250000 0.875000
+vt 0.250000 1.000000
+vt 0.218750 1.000000
+vt 0.218750 0.875000
+vt 0.250000 0.250000
+vt 0.218750 0.250000
+vt 0.250000 0.750000
+vt 0.218750 0.750000
+vt 0.250000 0.125000
+vt 0.218750 0.125000
+vt 0.250000 -0.000000
+vt 0.218750 -0.000000
+vt 0.156250 1.000000
+vt 0.125000 1.000000
+vt 0.781250 0.593750
+vt 0.781250 0.968750
+vt 0.656250 0.968750
+vt 0.656250 0.593750
+vt 0.625000 0.593750
+vt 0.625000 0.968750
+vt 0.500000 0.968750
+vt 0.500000 0.593750
+vt 0.406250 -0.000000
+vt 0.437500 -0.000000
+vt 0.437500 0.125000
+vt 0.406250 0.125000
+vt 0.312500 0.875000
+vt 0.343750 0.875000
+vt 0.343750 1.000000
+vt 0.312500 1.000000
+vt 0.312500 0.750000
+vt 0.343750 0.750000
 vt 0.312500 0.625000
-vt 0.333333 0.645833
-vt 0.333333 0.625000
-vt 0.354167 0.645833
-vt 0.354167 0.625000
-vt 0.708333 0.645833
-vt 0.729167 0.625000
-vt 0.750000 0.625000
-vt 0.770833 0.645833
-vt 0.770833 0.666667
-vt 0.750000 0.687500
-vt 0.729167 0.687500
-vt 0.708333 0.666667
+vt 0.343750 0.625000
+vt 0.312500 0.500000
+vt 0.343750 0.500000
+vt 0.406250 0.750000
+vt 0.437500 0.750000
+vt 0.437500 0.875000
+vt 0.406250 0.875000
+vt 0.312500 0.375000
+vt 0.343750 0.375000
+vt 0.312500 0.250000
+vt 0.343750 0.250000
+vt 0.406250 0.625000
 vt 0.437500 0.625000
-vt 0.437500 0.645833
-vt 0.458333 0.625000
-vt 0.458333 0.645833
-vt 0.656250 0.953125
-vt 0.593750 0.980469
-vt 0.531250 0.980469
-vt 0.468750 0.953125
-vt 0.421875 0.906250
-vt 0.394531 0.843750
-vt 0.394531 0.781250
-vt 0.421875 0.718750
-vt 0.468750 0.671875
-vt 0.531250 0.644531
-vt 0.593750 0.644531
-vt 0.656250 0.671875
-vt 0.703125 0.718750
-vt 0.730469 0.781250
-vt 0.730469 0.843750
-vt 0.703125 0.906250
-vt 0.019531 0.843750
-vt 0.019531 0.781250
-vt 0.046875 0.718750
-vt 0.093750 0.671875
-vt 0.156250 0.644531
-vt 0.218750 0.644531
-vt 0.281250 0.671875
-vt 0.328125 0.718750
-vt 0.355469 0.781250
-vt 0.355469 0.843750
-vt 0.328125 0.906250
-vt 0.281250 0.953125
-vt 0.218750 0.980469
-vt 0.156250 0.980469
-vt 0.093750 0.953125
-vt 0.046875 0.906250
-vt 0.187500 0.041667
-vt 0.104167 0.041667
-vt 0.104167 0.020833
-vt 0.187500 0.020833
-vt 0.270833 0.041667
-vt 0.270833 0.020833
-vt 0.354167 0.041667
-vt 0.354167 0.020833
-vt 0.437500 0.041667
-vt 0.437500 0.020833
-vt 0.520833 0.041667
-vt 0.520833 0.020833
-vt 0.354167 0.104167
-vt 0.270833 0.104167
-vt 0.270833 0.083333
-vt 0.354167 0.083333
-vt 0.604167 0.041667
-vt 0.604167 0.020833
-vt 0.687500 0.041667
-vt 0.687500 0.020833
-vt 0.437500 0.104167
-vt 0.437500 0.083333
-vt 0.104167 0.104167
-vt 0.020833 0.104167
-vt 0.020833 0.083333
-vt 0.104167 0.083333
-vt 0.520833 0.104167
-vt 0.520833 0.083333
-vt 0.187500 0.104167
-vt 0.187500 0.083333
-vt 0.604167 0.104167
-vt 0.604167 0.083333
-vt 0.687500 0.104167
-vt 0.687500 0.083333
-vt 0.020833 0.041667
-vt 0.020833 0.020833
-vt 0.979167 0.020833
-vt 0.979167 0.270833
-vt 0.895833 0.270833
-vt 0.895833 0.020833
-vt 0.875000 0.020833
-vt 0.875000 0.270833
-vt 0.791667 0.270833
-vt 0.791667 0.020833
-vt 0.687500 0.208333
-vt 0.687500 0.229167
-vt 0.604167 0.229167
-vt 0.604167 0.208333
-vt 0.104167 0.145833
-vt 0.104167 0.166667
-vt 0.020833 0.166667
-vt 0.020833 0.145833
-vt 0.187500 0.145833
-vt 0.187500 0.166667
-vt 0.270833 0.145833
-vt 0.270833 0.166667
-vt 0.354167 0.145833
-vt 0.354167 0.166667
-vt 0.187500 0.208333
-vt 0.187500 0.229167
-vt 0.104167 0.229167
-vt 0.104167 0.208333
-vt 0.437500 0.145833
-vt 0.437500 0.166667
-vt 0.520833 0.145833
-vt 0.520833 0.166667
-vt 0.270833 0.208333
-vt 0.270833 0.229167
-vt 0.604167 0.145833
-vt 0.604167 0.166667
-vt 0.354167 0.208333
-vt 0.354167 0.229167
-vt 0.687500 0.145833
-vt 0.687500 0.166667
-vt 0.437500 0.208333
-vt 0.437500 0.229167
-vt 0.020833 0.229167
-vt 0.020833 0.208333
-vt 0.520833 0.208333
-vt 0.520833 0.229167
-vt 0.854167 0.645833
-vt 0.854167 0.979167
-vt 0.812500 0.979167
-vt 0.812500 0.645833
-vt 0.979167 0.312500
-vt 0.979167 0.645833
-vt 0.937500 0.645833
-vt 0.937500 0.312500
-vt 0.895833 0.645833
-vt 0.895833 0.312500
-vt 0.854167 0.312500
-vt 0.812500 0.312500
-vt 0.979167 0.979167
-vt 0.937500 0.979167
-vt 0.895833 0.979167
-vt 0.020833 0.604167
-vt 0.020833 0.270833
-vt 0.354167 0.270833
-vt 0.354167 0.604167
-vt 0.729167 0.270833
-vt 0.729167 0.604167
-vt 0.395833 0.604167
-vt 0.395833 0.270833
+vt 0.312500 0.125000
+vt 0.343750 0.125000
+vt 0.406250 0.500000
+vt 0.437500 0.500000
+vt 0.312500 -0.000000
+vt 0.343750 -0.000000
+vt 0.406250 0.375000
+vt 0.437500 0.375000
+vt 0.437500 1.000000
+vt 0.406250 1.000000
+vt 0.406250 0.250000
+vt 0.437500 0.250000
+vt 0.031250 0.937500
+vt 0.062500 0.937500
+vt 0.062500 0.968750
+vt 0.031250 0.968750
+vt 0.031250 0.718750
+vt 0.062500 0.718750
+vt 0.062500 0.750000
+vt 0.031250 0.750000
+vt 0.062500 0.781250
+vt 0.031250 0.781250
+vt 0.062500 0.812500
+vt 0.031250 0.812500
+vt 0.062500 0.843750
+vt 0.031250 0.843750
+vt 0.062500 0.875000
+vt 0.031250 0.875000
+vt 0.031250 0.906250
+vt 0.062500 0.906250
+vn 1.000000 0.000000 0.000000
+vn -0.000000 -0.000000 1.000000
+vn -1.000000 -0.000000 -0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 -0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.382700 0.000000 -0.923900
+vn 0.923900 0.000000 -0.382700
+vn 0.923900 0.000000 0.382700
+vn 0.382700 0.000000 0.923900
+vn -0.382700 0.000000 0.923900
+vn -0.923900 0.000000 0.382700
+vn -0.382700 0.000000 -0.923900
+vn -0.923900 0.000000 -0.382700
+vn 0.707100 0.000000 0.707100
+vn -0.707100 0.000000 0.707100
+vn 0.707100 0.000000 -0.707100
+vn -0.707100 0.000000 -0.707100
+vn 0.806400 0.000000 -0.591300
+vn 0.988400 0.000000 0.152100
+vn 0.591300 0.000000 0.806400
+vn -0.152100 0.000000 0.988400
+vn -0.806400 0.000000 0.591300
+vn -0.988400 0.000000 -0.152100
+vn 0.152100 0.000000 -0.988400
+vn -0.591300 0.000000 -0.806400
+g Cylinder.002_Cylinder.003_sides
 s off
-f 1/1 2/2 4/3 3/4
-f 3/4 4/3 6/5 5/6
-f 5/7 6/8 8/9 7/10
-f 7/10 8/9 10/11 9/12
-f 9/12 10/11 12/13 11/14
-f 11/14 12/13 14/5 13/6
-f 4/15 2/16 16/17 14/18 12/19 10/20 8/21 6/22
-f 15/23 16/24 2/2 1/1
-f 13/25 14/26 16/24 15/23
-f 130/27 129/28 144/29 143/30 142/31 141/32 140/33 139/34 138/35 137/36 136/37 135/38 134/39 133/40 132/41 131/42
-f 18/43 17/44 32/45 31/46 30/47 29/48 28/49 27/50 26/51 25/52 24/53 23/54 22/55 21/56 20/57 19/58
-f 27/59 28/60 44/61 43/62
-f 26/63 27/59 43/62 42/64
-f 25/65 26/63 42/64 41/66
-f 24/67 25/65 41/66 40/68
-f 23/69 24/67 40/68 39/70
-f 17/71 18/72 34/73 33/74
-f 22/75 23/69 39/70 38/76
-f 21/77 22/75 38/76 37/78
-f 32/79 17/71 33/74 48/80
-f 20/81 21/82 37/83 36/84
-f 31/85 32/79 48/80 47/86
-f 19/87 20/81 36/84 35/88
-f 30/89 31/85 47/86 46/90
-f 18/72 19/87 35/88 34/73
-f 29/91 30/89 46/90 45/92
-f 28/60 29/93 45/94 44/61
-f 49/95 50/96 52/97 51/98
-f 68/98 67/95 54/96 53/97
-f 70/95 69/96 56/97 55/98
-f 72/96 71/97 58/98 57/95
-f 74/95 73/96 60/97 59/98
-f 76/95 75/96 62/97 61/98
-f 80/96 79/97 66/98 65/95
-f 78/95 77/96 64/97 63/98
-f 81/99 82/100 83/101 84/102
-f 85/100 86/101 87/102 88/99
-f 89/101 90/102 91/99 92/100
-f 93/102 94/99 95/100 96/101
-f 97/102 98/99 99/100 100/101
-f 101/99 102/100 103/101 104/102
-f 105/102 106/99 107/100 108/101
-f 109/101 110/102 111/99 112/100
-f 75/100 76/99 101/98 104/97
-f 71/100 72/99 93/98 96/97
-f 67/98 68/97 85/100 88/99
-f 79/98 80/97 105/100 108/99
-f 77/100 78/99 109/98 112/97
-f 73/100 74/99 97/98 100/97
-f 69/98 70/97 89/100 92/99
-f 50/98 49/97 81/100 84/99
-f 33/51 34/52 35/53 36/54 37/55 38/56 39/57 40/58 41/43 42/44 43/45 44/46 45/47 46/48 47/49 48/50
-f 123/103 139/104 140/105 124/106
-f 122/107 138/108 139/109 123/110
-f 121/111 137/112 138/108 122/107
-f 120/113 136/114 137/112 121/111
-f 119/115 135/116 136/114 120/113
-f 113/117 129/118 130/119 114/120
-f 118/121 134/122 135/116 119/115
-f 117/123 133/124 134/122 118/121
-f 128/125 144/126 129/118 113/117
-f 116/127 132/128 133/124 117/123
-f 127/129 143/130 144/126 128/125
-f 115/131 131/132 132/128 116/127
-f 126/133 142/134 143/130 127/129
-f 114/120 130/119 131/135 115/136
-f 125/137 141/138 142/134 126/133
-f 124/106 140/105 141/138 125/137
-f 145/139 146/140 148/141 147/142
-f 147/143 148/144 150/145 149/146
-f 149/146 150/145 152/147 151/148
-f 151/148 152/147 154/139 153/149
-f 153/149 154/139 156/142 155/150
-f 155/144 156/151 158/152 157/145
-f 159/147 160/153 146/140 145/139
-f 157/145 158/152 160/153 159/147
-f 161/154 162/155 163/156 164/157
-f 165/155 168/156 167/157 166/154
-f 161/158 165/159 166/160 162/161
-f 162/158 166/159 167/160 163/161
-f 163/158 167/159 168/160 164/161
-f 165/160 161/161 164/158 168/159
-f 113/40 114/41 115/42 116/27 117/28 118/29 119/30 120/31 121/32 122/33 123/34 124/35 125/36 126/37 127/38 128/39
+f 161/1/1 165/2/1 166/3/1 162/4/1
+f 162/1/2 166/2/2 167/3/2 163/4/2
+f 163/4/3 167/3/3 168/2/3 164/1/3
+f 165/2/4 161/1/4 164/4/4 168/3/4
+g Cylinder.002_Cylinder.003_top-bottom
+f 161/2/5 162/1/5 163/4/5 164/3/5
+f 165/2/6 168/3/6 167/4/6 166/1/6
+g Cylinder.002_Cylinder.003_turbine-top-bottom
+f 130/5/5 129/6/5 144/7/5 143/8/5 142/9/5 141/10/5 140/11/5 139/12/5 138/13/5 137/14/5 136/15/5 135/16/5 134/17/5 133/18/5 132/19/5 131/20/5
+f 18/5/5 17/6/5 32/7/5 31/8/5 30/9/5 29/10/5 28/11/5 27/12/5 26/13/5 25/14/5 24/15/5 23/16/5 22/17/5 21/18/5 20/19/5 19/20/5
+f 33/6/6 34/5/6 35/20/6 36/19/6 37/18/6 38/17/6 39/16/6 40/15/6 41/14/6 42/13/6 43/12/6 44/11/6 45/10/6 46/9/6 47/8/6 48/7/6
+f 113/6/6 114/5/6 115/20/6 116/19/6 117/18/6 118/17/6 119/16/6 120/15/6 121/14/6 122/13/6 123/12/6 124/11/6 125/10/6 126/9/6 127/8/6 128/7/6
+g Cylinder.002_Cylinder.003_turbine-blades-etc
+f 1/21/7 2/22/7 4/23/7 3/24/7
+f 3/24/8 4/23/8 6/25/8 5/26/8
+f 5/27/9 6/28/9 8/29/9 7/30/9
+f 7/30/10 8/29/10 10/31/10 9/32/10
+f 9/32/11 10/31/11 12/33/11 11/34/11
+f 11/34/12 12/33/12 14/25/12 13/26/12
+f 4/35/6 2/36/6 16/37/6 14/38/6 12/39/6 10/40/6 8/41/6 6/42/6
+f 15/43/13 16/44/13 2/22/13 1/21/13
+f 13/45/14 14/46/14 16/44/14 15/43/14
+f 27/47/15 28/48/15 44/49/15 43/50/15
+f 26/51/10 27/47/10 43/50/10 42/52/10
+f 25/53/2 26/51/2 42/52/2 41/54/2
+f 24/55/11 25/53/11 41/54/11 40/56/11
+f 23/57/16 24/55/16 40/56/16 39/58/16
+f 17/59/4 18/60/4 34/61/4 33/62/4
+f 22/63/12 23/57/12 39/58/12 38/64/12
+f 21/65/3 22/63/3 38/64/3 37/66/3
+f 32/67/7 17/59/7 33/62/7 48/68/7
+f 20/69/14 21/70/14 37/71/14 36/72/14
+f 31/73/17 32/67/17 48/68/17 47/74/17
+f 19/75/18 20/69/18 36/72/18 35/76/18
+f 30/77/8 31/73/8 47/74/8 46/78/8
+f 18/60/13 19/75/13 35/76/13 34/61/13
+f 29/79/1 30/77/1 46/78/1 45/80/1
+f 28/48/9 29/81/9 45/82/9 44/49/9
+f 49/83/19 50/84/19 52/85/19 51/86/19
+f 68/86/20 67/83/20 54/84/20 53/85/20
+f 70/83/21 69/84/21 56/85/21 55/86/21
+f 72/84/22 71/85/22 58/86/22 57/83/22
+f 74/83/23 73/84/23 60/85/23 59/86/23
+f 76/83/24 75/84/24 62/85/24 61/86/24
+f 80/84/25 79/85/25 66/86/25 65/83/25
+f 78/83/26 77/84/26 64/85/26 63/86/26
+f 81/87/23 82/88/23 83/89/23 84/90/23
+f 85/88/24 86/89/24 87/90/24 88/87/24
+f 89/89/26 90/90/26 91/87/26 92/88/26
+f 93/90/25 94/87/25 95/88/25 96/89/25
+f 97/90/19 98/87/19 99/88/19 100/89/19
+f 101/87/20 102/88/20 103/89/20 104/90/20
+f 105/90/22 106/87/22 107/88/22 108/89/22
+f 109/89/21 110/90/21 111/87/21 112/88/21
+f 75/88/22 76/87/22 101/86/22 104/85/22
+f 71/88/20 72/87/20 93/86/20 96/85/20
+f 67/86/25 68/85/25 85/88/25 88/87/25
+f 79/86/24 80/85/24 105/88/24 108/87/24
+f 77/88/23 78/87/23 109/86/23 112/85/23
+f 73/88/21 74/87/21 97/86/21 100/85/21
+f 69/86/19 70/85/19 89/88/19 92/87/19
+f 50/86/26 49/85/26 81/88/26 84/87/26
+f 123/91/15 139/92/15 140/93/15 124/94/15
+f 122/95/10 138/96/10 139/97/10 123/98/10
+f 121/99/2 137/100/2 138/96/2 122/95/2
+f 120/101/11 136/102/11 137/100/11 121/99/11
+f 119/103/16 135/104/16 136/102/16 120/101/16
+f 113/105/4 129/106/4 130/107/4 114/108/4
+f 118/109/12 134/110/12 135/104/12 119/103/12
+f 117/111/3 133/112/3 134/110/3 118/109/3
+f 128/113/7 144/114/7 129/106/7 113/105/7
+f 116/115/14 132/116/14 133/112/14 117/111/14
+f 127/117/17 143/118/17 144/114/17 128/113/17
+f 115/119/18 131/120/18 132/116/18 116/115/18
+f 126/121/8 142/122/8 143/118/8 127/117/8
+f 114/108/13 130/107/13 131/123/13 115/124/13
+f 125/125/1 141/126/1 142/122/1 126/121/1
+f 124/94/9 140/93/9 141/126/9 125/125/9
+f 145/127/17 146/128/17 148/129/17 147/130/17
+f 147/131/1 148/132/1 150/133/1 149/134/1
+f 149/134/15 150/133/15 152/135/15 151/136/15
+f 151/136/2 152/135/2 154/137/2 153/138/2
+f 153/138/16 154/137/16 156/139/16 155/140/16
+f 155/140/3 156/139/3 158/141/3 157/142/3
+f 159/143/4 160/144/4 146/128/4 145/127/4
+f 157/142/18 158/141/18 160/144/18 159/143/18

mesecons_insulated/doc/insulated/description.html

@@ -0,0 +1 @@
+ Insulated mesecons are conductors that only conduct in one direction (and also not up or down).

mesecons_lamp/doc/lamp/description.html

@@ -0,0 +1 @@
+Lamps are effectors that if powered emit light.

mesecons_lamp/init.lua

@@ -17,7 +17,7 @@ minetest.register_node("mesecons_lamp:lamp_on", {
 	legacy_wallmounted = true,
 	sunlight_propagates = true,
 	walkable = true,
-	light_source = LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	node_box = mesecon_lamp_box,
 	selection_box = mesecon_lamp_box,
 	groups = {dig_immediate=3,not_in_creative_inventory=1, mesecon_effector_on = 1},

mesecons_lightstone/doc/lightstone_blue/description.html

@@ -0,0 +1 @@
+Effector, glows blue when powered.