Bump version, update the changelog

Conflicts:
	logic/ForgeInstaller.cpp

CMakeLists.txt

@@ -104,7 +104,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	 3)
-set(MultiMC_VERSION_HOTFIX   6)
+set(MultiMC_VERSION_HOTFIX   9)
 
 # Build number
 set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")

MultiMC.cpp

@@ -484,6 +484,7 @@ void MultiMC::initGlobalSettings()
 	// Java Settings
 	m_settings->registerSetting("JavaPath", "");
 	m_settings->registerSetting("LastHostname", "");
+	m_settings->registerSetting("JavaDetectionHack", "");
 	m_settings->registerSetting("JvmArgs", "");
 
 	// Custom Commands

changelog.yaml

@@ -82,3 +82,9 @@
     - Fix for translations on OSX not working
     - Screenshot dialog should be harder to lose track of when used from the console window
     - A crash handler implementation has been added.
+0.3.7
+    - Fixed forge for 1.7.10-pre4 (and any future prereleases)
+0.3.8
+    - Workaround for performance issues with Intel integrated graphics chips
+0.3.9
+    - Workaround for 1.7.10 Forge

gui/MainWindow.cpp

@@ -110,7 +110,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
 
-	QString winTitle = QString("MultiMC 5 - Version %1").arg(BuildConfig.printableVersionString());
+	QString winTitle =
+		QString("MultiMC 5 - Version %1").arg(BuildConfig.printableVersionString());
 	if (!BuildConfig.BUILD_PLATFORM.isEmpty())
 		winTitle += " on " + BuildConfig.BUILD_PLATFORM;
 	setWindowTitle(winTitle);
@@ -120,7 +121,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 
 	// Global shortcuts
 	{
-		//FIXME: This is kinda weird. and bad. We need some kind of managed shutdown.
+		// FIXME: This is kinda weird. and bad. We need some kind of managed shutdown.
 		auto q = new QShortcut(QKeySequence::Quit, this);
 		connect(q, SIGNAL(activated()), qApp, SLOT(quit()));
 	}
@@ -259,7 +260,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 
 	auto accounts = MMC->accounts();
 
-    QList<CacheDownloadPtr> skin_dls;
+	QList<CacheDownloadPtr> skin_dls;
 	for (int i = 0; i < accounts->count(); i++)
 	{
 		auto account = accounts->at(i);
@@ -270,21 +271,21 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 				auto meta = MMC->metacache()->resolveEntry("skins", profile.name + ".png");
 				auto action = CacheDownload::make(
 					QUrl("http://" + URLConstants::SKINS_BASE + profile.name + ".png"), meta);
-                skin_dls.append(action);
+				skin_dls.append(action);
 				meta->stale = true;
 			}
 		}
 	}
-	if(!skin_dls.isEmpty())
-    {
-        auto job = new NetJob("Startup player skins download");
-        connect(job, SIGNAL(succeeded()), SLOT(skinJobFinished()));
-        connect(job, SIGNAL(failed()), SLOT(skinJobFinished()));
-        for(auto action: skin_dls)
-            job->addNetAction(action);
-        skin_download_job.reset(job);
-        job->start();
-    }
+	if (!skin_dls.isEmpty())
+	{
+		auto job = new NetJob("Startup player skins download");
+		connect(job, SIGNAL(succeeded()), SLOT(skinJobFinished()));
+		connect(job, SIGNAL(failed()), SLOT(skinJobFinished()));
+		for (auto action : skin_dls)
+			job->addNetAction(action);
+		skin_download_job.reset(job);
+		job->start();
+	}
 
 	// run the things that load and download other things... FIXME: this is NOT the place
 	// FIXME: invisible actions in the background = NOPE.
@@ -335,11 +336,10 @@ MainWindow::~MainWindow()
 
 void MainWindow::skinJobFinished()
 {
-    activeAccountChanged();
-    skin_download_job.reset();
+	activeAccountChanged();
+	skin_download_job.reset();
 }
 
