NOISSUE Update changelog for version 0.4.5

CMakeLists.txt

@@ -83,7 +83,7 @@ set(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch
 ######## Set version numbers ########
 set(MultiMC_VERSION_MAJOR	 0)
 set(MultiMC_VERSION_MINOR	 4)
-set(MultiMC_VERSION_HOTFIX   4)
+set(MultiMC_VERSION_HOTFIX   5)
 
 # Build number
 set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -118,9 +118,6 @@ if(MultiMC_VERSION_TYPE STREQUAL "Custom")
 elseif(MultiMC_VERSION_TYPE STREQUAL "Release")
 	message(STATUS "Version Type: Stable Release")
 	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}")
-elseif(MultiMC_VERSION_TYPE STREQUAL "ReleaseCandidate")
-	message(STATUS "Version Type: Release Candidate")
-	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}-rc${MultiMC_VERSION_BUILD}")
 elseif(MultiMC_VERSION_TYPE STREQUAL "Development")
 	message(STATUS "Version Type: Development")
 	set(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}-dev${MultiMC_VERSION_BUILD}")
@@ -191,11 +188,11 @@ if(UNIX AND APPLE)
 	set(MACOSX_BUNDLE_BUNDLE_NAME "MultiMC")
 	set(MACOSX_BUNDLE_INFO_STRING "MultiMC Minecraft launcher and management utility.")
 	set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.multimc.MultiMC5")
-	set(MACOSX_BUNDLE_BUNDLE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_REV}.${MultiMC_VERSION_BUILD}")
+	set(MACOSX_BUNDLE_BUNDLE_VERSION "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
-	set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_REV}.${MultiMC_VERSION_BUILD}")
+	set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
-	set(MACOSX_BUNDLE_LONG_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_REV}.${MultiMC_VERSION_BUILD}")
+	set(MACOSX_BUNDLE_LONG_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
 	set(MACOSX_BUNDLE_ICON_FILE MultiMC.icns)
-	set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2013 MultiMC Contributors")
+	set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2014 MultiMC Contributors")
 elseif(UNIX)
 	set(BINARY_DEST_DIR bin)
 	set(PLUGIN_DEST_DIR plugins)

changelog.md

@@ -1,5 +1,12 @@
 #MultiMC Changelog
 
+##0.4.5
+- Copies of FTB instances should work again (GH-619)
+- Fixed OSX version not including the hotfix number
+- If the currectly used java version goes missing, it now triggers auto-detect (GH-608)
+- Improved 'refresh' and 'update check' icons of the dark and bright simple icon themes (GH-618)
+- Fixed console window hiding - it no longer results in windowless/unusable MultiMC
+
 ##0.4.4
 - Other logs larger than 10MB will not load to prevent logs eating the whole available memory
 - Translations are now updated independently from MultiMC

gui/ConsoleWindow.cpp

@@ -22,6 +22,7 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <qlayoutitem.h>
+#include <QCloseEvent>
 
 #include <gui/Platform.h>
 #include <gui/dialogs/CustomMessageBox.h>
@@ -170,7 +171,6 @@ void ConsoleWindow::setMayClose(bool mayclose)
 
 void ConsoleWindow::toggleConsole()
 {
-	//QScrollBar *bar = ui->text->verticalScrollBar();
 	if (isVisible())
 	{
 		if(!isActiveWindow())
@@ -178,26 +178,11 @@ void ConsoleWindow::toggleConsole()
 			activateWindow();
 			return;
 		}
-		/*
-		int max_bar = bar->maximum();
-		int val_bar = m_last_scroll_value = bar->value();
-		m_scroll_active = (max_bar - val_bar) <= 1;
-		*/
 		hide();
 	}
 	else
 	{
 		show();
-		/*
-		if (m_scroll_active)
-		{
-			bar->setValue(bar->maximum());
-		}
-		else
-		{
-			bar->setValue(m_last_scroll_value);
-		}
-		*/
 	}
 }
 
@@ -206,6 +191,7 @@ void ConsoleWindow::closeEvent(QCloseEvent *event)
 	if (!m_mayclose)
 	{
 		toggleConsole();
+		event->ignore();
 	}
 	else if(m_container->requestClose(event))
 	{
@@ -214,7 +200,7 @@ void ConsoleWindow::closeEvent(QCloseEvent *event)
 
 		emit isClosing();
 		m_trayIcon->hide();
-		QMainWindow::closeEvent(event);
+		event->accept();
 	}
 }
 
@@ -246,7 +232,9 @@ void ConsoleWindow::onEnded(InstancePtr instance, int code, QProcess::ExitStatus
 		}
 	}
 	if (!isVisible())
