Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 into myserver

mods/ITEMS/mcl_campfires/api.lua

@@ -282,7 +282,7 @@ function mcl_campfires.register_campfire(name, def)
 					type="vertical_frames",
 					aspect_w=32,
 					aspect_h=16,
-					length=2.0
+					length=0.8
 				 }}
 		},
 		overlay_tiles = {

mods/ITEMS/mcl_stonecutter/init.lua

@@ -392,7 +392,7 @@ minetest.register_node("mcl_stonecutter:stonecutter", {
 				type = "vertical_frames",
 				aspect_w = 16,
 				aspect_h = 16,
-				length = 1
+				length = 0.15
 			}
 		}
 	},

mods/MAPGEN/mcl_mapgen_core/ores.lua

@@ -128,27 +128,6 @@ minetest.register_ore({
 })
 
 
-minetest.register_ore({
-    ore_type       = "blob",
-    ore            = "mcl_deepslate:deepslate",
-    wherein        = { "mcl_core:stone" },
-    clust_scarcity = 200,
-    clust_num_ores = 100,
-    clust_size     = 10,
-    y_min          = deepslate_min,
-    y_max          = deepslate_max,
-    noise_params = {
-        offset  = 0,
-        scale   = 1,
-        spread  = { x = 250, y = 250, z = 250 },
-        seed    = 12345,
-        octaves = 3,
-        persist = 0.6,
-        lacunarity = 2,
-        flags = "defaults",
-    }
-})
-
 minetest.register_ore({
 	ore_type       = "blob",
 	ore            = "mcl_deepslate:tuff",
@@ -173,6 +152,27 @@ minetest.register_ore({
 -- DEEPSLATE
 if minetest.settings:get_bool("mcl_generate_deepslate", true) then
 
+	minetest.register_ore({
+		ore_type       = "blob",
+		ore            = "mcl_deepslate:deepslate",
+		wherein        = { "mcl_core:stone" },
+		clust_scarcity = 200,
+		clust_num_ores = 100,
+		clust_size     = 10,
+		y_min          = deepslate_min,
+		y_max          = deepslate_max,
+		noise_params = {
+			offset  = 0,
+			scale   = 1,
+			spread  = { x = 250, y = 250, z = 250 },
+			seed    = 12345,
+			octaves = 3,
+			persist = 0.6,
+			lacunarity = 2,
+			flags = "defaults",
+		}
+	})
+	
 	minetest.register_ore({
 		ore_type       = "scatter",
 		ore            = "mcl_deepslate:infested_deepslate",