From 21b3c841bdb6afe2b45dcc3d4273b27efdda7d89 Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 11 Dec 2017 13:12:24 +0000 Subject: [PATCH] Default texture licenses: Move some to CC BY-SA 3.0. Remove WTFPL --- mods/default/README.txt | 10 +++--- mods/default/license.txt | 70 +++------------------------------------- 2 files changed, 8 insertions(+), 72 deletions(-) diff --git a/mods/default/README.txt b/mods/default/README.txt index d67f6205..fb30e268 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -115,8 +115,8 @@ paramat (CC BY-SA 3.0): default_silver_sandstone_block.png -- Derived from a texture by GreenXenith (CC-BY-SA 3.0) default_bookshelf_slot.png -- Derived from a texture by Gambit (CC-BY-SA 3.0) -TumeniNodes (CC BY-SA 4.0): - default_desert_cobble.png -- Derived from a texture by brunob.santos (CC BY-SA 4.0) +TumeniNodes (CC BY-SA 3.0): + default_desert_cobble.png -- Derived from a texture by brunob.santos (CC BY-SA 3.0) BlockMen (CC BY-SA 3.0): default_aspen_leaves.png -- Derived from Sofar's texture @@ -146,14 +146,12 @@ sofar (CC BY-SA 3.0): default_aspen_wood, derived from default_pine_wood (by paramat) default_chest_inside -sofar (WTFPL): +sofar (CC0 1.0): default_gravel.png -- Derived from Gambit's PixelBOX texture pack light gravel -Neuromancer (CC BY-SA 2.0): +Neuromancer (CC BY-SA 3.0): default_cobble.png, based on texture by Brane praefect default_mossycobble.png, based on texture by Brane praefect - -Neuromancer (CC BY-SA 3.0): default_dirt.png default_furnace_*.png diff --git a/mods/default/license.txt b/mods/default/license.txt index 32cd7510..ce143ee5 100644 --- a/mods/default/license.txt +++ b/mods/default/license.txt @@ -20,6 +20,7 @@ Licenses of media (textures, models and sounds) Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Copyright (C) 2010-2017: + celeron55, Perttu Ahola Cisoun G4JC @@ -46,6 +47,7 @@ Copyright (C) 2010-2017: kilbith tobyplowy CloudyProton + TumeniNodes You are free to: Share — copy and redistribute the material in any medium or format. @@ -77,73 +79,8 @@ http://creativecommons.org/licenses/by-sa/3.0/ ----------------------- -Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) -Copyright (C) 2017 TumeniNodes - -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. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -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-sa/4.0/ - ------------------------ - -Attribution-ShareAlike 2.0 Generic (CC BY-SA 2.0) -Copyright (C) 2014-2016 Neuromancer - -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. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -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-sa/2.0/ - ------------------------ - Attribution 3.0 Unported (CC BY 3.0) + Copyright (C) 2009 cmusounddesign Copyright (C) 2010 Tomlija Copyright (C) 2010 lsprice @@ -180,6 +117,7 @@ http://creativecommons.org/licenses/by/3.0/ ----------------------- CC0 1.0 Universal (CC0 1.0) Public Domain Dedication + Iwan Gabovitch Ottomaani138 Ogrebane