From 0b1fdde35d5781ba272fddeeab126853ed6810bb Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 3 Jul 2013 18:22:57 -0700 Subject: [PATCH] Fix eclipse workspaces and launch configurations. --- fml/.gitignore | 1 + fml/eclipse-workspace-dev.zip | Bin 24435 -> 24557 bytes .../.launches/Server.launch | 2 +- fml/jsons/1.6.1-dev.json | 4 ++-- fml/jsons/1.6.1-rel.json | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fml/.gitignore b/fml/.gitignore index 1ee60a965d..27935ea5f1 100644 --- a/fml/.gitignore +++ b/fml/.gitignore @@ -16,4 +16,5 @@ fmlbranding.properties /mcp_data/ /map_client.txt /*.lzma +**/*.lzma /installer_base.jar diff --git a/fml/eclipse-workspace-dev.zip b/fml/eclipse-workspace-dev.zip index 6af3ec7abd3bd2e4784e41ef768b766dd1061a05..556d41a571ab17f0451c7464e0457068fb20ba9a 100644 GIT binary patch delta 5487 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 U>H|B4CrSJ*V~0S5;X9xH2dAY)$p8QV delta 5330 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 Nt%id@W$Hh!{s)w>2fhFR diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch index 8ccdbce8a7..550685c761 100644 --- a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch +++ b/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch @@ -6,7 +6,7 @@ - + diff --git a/fml/jsons/1.6.1-dev.json b/fml/jsons/1.6.1-dev.json index 36db8b31b9..0c749a18c1 100644 --- a/fml/jsons/1.6.1-dev.json +++ b/fml/jsons/1.6.1-dev.json @@ -4,7 +4,7 @@ "releaseTime": "{timestamp}", "type": "release", "processArguments": "username_session_version", - "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker", + "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker", "minimumLauncherVersion": 2, "libraries": [ { @@ -133,5 +133,5 @@ } } ], - "mainClass": "net.minecraft.client.main.Main" + "mainClass": "net.minecraft.launchwrapper.Launch" } diff --git a/fml/jsons/1.6.1-rel.json b/fml/jsons/1.6.1-rel.json index 9788cc5fc1..72ced1340f 100644 --- a/fml/jsons/1.6.1-rel.json +++ b/fml/jsons/1.6.1-rel.json @@ -12,7 +12,7 @@ "versionInfo": { "id": "FML@version@", "time": "@timestamp@", - "releaseTime": "@timestamp@", + "releaseTime": "1960-01-01T00:00:00-0700", "type": "release", "processArguments": "username_session_version", "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",