Merge remote-tracking branch 'upstream/master'

LICENSE.txt

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 adrido
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -28,9 +28,11 @@ Contains code from CragiDavi and HybridDog
 
 ## Release Notes
 
-### Version 1.4.1
+### Version 1.4
 
-* Minor Bug fixes
+* New Textures by Skamiz
+* serveral mapgen fixes
+* Maintenance stuff
 
 Full release notes: <https://github.com/adrido/darkage/releases>
 
@@ -52,9 +54,28 @@ For Building-blocks and crafting information please take a look to the wiki:
 
 ## License
 
-Sourcecode: MIT
-Graphics: CC-0
+Sourcecode: WTFPL (see below)
+Graphics: WTFPL (see below)
 
 ## See also
 
-<https://www.luanti.org/>
+<http://minetest.net/>
+
+---
+
+```text
+
+         DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+```

aliases.lua

@@ -78,6 +78,8 @@ register_moreblocks_alias("darkage:slate_tale", "darkage:slate_tile")
 
 -- Basalt Brick
 minetest.register_alias("darkage:basalt_cobble", "darkage:basalt_brick")
+minetest.register_alias("stairs:slab_basalt_cobble", "stairs:slab_basalt_brick")
+minetest.register_alias("stairs:stair_basalt_cobble", "stairs:stair_basalt_brick")
 register_moreblocks_alias("darkage:basalt_cobble", "darkage:basalt_brick")
 minetest.register_alias("darkage:basalt_cobble_wall", "darkage:basalt_rubble_wall")
 

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({
-		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()
 })
 
 --[[

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")