merge resolution

9 files changed, 20 insertions, 15 deletions

diff --git a/depends.txt b/depends.txt
index e72ef00..d0220ae 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,5 +1,5 @@
-default
-farming
+default?
+farming?
 stairs?
 homedecor?
 intllib?
diff --git a/init.lua b/init.lua
index a653218..4bd9b5e 100644
--- a/init.lua
+++ b/init.lua
@@ -29,6 +29,11 @@ else
 	cottages.S = function(s) return s end
 end
 
+-- MineClone2 needs special treatment; default is only needed for
+-- crafting materials and sounds (less important)
+if( not( minetest.get_modpath("default"))) then
+	default = {};
+end
 --cottages.config_use_mesh_barrel   = false;
 --cottages.config_use_mesh_handmill = true;
 
diff --git a/nodes_feldweg.lua b/nodes_feldweg.lua
index bf64c61..e424e15 100644
--- a/nodes_feldweg.lua
+++ b/nodes_feldweg.lua
@@ -397,7 +397,7 @@ if( minetest.get_modpath("stairs") and stairs and stairs.register_stair_and_slab
 		{"cottages_feldweg.png","default_dirt.png", "default_grass.png","default_grass.png","cottages_feldweg.png","cottages_feldweg.png"},
 		S("Dirt Road Stairs"),
 		S("Dirt Road, half height"),
-		default.node_sound_dirt_defaults())
+		default.node_sound_dirt_defaults)
 end
 
 if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then
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 = {
diff --git a/nodes_historic.lua b/nodes_historic.lua
index 46537fb..993fb3e 100644
--- a/nodes_historic.lua
+++ b/nodes_historic.lua
@@ -27,7 +27,7 @@ minetest.register_node("cottages:wagon_wheel", {
         },
         groups = {choppy=2,dig_immediate=2,attached_node=1},
         legacy_wallmounted = true,
-        sounds = default.node_sound_defaults(),
+        sounds = default.node_sound_defaults,
 	is_ground_content = false,
 })
 
diff --git a/nodes_mining.lua b/nodes_mining.lua
index 05fa7fe..297af3e 100644
--- a/nodes_mining.lua
+++ b/nodes_mining.lua
@@ -55,7 +55,7 @@ minetest.register_node("cottages:ladder_with_rope_and_rail", {
 	},
 	groups = {choppy=2,oddly_breakable_by_hand=3,rail=1,connect_to_raillike=1}, --connect_to_raillike=minetest.raillike_group("rail")},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults,
 })
 
 
diff --git a/nodes_roof.lua b/nodes_roof.lua
index 11174d8..9503e86 100644
--- a/nodes_roof.lua
+++ b/nodes_roof.lua
@@ -191,7 +191,7 @@ minetest.register_node("cottages:slate_vertical", {
         tiles = {"cottages_slate.png",cottages.texture_roof_sides,"cottages_slate.png","cottages_slate.png",cottages.texture_roof_sides,"cottages_slate.png"},
         paramtype2 = "facedir",
         groups = {cracky=2, stone=1},
-        sounds = default.node_sound_stone_defaults(),
+        sounds = default.node_sound_stone_defaults,
 	is_ground_content = false,
 })
 
@@ -209,7 +209,7 @@ minetest.register_node("cottages:reet", {
         description = S("Reet for thatching"),
         tiles = {"cottages_reet.png"},
 	groups = {snappy=3,choppy=3,oddly_breakable_by_hand=3,flammable=3},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults,
 	is_ground_content = false,
 })
 
diff --git a/nodes_straw.lua b/nodes_straw.lua
index d5513e9..d119c98 100644
--- a/nodes_straw.lua
+++ b/nodes_straw.lua
@@ -32,7 +32,7 @@ minetest.register_node("cottages:straw_mat", {
         paramtype2 = "facedir",
         walkable = false,
         groups = { snappy = 3 },
-        sounds = default.node_sound_leaves_defaults(),
+        sounds = default.node_sound_leaves_defaults,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -58,7 +58,7 @@ minetest.register_node("cottages:straw_bale", {
 	tiles = {"cottages_darkage_straw_bale.png"},
 	paramtype = "light",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults,
         -- the bale is slightly smaller than a full node
 	node_box = {
 		type = "fixed",
@@ -81,7 +81,7 @@ minetest.register_node("cottages:straw", {
 	description = S("Straw block"),
 	tiles = {"cottages_darkage_straw.png"},
 	groups = {snappy=3,choppy=3,oddly_breakable_by_hand=3,flammable=3},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults,
         -- the bale is slightly smaller than a full node
 	is_ground_content = false,
 })
diff --git a/screenshot.jpg b/screenshot.jpg
new file mode 100644
index 0000000..62916da
--- /dev/null
+++ b/screenshot.jpg