summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2018-12-08 20:21:13 +0000
committerVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2018-12-08 20:21:13 +0000
commit839b0ed4b1c0a9cfca312ad5031d99d3cfb52e8a (patch)
tree52d112e4404f1b251594886fc86b8794db8ffe04
parentef5d30c92d71aa593353f453368ab429b47eadf4 (diff)
parentda764f4ce02b82e36e3c01d3903a4322bc3c9886 (diff)
downloadpipeworks-839b0ed4b1c0a9cfca312ad5031d99d3cfb52e8a.tar
pipeworks-839b0ed4b1c0a9cfca312ad5031d99d3cfb52e8a.tar.gz
pipeworks-839b0ed4b1c0a9cfca312ad5031d99d3cfb52e8a.tar.bz2
pipeworks-839b0ed4b1c0a9cfca312ad5031d99d3cfb52e8a.tar.xz
pipeworks-839b0ed4b1c0a9cfca312ad5031d99d3cfb52e8a.zip
Merge branch 'nomesecons' into 'master'
Remove hard dependency on mesecons See merge request VanessaE/pipeworks!7
-rw-r--r--depends.txt4
-rw-r--r--init.lua7
2 files changed, 6 insertions, 5 deletions
diff --git a/depends.txt b/depends.txt
index 97c9e30..b5dcdb1 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,5 +1,5 @@
default
basic_materials
-mesecons
-mesecons_mvps
+mesecons?
+mesecons_mvps?
digilines?
diff --git a/init.lua b/init.lua
index 714480e..445a8d4 100644
--- a/init.lua
+++ b/init.lua
@@ -133,15 +133,16 @@ dofile(pipeworks.modpath..logicdir.."flowable_node_registry_install.lua")
if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end
if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end
-
if pipeworks.enable_redefines then
dofile(pipeworks.modpath.."/compat-chests.lua")
dofile(pipeworks.modpath.."/compat-furnaces.lua")
end
if pipeworks.enable_autocrafter then dofile(pipeworks.modpath.."/autocrafter.lua") end
-if pipeworks.enable_lua_tube then dofile(pipeworks.modpath.."/lua_tube.lua") end
+if pipeworks.enable_lua_tube and
+ (minetest.get_modpath("mesecons") or minetest.get_modpath("digilines")) then
+ dofile(pipeworks.modpath.."/lua_tube.lua")
+end
minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
print("Pipeworks loaded!")
-