Merge branch 'develop' into macos-drag-n-drop

81 files changed, 703 insertions, 43 deletions

diff --git a/launcher/resources/OSX/OSX.qrc b/launcher/resources/OSX/OSX.qrc
index 55be28b5..19fe312b 100644
--- a/launcher/resources/OSX/OSX.qrc
+++ b/launcher/resources/OSX/OSX.qrc
@@ -38,5 +38,6 @@
         <file>scalable/tag.svg</file>
         <file>scalable/export.svg</file>
         <file>scalable/rename.svg</file>
+        <file>scalable/launch.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/OSX/scalable/launch.svg b/launcher/resources/OSX/scalable/launch.svg
new file mode 100644
index 00000000..fb189162
--- /dev/null
+++ b/launcher/resources/OSX/scalable/launch.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32.099998 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   width="32.099998"
+   height="32"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs45" />
+
+<rect
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="none"
+   width="32"
+   height="32"
+   id="rect1776"
+   x="0.1"
+   y="0" /><path
+   fill="#b6b5b6"
+   d="M 30,28.4 H 2 c -1.1,0 -2,-0.9 -2,-2 v -18 c 0,-1.1 0.9,-2 2,-2 h 28 c 1.1,0 2,0.9 2,2 v 18 c 0,1.1 -0.9,2 -2,2 z"
+   id="path1778" /><path
+   fill="#fbfbfb"
+   d="M 30,27.4 H 2 c -1.1,0 -2,-0.9 -2,-2 v -17 c 0,-1.1 0.9,-2 2,-2 h 28 c 1.1,0 2,0.9 2,2 v 17 c 0,1.1 -0.9,2 -2,2 z"
+   id="path1780" /><path
+   id="path11889"
+   style="color:#000000;fill:#585858;fill-opacity:1;stroke-width:0.999994;stroke-linecap:round;stroke-linejoin:round;paint-order:markers stroke fill"
+   d="m 11.520289,8.4637512 c -0.06474,-0.00183 -0.129661,-0.00125 -0.194234,0.00117 C 9.7763279,8.5230552 8.3049,9.7900155 8.3049,11.461507 v 10.877094 c -6e-7,2.228655 2.616628,3.738089 4.545774,2.622156 l 9.398109,-5.436205 c 1.928423,-1.115516 1.928423,-4.133479 0,-5.248993 L 12.850674,8.839348 C 12.428673,8.595238 11.973493,8.4765655 11.520289,8.4637512 Z m -0.184873,1.2309276 c 0.307885,1.456e-4 0.612521,0.080796 0.882242,0.2363567 a 0.89871379,0.89871379 0 0 0 0.0012,0 l 9.398109,5.4362075 c 1.143234,0.659415 1.143234,2.406201 0,3.065618 l -9.398109,5.436206 a 0.89871379,0.89871379 0 0 0 -0.0012,0 C 11.076744,24.528497 9.5659235,23.656375 9.56625,22.338599 V 11.461504 c 3.043e-4,-0.851902 0.622381,-1.5925143 1.461434,-1.7399133 0.102209,-0.018038 0.205103,-0.026958 0.307732,-0.026912 z" /></svg>
diff --git a/launcher/resources/OSX/scalable/launcher.svg b/launcher/resources/OSX/scalable/launcher.svg
index 69dd84b1..aeee8433 100644
--- a/launcher/resources/OSX/scalable/launcher.svg
+++ b/launcher/resources/OSX/scalable/launcher.svg
@@ -37,17 +37,21 @@
      </cc:Agent>
     </dc:contributor>
     <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
-    <dc:rights>
-     <cc:Agent>
-      <dc:title>CC BY-SA 4.0</dc:title>
-     </cc:Agent>
-    </dc:rights>
     <dc:publisher>
      <cc:Agent>
       <dc:title>Prism Launcher</dc:title>
      </cc:Agent>
     </dc:publisher>
+    <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"/>
    </cc:Work>
+   <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+   </cc:License>
   </rdf:RDF>
  </metadata>
 </svg>
