From 340fb79ab56c99578f98140210e5e18e804ba3a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Thu, 13 Mar 2025 23:44:39 -0700 Subject: [PATCH] chore: Properly update code license to reflect #60 --- LICENSE-CODE.md | 10 ---------- LICENSE.md | 10 +++------- README.md | 6 +++--- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 LICENSE-CODE.md diff --git a/LICENSE-CODE.md b/LICENSE-CODE.md deleted file mode 100644 index 059accb..0000000 --- a/LICENSE-CODE.md +++ /dev/null @@ -1,10 +0,0 @@ -Copyright 2024-2025 Pridecraft Studios -Copyright 2024 Wolren, blryface, WorldWidePixel, TheClashFruit, NormalFery, Zhamty, Daniel "rotgruengelb", CallMeEcho - -All Rights Reserved - -Code before the commit a5324c49102194e62b2571ec0663d760a84ea390 *may* be available under the Unlicense. - -Note: It is in our non-expert opinion that Unlicense is not a valid license due to the lack of a proper fallback clause. -Beware that this may affect your rights if you intend to use it in a region where the Public Domain does not exist, -or is more restrictive than simply using All Rights Reserved code and assets. diff --git a/LICENSE.md b/LICENSE.md index 32de10d..d798e50 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -5,13 +5,9 @@ Read carefully, this may affect how you may use and distribute Joy. ## Code -[All Rights Reserved][CODE]. +[Mozilla Public License 2.0][CODE]. -Code before the commit a5324c49102194e62b2571ec0663d760a84ea390 *may* be available under the Unlicense. - -Note: It is in our non-expert opinion that Unlicense is not a valid license due to the lack of a proper fallback clause. -Beware that this may affect your rights if you intend to use it in a region where the Public Domain does not exist, -or is more restrictive than simply using All Rights Reserved code and assets. +You may use code from Joy under the terms of the MPL-2.0. ## Blahaj @@ -35,7 +31,7 @@ These are All Rights Reserved. [All Rights Reserved][MUSIC]. See the license file for details. -[CODE]: LICENSE-CODE.md +[CODE]: LICENSE-CODE [BLAHAJ-BASE]: LICENSE-BLAHAJ-BASE diff --git a/README.md b/README.md index c851aa8..a98901f 100644 --- a/README.md +++ b/README.md @@ -96,15 +96,15 @@ Pride Blahajs were taken from [musicalskele] under the [MIT License][BLAHAJ-PRID -
Code license [ARR] +
Code license [MPL-2.0] -The code for Joy is currently licensed as "All Rights Reserved". +The code for Joy is available under the [MPL-2.0][LICENSE-CODE].
[LICENSE]: https://git.pridecraft.gay/joy/tree/HEAD/LICENSE.md -[CODE]: https://git.pridecraft.gay/joy/tree/HEAD/LICENSE-CODE.md +[CODE]: https://git.pridecraft.gay/joy/tree/HEAD/LICENSE-CODE [BLAHAJ-BASE]: https://git.pridecraft.gay/joy/tree/HEAD/LICENSE-BLAHAJ-BASE