From 2ad1feb8dd7ca10c0381a557cd166e8d34874c09 Mon Sep 17 00:00:00 2001 From: Andrew Gioia Date: Wed, 30 Oct 2019 11:29:34 -0400 Subject: [PATCH] Updating license for non-font files to GPL --- LICENSE.md | 20 +++++++++++--------- README.md | 1 + package.json | 7 ++++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index cb0610e..e180247 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,18 +1,20 @@ # Keyrune License -Keyrune is free, open source, and GPL-friendly. You can use it for commercial or open source projects, arts and crafts projects, or whatever you want. Because Keyrune is made up of different parts, there are different licenses that apply to each. +Copyright (c) 2019 Andrew Gioia -## Individual licenses +Keyrune is free, open source, and GPL-friendly. You can use it for commercial or open source projects, arts and crafts projects, or whatever you want. It is published without any warranty, without even the implied warranty of merchantabilityor itness for a particular purpose. Because Keyrune is made up of different parts, there are different licenses that apply to each. -* Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by-sa/4.0/) -Keyrune's glyphs, including the packaged SVG files, are distrubuted under the Creative Commons BY-SA 4.0 license. The underlying symbols that these glyphs are based on are trademarks of Wizards of the Coast. Keyrune's glyphs are distributed for the express purpose of identifying Wizards of the Coast products (i.e., card sets and expansions), as provided in the Wizards Play Network Marketing Material Policy (https://wpn.wizards.com/en/document/wizards-play-network-marketing-materials-policy). The use of these trademarks does not indicate endorsement of Wizards of the Coast or trademark holder by Keyrune, nor vice versa. +## Individual licenses and commentary -* Fonts: SIL OFL 1.1 License (https://opensource.org/licenses/OFL-1.1) -The font files distributed in Keyrune are carry the SIL OFL 1.1 license. This includes fonts for the web or desktop and controls all uses and applications. +* Icons: GPL 3.0 License (https://opensource.org/licenses/GPL-3.0). +Keyrune's glyphs, including the packaged source SVG files, are distributed under the GPL 3.0 license as of version 3.6.1 of this project. The underlying symbols that these glyphs are based on are trademarks of Wizards of the Coast. Keyrune's glyphs are redrawn by hand and distributed for the express purpose of identifying Wizards of the Coast products (i.e., card sets and expansions), as provided in the Wizards Play Network Marketing Material Policy (https://wpn.wizards.com/en/document/wizards-play-network-marketing-materials-policy). The use of these trademarks does not indicate endorsement of Wizards of the Coast or other trademark holder, if any, by Keyrune, nor vice versa. -* Code: MIT License (https://opensource.org/licenses/MIT) -The MIT license applies to all non-font and non-icon files in this repository. +* Code: GPL 3.0 License (https://opensource.org/licenses/GPL-3.0). +The GPL 3.0 license applies to all non-font and non-icon files in this repository. + +* Fonts: SIL OFL 1.1 License (https://opensource.org/licenses/OFL-1.1). +The prepared font files distributed in Keyrune carry the SIL OFL 1.1 license. This includes fonts for the web or desktop and controls all uses and applications. ## Attribution -Minimal attribution is required by the MIT, SIL OLF, and CC BY-SA licenses Keyrune is distributed under. The files themselves already contain embedded comments with sufficient attribution and there is no need to otherwise reference Keyrune or Andrew Gioia in your project (though it is appreciated!). +Minimal attribution is required by SIL OLF and GPL 3.0 that Keyrune is are distributed under. The files themselves already contain embedded comments with sufficient attribution and there is no need to otherwise reference Keyrune or Andrew Gioia in your project (though it is appreciated!). diff --git a/README.md b/README.md index e240aad..92fd767 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,7 @@ All set symbol images are trademarks of Wizards of the Coast ([http://magicthega ## Changelog +* v3.6.1 - Issuing fonts under OFL 1.1 and package under GPL now * v3.6.0 - Big 2020 update: unofficials for Theros: Beyond Death, Ikoria: Lair of Behemoths, Core 2021, Zendikar Rising, promo PTG, and Game Night 2019; ELD updated with official * v3.5.0 - Throne of Eldraine (unofficial) and Commander 2019 added; SCSS files cleaned up and tested; SVG files now distributed with project * v3.4.3 - Magic 2020 (finally) added, sorry everyone. M19 symbol updated to M20 style it should have been. diff --git a/package.json b/package.json index 4b43963..e27f98b 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,18 @@ { "name": "keyrune", "description": "Keyrune", - "version": "3.6.0", + "version": "3.6.1", "author": { "name": "Andrew Gioia", "email": "andrewgioia@gmail.com", "url": "http://andrewgioia.com" }, "contributors": [ + "Mike Gioia ", "JayGray ", "ardeay", "Jordan Brauer ", - "Corey Csuhta <@csuhta>" + "Corey Csuhta" ], "repository": { "type": "git", @@ -21,7 +22,7 @@ "homepage": "http://andrewgioia.com", "dependencies": {}, "devDependencies": {}, - "license": "(OFL-1.1 AND MIT)", + "license": "(OFL-1.1 AND GPL-3.0-only)", "main": "css/keyrune.css", "ignore": [ "*/.*",