-
 void MainWindow::showInstanceContextMenu(const QPoint &pos)
 {
 	QList<QAction *> actions;
@@ -361,9 +361,10 @@ void MainWindow::showInstanceContextMenu(const QPoint &pos)
 		QAction *actionCopyInstance = new QAction(tr("Copy instance"), this);
 		actionCopyInstance->setToolTip(ui->actionCopyInstance->toolTip());
 
-
-		connect(actionRename, SIGNAL(triggered(bool)), SLOT(on_actionRenameInstance_triggered()));
-		connect(actionCopyInstance, SIGNAL(triggered(bool)), SLOT(on_actionCopyInstance_triggered()));
+		connect(actionRename, SIGNAL(triggered(bool)),
+				SLOT(on_actionRenameInstance_triggered()));
+		connect(actionCopyInstance, SIGNAL(triggered(bool)),
+				SLOT(on_actionCopyInstance_triggered()));
 
 		actions.replace(1, actionRename);
 		actions.prepend(actionSep);
@@ -378,7 +379,8 @@ void MainWindow::showInstanceContextMenu(const QPoint &pos)
 		QAction *actionCreateInstance = new QAction(tr("Create instance"), this);
 		actionCreateInstance->setToolTip(ui->actionAddInstance->toolTip());
 
-		connect(actionCreateInstance, SIGNAL(triggered(bool)), SLOT(on_actionAddInstance_triggered()));
+		connect(actionCreateInstance, SIGNAL(triggered(bool)),
+				SLOT(on_actionAddInstance_triggered()));
 
 		actions.prepend(actionSep);
 		actions.prepend(actionVoid);
@@ -386,7 +388,7 @@ void MainWindow::showInstanceContextMenu(const QPoint &pos)
 	}
 	QMenu myMenu;
 	myMenu.addActions(actions);
-	if(onInstance)
+	if (onInstance)
 		myMenu.setEnabled(m_selectedInstance->canLaunch());
 	myMenu.exec(view->mapToGlobal(pos));
 }
@@ -399,7 +401,8 @@ void MainWindow::updateToolsMenu()
 	}
 	QMenu *launchMenu = new QMenu(this);
 	QAction *normalLaunch = launchMenu->addAction(tr("Launch"));
-	connect(normalLaunch, &QAction::triggered, [this](){doLaunch();});
+	connect(normalLaunch, &QAction::triggered, [this]()
+	{ doLaunch(); });
 	launchMenu->addSeparator()->setText(tr("Profilers"));
 	for (auto profiler : MMC->profilers().values())
 	{
@@ -408,11 +411,13 @@ void MainWindow::updateToolsMenu()
 		if (!profiler->check(&error))
 		{
 			profilerAction->setDisabled(true);
-			profilerAction->setToolTip(tr("Profiler not setup correctly. Go into settings, \"External Tools\"."));
+			profilerAction->setToolTip(
+				tr("Profiler not setup correctly. Go into settings, \"External Tools\"."));
 		}
 		else
 		{
-			connect(profilerAction, &QAction::triggered, [this, profiler](){doLaunch(true, profiler.get());});
+			connect(profilerAction, &QAction::triggered, [this, profiler]()
+			{ doLaunch(true, profiler.get()); });
 		}
 	}
 	launchMenu->addSeparator()->setText(tr("Tools"));
@@ -423,14 +428,13 @@ void MainWindow::updateToolsMenu()
 		if (!tool->check(&error))
 		{
 			toolAction->setDisabled(true);
-			toolAction->setToolTip(tr("Tool not setup correctly. Go into settings, \"External Tools\"."));
+			toolAction->setToolTip(
+				tr("Tool not setup correctly. Go into settings, \"External Tools\"."));
 		}
 		else
 		{
 			connect(toolAction, &QAction::triggered, [this, tool]()
-			{
-				tool->createDetachedTool(m_selectedInstance, this)->run();
-			});
+			{ tool->createDetachedTool(m_selectedInstance, this)->run(); });
 		}
 	}
 	ui->actionLaunchInstance->setMenu(launchMenu);
