Merge branch 'feature_profiling' into integration_json_and_tools

2014-02-24 00:29:13 +01:00
parent e3d2e5fd74 a354e8bfae
commit f7c97efcf3
24 changed files with 1058 additions and 62 deletions
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -230,7 +230,7 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session)
 		launchScript += "ext " + finfo.absoluteFilePath() + "\n";
 	}
 	launchScript += "natives " + natives_dir.absolutePath() + "\n";
-	launchScript += "launch onesix\n";
+	launchScript += "launcher onesix\n";

 	// create the process and set its parameters
 	MinecraftProcess *proc = new MinecraftProcess(this);