Merge branch 'master' into nextgen

Conflicts:
	mesecons/internal.lua
	mesecons/wires.lua
	mesecons_pistons/init.lua
This commit is contained in:
Jeija
2012-12-21 16:22:25 +01:00
4 changed files with 27 additions and 46 deletions

View File

@ -134,6 +134,7 @@ function mesecon:receptor_get_rules(node)
return rules
end
end
return mesecon.rules.default
end