Merge remote-tracking branch 'upstream/master'

Merge branch 'fix-recipies-groups' into 'master'
Update recipies to contain groups See merge request VanessaE/homedecor_modpack!17
2020-12-03 20:50:27 +01:00 · 2020-12-01 23:45:49 +00:00 · 2020-12-02 00:32:16 +01:00 · 2020-11-25 21:53:41 +01:00 · 2020-11-19 20:29:59 +00:00 · 2020-11-19 16:41:12 +00:00
6 changed files with 23 additions and 22 deletions
--- a/building_blocks/recipes.lua
+++ b/building_blocks/recipes.lua
@ -41,7 +41,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'building_blocks:fakegrass 2',
 	recipe = {
-		{'default:leaves'},
+		{'group:leaves'},
 		{"default:dirt"},
 	}
 })
@ -139,7 +139,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'building_blocks:woodglass 1',
 	recipe = {
-		{"default:wood"},
+		{"group:wood"},
 		{"default:glass"},
 	}
 })
--- a/homedecor_electrical/init.lua
+++ b/homedecor_electrical/init.lua
@ -161,7 +161,7 @@ minetest.register_craft( {
 minetest.register_craft( {
        output = "homedecor:doorbell",
        recipe = {
-			{ "homedecor:light_switch", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" }
+			{ "homedecor:light_switch_off", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" }
        },
 })

--- a/homedecor_furniture/init.lua
+++ b/homedecor_furniture/init.lua
@ -76,7 +76,7 @@ homedecor.register("wall_shelf", {
 minetest.register_craft({
 	output = "homedecor:table",
 	recipe = {
-		{ "default:wood","default:wood", "default:wood" },
+		{ "group:wood","group:wood", "group:wood" },
 		{ "group:stick", "", "group:stick" },
 	},
 })
--- a/homedecor_lighting/init.lua
+++ b/homedecor_lighting/init.lua
@ -27,19 +27,20 @@ local word_to_bright = {
 }

 local rules_alldir = {
-	{x =  0, y =  0, z = -1},  -- borrowed from lightstones
-	{x =  1, y =  0, z =  0},
-	{x = -1, y =  0, z =  0},
 	{x =  0, y =  0, z =  1},
-	{x =  1, y =  1, z =  0},
-	{x =  1, y = -1, z =  0},
-	{x = -1, y =  1, z =  0},
-	{x = -1, y = -1, z =  0},
+	{x = -1, y =  0, z =  0},
+	{x =  1, y =  0, z =  0},
+	{x =  0, y =  0, z = -1},  -- borrowed from lightstones
 	{x =  0, y =  1, z =  1},
-	{x =  0, y = -1, z =  1},
+	{x = -1, y =  1, z =  0},
+	{x =  0, y =  1, z =  0},
+	{x =  1, y =  1, z =  0},
 	{x =  0, y =  1, z = -1},
-	{x =  0, y = -1, z = -1},
+	{x =  0, y = -1, z =  1},
+	{x = -1, y = -1, z =  0},
 	{x =  0, y = -1, z =  0},
+	{x =  1, y = -1, z =  0},
+	{x =  0, y = -1, z = -1},
 }

 -- mesecons compatibility
--- a/homedecor_office/init.lua
+++ b/homedecor_office/init.lua
@ -96,8 +96,8 @@ minetest.register_craft({
    output = "homedecor:desk",
    recipe = {
 		{ "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" },
-		{ "homedecor:drawer_small", "default:wood", "default:wood" },
-		{ "homedecor:drawer_small", "", "default:wood" },
+		{ "homedecor:drawer_small", "group:wood", "group:wood" },
+		{ "homedecor:drawer_small", "", "group:wood" },
    },
 })

@ -105,17 +105,17 @@ minetest.register_craft({
    output = "homedecor:desk",
    recipe = {
 		{ "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" },
-		{ "homedecor:drawer_small", "default:wood", "default:wood" },
-		{ "homedecor:drawer_small", "", "default:wood" },
+		{ "homedecor:drawer_small", "group:wood", "group:wood" },
+		{ "homedecor:drawer_small", "", "group:wood" },
    },
 })

 minetest.register_craft({
    output = "homedecor:filing_cabinet",
    recipe = {
-		{ "", "default:wood", "" },
-		{ "default:wood", "homedecor:drawer_small", "default:wood" },
-		{ "", "default:wood", "" },
+		{ "", "group:wood", "" },
+		{ "group:wood", "homedecor:drawer_small", "group:wood" },
+		{ "", "group:wood", "" },
    },
 })

--- a/homedecor_wardrobe/init.lua
+++ b/homedecor_wardrobe/init.lua
@ -189,7 +189,7 @@ minetest.register_craft( {
 	output = "homedecor:wardrobe",
 	recipe = {
 		{ "homedecor:drawer_small", "homedecor:kitchen_cabinet" },
-		{ "homedecor:drawer_small", "default:wood" },
-		{ "homedecor:drawer_small", "default:wood" }
+		{ "homedecor:drawer_small", "group:wood" },
+		{ "homedecor:drawer_small", "group:wood" }
 	},
 })
Author	SHA1	Message	Date
sys4	99a01301a8	Merge remote-tracking branch 'upstream/master'	2020-12-03 20:50:27 +01:00
Vanessa Dannenberg	a57723df7d	Merge branch 'fix-recipies-groups' into 'master' Update recipies to contain groups See merge request VanessaE/homedecor_modpack!17	2020-12-01 23:45:49 +00:00
Peter Nerlich	af808c7586	update recipies to contain groups instead of concrete items: wardrobe, filing_cabinet, desk, table, woodglass, fakegrass	2020-12-02 00:32:16 +01:00
sys4	2ef259fa24	Merge remote-tracking branch 'upstream/master'	2020-11-25 21:53:41 +01:00
Vanessa Dannenberg	99d5d96113	Merge branch 'master' into 'master' add connection to direct top node (0;1;0) in rules_alldir of homedecor_lightning/init.lua See merge request VanessaE/homedecor_modpack!16	2020-11-19 20:29:59 +00:00
Sebastian Lobinger	93bf5d76ae	reorder rules_alldir in homedecor_lightning/init.lua so it can read by y-axis and then line by line of 2d coordinates if you express the connections in ascii where N is the Node 1 is connected and 0 is not connected: ``` y+0: 010 1N1 010 y+1: 010 111 010 y-1: 010 111 010 ``` This code structure is more easy to read / a very close representation of the sketched layers.	2020-11-19 16:41:12 +00:00
Sebastian Lobinger	ec06010320	add connection to direct top node (0;1;0) in rules_alldir of homedecor_lightning/init.lua This allows the rope_light_on_ceiling node to be connected with mesecon in a natural manner.	2020-11-19 16:17:28 +00:00
VanessaE	96a0862833	fixed doorbell recipe fixes #32	2020-11-18 11:41:19 -05:00