diff --git a/launcher/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc
index 52921512..fb426707 100644
--- a/launcher/resources/backgrounds/backgrounds.qrc
+++ b/launcher/resources/backgrounds/backgrounds.qrc
@@ -1,8 +1,14 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
     <qresource prefix="/backgrounds">
-        <file alias="kitteh">catbgrnd2.png</file>
-        <file alias="catmas">catmas.png</file>
-        <file alias="cattiversary">cattiversary.png</file>
+        <file alias="kitteh">kitteh.png</file>
+        <file alias="kitteh-xmas">kitteh-xmas.png</file>
+        <file alias="kitteh-bday">kitteh-bday.png</file>
+        <file alias="rory">rory.png</file>
+        <file alias="rory-xmas">rory-xmas.png</file>
+        <file alias="rory-bday">rory-bday.png</file>
+        <file alias="rory-flat">rory-flat.png</file>
+        <file alias="rory-flat-xmas">rory-flat-xmas.png</file>
+        <file alias="rory-flat-bday">rory-flat-bday.png</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/backgrounds/cattiversary.png b/launcher/resources/backgrounds/kitteh-bday.png
index 09a36566..09a36566 100644
--- a/launcher/resources/backgrounds/cattiversary.png
+++ b/launcher/resources/backgrounds/kitteh-bday.png
diff --git a/launcher/resources/backgrounds/catmas.png b/launcher/resources/backgrounds/kitteh-xmas.png
index 8bdb1d5c..8bdb1d5c 100644
--- a/launcher/resources/backgrounds/catmas.png
+++ b/launcher/resources/backgrounds/kitteh-xmas.png
diff --git a/launcher/resources/backgrounds/catbgrnd2.png b/launcher/resources/backgrounds/kitteh.png
index e9de7f27..e9de7f27 100644
--- a/launcher/resources/backgrounds/catbgrnd2.png
+++ b/launcher/resources/backgrounds/kitteh.png
diff --git a/launcher/resources/backgrounds/rory-bday.png b/launcher/resources/backgrounds/rory-bday.png
new file mode 100644
index 00000000..66b88094
--- /dev/null
+++ b/launcher/resources/backgrounds/rory-bday.png
diff --git a/launcher/resources/backgrounds/rory-flat-bday.png b/launcher/resources/backgrounds/rory-flat-bday.png
new file mode 100644
index 00000000..8a6e366d
--- /dev/null
+++ b/launcher/resources/backgrounds/rory-flat-bday.png
diff --git a/launcher/resources/backgrounds/rory-flat-xmas.png b/launcher/resources/backgrounds/rory-flat-xmas.png
new file mode 100644
index 00000000..96c3ae38
--- /dev/null
+++ b/launcher/resources/backgrounds/rory-flat-xmas.png
diff --git a/launcher/resources/backgrounds/rory-flat.png b/launcher/resources/backgrounds/rory-flat.png
new file mode 100644
index 00000000..ccec0662
--- /dev/null
+++ b/launcher/resources/backgrounds/rory-flat.png
diff --git a/launcher/resources/backgrounds/rory-xmas.png b/launcher/resources/backgrounds/rory-xmas.png
new file mode 100644
index 00000000..107feb78
--- /dev/null
+++ b/launcher/resources/backgrounds/rory-xmas.png
diff --git a/launcher/resources/backgrounds/rory.png b/launcher/resources/backgrounds/rory.png
new file mode 100644
index 00000000..577f4dce
--- /dev/null
+++ b/launcher/resources/backgrounds/rory.png
diff --git a/launcher/resources/flat/flat.qrc b/launcher/resources/flat/flat.qrc
index 7f59da7b..508e0a9f 100644
--- a/launcher/resources/flat/flat.qrc
+++ b/launcher/resources/flat/flat.qrc
@@ -46,5 +46,6 @@
         <file>scalable/tag.svg</file>
         <file>scalable/export.svg</file>
         <file>scalable/rename.svg</file>
