From ab3b1a35f50c7f9b667e1868cfd0762a28139f8d Mon Sep 17 00:00:00 2001 From: Paramat Date: Tue, 31 Jul 2018 10:55:28 +0100 Subject: [PATCH] sfinv, player_api mods: Fix and cleanup README and license files sfinv: Move license information to create the missing license.txt file. Make README consistent with other Minetest Game mods. player_api: Add missing texture and sound credits to README. Update and add extra license information. default: Remove credit for 'player_damage.ogg' sound. --- mods/default/README.txt | 4 ---- mods/player_api/README.txt | 20 ++++++++++++++---- mods/player_api/license.txt | 41 +++++++++++++++++++++++++++++++++---- mods/sfinv/README.md | 23 --------------------- mods/sfinv/README.txt | 13 ++++++++++++ mods/sfinv/license.txt | 24 ++++++++++++++++++++++ 6 files changed, 90 insertions(+), 35 deletions(-) delete mode 100644 mods/sfinv/README.md create mode 100644 mods/sfinv/README.txt create mode 100644 mods/sfinv/license.txt diff --git a/mods/default/README.txt b/mods/default/README.txt index d78941ad..1f747bce 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -238,10 +238,6 @@ Glass breaking sounds (CC BY 3.0): 2: http://www.freesound.org/people/Tomlija/sounds/97669/ 3: http://www.freesound.org/people/lsprice/sounds/88808/ -sonictechtonic (CC BY 3.0): -https://www.freesound.org/people/sonictechtonic/sounds/241872/ - player_damage.ogg - Mito551 (sounds) (CC BY-SA 3.0): default_dig_choppy.ogg default_dig_cracky.ogg diff --git a/mods/player_api/README.txt b/mods/player_api/README.txt index cf124686..62e37c69 100644 --- a/mods/player_api/README.txt +++ b/mods/player_api/README.txt @@ -10,11 +10,23 @@ Authors of source code Originally by celeron55, Perttu Ahola (LGPL 2.1) Various Minetest developers and contributors (LGPL 2.1) -Authors of media (textures and models) --------------------------------------- - +Authors of media (textures, models and sounds) +---------------------------------------------- stujones11 (CC BY-SA 3.0): - character.* -- Derived from a model by MirceaKitsune (CC BY-SA 3.0) + character.b3d + character.blend -- Both derived from a model by MirceaKitsune (CC BY-SA 3.0) Jordach (CC BY-SA 3.0): character.png + +BlockMen (CC BY-SA 3.0): + gui_hotbar.png + gui_hotbar_selected.png + +celeron55, Perttu Ahola (CC BY-SA 3.0): + player.png + player_back.png + +sonictechtonic (CC BY 3.0): +https://www.freesound.org/people/sonictechtonic/sounds/241872/ + player_damage.ogg diff --git a/mods/player_api/license.txt b/mods/player_api/license.txt index 4bee6c52..9d89425d 100644 --- a/mods/player_api/license.txt +++ b/mods/player_api/license.txt @@ -2,8 +2,8 @@ License of source code ---------------------- GNU Lesser General Public License, version 2.1 -Copyright (C) 2011-2017 celeron55, Perttu Ahola -Copyright (C) 2011-2017 Various Minetest developers and contributors +Copyright (C) 2011-2018 celeron55, Perttu Ahola +Copyright (C) 2011-2018 Various Minetest developers and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; @@ -19,8 +19,10 @@ Licenses of media (textures, models and sounds) ----------------------------------------------- Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2017 stujones11 -Copyright (C) 2012-2017 Jordach +Copyright (C) 2011-2018 celeron55, Perttu Ahola +Copyright (C) 2012-2018 Jordach +Copyright (C) 2014-2018 BlockMen +Copyright (C) 2018 stujones11 You are free to: Share — copy and redistribute the material in any medium or format. @@ -49,3 +51,34 @@ rights may limit how you use the material. For more details: http://creativecommons.org/licenses/by-sa/3.0/ + +------------------------------------ + +Attribution 3.0 Unported (CC BY 3.0) +Copyright (C) 2014-2018 sonictechtonic + +You are free to: +Share — copy and redistribute the material in any medium or format. +Adapt — remix, transform, and build upon the material for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the license terms. + +Under the following terms: + +Attribution — You must give appropriate credit, provide a link to the license, and +indicate if changes were made. You may do so in any reasonable manner, but not in any way +that suggests the licensor endorses you or your use. + +No additional restrictions — You may not apply legal terms or technological measures that +legally restrict others from doing anything the license permits. + +Notices: + +You do not have to comply with the license for elements of the material in the public +domain or where your use is permitted by an applicable exception or limitation. +No warranties are given. The license may not give you all of the permissions necessary +for your intended use. For example, other rights such as publicity, privacy, or moral +rights may limit how you use the material. + +For more details: +http://creativecommons.org/licenses/by/3.0/ + diff --git a/mods/sfinv/README.md b/mods/sfinv/README.md deleted file mode 100644 index 0b152a0e..00000000 --- a/mods/sfinv/README.md +++ /dev/null @@ -1,23 +0,0 @@ -Simple Fast Inventory -==================== - -![SFINV Screeny](https://cdn.pbrd.co/images/1yQhd1TI.png) - -A cleaner, simpler, solution to having an advanced inventory in Minetest. - -Available for use outside of MTG here: - -Written by rubenwardy. -License: MIT - -See game_api.txt for this mod's API - -License of source code and media files: ---------------------------------------- -Copyright (C) 2016 rubenwardy - -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. diff --git a/mods/sfinv/README.txt b/mods/sfinv/README.txt new file mode 100644 index 00000000..a7ac794f --- /dev/null +++ b/mods/sfinv/README.txt @@ -0,0 +1,13 @@ +Minetest Game mod: sfinv +======================== +See license.txt for license information. + +Simple Fast Inventory. +A cleaner, simpler, solution to having an advanced inventory in Minetest. +See game_api.txt for this mod's API. +Available for use outside of MTG here: +https://forum.minetest.net/viewtopic.php?t=19765 + +Authors of source code +---------------------- +rubenwardy (MIT) diff --git a/mods/sfinv/license.txt b/mods/sfinv/license.txt new file mode 100644 index 00000000..e27dc85f --- /dev/null +++ b/mods/sfinv/license.txt @@ -0,0 +1,24 @@ +License of source code +---------------------- + +The MIT License (MIT) +Copyright (C) 2016-2018 rubenwardy + +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. + +For more details: +https://opensource.org/licenses/MIT