Merge remote-tracking branch 'upstream/master'

remove duplicate craft recipe (#65 )
Fix recipe collision (#64 )
2025-07-15 22:40:24 +02:00 · 2021-11-01 10:41:33 +01:00 · 2021-10-13 14:34:36 +02:00 · 2021-10-11 09:04:12 +02:00 · 2021-10-04 21:49:01 +02:00 · 2021-08-31 19:59:22 +02:00
5 changed files with 6 additions and 25 deletions
--- a/.luacheckrc
+++ b/.luacheckrc
@ -20,7 +20,6 @@ read_globals = {
 	"screwdriver",
 	"minetest",
 	"mesecon",
-	"unifieddyes",
-	"pkarcs"
+	"unifieddyes"

 }
--- a/crafts.lua
+++ b/crafts.lua
@ -1486,9 +1486,9 @@ minetest.register_craft({
 minetest.register_craft({
    output = "scifi_nodes:plant8",
    recipe = {
-        {"flowers:viola","default:junglegrass"},
-        {"default:dirt",""},
-        {"scifi_nodes:greybolts",""}
+        {"flowers:viola","default:junglegrass", "default:grass_1"},
+        {"default:dirt","",""},
+        {"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 = {
--- a/init.lua
+++ b/init.lua
@ -31,8 +31,4 @@ dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
 dofile(MP.."/octagon_panes.lua")
 dofile(MP.."/crafts.lua")
-
-if minetest.get_modpath("pkarcs") then
-	-- register some nodes in the pkarcs mod
-	dofile(MP.."/pkarcs.lua")
-end
+minetest.log("action", "[scifi_nodes] loaded.")
--- a/mod.conf
+++ b/mod.conf
@ -11,6 +11,5 @@ mesecons_torch,
 mesecons_receiver,
 basic_materials,
 dye,
-unifieddyes,
-pkarcs
+unifieddyes
 """
--- a/pkarcs.lua
+++ b/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")
Author	SHA1	Message	Date
sys4	8816db8ecf	Merge remote-tracking branch 'upstream/master'	2021-11-01 10:41:33 +01:00
OgelGames	1558b4c146	remove duplicate craft recipe (#65 )	2021-10-13 14:34:36 +02:00
acmgit	cb515e60f1	Fix recipe collision (#64 ) * Fixed Recipe-Collision.	2021-10-11 09:04:12 +02:00
sys4	5b903a6e78	Merge remote-tracking branch 'upstream/master'	2021-10-04 21:49:01 +02:00
sys4	eb231d7ca7	Merge remote-tracking branch 'upstream/master'	2021-08-31 19:59:22 +02:00
sys4	2fd4de11c0	Merge remote-tracking branch 'upstream/master'	2021-08-16 18:18:21 +02:00
sys4	b88b7349a5	Merge remote-tracking branch 'upstream/master'	2021-06-20 17:30:14 +02:00
sys4	c30ae4b3bd	Merge remote-tracking branch 'upstream/master'	2021-05-09 21:44:34 +02:00
sys4	6cf45fcd43	Merge remote-tracking branch 'upstream/master'	2021-03-25 21:58:42 +01:00
sys4	1ded358e04	Merge branch 'github'	2021-03-20 13:38:15 +01:00
sys4	ecfaa4714a	Fix things to avoid warnings about use_texture_alpha And optimize textures with optipng	2021-03-20 13:33:39 +01:00
sys4	c341cb8a20	Merge remote-tracking branch 'upstream/master'	2021-01-29 17:43:56 +01:00
sys4	d66e04f9b1	Merge remote-tracking branch 'upstream/master'	2020-12-24 21:10:26 +01:00
sys4	d3d6a7bf79	Merge remote-tracking branch 'upstream/master'	2020-12-18 12:21:17 +01:00
sys4	e34fdde795	Merge remote-tracking branch 'upstream/master'	2020-12-15 23:41:17 +01:00
sys4	1993068ed1	Merge remote-tracking branch 'upstream/master'	2020-11-12 22:04:59 +01:00
sys4	436f51ab0d	Merge remote-tracking branch 'upstream/master'	2020-11-10 19:59:40 +01:00
sys4	749d59a530	Merge remote-tracking branch 'upstream/master'	2020-09-13 12:28:42 +02:00
sys4	bd58dbc48b	Merge remote-tracking branch 'upstream/master'	2020-07-23 11:42:19 +02:00
sys4	4eaba4f6e1	Adds loading message in the Action Log	2020-07-21 11:52:47 +02:00