+        <file>scalable/launch.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/flat/scalable/launch.svg b/launcher/resources/flat/scalable/launch.svg
new file mode 100644
index 00000000..b462f2e4
--- /dev/null
+++ b/launcher/resources/flat/scalable/launch.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   fill="#757575"
+   height="48"
+   width="48"
+   version="1.1"
+   id="svg24108"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs24112" />
+  <path
+     d="M 11.674384,43.35533 V 4.3446706 L 42.325617,23.850001 Z"
+     id="path24106"
+     style="stroke-width:1" />
+</svg>
diff --git a/launcher/resources/flat/scalable/launcher.svg b/launcher/resources/flat/scalable/launcher.svg
index 69dd84b1..aeee8433 100644
--- a/launcher/resources/flat/scalable/launcher.svg
+++ b/launcher/resources/flat/scalable/launcher.svg
@@ -37,17 +37,21 @@
      </cc:Agent>
     </dc:contributor>
     <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
-    <dc:rights>
-     <cc:Agent>
-      <dc:title>CC BY-SA 4.0</dc:title>
-     </cc:Agent>
-    </dc:rights>
     <dc:publisher>
      <cc:Agent>
       <dc:title>Prism Launcher</dc:title>
      </cc:Agent>
     </dc:publisher>
+    <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"/>
    </cc:Work>
+   <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+   </cc:License>
   </rdf:RDF>
  </metadata>
 </svg>
diff --git a/launcher/resources/flat_white/flat_white.qrc b/launcher/resources/flat_white/flat_white.qrc
new file mode 100644
index 00000000..e11d6316
--- /dev/null
+++ b/launcher/resources/flat_white/flat_white.qrc
@@ -0,0 +1,51 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource prefix="/icons/flat_white">
+        <file>index.theme</file>
+        <file>scalable/about.svg</file>
+        <file>scalable/accounts.svg</file>
+        <file>scalable/bug.svg</file>
+        <file>scalable/cat.svg</file>
+        <file>scalable/centralmods.svg</file>
+        <file>scalable/checkupdate.svg</file>
+        <file>scalable/copy.svg</file>
+        <file>scalable/coremods.svg</file>
+        <file>scalable/custom-commands.svg</file>
+        <file>scalable/discord.svg</file>
+        <file>scalable/externaltools.svg</file>
+        <file>scalable/help.svg</file>
+        <file>scalable/instance-settings.svg</file>
+        <file>scalable/jarmods.svg</file>
+        <file>scalable/java.svg</file>
+        <file>scalable/language.svg</file>
+        <file>scalable/launcher.svg</file>
+        <file>scalable/loadermods.svg</file>
+        <file>scalable/log.svg</file>
+        <file>scalable/minecraft.svg</file>
+        <file>scalable/new.svg</file>
+        <file>scalable/news.svg</file>
+        <file>scalable/notes.svg</file>
+        <file>scalable/packages.svg</file>
+        <file>scalable/proxy.svg</file>
+        <file>scalable/quickmods.svg</file>
+        <file>scalable/reddit-alien.svg</file>
+        <file>scalable/refresh.svg</file>
+        <file>scalable/resourcepacks.svg</file>
+        <file>scalable/shaderpacks.svg</file>
+        <file>scalable/screenshot-placeholder.svg</file>
+        <file>scalable/screenshots.svg</file>
+        <file>scalable/settings.svg</file>
+        <file>scalable/star.svg</file>
+        <file>scalable/status-bad.svg</file>
+        <file>scalable/status-good.svg</file>
+        <file>scalable/status-running.svg</file>
+        <file>scalable/status-yellow.svg</file>
+        <file>scalable/viewfolder.svg</file>
+        <file>scalable/worlds.svg</file>        
+        <file>scalable/delete.svg</file>
+        <file>scalable/export.svg</file>
+        <file>scalable/rename.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/launch.svg</file>
+    </qresource>
+</RCC>
diff --git a/launcher/resources/flat_white/index.theme b/launcher/resources/flat_white/index.theme
new file mode 100644
index 00000000..54dd0e10
--- /dev/null
+++ b/launcher/resources/flat_white/index.theme