summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2017-08-07 17:17:01 +0200
committerGitHub <noreply@github.com>2017-08-07 17:17:01 +0200
commit83ff815d1e5a03db3a2ea2a13319cd5c75a9687a (patch)
treea0b2070c015b8e16498d4da0b8c0878b75deb345
parentRemoved unneeded includes (#3902) (diff)
downloadcuberite-83ff815d1e5a03db3a2ea2a13319cd5c75a9687a.tar
cuberite-83ff815d1e5a03db3a2ea2a13319cd5c75a9687a.tar.gz
cuberite-83ff815d1e5a03db3a2ea2a13319cd5c75a9687a.tar.bz2
cuberite-83ff815d1e5a03db3a2ea2a13319cd5c75a9687a.tar.lz
cuberite-83ff815d1e5a03db3a2ea2a13319cd5c75a9687a.tar.xz
cuberite-83ff815d1e5a03db3a2ea2a13319cd5c75a9687a.tar.zst
cuberite-83ff815d1e5a03db3a2ea2a13319cd5c75a9687a.zip
-rw-r--r--CONTRIBUTORS10
-rw-r--r--LICENSE9
2 files changed, 12 insertions, 7 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0cf95af2a..84af3215a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,4 +1,9 @@
-Many people have contributed to Cuberite, and this list attempts to broadcast at least some of them.
+This file contains all known copyright holders of this software, as far as is
+practically possible to ascertain.
+
+If you contribute to this software you must add yourself to this file, to
+indicate your agreement to license your contributions according to the license
+as provided in the LICENSE file.
Altenius
BasedDoge (Donated AlchemistVillage prefabs)
@@ -53,6 +58,3 @@ WebFreak001
worktycho
xoft (Mattes Dolak/madmaxoft on GH)
Yeeeeezus (Donated AlchemistVillage prefabs)
-
-Please add yourself to this list if you contribute to the official Cuberite project
-and license your work under the Apache License 2.0
diff --git a/LICENSE b/LICENSE
index ffe546924..e16303d0b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,10 @@
Cuberite: A lightweight, fast and extensible game server for Minecraft
-www: https://github.com/cuberite/cuberite
-
-Copyright 2011-2016 Cuberite Team
+www: https://cuberite.org
+
+Copyright 2011-2017 Cuberite Contributors
+
+A full list of known copyright holders can be found in the CONTRIBUTORS file
+to be distributed with all copies of this software.
------