Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

init.lua

@@ -384,3 +384,5 @@ minetest.register_craft({
 		{"darkage:rhyolitic_tuff", "darkage:rhyolitic_tuff"},
 	}
 })
+
+minetest.log("action", "[darkage] loaded.")

mapgen.lua

@@ -157,7 +157,7 @@ local mgparams = minetest.get_mapgen_params()
 local seed = mgparams.seed
 
 
--- Generate desert stone with iron in derset.
+--[[ Generate desert stone with iron in derset.
 minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "darkage:desert_stone_with_iron",
@@ -168,6 +168,7 @@ minetest.register_ore({
 	y_min          = -1,
 	y_max          = 200,
 })
+]]--
 
 -- Generate chalk inside mountains
 minetest.register_ore({

nodes.lua

@@ -110,7 +110,7 @@ minetest.register_lbm({
 	end
 })
 
-minetest.register_node("darkage:desert_stone_with_iron", {
+--[[minetest.register_node("darkage:desert_stone_with_iron", {
 	description = "Desert Iron Ore",
 	tiles = {"default_desert_stone.png^default_mineral_iron.png"},
 	is_ground_content = true,
@@ -118,6 +118,7 @@ minetest.register_node("darkage:desert_stone_with_iron", {
 	drop = 'default:iron_lump',
 	sounds = default.node_sound_stone_defaults(),
 })
+]]--
 
 minetest.register_node("darkage:darkdirt", {
 	description = "Dark Dirt",