update farmind, homedecor, and unified dyes

6 files changed, 118 insertions, 24 deletions

diff --git a/farming/README.md b/farming/README.md
index 012edd4..55ddee0 100644
--- a/farming/README.md
+++ b/farming/README.md
@@ -59,4 +59,4 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 - 0.1 - Fixed growing bug
 - 0.0 - Initial release
 
-### Lucky Blocks: 30
+### Lucky Blocks: 38
diff --git a/farming/lucky_block.lua b/farming/lucky_block.lua
index b24ed32..6f656ff 100644
--- a/farming/lucky_block.lua
+++ b/farming/lucky_block.lua
@@ -15,7 +15,7 @@ if minetest.get_modpath("lucky_block") then
 		{"dro", {"farming:bottle_ethanol"}, 1},
 		{"nod", "farming:melon", 0},
 		{"dro", {"farming:donut", "farming:donut_chocolate", "farming:donut_apple"}, 5},
-		{"dro", {"farming:hemp_leaf", "farming:hemp_fibre", "farming:seed_hemp"}, 5},
+		{"dro", {"farming:hemp_leaf", "farming:hemp_fibre", "farming:seed_hemp"}, 10},
 		{"nod", "fire:permanent_flame", 1},
 		{"dro", {"farming:chili_pepper", "farming:chili_bowl"}, 5},
 		{"dro", {"farming:bowl"}, 3},
@@ -34,5 +34,40 @@ if minetest.get_modpath("lucky_block") then
 		{"dro", {"farming:hoe_bomb"}, 10},
 		{"dro", {"farming:turkish_delight"}, 5},
 		{"lig"},
+		{"sch", "instafarm", 0, true, {
+			{"farming:wheat_8", "farming:carrot_8"},
+			{"farming:cotton_8", "farming:rhubarb_3"},
+		}},
+		{"sch", "instafarm", 0, true, {
+			{"farming:wheat_8", "farming:pepper_5"},
+			{"farming:cotton_8", "farming:onion_5"},
+		}},
+		{"sch", "instafarm", 0, true, {
+			{"farming:wheat_8", "farming:beetroot_5"},
+			{"farming:cotton_8", "farming:barley_7"},
+		}},
+		{"sch", "instafarm", 0, true, {
+			{"farming:wheat_8", "farming:corn_8"},
+			{"farming:cotton_8", "farming:grapes_8"},
+		}},
+		{"sch", "instafarm", 0, true, {
+			{"farming:wheat_8", "farming:pea_5"},
+			{"farming:cotton_8", "farming:coffee_5"},
+		}},
+		{"sch", "instafarm", 0, true, {
+			{"farming:wheat_8", "farming:raspberry_4"},
+			{"farming:cotton_8", "farming:tomato_8"},
+		}},
+		{"sch", "instafarm", 0, true, {
+			{"farming:wheat_8", "farming:chili_8"},
+			{"farming:cotton_8", "farming:cucumber_4"},
+		}},
+		{"nod", "default:chest", 0, {
+			{name = "farming:seed_wheat", max = 15},
+			{name = "farming:seed_barley", max = 15},
+			{name = "farming:seed_barley", max = 15},
+			{name = "farming:seed_hemp", max = 15},
+			{name = "farming:soil_wet", max = 10},
+		}},
 	})
 end
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
 
@@ -2170,6 +2209,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",
     recipe = {
diff --git a/homedecor/depends.txt b/homedecor/depends.txt
index 1c71e74..baaeb85 100644
--- a/homedecor/depends.txt
+++ b/homedecor/depends.txt
@@ -14,3 +14,4 @@ flowers?
 3d_armor?
 skinsdb?
 mesecons?
+darkage?
diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua
index 9055f23..ddd0e44 100644
--- a/homedecor/lighting.lua
+++ b/homedecor/lighting.lua
@@ -360,13 +360,20 @@ homedecor.register("ceiling_lantern", {
 	walkable = false
 })
 
-homedecor.register("lattice_lantern_large", {
-	description = S("Lattice lantern (large)"),
-	tiles = { 'homedecor_lattice_lantern_large.png' },
-	groups = { snappy = 3 },
-	light_source = default.LIGHT_MAX,
-	sounds = default.node_sound_glass_defaults(),
-})
+local sm_light = default.LIGHT_MAX-2
+
+if minetest.get_modpath("darkage") then
+	minetest.register_alias("homedecor:lattice_lantern_large", "darkage:lamp")
+	sm_light = default.LIGHT_MAX-5
+else
+	homedecor.register("lattice_lantern_large", {
+		description = S("Lattice lantern (large)"),
+		tiles = { 'homedecor_lattice_lantern_large.png' },
+		groups = { snappy = 3 },
+		light_source = default.LIGHT_MAX,
+		sounds = default.node_sound_glass_defaults(),
+	})
+end
 
 homedecor.register("lattice_lantern_small", {
 	description = S("Lattice lantern (small)"),
@@ -384,7 +391,7 @@ homedecor.register("lattice_lantern_small", {
 		fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 }
 	},
 	groups = { snappy = 3 },
-	light_source = default.LIGHT_MAX-1,
+	light_source = sm_light,
 	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
diff --git a/unifieddyes/init.lua b/unifieddyes/init.lua
index 07d6864..27be3f1 100644
--- a/unifieddyes/init.lua
+++ b/unifieddyes/init.lua
@@ -667,7 +667,10 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing)
 
 	local palette = nil
 	local fdir = 0
-	if def.palette == "unifieddyes_palette_extended.png" then
+	if not def or not def.palette then
+		minetest.chat_send_player(player_name, "*** That node can't be colored -- it's either undefined or has no palette.")
+		return
+	elseif def.palette == "unifieddyes_palette_extended.png" then
 		palette = "extended"
 	elseif def.palette == "unifieddyes_palette_colorwallmounted.png" then
 		palette = "wallmounted"