Merge remote-tracking branch 'upstream/master'

* Fixed Recipe-Collision.

README.md

@@ -55,3 +55,4 @@ CC0
 * OgelGames https://github.com/OgelGames
 * leftshift https://github.com/leftshift
 * fluxionary https://github.com/fluxionary
+* Niles Corder https://github.com/ncorder

crafts.lua

@@ -10,8 +10,22 @@ if minetest.get_modpath("basic_materials") then
             {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}
         }
     })
+
+    if minetest.settings:get_bool("scifi_nodes.teleporter_enable_crafting", false) then
+        -- enable the teleporter pad crafting recipe only if the setting is enabled
+        minetest.register_craft({
+            output = "scifi_nodes:pad",
+            recipe = {
+                {"homedecor:plastic_sheeting", "quartz:block", "homedecor:plastic_sheeting"},
+                {"default:mese_crystal", "quartz:block", "default:mese_crystal"},
+                {"homedecor:plastic_sheeting", "quartz:block", "homedecor:plastic_sheeting"}
+            }
+        })
+    end
+
 end
 
+
 if not minetest.get_modpath("default") or not minetest.get_modpath("dye") then
     -- the default and dye mod are required for most of the recipes
     -- if either of them is missing (because we are not in the default game)
@@ -1472,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","",""}
     }
 })
 
@@ -1621,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,3 +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.")

settingtypes.txt

@@ -1,2 +1,5 @@
-#    Doors can only be opened by mesecon signal
+# Doors can only be opened by mesecon signal
-scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool true
+scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool false
+
+# Teleporter recipe flag
+scifi_nodes.teleporter_enable_crafting (enables the teleporter recipe) bool false