+	{
 		show();
+	}
 	// Raise Window
 	if (MMC->settings()->get("RaiseConsole").toBool())
 	{

gui/MainWindow.cpp

@@ -734,11 +734,6 @@ void MainWindow::setCatBackground(bool enabled)
 
 void MainWindow::on_actionAddInstance_triggered()
 {
-#ifdef TEST_SEGV
-	// For further testing stuff.
-	int v = *((int *)-1);
-#endif
-
 	if (!MMC->minecraftlist()->isLoaded() && m_versionLoadTask &&
 		m_versionLoadTask->isRunning())
 	{
@@ -1491,6 +1486,16 @@ void MainWindow::checkSetDefaultJava()
 			askForJava = true;
 			break;
 		}
+		if(!currentJavaPath.contains('/'))
+		{
+			currentJavaPath = QStandardPaths::findExecutable(currentJavaPath);
+		}
+		QFile currentJavaBin(currentJavaPath);
+		if(!currentJavaBin.exists())
+		{
+			askForJava = true;
+			break;
+		}
 		#if defined Q_OS_WIN32
 		QString currentHack = MMC->settings()->get("JavaDetectionHack").toString();
 		if (currentHack != javaHack)

logic/OneSixFTBInstance.cpp

@@ -40,6 +40,23 @@ void OneSixFTBInstance::copy(const QDir &newDir)
 		}
 		root.remove("libraries");
 		root.remove("id");
+
+		// HACK HACK HACK HACK
+		// A workaround for a problem in MultiMC, triggered by a historical problem in FTB,
+		// triggered by Mojang getting their library versions wrong in 1.7.10
+		if(intendedVersionId() == "1.7.10")
+		{
+			auto insert = [&outLibs, &libraryNames](QString name)
+			{
+				QJsonObject libObj;
+				libObj.insert("insert", QString("replace"));
+				libObj.insert("name", name);
+				libraryNames.push_back(name);
+				outLibs.prepend(libObj);
+			};
+			insert("com.google.guava:guava:16.0");
+			insert("org.apache.commons:commons-lang3:3.2.1");
+		}
 		root.insert("+libraries", outLibs);
 		root.insert("order", 1);
 		root.insert("fileId", QString("org.multimc.ftb.pack.json"));

resources/pe_dark/scalable/checkupdate.svg

@@ -3,41 +3,10 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<path fill="#999999" d="M26,24h-0.4c0-0.1-0.1-0.2-0.1-0.3c-0.7-1.6-1.5-2.8-3.5-3.4V18c0-3.3-2.7-6-6-6c-3.3,0-6,2.7-6,6v2.3
+<path fill="#666666" d="M26,24h-0.4c0-0.1-0.1-0.2-0.1-0.3c-0.7-1.6-1.5-2.8-3.5-3.4V18c0-3.3-2.7-6-6-6c-3.3,0-6,2.7-6,6v2.3
 	c-2,0.6-2.9,1.8-3.5,3.4c0,0,0,0.1,0,0.1C2.8,23.1,0,19.9,0,16v-2c0-4.4,3.6-8,8-8c0.8,0,1.5,0.1,2.2,0.3C10.9,2.7,14.2,0,18,0
 	c4.4,0,8,3.6,8,8c0,0.7-0.1,1.4-0.3,2c0.1,0,0.2,0,0.3,0c3.3,0,6,2.7,6,6v2C32,21.3,29.3,24,26,24z"/>
-<path fill="#666666" d="M12,24h2v-6c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2v6h2c0.8,0,1.5,0.5,1.8,1.2c0.1,0.2,0.1,0.4,0.1,0.6
+<path d="M12,24h2v-6c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2v6h2c0.8,0,1.5,0.5,1.8,1.2c0.1,0.2,0.1,0.4,0.1,0.6c0.1,0.6-0.1,1.2-0.6,1.6
-	c0.1,0.6-0.1,1.2-0.6,1.6l-4,4C17,31.8,16.5,32,16,32c-0.5,0-1-0.2-1.4-0.6l-4-4c-0.4-0.4-0.6-1-0.6-1.6c0-0.2,0.1-0.4,0.1-0.6
+	l-4,4C17,31.8,16.5,32,16,32c-0.5,0-1-0.2-1.4-0.6l-4-4c-0.4-0.4-0.6-1-0.6-1.6c0-0.2,0.1-0.4,0.1-0.6C10.5,24.5,11.2,24,12,24z"/>
-	C10.5,24.5,11.2,24,12,24z"/>
+<rect fill="none" width="32" height="32"/>
-<rect y="0" fill="none" width="32" height="32"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>

resources/pe_dark/scalable/refresh.svg

@@ -4,38 +4,8 @@
 <svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
 <rect fill="none" width="32" height="32"/>
-<path fill="#666666" d="M31.8,17.4c-0.4-0.9-1.2-1.4-2.1-1.4h-2.3c0-7.6-6.1-13.7-13.7-13.7C6.1,2.3,0,8.4,0,16
+<path d="M31.8,17.4c-0.4-0.9-1.2-1.4-2.1-1.4h-2.3c0-7.6-6.1-13.7-13.7-13.7C6.1,2.3,0,8.4,0,16c0,7.6,6.1,13.7,13.7,13.7
-	c0,7.6,6.1,13.7,13.7,13.7c2.5,0,4.8-0.7,6.8-1.8l-3.4-3.4c-1,0.4-2.2,0.7-3.4,0.7c-5,0-9.1-4.1-9.1-9.1s4.1-9.1,9.1-9.1
+	c2.5,0,4.8-0.7,6.8-1.8l-3.4-3.4c-1,0.4-2.2,0.7-3.4,0.7c-5,0-9.1-4.1-9.1-9.1s4.1-9.1,9.1-9.1c5.1,0,9.1,4.1,9.1,9.1h-2.3
-	c5.1,0,9.1,4.1,9.1,9.1h-2.3c-0.9,0-1.8,0.6-2.1,1.4c-0.4,0.9-0.2,1.8,0.5,2.5l4.6,4.6c0.4,0.4,1,0.7,1.6,0.7c0.6,0,1.2-0.2,1.6-0.7
+	c-0.9,0-1.8,0.6-2.1,1.4c-0.4,0.9-0.2,1.8,0.5,2.5l4.6,4.6c0.4,0.4,1,0.7,1.6,0.7c0.6,0,1.2-0.2,1.6-0.7l4.6-4.6
-	l4.6-4.6C32,19.2,32.2,18.3,31.8,17.4z"/>
+	C32,19.2,32.2,18.3,31.8,17.4z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>

resources/pe_light/scalable/checkupdate.svg

@@ -3,41 +3,11 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<path fill="#F2F2F2" d="M26,24h-0.4c0-0.1-0.1-0.2-0.1-0.3c-0.7-1.6-1.5-2.8-3.5-3.4V18c0-3.3-2.7-6-6-6c-3.3,0-6,2.7-6,6v2.3
+<path fill="#CCCCCC" d="M26,24h-0.4c0-0.1-0.1-0.2-0.1-0.3c-0.7-1.6-1.5-2.8-3.5-3.4V18c0-3.3-2.7-6-6-6c-3.3,0-6,2.7-6,6v2.3
 	c-2,0.6-2.9,1.8-3.5,3.4c0,0,0,0.1,0,0.1C2.8,23.1,0,19.9,0,16v-2c0-4.4,3.6-8,8-8c0.8,0,1.5,0.1,2.2,0.3C10.9,2.7,14.2,0,18,0
 	c4.4,0,8,3.6,8,8c0,0.7-0.1,1.4-0.3,2c0.1,0,0.2,0,0.3,0c3.3,0,6,2.7,6,6v2C32,21.3,29.3,24,26,24z"/>
-<path fill="#CCCCCC" d="M12,24h2v-6c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2v6h2c0.8,0,1.5,0.5,1.8,1.2c0.1,0.2,0.1,0.4,0.1,0.6
+<path fill="#F2F2F2" d="M12,24h2v-6c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2v6h2c0.8,0,1.5,0.5,1.8,1.2c0.1,0.2,0.1,0.4,0.1,0.6
 	c0.1,0.6-0.1,1.2-0.6,1.6l-4,4C17,31.8,16.5,32,16,32c-0.5,0-1-0.2-1.4-0.6l-4-4c-0.4-0.4-0.6-1-0.6-1.6c0-0.2,0.1-0.4,0.1-0.6
 	C10.5,24.5,11.2,24,12,24z"/>
 <rect fill="none" width="32" height="32"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>

resources/pe_light/scalable/refresh.svg

@@ -4,38 +4,8 @@
 <svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
 <rect fill="none" width="32" height="32"/>
-<path fill="#CCCCCC" d="M31.8,17.4c-0.4-0.9-1.2-1.4-2.1-1.4h-2.3c0-7.6-6.1-13.7-13.7-13.7C6.1,2.3,0,8.4,0,16
+<path fill="#F2F2F2" d="M31.8,17.4c-0.4-0.9-1.2-1.4-2.1-1.4h-2.3c0-7.6-6.1-13.7-13.7-13.7C6.1,2.3,0,8.4,0,16
 	c0,7.6,6.1,13.7,13.7,13.7c2.5,0,4.8-0.7,6.8-1.8l-3.4-3.4c-1,0.4-2.2,0.7-3.4,0.7c-5,0-9.1-4.1-9.1-9.1s4.1-9.1,9.1-9.1
 	c5.1,0,9.1,4.1,9.1,9.1h-2.3c-0.9,0-1.8,0.6-2.1,1.4c-0.4,0.9-0.2,1.8,0.5,2.5l4.6,4.6c0.4,0.4,1,0.7,1.6,0.7c0.6,0,1.2-0.2,1.6-0.7
 	l4.6-4.6C32,19.2,32.2,18.3,31.8,17.4z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
 </svg>