Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp

1 files changed, 14 insertions, 14 deletions

diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 0537d0e5..82e3b05f 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -14,7 +14,7 @@
    <string>MultiMC 5</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../multimc.qrc">
+   <iconset resource="../graphics.qrc">
     <normaloff>:/icons/multimc/scalable/apps/multimc.svg</normaloff>:/icons/multimc/scalable/apps/multimc.svg</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -123,7 +123,7 @@
   </widget>
   <action name="actionAddInstance">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/new</normaloff>:/icons/toolbar/new</iconset>
    </property>
    <property name="text">
@@ -138,7 +138,7 @@
   </action>
   <action name="actionViewInstanceFolder">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/viewfolder</normaloff>:/icons/toolbar/viewfolder</iconset>
    </property>
    <property name="text">
@@ -153,7 +153,7 @@
   </action>
   <action name="actionRefresh">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/refresh</normaloff>:/icons/toolbar/refresh</iconset>
    </property>
    <property name="text">
@@ -168,7 +168,7 @@
   </action>
   <action name="actionViewCentralModsFolder">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/centralmods</normaloff>:/icons/toolbar/centralmods</iconset>
    </property>
    <property name="text">
@@ -183,7 +183,7 @@
   </action>
   <action name="actionCheckUpdate">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/checkupdate</normaloff>:/icons/toolbar/checkupdate</iconset>
    </property>
    <property name="text">
@@ -198,7 +198,7 @@
   </action>
   <action name="actionSettings">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset>
    </property>
    <property name="text">
@@ -216,7 +216,7 @@
   </action>
   <action name="actionReportBug">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/bug</normaloff>:/icons/toolbar/bug</iconset>
    </property>
    <property name="text">
@@ -231,7 +231,7 @@
   </action>
   <action name="actionNews">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/news</normaloff>:/icons/toolbar/news</iconset>
    </property>
    <property name="text">
@@ -246,7 +246,7 @@
   </action>
   <action name="actionAbout">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/about</normaloff>:/icons/toolbar/about</iconset>
    </property>
    <property name="text">
@@ -300,7 +300,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/instances/infinity</normaloff>:/icons/instances/infinity</iconset>
    </property>
    <property name="text">
@@ -440,7 +440,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/cat</normaloff>:/icons/toolbar/cat</iconset>
    </property>
    <property name="text">
@@ -452,7 +452,7 @@
   </action>
   <action name="actionCopyInstance">
    <property name="icon">
-    <iconset resource="../multimc.qrc">
+    <iconset resource="../graphics.qrc">
      <normaloff>:/icons/toolbar/copy</normaloff>:/icons/toolbar/copy</iconset>
    </property>
    <property name="text">
@@ -476,7 +476,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../multimc.qrc"/>
+  <include location="../graphics.qrc"/>
  </resources>
  <connections/>
 </ui>