diff options
| author | h-v-smacker <hans-von-smacker+github@gmail.com> | 2018-07-14 21:44:44 +0300 |
|---|---|---|
| committer | h-v-smacker <hans-von-smacker+github@gmail.com> | 2018-07-14 21:44:44 +0300 |
| commit | 4b267bcde860f081616748d38010a38352672a00 (patch) | |
| tree | f0f2fbf004c87427efb5ca9144bfcc6c11052207 /nodes_furniture.lua | |
| parent | 69709206eb0264e348694b64b5749593bf2a8b69 (diff) | |
| parent | 739f3a7ac4d221590383d5d8cd97f821c7d61b87 (diff) | |
merge resolution
Diffstat (limited to 'nodes_furniture.lua')
| -rw-r--r-- | nodes_furniture.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nodes_furniture.lua b/nodes_furniture.lua index 946eab7..dbbf927 100644 --- a/nodes_furniture.lua +++ b/nodes_furniture.lua @@ -23,7 +23,7 @@ minetest.register_node("cottages:bed_foot", { paramtype = "light", paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_wood_defaults, node_box = { type = "fixed", fixed = { @@ -58,7 +58,7 @@ minetest.register_node("cottages:bed_head", { paramtype = "light", paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_wood_defaults, node_box = { type = "fixed", fixed = { @@ -99,7 +99,7 @@ minetest.register_node("cottages:sleeping_mat", { paramtype2 = "facedir", walkable = false, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_leaves_defaults, selection_box = { type = "wallmounted", }, @@ -133,7 +133,7 @@ minetest.register_node("cottages:sleeping_mat_head", { paramtype = 'light', paramtype2 = "facedir", groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_leaves_defaults, node_box = { type = "fixed", fixed = { @@ -162,7 +162,7 @@ minetest.register_node("cottages:bench", { paramtype = "light", paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_wood_defaults, node_box = { type = "fixed", fixed = { |