Merge branch 'release-0.2'

144 files changed, 1834 insertions, 26 deletions

diff --git a/resources/MultiMC.icns b/resources/MultiMC.icns
new file mode 100644
index 00000000..f96fd5a4
--- /dev/null
+++ b/resources/MultiMC.icns
diff --git a/resources/icons/MultiMC.ico b/resources/MultiMC.ico
index 734af0fb..734af0fb 100644
--- a/resources/icons/MultiMC.ico
+++ b/resources/MultiMC.ico
diff --git a/resources/MultiMC.manifest b/resources/MultiMC.manifest
new file mode 100644
index 00000000..3acf8f7f
--- /dev/null
+++ b/resources/MultiMC.manifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <assemblyIdentity name="MultiMC.Application.5" type="win32" version="5.0.0.0" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
+    </dependentAssembly>
+  </dependency>
+  <description>Custom Minecraft launcher for managing multiple installs.</description>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--The ID below indicates app support for Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!--The ID below indicates app support for Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--The ID below indicates app support for Windows Developer Preview / Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+    </application> 
+  </compatibility>
+</assembly>
\ No newline at end of file
diff --git a/resources/XdgIcon.theme b/resources/XdgIcon.theme
deleted file mode 100644
index ad26482e..00000000
--- a/resources/XdgIcon.theme
+++ /dev/null
@@ -1,12 +0,0 @@
-[Icon Theme]
-Name=MultiMC
-Comment=MultiMC Default Icons
-Inherits=default
-Directories=scalable/apps
-
-[scalable/apps]
-Size=48
-Type=scalable
-MinSize=1
-MaxSize=512
-Context=Applications
diff --git a/resources/backgrounds/backgrounds.qrc b/resources/backgrounds/backgrounds.qrc
new file mode 100644
index 00000000..55de139e
--- /dev/null
+++ b/resources/backgrounds/backgrounds.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource prefix="/backgrounds">
+        <file alias="kitteh">catbgrnd2.png</file>
+    </qresource>
+</RCC>
diff --git a/resources/catbgrnd2.png b/resources/backgrounds/catbgrnd2.png
index 2b949e0b..2b949e0b 100644
--- a/resources/catbgrnd2.png
+++ b/resources/backgrounds/catbgrnd2.png
diff --git a/resources/icons/toolbar/Cat.png b/resources/icons/toolbar/Cat.png
deleted file mode 100644
index 4fcda3ea..00000000
--- a/resources/icons/toolbar/Cat.png
+++ /dev/null
diff --git a/resources/icons/toolbar/InstCopy.png b/resources/icons/toolbar/InstCopy.png
deleted file mode 100644
index c8f9db41..00000000
--- a/resources/icons/toolbar/InstCopy.png
+++ /dev/null
diff --git a/resources/icons/toolbar/refresh.png b/resources/icons/toolbar/refresh.png
deleted file mode 100644
index 734729bf..00000000
--- a/resources/icons/toolbar/refresh.png
+++ /dev/null
diff --git a/resources/icons/instances/brick.png b/resources/instances/brick.png
index 0b534366..0b534366 100644
--- a/resources/icons/instances/brick.png
+++ b/resources/instances/brick.png
diff --git a/resources/icons/instances/chicken.png b/resources/instances/chicken.png
index f870467a..f870467a 100644
--- a/resources/icons/instances/chicken.png
+++ b/resources/instances/chicken.png
diff --git a/resources/icons/instances/chicken128.png b/resources/instances/chicken128.png
index 71f6dedc..71f6dedc 100644
--- a/resources/icons/instances/chicken128.png
+++ b/resources/instances/chicken128.png
diff --git a/resources/icons/instances/creeper.png b/resources/instances/creeper.png
index a67ecfc3..a67ecfc3 100644
--- a/resources/icons/instances/creeper.png
+++ b/resources/instances/creeper.png
diff --git a/resources/icons/instances/creeper128.png b/resources/instances/creeper128.png
index 41b7d07d..41b7d07d 100644
--- a/resources/icons/instances/creeper128.png
+++ b/resources/instances/creeper128.png
diff --git a/resources/icons/instances/derp.png b/resources/instances/derp.png
index 4c361942..4c361942 100644
--- a/resources/icons/instances/derp.png
+++ b/resources/instances/derp.png
diff --git a/resources/icons/instances/diamond.png b/resources/instances/diamond.png
index 376ab901..376ab901 100644
--- a/resources/icons/instances/diamond.png
+++ b/resources/instances/diamond.png
diff --g