Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances

Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp

1 files changed, 4 insertions, 3 deletions

diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/OneSixModEditDialog.h
index 2510c59c..7e759f48 100644
--- a/gui/dialogs/OneSixModEditDialog.h
+++ b/gui/dialogs/OneSixModEditDialog.h
@@ -45,9 +45,9 @@ slots:
 	void on_buttonBox_rejected();
 	void on_forgeBtn_clicked();
 	void on_liteloaderBtn_clicked();
-	void on_customizeBtn_clicked();
-	void on_revertBtn_clicked();
-	void on_customEditorBtn_clicked();
+	void on_userEditorBtn_clicked();
+	void on_reloadLibrariesBtn_clicked();
+	void on_removeLibraryBtn_clicked();
 	void updateVersionControls();
 	void disableVersionControls();
 
@@ -66,4 +66,5 @@ private:
 public
 slots:
 	void loaderCurrent(QModelIndex current, QModelIndex previous);
+	void versionCurrent(const QModelIndex &current, const QModelIndex &previous);
 };