Merge remote-tracking branch 'upstream/master'

init.lua

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

mapgen.lua

@@ -156,7 +156,7 @@ end
 local seed = minetest.get_mapgen_setting("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",
@@ -167,6 +167,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",
@@ -197,9 +198,7 @@ minetest.register_node("darkage:mud", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 	drop = 'darkage:mud_lump 4',
-	sounds = default.node_sound_dirt_defaults({
+	sounds = default.node_sound_dirt_defaults()
-		footstep = "",
-	}),
 })
 
 --[[
@@ -268,9 +267,7 @@ minetest.register_node("darkage:silt", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 	drop = 'darkage:silt_lump 4',
-	sounds = default.node_sound_dirt_defaults({
+	sounds = default.node_sound_dirt_defaults()
-		footstep = "",
-	}),
 })
 
 --[[

stairs.lua

@@ -15,6 +15,7 @@ darkage.register_stairs("darkage:ors_brick")
 darkage.register_stairs("darkage:ors_rubble")
 darkage.register_stairs("darkage:rhyolitic_tuff")
 darkage.register_stairs("darkage:rhyolitic_tuff_bricks")
+darkage.register_stairs("darkage:rhyolitic_tuff_rubble")
 darkage.register_stairs("darkage:schist")
 darkage.register_stairs("darkage:serpentine")
 darkage.register_stairs("darkage:shale")
@@ -26,4 +27,5 @@ darkage.register_stairs("darkage:stone_brick")
 darkage.register_stairs("darkage:straw_bale")
 darkage.register_stairs("darkage:tuff")
 darkage.register_stairs("darkage:tuff_bricks")
+darkage.register_stairs("darkage:tuff_rubble")