Merge remote-tracking branch 'upstream/master'

* Fixed Recipe-Collision.

.luacheckrc

@@ -20,7 +20,6 @@ read_globals = {
 	"screwdriver",
 	"minetest",
 	"mesecon",
-	"unifieddyes",
+	"unifieddyes"
-	"pkarcs"
 
 }

crafts.lua

@@ -1486,9 +1486,9 @@ minetest.register_craft({
 minetest.register_craft({
     output = "scifi_nodes:plant8",
     recipe = {
-        {"flowers:viola","default:junglegrass"},
+        {"flowers:viola","default:junglegrass", "default:grass_1"},
-        {"default:dirt",""},
+        {"default:dirt","",""},
-        {"scifi_nodes:greybolts",""}
+        {"scifi_nodes:greybolts","",""}
     }
 })
 
@@ -1635,15 +1635,6 @@ minetest.register_craft({
     }
 })
 
-minetest.register_craft({
-    output = 'scifi_nodes:doomwall43 6',
-    recipe = {
-        {"scifi_nodes:white","dye:black","scifi_nodes:white"},
-        {"scifi_nodes:black","dye:dark_green","scifi_nodes:black"},
-        {"scifi_nodes:white","dye:yellow","scifi_nodes:white"}
-    }
-})
-
 minetest.register_craft({
     output = 'scifi_nodes:doomwall43 6',
     recipe = {

init.lua

@@ -31,8 +31,4 @@ dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
 dofile(MP.."/octagon_panes.lua")
 dofile(MP.."/crafts.lua")
-
+minetest.log("action", "[scifi_nodes] loaded.")
-if minetest.get_modpath("pkarcs") then
-	-- register some nodes in the pkarcs mod
-	dofile(MP.."/pkarcs.lua")
-end

mod.conf

@@ -11,6 +11,5 @@ mesecons_torch,
 mesecons_receiver,
 basic_materials,
 dye,
-unifieddyes,
+unifieddyes
-pkarcs
 """

pkarcs.lua

@@ -1,4 +0,0 @@
-pkarcs.register_node("scifi_nodes:whitetile")
-pkarcs.register_node("scifi_nodes:whiteoct")
-pkarcs.register_node("scifi_nodes:white")
-pkarcs.register_node("scifi_nodes:lighttop")