Merge branch 'feature_profiling' into integration_json_and_tools
This commit is contained in:
commit
f7c97efcf3
24 changed files with 1058 additions and 62 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue