merge resolution

1 files changed, 5 insertions, 0 deletions

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;