diff --git a/build.gradle b/build.gradle
index efd8d36a..452575f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,9 +16,17 @@ targetCompatibility = 1.8
 group = 'me.shedaniel'
 archivesBaseName = project.name
 def baseVersion = '0.6'
+def runNumber = (System.getenv("GITHUB_RUN_NUMBER") == null ? (((short) new Random().nextInt()).abs() + 1000).toString() : System.getenv("GITHUB_RUN_NUMBER"))
 
-def build = "release #${System.getenv("GITHUB_RUN_NUMBER") == null ? "custom" : System.getenv("GITHUB_RUN_NUMBER")}"
-version = baseVersion + "." + (System.getenv("GITHUB_RUN_NUMBER") == null ? (((short) new Random().nextInt()).abs() + 1000).toString() : System.getenv("GITHUB_RUN_NUMBER"))
+def isSnapshot = System.getenv("PR_NUM") != null
+
+def build = "release #$runNumber"
+
+if (!isSnapshot) {
+	version = baseVersion + "." + runNumber
+} else {
+	version = baseVersion + "-PR." + System.getenv("PR_NUM") + "." + runNumber
+}
 
 logger.lifecycle(":building plugin v${version}")
 
diff --git a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
index cac0b324..b184e925 100644
--- a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
+++ b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
@@ -24,6 +24,10 @@
 
 package net.fabricmc.loom;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -44,7 +48,14 @@ public class LoomGradlePlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
-		project.getLogger().lifecycle("Fabric Loom: " + LoomGradlePlugin.class.getPackage().getImplementationVersion());
+		String loomVersion = LoomGradlePlugin.class.getPackage().getImplementationVersion();
+		Set<String> loggedVersions = new HashSet<>(Arrays.asList(System.getProperty("loom.printed.logged", "").split(",")));
+
+		if (!loggedVersions.contains(loomVersion)) {
+			loggedVersions.add(loomVersion);
+			System.setProperty("loom.printed.logged", String.join(",", loggedVersions));
+			project.getLogger().lifecycle("Fabric Loom: " + loomVersion);
+		}
 
 		refreshDeps = project.getGradle().getStartParameter().isRefreshDependencies();
 
diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
index 0dd84932..14f14e88 100644
--- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
+++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
@@ -34,29 +34,22 @@ import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import org.apache.commons.io.IOUtils;
 import org.gradle.api.Project;
 import org.objectweb.asm.commons.Remapper;
 import org.zeroturnaround.zip.ZipUtil;
-import org.zeroturnaround.zip.transform.ByteArrayZipEntryTransformer;
 import org.zeroturnaround.zip.transform.StringZipEntryTransformer;
 import org.zeroturnaround.zip.transform.ZipEntryTransformerEntry;
 
@@ -220,19 +213,10 @@ public class ModProcessor {
 				AtRemapper.remap(project.getLogger(), info.getRemappedOutput().toPath(), mappings);
 				CoreModClassRemapper.remapJar(info.getRemappedOutput().toPath(), mappings, project.getLogger());
 
-				Set<String> mixinConfigs = new HashSet<>();
-				Set<String> presentMixinConfigs = new HashSet<>();
-
 				if (ZipUtil.containsEntry(info.getRemappedOutput(), "META-INF/MANIFEST.MF")) {
 					ZipUtil.transformEntry(info.getRemappedOutput(), "META-INF/MANIFEST.MF", (in, zipEntry, out) -> {
 						Manifest manifest = new Manifest(in);
 						fixManifest(manifest);
-						String configs = manifest.getMainAttributes().getValue("MixinConfigs");
-
-						if (configs != null) {
-							mixinConfigs.addAll(Arrays.asList(configs.split(",")));
-						}
-
 						out.putNextEntry(new ZipEntry(zipEntry.getName()));
 						manifest.write(out);
 						out.closeEntry();
@@ -245,27 +229,9 @@ public class ModProcessor {
 						if (zipEntry.getName().startsWith("META-INF")) {
 							filesToRemove.add(zipEntry.getName());
 						}
-					} else if (mixinConfigs.contains(zipEntry.getName())) {
-						presentMixinConfigs.add(zipEntry.getName());
 					}
 				});
 				ZipUtil.removeEntries(info.getRemappedOutput(), filesToRemove.toArray(new String[0]));
-				Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
-				ZipUtil.transformEntries(info.getRemappedOutput(), presentMixinConfigs.stream()
-						.map(path -> new ZipEntryTransformerEntry(path, new ByteArrayZipEntryTransformer() {
-							@Override
-							protected byte[] transform(ZipEntry zipEntry, byte[] input) {
-								try (InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(input))) {
-									JsonObject object = JsonParser.parseReader(reader).getAsJsonObject();
-									object.remove("minVersion");
-									object.addProperty("minVersion", "0.8");
-									return gson.toJson(object).getBytes(StandardCharsets.UTF_8);
-								} catch (IOException exception) {
-									throw new RuntimeException(exception);
-								}
-							}
-						}))
-						.toArray(ZipEntryTransformerEntry[]::new));
 			}
 
 			info.finaliseRemapping();
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
index e8dcedf1..de0394ce 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
@@ -79,11 +79,14 @@ public class ForgeUserdevProvider extends DependencyProvider {
 		addDependency(json.get("universal").getAsString(), Constants.Configurations.FORGE_UNIVERSAL);
 
 		for (JsonElement lib : json.get("libraries").getAsJsonArray()) {
-			if (!getExtension().useFabricMixin || !lib.getAsString().startsWith("org.spongepowered:mixin:")) {
-				addDependency(lib.getAsString(), Constants.Configurations.FORGE_DEPENDENCIES);
-			} else {
-				addDependency("net.fabricmc:sponge-mixin:0.8+build.18", Constants.Configurations.FORGE_DEPENDENCIES);
+			if (lib.getAsString().startsWith("org.spongepowered:mixin:")) {
+				if (getExtension().useFabricMixin) {
+					addDependency("net.fabricmc:sponge-mixin:0.8.2+build.24", Constants.Configurations.FORGE_DEPENDENCIES);
+					continue;
+				}
 			}
+
+			addDependency(lib.getAsString(), Constants.Configurations.FORGE_DEPENDENCIES);
 		}
 
 		// TODO: Read launch configs from the JSON too