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

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

gui/MainWindow.h

@@ -51,6 +51,7 @@ public:
 	void openWebPage(QUrl url);
 
 	void checkSetDefaultJava();
+	void checkMigrateLegacyAssets();
 
 private
 slots:
@@ -145,6 +146,9 @@ slots:
 	void assetsFailed();
 	void assetsFinished();
 
+	// called when an icon is changed in the icon model.
+	void iconUpdated(QString);
+
 public
 slots:
 	void instanceActivated(QModelIndex);
@@ -173,6 +177,7 @@ slots:
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
 	void setCatBackground(bool enabled);
+	void updateInstanceToolIcon(QString new_icon);
 
 private:
 	Ui::MainWindow *ui;
@@ -186,6 +191,7 @@ private:
 	QToolButton* newsLabel;
 
 	BaseInstance *m_selectedInstance;
+	QString m_currentInstIcon;
 
 	Task *m_versionLoadTask;