Merge remote-tracking branch 'upstream/master'

2025-06-28 14:36:22 +02:00 · 2025-03-20 11:34:03 +01:00 · 2023-06-05 23:31:39 +02:00 · 2022-06-25 16:45:59 +02:00 · 2021-11-26 21:40:36 +01:00 · 2021-03-12 12:16:26 +01:00
4 changed files with 10 additions and 8 deletions
--- a/init.lua
+++ b/init.lua
@ -384,3 +384,5 @@ minetest.register_craft({
 		{"darkage:rhyolitic_tuff", "darkage:rhyolitic_tuff"},
 	}
 })
+
+minetest.log("action", "[darkage] loaded.")
--- a/mapgen.lua
+++ b/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({
--- a/nodes.lua
+++ b/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({
-		footstep = "",
-	}),
+	sounds = default.node_sound_dirt_defaults()
 })

 --[[
@ -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({
-		footstep = "",
-	}),
+	sounds = default.node_sound_dirt_defaults()
 })

 --[[
--- a/stairs.lua
+++ b/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")
Author	SHA1	Message	Date
sys4	36feb4dffe	Merge remote-tracking branch 'upstream/master'	2025-03-20 11:34:03 +01:00
sys4	9227671f4e	Merge remote-tracking branch 'upstream/master'	2023-06-05 23:31:39 +02:00
sys4	cfd084c709	Merge remote-tracking branch 'upstream/master'	2022-06-25 16:45:59 +02:00
sys4	f0d82a4b4d	Merge remote-tracking branch 'upstream/master'	2021-11-26 21:40:36 +01:00
sys4	5df75e71e6	Merge remote-tracking branch 'upstream/master'	2021-03-12 12:16:26 +01:00
sys4	1455700431	Restore the sound of footsteps on the mud and silt	2021-03-06 18:29:33 +01:00
sys4	0cadd5e5b9	Merge branch 'github'	2021-03-06 18:24:29 +01:00
sys4	994f4cc144	Remove warnings from deprecated definitions and functions	2021-03-06 18:21:00 +01:00
sys4	fa50c54aa7	Add stairsplus compatibility for tuff and rhyolitic_tuf rubbles	2020-08-30 13:27:16 +02:00
sys4	6dfddf7151	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-06-16 21:30:40 +02:00
sys4	def6b91bd5	Merge branch 'master' of yunohost.local:mtcontrib/darkage into nalc-1.2-dev	2019-12-22 12:51:27 +01:00
sys4-fr	51a0c9dc13	Ajoute message de chargement du mod dans le journal "action"	2018-12-25 13:18:11 +01:00
sys4-fr	aa228814b2	Suppression de la génération du minerai de fer dans la roche du desert	2018-11-29 21:27:01 +01:00