Merge remote-tracking branch 'upstream/master'

* Update default_settings.lua and settingtypes.txt
- Make new vertical behaviour opt-in
- crop comment

autocrafter.lua

@@ -601,11 +601,12 @@ minetest.register_node("pipeworks:autocrafter", {
 					if #msg < 3 then return end
 					local inv = meta:get_inventory()
 					for y = 0, 2, 1 do
+						local row = msg[y + 1]
 						for x = 1, 3, 1 do
 							local slot = y * 3 + x
-							if minetest.registered_items[msg[y + 1][x]] then
+							if type(row) == "table" and minetest.registered_items[row[x]] then
 								inv:set_stack("recipe", slot, ItemStack(
-									msg[y + 1][x]))
+									row[x]))
 							else
 								inv:set_stack("recipe", slot, ItemStack(""))
 							end

common.lua

@@ -15,7 +15,17 @@ pipeworks.rules_all = {{x=0, y=0, z=1},{x=0, y=0, z=-1},{x=1, y=0, z=0},{x=-1, y
 		{x=0, y=1, z=0}, {x=0, y=-1, z=0}}
 
 pipeworks.mesecons_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
-pipeworks.digilines_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
+
+local digilines_enabled = minetest.get_modpath("digilines") ~= nil
+if digilines_enabled and pipeworks.enable_vertical_digilines_connectivity then
+	pipeworks.digilines_rules=digiline.rules.default
+else
+	-- These rules break vertical connectivity to deployers, node breakers, dispensers, and digiline filter injectors
+	-- via digiline conducting tubes. Changing them may break some builds on some servers, so the setting was added
+	-- for server admins to be able to revert to the old "broken" behavior as some builds may use it as a "feature".
+	-- See https://github.com/mt-mods/pipeworks/issues/64
+	pipeworks.digilines_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0}}
+end
 
 pipeworks.liquid_texture = minetest.registered_nodes[pipeworks.liquids.water.flowing].tiles[1]
 if type(pipeworks.liquid_texture) == "table" then pipeworks.liquid_texture = pipeworks.liquid_texture.name end

default_settings.lua

@@ -31,6 +31,7 @@ local settings = {
 	delete_item_on_clearobject = true,
 	use_real_entities = true,
 	entity_update_interval = 0,
+	enable_vertical_digilines_connectivity = false,
 }
 
 pipeworks.toggles = {}

filter-injector.lua

@@ -451,11 +451,6 @@ for _, data in ipairs({
 			if not pipeworks.may_configure(pos, player) then return 0 end
 			return count
 		end,
-		can_dig = function(pos, player)
-			local meta = minetest.get_meta(pos)
-			local inv = meta:get_inventory()
-			return inv:is_empty("main")
-		end,
 		tube = {connect_sides = {right = 1}},
 	}
 

settingtypes.txt

@@ -85,6 +85,14 @@ pipeworks_use_real_entities (Use Real Entities) bool true
 #A value 0.2 or above may cause issues with accelerator tubes.
 pipeworks_entity_update_interval (Entity Update Interval) float 0 0 0.8
 
+# Use the default rules from the digilines mod.
+# If enabled the following devices will connect to digiline networks in the vertical direction:
+# digiline filter injector, deployer, dispenser, node breaker, autocrafter
+# This breaks expected behavior with digiline conducting tubes.
+# If disabled, the devices will not be able to send or recieve digiline signals from the top
+# or bottom faces, regardless of the node rotation.
+enable_vertical_digilines_connectivity (Use the default rules from the digilines mod) bool false
+
 # if set to true, items passing through teleport tubes will log log where they came from and where they went.
 pipeworks_log_teleport_tubes (Log Teleport Tubes) bool false