Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2025-03-20 11:34:03 +01:00
commit 36feb4dffe
3 changed files with 26 additions and 28 deletions

21
LICENSE.txt Normal file
View File

@ -0,0 +1,21 @@
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.

View File

@ -28,11 +28,9 @@ Contains code from CragiDavi and HybridDog
## Release Notes ## Release Notes
### Version 1.4 ### Version 1.4.1
* New Textures by Skamiz * Minor Bug fixes
* serveral mapgen fixes
* Maintenance stuff
Full release notes: <https://github.com/adrido/darkage/releases> Full release notes: <https://github.com/adrido/darkage/releases>
@ -54,28 +52,9 @@ For Building-blocks and crafting information please take a look to the wiki:
## License ## License
Sourcecode: WTFPL (see below) Sourcecode: MIT
Graphics: WTFPL (see below) Graphics: CC-0
## See also ## See also
<http://minetest.net/> <https://www.luanti.org/>
---
```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.
```

View File

@ -78,8 +78,6 @@ register_moreblocks_alias("darkage:slate_tale", "darkage:slate_tile")
-- Basalt Brick -- Basalt Brick
minetest.register_alias("darkage:basalt_cobble", "darkage: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") register_moreblocks_alias("darkage:basalt_cobble", "darkage:basalt_brick")
minetest.register_alias("darkage:basalt_cobble_wall", "darkage:basalt_rubble_wall") minetest.register_alias("darkage:basalt_cobble_wall", "darkage:basalt_rubble_wall")