Merge remote-tracking branch 'upstream/master'

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-25 21:53:41 +01:00 · 2020-11-19 20:29:59 +00:00 · 2020-11-19 16:41:12 +00:00 · 2020-11-19 16:17:28 +00:00 · 2020-11-18 11:41:19 -05:00
2 changed files with 11 additions and 10 deletions
--- 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_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
Author	SHA1	Message	Date
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