Licenses: Change WTFPL to MIT (part 2)

Add license.txt files. Update and improve README.txt files. Corrections to part 1.
minetest · Sep 6, 2016 · 7d70d25eeb3e27e7b335437dbb87766398d8f560 · 7d70d25
1 parent e9d26e2
commit 7d70d25eeb3e27e7b335437dbb87766398d8f560
Show file tree

Hide file tree

Showing 24 changed files with 512 additions and 163 deletions.
diff --git a/mods/boats/license.txt b/mods/boats/license.txt
@@ -2,8 +2,8 @@ License of source code and media (textures and model)
 -----------------------------------------------------
 
 The MIT License (MIT)
-Copyright (C) 2012-2016 PilzAdam (source code)
-Copyright (C) 2012-2016 Zeg9, thetoon, PavelS(SokolovPavel) (media)
+Copyright (C) 2012-2016 PilzAdam
+Copyright (C) 2012-2016 Zeg9, thetoon, PavelS(SokolovPavel)
 
 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

diff --git a/mods/bucket/README.txt b/mods/bucket/README.txt
@@ -1,26 +1,12 @@
 Minetest Game mod: bucket
 =========================
+See license.txt for license information.
 
-License of source code:
------------------------
-Copyright (C) 2011-2012 Kahrl <kahrl@gmx.net>
-Copyright (C) 2011-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-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; either version 2 of the License, or
-(at your option) any later version.
-
-http://www.gnu.org/licenses/lgpl-2.1.html
-
-License of media (textures and sounds)
---------------------------------------
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
-http://creativecommons.org/licenses/by-sa/3.0/
-
-Authors of media files
------------------------
-Everything not listed in here:
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
-
+Authors of source code
+----------------------
+Kahrl <kahrl@gmx.net> (LGPL 2.1)
+celeron55, Perttu Ahola <celeron55@gmail.com> (LGPL 2.1)
 
+Authors of media (textures)
+---------------------------
+ElementW (MIT)
diff --git a/mods/bucket/license.txt b/mods/bucket/license.txt
@@ -0,0 +1,41 @@
+License of source code
+----------------------
+
+GNU Lesser General Public License, version 2.1
+Copyright (C) 2011-2016 Kahrl <kahrl@gmx.net>
+Copyright (C) 2011-2016 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+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;
+either version 2.1 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Lesser General Public License for more details:
+https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+
+
+License of media (textures)
+---------------------------
+
+The MIT License (MIT)
+Copyright (C) 2015-2016 ElementW
+
+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
diff --git a/mods/creative/license.txt b/mods/creative/license.txt
@@ -2,9 +2,8 @@ License of source code and media (textures)
 -------------------------------------------
 
 The MIT License (MIT)
-Copyright (C) 2012-2016 Perttu Ahola (celeron55) <celeron55@gmail.com> (source code)
-Copyright (C) 2016 Jean-Patrick G. (kilbith)
-	<jeanpatrick.guerrero@gmail.com> (source code and textures)
+Copyright (C) 2012-2016 Perttu Ahola (celeron55) <celeron55@gmail.com>
+Copyright (C) 2016 Jean-Patrick G. (kilbith) <jeanpatrick.guerrero@gmail.com>
 
 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

diff --git a/mods/default/README.txt b/mods/default/README.txt
@@ -1,28 +1,18 @@
 Minetest Game mod: default
 ==========================
+See license.txt for license information.
 
-License of source code:
------------------------
-Copyright (C) 2011-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Authors of source code
+----------------------
+celeron55, Perttu Ahola <celeron55@gmail.com> (LGPL 2.1)
+Various Minetest developers and contributors (LGPL 2.1)
 
-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; either version 2.1 of the License, or
-(at your option) any later version.
-
-http://www.gnu.org/licenses/lgpl-2.1.html
-
-License of media (textures and sounds)
---------------------------------------
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
-http://creativecommons.org/licenses/by-sa/3.0/
-
-Authors of media files
------------------------
+Authors of media (textures, models and sounds)
+----------------------------------------------
 Everything not listed in here:
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+celeron55, Perttu Ahola <celeron55@gmail.com> (CC BY-SA 3.0)
 
-Cisoun's WTFPL texture pack:
+Cisoun's texture pack (MIT):
   default_jungletree.png
   default_lava.png
   default_leaves.png
@@ -32,25 +22,25 @@ Cisoun's WTFPL texture pack:
   default_tree_top.png
   default_water.png
 
-Cisoun's conifers mod (WTFPL):
+Cisoun's conifers mod (MIT):
   default_pine_needles.png
 
-Originating from G4JC's Almost MC Texture Pack:
+Originating from G4JC's Almost MC Texture Pack (CC BY-SA 3.0):
   default_torch.png
   default_torch_on_ceiling.png
   default_torch_on_floor.png
 
-VanessaE's animated torches (WTFPL):
+VanessaE's animated torches (MIT):
   default_torch_animated.png
   default_torch_on_ceiling_animated.png
   default_torch_on_floor_animated.png
   default_torch_on_floor.png
 
-RealBadAngel's animated water (WTFPL):
+RealBadAngel's animated water (MIT):
   default_water_source_animated.png
   default_water_flowing_animated.png
 
-VanessaE (WTFPL):
+VanessaE (MIT):
   default_desert_sand.png
   default_desert_stone.png
   default_sand.png
@@ -63,24 +53,24 @@ Calinou (CC BY-SA):
   default_mineral_copper.png
   default_glass_detail.png
 
-MirceaKitsune (WTFPL):
+MirceaKitsune (MIT):
   character.x
 
 Jordach (CC BY-SA 3.0):
   character.png
 
-PilzAdam (WTFPL):
+PilzAdam (MIT):
   default_jungleleaves.png
   default_junglesapling.png
   default_obsidian_glass.png
   default_obsidian_shard.png
   default_mineral_gold.png
   default_snowball.png
 
-jojoa1997 (WTFPL):
+jojoa1997 (MIT):
   default_obsidian.png
 
-InfinityProject (WTFPL):
+InfinityProject (MIT):
   default_mineral_diamond.png
 
 Splizard (CC BY-SA 3.0):
@@ -157,7 +147,7 @@ sofar (CC BY-SA 3.0):
   default_aspen_tree_top, derived from default_pine_tree_top (by paramat)
   default_aspen_wood, derived from default_pine_wood (by paramat)
 
-sofar (WTFPL):
+sofar (MIT):
   default_gravel.png -- Derived from Gambit's PixelBOX texture pack light gravel
 
 Neuromancer (CC BY-SA 2.0):
@@ -167,7 +157,7 @@ Neuromancer (CC BY-SA 3.0):
   default_dirt.png
   default_furnace_*.png
 
-Gambit (WTFPL):
+Gambit (MIT):
   default_bronze_ingot.png
   default_copper_ingot.png
   default_copper_lump.png
@@ -182,7 +172,7 @@ Gambit (WTFPL):
   default_sign_wall_wood.png
   default_flint.png
 
-asl97 (WTFPL):
+asl97 (MIT):
   default_ice.png
 
 KevDoy (CC BY-SA 3.0)
@@ -193,7 +183,7 @@ 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/
 
-Mito551 (sounds) (CC BY-SA):
+Mito551 (sounds) (CC BY-SA 3.0):
   default_dig_choppy.ogg
   default_dig_cracky.ogg
   default_dig_crumbly.1.ogg