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 6af3ec7abd..556d41a571 100644
Binary files a/fml/eclipse-workspace-dev.zip and b/fml/eclipse-workspace-dev.zip differ
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 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraft.server.MinecraftServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="cpw.mods.fml.relauncher.ServerLaunchWrapper"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Minecraft/jars}"/>
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",