nalc/homedecor_modpack
1
0
Fork 1
forked from mtcontrib/homedecor_modpack
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nalc:caaa963eaf97c7af73788d4666a1773be21e8bb4
Branches Tags
nalc:master
nalc:nalc-1.2.0 nalc:nalc-1.0 mtcontrib:0.4.15 mtcontrib:0.4.16 mtcontrib:2018-08-22-1 mtcontrib:2018-09-13-1 mtcontrib:2018-09-13-2 mtcontrib:2018-09-13-3 mtcontrib:2018-11-09 mtcontrib:2018-11-09-2 mtcontrib:2018-11-23 mtcontrib:2018-11-26 mtcontrib:2019-05-04-1 mtcontrib:2019-05-25 mtcontrib:2019-05-27 mtcontrib:2019-05-28 mtcontrib:2019-05-28-2 mtcontrib:2019-05-28-3 mtcontrib:2019-05-30 mtcontrib:2019-05-31-4 mtcontrib:2019-06-02-1 mtcontrib:2019-06-02-2 mtcontrib:2019-06-03-1 mtcontrib:2019-06-03-2 mtcontrib:2019-06-04-1 mtcontrib:2019-06-06-1 mtcontrib:2019-06-06-2 mtcontrib:2019-06-06-3 mtcontrib:2019-06-07-1 mtcontrib:2019-06-07-2 mtcontrib:2019-06-07-3 mtcontrib:2019-06-15-1 mtcontrib:2019-06-18-1 mtcontrib:2019-06-20-1 mtcontrib:2019-06-25-1 mtcontrib:2019-09-12-1 mtcontrib:2019-09-19-1 mtcontrib:2019-09-19-2 mtcontrib:2019-09-22-1 mtcontrib:20190430 mtcontrib:2020-06-04-1 mtcontrib:20200603-1302 mtcontrib:2021-01-30 mtcontrib:2021-02-25-01 mtcontrib:2021-02-25-02 mtcontrib:2021-03-26-1 mtcontrib:2021-03-26-2 mtcontrib:2021-03-27-1 mtcontrib:stable-20170228 mtcontrib:stable-20170925 mtcontrib:stable-20170925-3
...
compare: nalc:99a01301a81690c34873e81df9bde25d37e858f1
Branches Tags
nalc:master mtcontrib:master mtcontrib:seat_dig_freeing mtcontrib:ditch_physics_hell_for_entity_hell mtcontrib:issue_67 mtcontrib:stair_complaining mtcontrib:global-luacheckrc
nalc:nalc-1.2.0 nalc:nalc-1.0 mtcontrib:0.4.15 mtcontrib:0.4.16 mtcontrib:2018-08-22-1 mtcontrib:2018-09-13-1 mtcontrib:2018-09-13-2 mtcontrib:2018-09-13-3 mtcontrib:2018-11-09 mtcontrib:2018-11-09-2 mtcontrib:2018-11-23 mtcontrib:2018-11-26 mtcontrib:2019-05-04-1 mtcontrib:2019-05-25 mtcontrib:2019-05-27 mtcontrib:2019-05-28 mtcontrib:2019-05-28-2 mtcontrib:2019-05-28-3 mtcontrib:2019-05-30 mtcontrib:2019-05-31-4 mtcontrib:2019-06-02-1 mtcontrib:2019-06-02-2 mtcontrib:2019-06-03-1 mtcontrib:2019-06-03-2 mtcontrib:2019-06-04-1 mtcontrib:2019-06-06-1 mtcontrib:2019-06-06-2 mtcontrib:2019-06-06-3 mtcontrib:2019-06-07-1 mtcontrib:2019-06-07-2 mtcontrib:2019-06-07-3 mtcontrib:2019-06-15-1 mtcontrib:2019-06-18-1 mtcontrib:2019-06-20-1 mtcontrib:2019-06-25-1 mtcontrib:2019-09-12-1 mtcontrib:2019-09-19-1 mtcontrib:2019-09-19-2 mtcontrib:2019-09-22-1 mtcontrib:20190430 mtcontrib:2020-06-04-1 mtcontrib:20200603-1302 mtcontrib:2021-01-30 mtcontrib:2021-02-25-01 mtcontrib:2021-02-25-02 mtcontrib:2021-03-26-1 mtcontrib:2021-03-26-2 mtcontrib:2021-03-27-1 mtcontrib:stable-20170228 mtcontrib:stable-20170925 mtcontrib:stable-20170925-3

8 Commits
caaa963eaf ... 99a01301a8

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
6 changed files with 23 additions and 22 deletions
Expand all files Collapse all files

4
building_blocks/recipes.lua
View File

@ -41,7 +41,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = 'building_blocks:fakegrass 2', output = 'building_blocks:fakegrass 2',
recipe = { recipe = {
{'default:leaves'}, {'group:leaves'},
{"default:dirt"}, {"default:dirt"},
} }
}) })
@ -139,7 +139,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = 'building_blocks:woodglass 1', output = 'building_blocks:woodglass 1',
recipe = { recipe = {
{"default:wood"}, {"group:wood"},
{"default:glass"}, {"default:glass"},
} }
}) })

2
homedecor_electrical/init.lua
View File

@ -161,7 +161,7 @@ minetest.register_craft( {
minetest.register_craft( { minetest.register_craft( {
output = "homedecor:doorbell", output = "homedecor:doorbell",
recipe = { recipe = {
{ "homedecor:light_switch", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" } { "homedecor:light_switch_off", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" }
}, },
}) })

2
homedecor_furniture/init.lua
View File

@ -76,7 +76,7 @@ homedecor.register("wall_shelf", {
minetest.register_craft({ minetest.register_craft({
output = "homedecor:table", output = "homedecor:table",
recipe = { recipe = {
{ "default:wood","default:wood", "default:wood" }, { "group:wood","group:wood", "group:wood" },
{ "group:stick", "", "group:stick" }, { "group:stick", "", "group:stick" },
}, },
}) })

19
homedecor_lighting/init.lua
View File

@ -27,19 +27,20 @@ local word_to_bright = {
} }
local rules_alldir = { 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 = 0, y = 0, z = 1},
{x = 1, y = 1, z = 0}, {x = -1, y = 0, z = 0},
{x = 1, y = -1, z = 0}, {x = 1, y = 0, z = 0},
{x = -1, y = 1, z = 0}, {x = 0, y = 0, z = -1}, -- borrowed from lightstones
{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}, {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 = 0, y = -1, z = 0},
{x = 1, y = -1, z = 0},
{x = 0, y = -1, z = -1},
} }
-- mesecons compatibility -- mesecons compatibility

14
homedecor_office/init.lua
View File

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

4
homedecor_wardrobe/init.lua
View File

@ -189,7 +189,7 @@ minetest.register_craft( {
output = "homedecor:wardrobe", output = "homedecor:wardrobe",
recipe = { recipe = {
{ "homedecor:drawer_small", "homedecor:kitchen_cabinet" }, { "homedecor:drawer_small", "homedecor:kitchen_cabinet" },
{ "homedecor:drawer_small", "default:wood" }, { "homedecor:drawer_small", "group:wood" },
{ "homedecor:drawer_small", "default:wood" } { "homedecor:drawer_small", "group:wood" }
}, },
}) })