Merge remote-tracking branch 'upstream/master'

homedecor_3d_extras/.luacheckrc

@@ -1,18 +0,0 @@
-unused_args = false
-allow_defined_top = true
-max_comment_line_length = 999
-
-read_globals = {
-	"DIR_DELIM",
-	"minetest", "core",
-	"unpack",
-	"dump",
-	table = { fields = { "copy", "getn" } },
-	"vector", "nodeupdate",
-	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
-}
-
-globals = {
-}
-

homedecor_3d_extras/init.lua

@@ -1,14 +1,16 @@
-minetest.override_item("default:bookshelf", {
-	drawtype = "mesh",
-	mesh = "homedecor_3d_bookshelf.obj",
-	tiles = {
-		"default_wood.png",
-		"default_wood.png^homedecor_3d_bookshelf_inside_back.png",
-		"homedecor_3d_bookshelf_books.png",
-	},
-	paramtype = "light",
-	paramtype2 = "facedir",
-})
+if minetest.get_modpath("default") then
+	minetest.override_item("default:bookshelf", {
+		drawtype = "mesh",
+		mesh = "homedecor_3d_bookshelf.obj",
+		tiles = {
+			"default_wood.png",
+			"default_wood.png^homedecor_3d_bookshelf_inside_back.png",
+			"homedecor_3d_bookshelf_books.png",
+		},
+		paramtype = "light",
+		paramtype2 = "facedir",
+	})
+end
 
 if minetest.get_modpath("vessels") then
 	minetest.override_item("vessels:shelf", {

homedecor_3d_extras/mod.conf

@@ -1,4 +1,3 @@
 name = homedecor_3d_extras
 description = Homedecor Mod: 3d extras
-depends = default
-optional_depends = vessels, moreblocks, doors
+optional_depends = vessels, moreblocks, doors, default