diff --git a/fml/build.xml b/fml/build.xml
index 76344da21..54644aeb4 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -35,6 +35,9 @@
+
+
+
@@ -71,7 +74,7 @@
-
+
@@ -198,7 +201,7 @@
-
+
@@ -334,4 +337,12 @@
+
+
+
+
+
+ ${env.JENKINS_HOME} ${universal.jarname} ${sign.KEYPASS}
+
+
diff --git a/fml/common/cpw/mods/fml/common/FMLModContainer.java b/fml/common/cpw/mods/fml/common/FMLModContainer.java
index 334baad12..fe19417c9 100644
--- a/fml/common/cpw/mods/fml/common/FMLModContainer.java
+++ b/fml/common/cpw/mods/fml/common/FMLModContainer.java
@@ -52,6 +52,7 @@ import cpw.mods.fml.common.event.FMLConstructionEvent;
import cpw.mods.fml.common.event.FMLEvent;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
+import cpw.mods.fml.common.event.FMLFingerprintViolationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartedEvent;
diff --git a/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java b/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java
index 6b075bd99..01ce04f47 100644
--- a/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java
+++ b/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java
@@ -20,7 +20,8 @@ import cpw.mods.fml.relauncher.RelaunchClassLoader;
public class FMLSanityChecker implements IFMLCallHook
{
- private static final String FMLFINGERPRINT = "EE:E2:73:7A:8B:90:5F:7D:C6:02:D5:B7:23:9F:B6:29:C2:18:0F:3E".toLowerCase().replace(":","");
+ private static final String FMLFINGERPRINT = "AE:F6:54:79:96:E9:1B:D1:59:70:6C:B4:6B:F5:4A:89:C5:CE:08:1D".toLowerCase().replace(":","");
+ private static final String FORGEFINGERPRINT = "".toLowerCase().replace(":", "");
static class MLDetectorClassVisitor extends ClassVisitor
{
private boolean foundMarker = false;
@@ -59,6 +60,11 @@ public class FMLSanityChecker implements IFMLCallHook
FMLLog.info("Found valid fingerprint for FML: %s", fingerprint);
goodFML = true;
}
+ else if (fingerprint.equals(FORGEFINGERPRINT))
+ {
+ FMLLog.info("Found valid fingerprint for Minecraft Forge: %s", fingerprint);
+ goodFML = true;
+ }
else
{
FMLLog.severe("Found invalid fingerprint for FML: %s", fingerprint);
@@ -71,7 +77,7 @@ public class FMLSanityChecker implements IFMLCallHook
}
if (!goodFML)
{
- FMLLog.severe("FML appears to be missing it's signature data. This is not a good thing");
+ FMLLog.severe("FML appears to be missing any signature data. This is not a good thing");
}
byte[] mlClass = cl.getClassBytes("ModLoader");
// Only care in obfuscated env
diff --git a/fml/common/cpw/mods/fml/common/FMLFingerprintViolationEvent.java b/fml/common/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java
similarity index 88%
rename from fml/common/cpw/mods/fml/common/FMLFingerprintViolationEvent.java
rename to fml/common/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java
index b292a433a..c5d98747e 100644
--- a/fml/common/cpw/mods/fml/common/FMLFingerprintViolationEvent.java
+++ b/fml/common/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java
@@ -1,4 +1,4 @@
-package cpw.mods.fml.common;
+package cpw.mods.fml.common.event;
import java.io.File;
import java.util.List;
@@ -6,7 +6,6 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
-import cpw.mods.fml.common.event.FMLEvent;
public class FMLFingerprintViolationEvent extends FMLEvent {
diff --git a/fml/mc_versions.cfg b/fml/mc_versions.cfg
index 5741350a0..a37da90d0 100644
--- a/fml/mc_versions.cfg
+++ b/fml/mc_versions.cfg
@@ -1,5 +1,5 @@
[default]
-current_ver = 1.4.5
+current_ver = 1.4.6
base_url = http://s3.amazonaws.com/MinecraftDownload/
libraries = lwjgl.jar lwjgl_util.jar jinput.jar
natives = windows_natives.jar macosx_natives.jar linux_natives.jar
@@ -21,3 +21,13 @@ server_md5 = 250654ceae7a26ba955a30095d90a475
mcp_ver = 7.23
mcp_url = http://mcp.ocean-labs.de/files/archive/mcp723.zip
mcp_md5 = 9fbb5835b437b64bc5ce618fa5a53d1d
+
+[1.4.6]
+client_url = http://assets.minecraft.net/1_4_6/minecraft.jar
+server_url = http://assets.minecraft.net/1_4_6/minecraft_server.jar
+client_md5 = 48677dc4c2b98c29918722b5ab27b4fd
+server_md5 = b0700fa969dbf0ff085082cde87384d2
+mcp_ver = 7.24
+mcp_url = http://mcp.ocean-labs.de/files/archive/mcp724.zip
+mcp_md5 = 9fbb5835b437b64bc5ce618fa5a53d1d
+