diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-09 23:59:30 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-09 23:59:30 +0100 |
| commit | d18b97ae3dc05fdf6ea1793ea06ecad52c28f5e2 (patch) | |
| tree | 3cb38ad447db5d19ae9f1b95ba70215b82ea0bc9 /logic | |
| parent | 7fd56a30bd9fba9e0a05f7267e0982be39f00616 (diff) | |
| parent | 91faaa5b591d7d4203591994718c2ed21d5b4d6e (diff) | |
| download | MultiMC-d18b97ae3dc05fdf6ea1793ea06ecad52c28f5e2.tar MultiMC-d18b97ae3dc05fdf6ea1793ea06ecad52c28f5e2.tar.gz MultiMC-d18b97ae3dc05fdf6ea1793ea06ecad52c28f5e2.tar.lz MultiMC-d18b97ae3dc05fdf6ea1793ea06ecad52c28f5e2.tar.xz MultiMC-d18b97ae3dc05fdf6ea1793ea06ecad52c28f5e2.zip | |
Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery
Conflicts:
logic/MinecraftProcess.cpp
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/MinecraftProcess.cpp | 1 | ||||
| -rw-r--r-- | logic/OneSixInstance.cpp | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp index 1001cee5..effa1095 100644 --- a/logic/MinecraftProcess.cpp +++ b/logic/MinecraftProcess.cpp @@ -387,6 +387,7 @@ QStringList MinecraftProcess::javaArguments() const args << QString("-Xms%1m").arg(m_instance->settings().get("MinMemAlloc").toInt()); args << QString("-Xmx%1m").arg(m_instance->settings().get("MaxMemAlloc").toInt()); args << QString("-XX:PermSize=%1m").arg(m_instance->settings().get("PermGen").toInt()); + args << "-Duser.language=en"; if (!m_nativeFolder.isEmpty()) args << QString("-Djava.library.path=%1").arg(m_nativeFolder); args << "-jar" << PathCombine(MMC->bin(), "jars", "NewLaunch.jar"); diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 23c4fae1..ed7ad993 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -425,7 +425,19 @@ bool OneSixInstance::providesVersionFile() const bool OneSixInstance::reload() { - return BaseInstance::reload() && reloadVersion(); + if(BaseInstance::reload()) + { + try + { + reloadVersion(); + return true; + } + catch (...) + { + return false; + } + } + return false; } QString OneSixInstance::loaderModsDir() const |