From 7097ab9f4eff53b4b2022f268471d205a479760c Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Tue, 23 Oct 2018 09:44:13 -0400
Subject: update farmind, homedecor, and unified dyes

---
 homedecor/crafts.lua | 74 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 61 insertions(+), 13 deletions(-)

(limited to 'homedecor/crafts.lua')

diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua
index f9edb53..72ccfd5 100644
--- a/homedecor/crafts.lua
+++ b/homedecor/crafts.lua
@@ -1207,21 +1207,60 @@ minetest.register_craft({
 
 -- wood-lattice lamps
 
-minetest.register_craft( {
-        output = "homedecor:lattice_lantern_large 2",
-        recipe = {
-			{ "dye:black", "dye:yellow", "dye:black" },
-			{ "group:stick", "building_blocks:woodglass", "group:stick" },
-			{ "group:stick", "homedecor:power_crystal", "group:stick" }
-        },
-})
+if minetest.get_modpath("darkage") then
+	minetest.register_craft( {
+		output = "homedecor:lattice_lantern_small 8",
+		recipe = {
+			{ "darkage:lamp" },
+		},
+	})
 
-minetest.register_craft( {
-        output = "homedecor:lattice_lantern_small 8",
-        recipe = {
+	minetest.register_craft( {
+		output = "darkage:lamp",
+		type = "shapeless",
+		recipe = {
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+		},
+	})
+else
+	minetest.register_craft( {
+			output = "homedecor:lattice_lantern_large 2",
+			recipe = {
+				{ "dye:black", "dye:yellow", "dye:black" },
+				{ "group:stick", "building_blocks:woodglass", "group:stick" },
+				{ "group:stick", "homedecor:power_crystal", "group:stick" }
+			},
+	})
+
+	minetest.register_craft( {
+		output = "homedecor:lattice_lantern_small 8",
+		recipe = {
 			{ "homedecor:lattice_lantern_large" },
-        },
-})
+		},
+	})
+
+	minetest.register_craft( {
+		output = "homedecor:lattice_lantern_large",
+		type = "shapeless",
+		recipe = {
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+		},
+	})
+end
 
 -- glowlights
 
@@ -2169,6 +2208,15 @@ minetest.register_craft({
     },
 })
 
+minetest.register_craft({
+    output = "homedecor:welcome_mat_green 2",
+    recipe = {
+		{ "", "dye:white", "" },
+		{ "dye:black", "dye:black", "dye:black" },
+		{ "wool:green", "wool:green", "wool:green" },
+    },
+})
+
 minetest.register_craft({
 	type = "shapeless",
     output = "homedecor:window_plain 8",
-- 
cgit v1.2.3