From 57c7a4d43f093c8c2bfacfd5de2e6c7a90f24f31 Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 7 Sep 2016 02:52:57 +0100 Subject: [PATCH] Change WTFPL to MIT (part 3) Relicense WTFPL media to CC BY-SA 3.0. Various corrections and edits. --- README.txt | 9 +++++---- license.txt | 45 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/README.txt b/README.txt index 2b14880..c1ca88d 100644 --- a/README.txt +++ b/README.txt @@ -7,19 +7,20 @@ Authors of source code PilzAdam (MIT) ShadowNinja (MIT) sofar (sofar@foo-projects.org) (MIT) +Various Minetest developers and contributors (MIT) Authors of media (textures) --------------------------- -BlockMen (MIT): +BlockMen (CC BY-SA 3.0): All textures not mentioned below. -ShadowNinja (MIT): +ShadowNinja (CC BY-SA 3.0): tnt_smoke.png -Wuzzy (MIT): +Wuzzy (CC BY-SA 3.0): All gunpowder textures except tnt_gunpowder_inventory.png. -sofar (sofar@foo-projects.org) (MIT): +sofar (sofar@foo-projects.org) (CC BY-SA 3.0): tnt_blast.png Introduction diff --git a/license.txt b/license.txt index 6519bb7..210f2bd 100644 --- a/license.txt +++ b/license.txt @@ -1,12 +1,11 @@ -License of source code and media (textures) -------------------------------------------- +License of source code +---------------------- The MIT License (MIT) Copyright (C) 2014-2016 PilzAdam Copyright (C) 2014-2016 ShadowNinja Copyright (C) 2016 sofar (sofar@foo-projects.org) -Copyright (C) 2014-2016 BlockMen -Copyright (C) 2015-2016 Wuzzy +Copyright (C) 2014-2016 Various Minetest developers and contributors 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 @@ -26,3 +25,41 @@ DEALINGS IN THE SOFTWARE. For more details: https://opensource.org/licenses/MIT + + +Licenses of media (textures) +---------------------------- + +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +Copyright (C) 2014-2016 BlockMen +Copyright (C) 2014-2016 ShadowNinja +Copyright (C) 2015-2016 Wuzzy +Copyright (C) 2016 sofar (sofar@foo-projects.org) + +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/3.0/