From 842328df8e26106471ce3e5e9d37bc3df7be34cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 7 Jul 2014 08:40:03 +0200
Subject: [PATCH 1/2] Update the forge hacks.

Conflicts:
	logic/ForgeInstaller.cpp
---
 logic/ForgeInstaller.cpp | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/logic/ForgeInstaller.cpp b/logic/ForgeInstaller.cpp
index 94b3f3199..5b3e80294 100644
--- a/logic/ForgeInstaller.cpp
+++ b/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();
 

From b3cf19190fe805367686af0f0c2cbbc8b00176d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 8 Jul 2014 01:03:18 +0200
Subject: [PATCH 2/2] Bump version, update the changelog

---
 CMakeLists.txt | 2 +-
 changelog.yaml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9ed396ee..da86405f3 100644
--- a/CMakeLists.txt
+++ b/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   8)
+set(MultiMC_VERSION_HOTFIX   9)
 
 # Build number
 set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
diff --git a/changelog.yaml b/changelog.yaml
index 02aebf5ef..75ede1967 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -86,3 +86,5 @@
     - 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