From bf6f0387931af263e045b9ce0ea38db7bca874b6 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 12 Jul 2013 03:05:20 -0700 Subject: [PATCH] Update Forge signature for new private key --- fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java | 2 +- fml/install/fml.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java b/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java index f9863946c..5fc9f04d9 100644 --- a/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java +++ b/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java @@ -62,7 +62,7 @@ import cpw.mods.fml.relauncher.Side; public class FMLSanityChecker implements IFMLCallHook { private static final String FMLFINGERPRINT = "51:0A:FB:4C:AF:A4:A0:F2:F5:CF:C5:0E:B4:CC:3C:30:24:4A:E3:8E".toLowerCase().replace(":", ""); - private static final String FORGEFINGERPRINT = "DE:4C:F8:A3:F3:BC:15:63:58:10:04:4C:39:24:0B:F9:68:04:EA:7D".toLowerCase().replace(":", ""); + private static final String FORGEFINGERPRINT = "E3:C3:D5:0C:7C:98:6D:F7:4C:64:5C:0A:C5:46:39:74:1C:90:A5:57".toLowerCase().replace(":", ""); private static final String MCFINGERPRINT = "CD:99:95:96:56:F7:53:DC:28:D8:63:B4:67:69:F7:F8:FB:AE:FC:FC".toLowerCase().replace(":", ""); static class MLDetectorClassVisitor extends ClassVisitor { diff --git a/fml/install/fml.py b/fml/install/fml.py index bfaaa03e8..9b13ee249 100644 --- a/fml/install/fml.py +++ b/fml/install/fml.py @@ -75,7 +75,7 @@ def read_mc_versions(fml_dir, version=None, work_dir=None): mc_info['version'] = version if not 'client_url' in mc_info.keys(): mc_info['new_launcher'] = True - base_url = 'https://s3.amazonaws.com/Minecraft.Download/versions/%s' % version + base_url = 'http://s3.amazonaws.com/Minecraft.Download/versions/%s' % version mc_info['client_url'] = '%s/%s.jar' % (base_url, version) mc_info['json_url'] = '%s/%s.json' % (base_url, version) mc_info['server_url'] = '%s/minecraft_server.%s.jar' % (base_url, version) @@ -1146,7 +1146,7 @@ def download_libraries(mcp_dir, libraries, natives_dir): # This list should be in the format of the new launcher's version.json file # Under the entry 'libraries' lib_dir = os.path.join(mcp_dir, 'jars', 'libraries') - default_url = 'https://s3.amazonaws.com/Minecraft.Download/libraries' + default_url = 'http://s3.amazonaws.com/Minecraft.Download/libraries' downloads = [] failed = False @@ -1239,7 +1239,7 @@ def download_list(list, natives_dir): def download_assets(mcp_dir): from xml.dom.minidom import parse asset_dir = os.path.join(mcp_dir, 'jars', 'assets') - base_url = 'https://s3.amazonaws.com/Minecraft.Resources' + base_url = 'http://s3.amazonaws.com/Minecraft.Resources' print('Gathering assets list from %s' % base_url)