@@ -672,7 +676,7 @@ void MainWindow::downloadUpdates(QString repo, int versionId, bool installOnExit
 	if (updateDlg.exec(&updateTask))
 	{
 		UpdateFlags baseFlags = None;
-		if(BuildConfig.UPDATER_DRY_RUN)
+		if (BuildConfig.UPDATER_DRY_RUN)
 			baseFlags |= DryRun;
 		if (installOnExit)
 			MMC->installUpdates(updateTask.updateFilesDir(), baseFlags | OnExit);
@@ -711,9 +715,9 @@ void MainWindow::on_actionAddInstance_triggered()
 {
 #ifdef TEST_SEGV
 	// For further testing stuff.
-	int v = *((int*)-1);
+	int v = *((int *)-1);
 #endif
-	
+
 	if (!MMC->minecraftlist()->isLoaded() && m_versionLoadTask &&
 		m_versionLoadTask->isRunning())
 	{
@@ -1068,10 +1072,10 @@ void MainWindow::instanceActivated(QModelIndex index)
 {
 	if (!index.isValid())
 		return;
-    QString id = index.data(InstanceList::InstanceIDRole).toString();
+	QString id = index.data(InstanceList::InstanceIDRole).toString();
 	InstancePtr inst = MMC->instances()->getInstanceById(id);
-    if(!inst)
-        return;
+	if (!inst)
+		return;
 
 	NagUtils::checkJVMArgs(inst->settings().get("JvmArgs").toString(), this);
 
@@ -1224,7 +1228,8 @@ void MainWindow::doLaunch(bool online, BaseProfilerFactory *profiler)
 	}
 }
 
-void MainWindow::updateInstance(InstancePtr instance, AuthSessionPtr session, BaseProfilerFactory *profiler)
+void MainWindow::updateInstance(InstancePtr instance, AuthSessionPtr session,
+								BaseProfilerFactory *profiler)
 {
 	auto updateTask = instance->doUpdate();
 	if (!updateTask)
@@ -1239,14 +1244,15 @@ void MainWindow::updateInstance(InstancePtr instance, AuthSessionPtr session, Ba
 	tDialog.exec(updateTask.get());
 }
 
-void MainWindow::launchInstance(InstancePtr instance, AuthSessionPtr session, BaseProfilerFactory *profiler)
+void MainWindow::launchInstance(InstancePtr instance, AuthSessionPtr session,
+								BaseProfilerFactory *profiler)
 {
 	Q_ASSERT_X(instance != NULL, "launchInstance", "instance is NULL");
 	Q_ASSERT_X(session.get() != nullptr, "launchInstance", "session is NULL");
 
 	QString launchScript;
 
-	if(!instance->prepareForLaunch(session, launchScript))
+	if (!instance->prepareForLaunch(session, launchScript))
 		return;
 
 	MinecraftProcess *proc = new MinecraftProcess(instance);
@@ -1266,7 +1272,8 @@ void MainWindow::launchInstance(InstancePtr instance, AuthSessionPtr session, Ba
 		QString error;
 		if (!profiler->check(&error))
 		{
-			QMessageBox::critical(this, tr("Error"), tr("Couldn't start profiler: %1").arg(error));
+			QMessageBox::critical(this, tr("Error"),
+								  tr("Couldn't start profiler: %1").arg(error));
 			proc->abort();
 			return;
 		}
@@ -1276,9 +1283,11 @@ void MainWindow::launchInstance(InstancePtr instance, AuthSessionPtr session, Ba
 		dialog.setMaximum(0);
 		dialog.setValue(0);
 		dialog.setLabelText(tr("Waiting for profiler..."));
-		connect(&dialog, &QProgressDialog::canceled, profilerInstance, &BaseProfiler::abortProfiling);
+		connect(&dialog, &QProgressDialog::canceled, profilerInstance,
+				&BaseProfiler::abortProfiling);
 		dialog.show();
-		connect(profilerInstance, &BaseProfiler::readyToLaunch, [&dialog, this, proc](const QString &message)
+		connect(profilerInstance, &BaseProfiler::readyToLaunch,
+				[&dialog, this, proc](const QString & message)
 		{
 			dialog.accept();
 			QMessageBox msg;
@@ -1291,7 +1300,8 @@ void MainWindow::launchInstance(InstancePtr instance, AuthSessionPtr session, Ba
 			msg.exec();
 			proc->launch();
 		});
-		connect(profilerInstance, &BaseProfiler::abortLaunch, [&dialog, this, proc](const QString &message)
+		connect(profilerInstance, &BaseProfiler::abortLaunch,
+				[&dialog, this, proc](const QString & message)
 		{
 			dialog.accept();
 			QMessageBox msg;
@@ -1416,9 +1426,9 @@ void MainWindow::on_actionChangeInstLWJGLVersion_triggered()
 	lselect.exec();
 	if (lselect.result() == QDialog::Accepted)
 	{
-        auto ptr = std::dynamic_pointer_cast<LegacyInstance>(m_selectedInstance);
-        if(ptr)
-            ptr->setLWJGLVersion(lselect.selectedVersion());
+		auto ptr = std::dynamic_pointer_cast<LegacyInstance>(m_selectedInstance);
+		if (ptr)
+			ptr->setLWJGLVersion(lselect.selectedVersion());
 	}
 }
 
@@ -1434,15 +1444,15 @@ void MainWindow::on_actionInstanceSettings_triggered()
 
 void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &previous)
 {
-    if(!current.isValid())
-    {
-        selectionBad();
-        MMC->settings()->set("SelectedInstance", QString());
-        return;
-    }
-    QString id = current.data(InstanceList::InstanceIDRole).toString();
-    m_selectedInstance = MMC->instances()->getInstanceById(id);
-	if ( m_selectedInstance )
+	if (!current.isValid())
+	{
+		selectionBad();
+		MMC->settings()->set("SelectedInstance", QString());
+		return;
+	}
+	QString id = current.data(InstanceList::InstanceIDRole).toString();
+	m_selectedInstance = MMC->instances()->getInstanceById(id);
+	if (m_selectedInstance)
 	{
 		ui->instanceToolBar->setEnabled(m_selectedInstance->canLaunch());
 		renameButton->setText(m_selectedInstance->name());
@@ -1461,9 +1471,9 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
 	}
 	else
 	{
-        selectionBad();
-        MMC->settings()->set("SelectedInstance", QString());
-        return;
+		selectionBad();
+		MMC->settings()->set("SelectedInstance", QString());
+		return;
 	}
 }
 
@@ -1528,7 +1538,9 @@ void MainWindow::checkMigrateLegacyAssets()
 
 void MainWindow::checkSetDefaultJava()
 {
+	const QString javaHack = "IntelHack";
 	bool askForJava = false;
+	do
 	{
 		QString currentHostName = QHostInfo::localHostName();
 		QString oldHostName = MMC->settings()->get("LastHostname").toString();
@@ -1536,16 +1548,30 @@ void MainWindow::checkSetDefaultJava()
 		{
 			MMC->settings()->set("LastHostname", currentHostName);
 			askForJava = true;
+			break;
 		}
-	}
-
-	{
 		QString currentJavaPath = MMC->settings()->get("JavaPath").toString();
 		if (currentJavaPath.isEmpty())
 		{
 			askForJava = true;
+			break;
 		}
-	}
+		#if defined Q_OS_WIN32
+		QString currentHack = MMC->settings()->get("JavaDetectionHack").toString();
+		if (currentHack != javaHack)
+		{
+			CustomMessageBox::selectable(
+				this, tr("Java detection forced"),
+				tr("Because of graphics performance issues caused by Intel drivers on Windows, "
+				   "MultiMC java detection was forced. Please select a Java "
+				   "version.<br/><br/>If you have custom java versions set for your instances, "
+				   "make sure you use the 'javaw.exe' executable."),
+				QMessageBox::Warning)->exec();
+			askForJava = true;
+			break;
+		}
+		#endif
+	} while (0);
 
 	if (askForJava)
 	{
@@ -1573,7 +1599,10 @@ void MainWindow::checkSetDefaultJava()
 			java = ju.GetDefaultJava();
 		}
 		if (java)
+		{
 			MMC->settings()->set("JavaPath", java->path);
+			MMC->settings()->set("JavaDetectionHack", javaHack);
+		}
 		else
 			MMC->settings()->set("JavaPath", QString("java"));
 	}
@@ -1600,3 +1629,5 @@ void MainWindow::on_actionScreenshots_triggered()
 									 QMessageBox::Information)->exec();
 	}
 }
+
+

logic/ForgeInstaller.cpp

@@ -133,24 +133,37 @@ bool ForgeInstaller::add(OneSixInstance *to)
 	int sliding_insert_window = 0;
 	{
 		QJsonArray librariesPlus;
-
-		// for each library in the version we are adding (except for the blacklisted)
+		// A blacklist - we ignore these entirely
 		QSet<QString> blacklist{"lwjgl", "lwjgl_util", "lwjgl-platform"};
+		QList<QString> xzlist{"org.scala-lang", "com.typesafe"};
+		// for each library in the version we are adding (except for the blacklisted)
 		for (auto lib : m_forge_version->libraries)
 		{
 			QString libName = lib->name();
+			QString rawName = lib->rawName();
+
+			// ignore blacklisted stuff
+			if (blacklist.contains(libName))
+				continue;
+
 			// WARNING: This could actually break.
 			// if this is the actual forge lib, set an absolute url for the download
 			if (libName.contains("minecraftforge"))
 			{
 				lib->setAbsoluteUrl(m_universal_url);
 			}
-			else if (libName.contains("scala"))
+
+			// WARNING: This could actually break.
+			// mark bad libraries based on the xzlist above
+			for(auto entry : xzlist)
 			{
-				lib->setHint("forge-pack-xz");
+				QLOG_DEBUG() << "Testing " << rawName << " : " << entry;
+				if(rawName.startsWith(entry))
+				{
+					lib->setHint("forge-pack-xz");
+					break;
+				}
 			}
-			if (blacklist.contains(libName))
-				continue;
 
 			QJsonObject libObj = lib->toJson();
 

logic/JavaUtils.cpp

@@ -124,7 +124,7 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
 							javaVersion->id = subKeyName;
 							javaVersion->arch = archType;
 							javaVersion->path =
-								QDir(PathCombine(value, "bin")).absoluteFilePath("java.exe");
+								QDir(PathCombine(value, "bin")).absoluteFilePath("javaw.exe");
 							javas.append(javaVersion);
 						}
 
@@ -154,12 +154,12 @@ QList<QString> JavaUtils::FindJavaPaths()
 		KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
 
 	java_candidates.append(JRE64s);
-	java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre7/bin/java.exe"));
-	java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre6/bin/java.exe"));
+	java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre7/bin/javaw.exe"));
+	java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre6/bin/javaw.exe"));
 	java_candidates.append(JDK64s);
 	java_candidates.append(JRE32s);
-	java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre7/bin/java.exe"));
-	java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre6/bin/java.exe"));
+	java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre7/bin/javaw.exe"));
+	java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre6/bin/javaw.exe"));
 	java_candidates.append(JDK32s);
 	java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path));
 

logic/lists/ForgeVersionList.cpp

@@ -71,7 +71,7 @@ QVariant ForgeVersionList::data(const QModelIndex &index, int role) const
 			return version->name();
 
 		case 1:
-			return version->mcver;
+			return version->mcver_sane;
 
 		case 2:
 			return version->typeString();
@@ -281,7 +281,7 @@ bool ForgeListLoadTask::parseForgeList(QList<BaseVersionPtr> &out)
 			fVersion->changelog_url = changelog_url;
 			fVersion->installer_url = installer_url;
 			fVersion->jobbuildver = jobbuildver;
-			fVersion->mcver = mcver;
+			fVersion->mcver = fVersion->mcver_sane = mcver;
 			if (installer_filename.isEmpty())
 			{
 				fVersion->filename = filename;
@@ -341,9 +341,16 @@ bool ForgeListLoadTask::parseForgeGradleList(QList<BaseVersionPtr> &out)
 		std::shared_ptr<ForgeVersion> fVersion(new ForgeVersion());
 		fVersion->m_buildnr = number.value("build").toDouble();
 		fVersion->jobbuildver = number.value("version").toString();
+		fVersion->branch = number.value("branch").toString("");
 		fVersion->mcver = number.value("mcversion").toString();
+		// HACK: here, we fix the minecraft version used by forge.
+		// HACK: this will inevitably break (later)
+		// FIXME: replace with a dictionary
+		fVersion->mcver_sane = fVersion->mcver;
+		fVersion->mcver_sane.replace("_pre", "-pre");
 		fVersion->filename = "";
-		QString filename, installer_filename;
+
+		QString universal_filename, installer_filename;
 		QJsonArray files = number.value("files").toArray();
 		for (auto fIt = files.begin(); fIt != files.end(); ++fIt)
 		{
@@ -353,37 +360,46 @@ bool ForgeListLoadTask::parseForgeGradleList(QList<BaseVersionPtr> &out)
 			{
 				continue;
 			}
-			if (file.at(1).toString() == "installer")
+
+			QString extension = file.at(0).toString();
+			QString part = file.at(1).toString();
+			QString checksum = file.at(2).toString();
+
+			// insane form of mcver is used here
+			QString longVersion = fVersion->mcver + "-" + fVersion->jobbuildver;
+			if (!fVersion->branch.isEmpty())
 			{
-				fVersion->installer_url = QString("%1/%2-%3/%4-%2-%3-installer.%5").arg(
-					webpath, fVersion->mcver, fVersion->jobbuildver, artifact,
-					file.at(0).toString());
-				installer_filename = QString("%1-%2-%3-installer.%4").arg(
-					artifact, fVersion->mcver, fVersion->jobbuildver, file.at(0).toString());
+				longVersion = longVersion + "-" + fVersion->branch;
 			}
-			else if (file.at(1).toString() == "universal")
+			QString filename = artifact + "-" + longVersion + "-" + part + "." + extension;
+
+			QString url = QString("%1/%2/%3")
+							  .arg(webpath)
+							  .arg(longVersion)
+							  .arg(filename);
+
+			if (part == "installer")
 			{
-				fVersion->universal_url = QString("%1/%2-%3/%4-%2-%3-universal.%5").arg(
-					webpath, fVersion->mcver, fVersion->jobbuildver, artifact,
-					file.at(0).toString());
-				filename = QString("%1-%2-%3-universal.%4").arg(
-					artifact, fVersion->mcver, fVersion->jobbuildver, file.at(0).toString());
+				fVersion->installer_url = url;
+				installer_filename = filename;
 			}
-			else if (file.at(1).toString() == "changelog")
+			else if (part == "universal")
 			{
-				fVersion->changelog_url = QString("%1/%2-%3/%4-%2-%3-changelog.%5").arg(
-					webpath, fVersion->mcver, fVersion->jobbuildver, artifact,
-					file.at(0).toString());
+				fVersion->universal_url = url;
+				universal_filename = filename;
+			}
+			else if (part == "changelog")
+			{
+				fVersion->changelog_url = url;
 			}
 		}
 		if (fVersion->installer_url.isEmpty() && fVersion->universal_url.isEmpty())
 		{
 			continue;
 		}
-		fVersion->filename = fVersion->installer_url.isEmpty() ? filename : installer_filename;
+		fVersion->filename = fVersion->installer_url.isEmpty() ? universal_filename : installer_filename;
 		out.append(fVersion);
 	}
-
 	return true;
 }
 

logic/lists/ForgeVersionList.h

@@ -68,6 +68,8 @@ struct ForgeVersion : public BaseVersion
 	QString jobbuildver;
 	QString mcver;
 	QString filename;
+	QString branch;
+	QString mcver_sane;
 };
 
 class ForgeVersionList : public BaseVersionList