Merge remote-tracking branch 'upstream/master'

glass.lua

@@ -29,6 +29,21 @@ minetest.register_craft({
 })
 
 --[[ Round Glass By Semmett9 aka Infinatum ]]
+if minetest.get_modpath("unifieddyes") then
+	minetest.register_node("darkage:milk_glass", {
+		description = "Milky Medieval Glass (Good for colorization)",
+		drawtype = "glasslike",
+		tiles = {"darkage_milk_glass.png"},
+		use_texture_alpha=true,
+		paramtype = "light",
+		paramtype2 = "color",
+		palette = "unifieddyes_palette_extended.png",
+		sunlight_propagates = true,
+		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1},
+		sounds = default.node_sound_glass_defaults(),
+		after_dig_node = unifieddyes.after_dig_node
+	})
+end
 
 minetest.register_node("darkage:glass_round", {
 	description = "Round Glass",

mapgen.lua

@@ -191,7 +191,7 @@ minetest.register_ore({
 minetest.register_ore({
 	ore_type        	= "sheet",
 	ore             	= "darkage:tuff",
-	wherein         	= {"default:stone", "default:needs_dirt", "default:gravel", "default:stone_with_coal"},
+	wherein         	= {"default:stone", "default:dirt", "default:gravel", "default:stone_with_coal"},
 	column_height_max = 20,
 	column_height_min = 15,
 	y_min            = -200,
@@ -210,7 +210,7 @@ minetest.register_ore({
 minetest.register_ore({
 	ore_type        	= "sheet",
 	ore             	= "darkage:rhyolitic_tuff",
-	wherein         	= {"default:stone", "default:needs_dirt", "default:gravel", "default:stone_with_coal"},
+	wherein         	= {"default:stone", "default:dirt", "default:gravel", "default:stone_with_coal"},
 	column_height_max = 20,
 	column_height_min = 15,
 	y_min            = -2000,