From 529ffbb4859a66a7fbfd33a0270872e0980e03c1 Mon Sep 17 00:00:00 2001 From: Treer Date: Mon, 17 Sep 2018 22:54:34 +1000 Subject: [PATCH] Remove non-free ND licence (ND - No Derivations) No Modern UI Icons are used in the project, the licence was added to the AmidstExporter fork in 2aaecfd854 and then erroneously included in Amidst4 in 58f2284231 when some of the AmidstExporter features were brought across. The Modern UI Icon it was added to cover was /src/amidst/resources/export_image.png (in 2aaecfd854 of AmidstExporter), which has never been included in Amidst4 or Amidstest. --- .../amidst/gui/license/LicenseWindow.java | 1 - .../amidst/gui/license/modernUIIcons.txt | 62 ------------------- 2 files changed, 63 deletions(-) delete mode 100644 src/main/resources/amidst/gui/license/modernUIIcons.txt diff --git a/src/main/java/amidst/gui/license/LicenseWindow.java b/src/main/java/amidst/gui/license/LicenseWindow.java index 7781d33e..a1950598 100644 --- a/src/main/java/amidst/gui/license/LicenseWindow.java +++ b/src/main/java/amidst/gui/license/LicenseWindow.java @@ -41,7 +41,6 @@ public class LicenseWindow { createLicense("Gson", "gson.txt"), createLicense("JNBT", "jnbt.txt"), createLicense("MiG Layout", "miglayout.txt"), - createLicense("Modern UI Icons", "modernUIIcons.txt"), createLicense("Attribution", "attribution.txt")); return result.toArray(new License[result.size()]); } diff --git a/src/main/resources/amidst/gui/license/modernUIIcons.txt b/src/main/resources/amidst/gui/license/modernUIIcons.txt deleted file mode 100644 index d22c6d05..00000000 --- a/src/main/resources/amidst/gui/license/modernUIIcons.txt +++ /dev/null @@ -1,62 +0,0 @@ -# License - -Please carefully understand the license and download the latest icons at ModernUIIcons.com. - -## Understand Your Rights -No Attribution and No Derived Works -http://creativecommons.org/licenses/by-nd/3.0/ * - -- If your project is open source include this license file in the source. -- Nothing is needed in the front facing project (UNLESS you - are using any of the icons listed below in the attribution section). -- Commercial use is not only allowed but encouraged. If it is an icon - in the attribution list below, you still need to attribute those! -- Do not distribute the entire package (I've allowed this dozens of - times for open source projects, but email me first). - -## Creator -- Austin Andrews (@templarian) - -## Contributor** -- Jay Zawrotny (@JayZawrotny) - - A Bunch -- Oren Nachman - - appbar.chevron.down - - appbar.chevron.up - - appbar.chevron.left - - appbar.chevron.right - -## Derived Works -- Alex Peattie - - Social: http://www.alexpeattie.com/projects/justvector_icons/ - -## Attribution*** -- Kris Vandermotten (@kvandermotten) - - appbar.medical.pulse -- Constantin Kichinsky (@kichinsky) - - appbar.currency.rubles - - appbar.currency.grivna -- Massimo Savazzi (@msavazzi) - - List of missing exported icons -- Proletkult Graphik, from The Noun Project - - appbar.draw.pen (inspired) -- Olivier Guin, from The Noun Project - - appbar.draw.marker -- Gibran Bisio, from The Noun Project - - appbar.draw.bucket -Andrew Forrester, from The Noun Project - - appbar.fingerprint - -* The license is for attribution, but this is not required. -** Developers and designers that emailed Templarian the source .design icons to be added into the package. PNGs also accepted, but may take longer to be added. -*** Icons I've copied so closely you want to attribute them and are also under the CC license. - -Contact -- http://templarian.com/ -- admin[@]templarian[.]com - -* Does not apply to copyrighted logos -- Skype -- Facebook -- Twitter -- etc...