From 2fe033c4a0bcdb0972046e1b55b0cf463075dc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 19 Jan 2014 05:21:09 +0100
Subject: [PATCH] Move a bunch of resources into the resources folder.

Also, cat is no longer mysterious. It's just FLUFFY!
---
 CMakeLists.txt                                 |   4 ++--
 gui/MainWindow.ui                              |   2 +-
 MultiMC.icns => resources/MultiMC.icns         | Bin
 MultiMC.manifest => resources/MultiMC.manifest |   0
 multimc.rc => resources/multimc.rc             |   2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename MultiMC.icns => resources/MultiMC.icns (100%)
 rename MultiMC.manifest => resources/MultiMC.manifest (100%)
 rename multimc.rc => resources/multimc.rc (90%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ccdab0a..9efb4cd20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -528,7 +528,7 @@ resources/instances/instances.qrc
 
 ######## Windows resource files ########
 IF(WIN32)
-SET(MULTIMC_RCS multimc.rc)
+SET(MULTIMC_RCS resources/multimc.rc)
 ENDIF()
 
 ####### X11 Stuff #######
@@ -670,7 +670,7 @@ FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
 
 # ICNS file for OS X
 IF(APPLE)
-	INSTALL(FILES MultiMC.icns DESTINATION MultiMC.app/Contents/Resources)
+	INSTALL(FILES resources/MultiMC.icns DESTINATION MultiMC.app/Contents/Resources)
 ENDIF()
 
 CONFIGURE_FILE(
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 5653907e4..25af6f602 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -469,7 +469,7 @@
     <string>Meow</string>
    </property>
    <property name="toolTip">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; color:#ff0004;&quot;&gt;Catnarok!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Or just a cat with a ball of yarn?&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;WHO KNOWS?!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;img src=&quot;:/icons/instances/tnt&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;It's a fluffy kitty :3&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </action>
   <action name="actionCopyInstance">
diff --git a/MultiMC.icns b/resources/MultiMC.icns
similarity index 100%
rename from MultiMC.icns
rename to resources/MultiMC.icns
diff --git a/MultiMC.manifest b/resources/MultiMC.manifest
similarity index 100%
rename from MultiMC.manifest
rename to resources/MultiMC.manifest
diff --git a/multimc.rc b/resources/multimc.rc
similarity index 90%
rename from multimc.rc
rename to resources/multimc.rc
index 2140e3f4f..ca92e2c3d 100644
--- a/multimc.rc
+++ b/resources/multimc.rc
@@ -3,7 +3,7 @@
 #endif
 #include <windows.h>
 
-IDI_ICON1               ICON    DISCARDABLE     "resources/icons/MultiMC.ico"
+IDI_ICON1               ICON    DISCARDABLE     "MultiMC.ico"
 1 RT_MANIFEST "MultiMC.manifest"
 
 VS_VERSION_INFO VERSIONINFO