diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-11 04:47:09 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-11 04:47:09 +0100 |
| commit | 997054a5351cd6187f578d2ac24df661027bf7cc (patch) | |
| tree | 895e74767b71f5907d006ce01f47ea7d1e0f97ff | |
| parent | cc6e9358fe39abc78eaa5be5b37213faf3605674 (diff) | |
| parent | e611aef0e77f727d0c77f6dea0d373e7a12b241c (diff) | |
| download | MultiMC-997054a5351cd6187f578d2ac24df661027bf7cc.tar MultiMC-997054a5351cd6187f578d2ac24df661027bf7cc.tar.gz MultiMC-997054a5351cd6187f578d2ac24df661027bf7cc.tar.lz MultiMC-997054a5351cd6187f578d2ac24df661027bf7cc.tar.xz MultiMC-997054a5351cd6187f578d2ac24df661027bf7cc.zip | |
Merge branch 'develop'
| -rw-r--r-- | gui/ConsoleWindow.ui | 22 | ||||
| -rw-r--r-- | logic/LegacyUpdate.cpp | 7 |
2 files changed, 23 insertions, 6 deletions
diff --git a/gui/ConsoleWindow.ui b/gui/ConsoleWindow.ui index 8dc80015..472c7c8d 100644 --- a/gui/ConsoleWindow.ui +++ b/gui/ConsoleWindow.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>600</width> - <height>400</height> + <width>610</width> + <height>391</height> </rect> </property> <property name="windowTitle"> @@ -23,6 +23,9 @@ <property name="rightMargin"> <number>0</number> </property> + <property name="bottomMargin"> + <number>6</number> + </property> <item> <widget class="QPlainTextEdit" name="text"> <property name="font"> @@ -49,6 +52,12 @@ </item> <item> <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="leftMargin"> + <number>6</number> + </property> + <property name="rightMargin"> + <number>6</number> + </property> <item> <spacer name="horizontalSpacer"> <property name="orientation"> @@ -65,14 +74,14 @@ <item> <widget class="QPushButton" name="btnKillMinecraft"> <property name="text"> - <string>Kill Minecraft</string> + <string>&Kill Minecraft</string> </property> </widget> </item> <item> <widget class="QPushButton" name="closeButton"> <property name="text"> - <string>Close</string> + <string>&Close</string> </property> </widget> </item> @@ -80,6 +89,11 @@ </item> </layout> </widget> + <tabstops> + <tabstop>text</tabstop> + <tabstop>closeButton</tabstop> + <tabstop>btnKillMinecraft</tabstop> + </tabstops> <resources/> <connections/> </ui> diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp index 9533f8ff..8ba97827 100644 --- a/logic/LegacyUpdate.cpp +++ b/logic/LegacyUpdate.cpp @@ -40,7 +40,7 @@ void LegacyUpdate::lwjglStart() LegacyInstance *inst = (LegacyInstance *)m_inst; lwjglVersion = inst->lwjglVersion(); - lwjglTargetPath = PathCombine("lwjgl", lwjglVersion); + lwjglTargetPath = PathCombine(MMC->settings()->get("LWJGLDir").toString(), lwjglVersion); lwjglNativesPath = PathCombine(lwjglTargetPath, "natives"); // if the 'done' file exists, we don't have to download this again @@ -361,7 +361,10 @@ void LegacyUpdate::ModTheJar() setStatus("Installing mods - backing up minecraft.jar..."); if (!baseJar.exists() && !QFile::copy(runnableJar.filePath(), baseJar.filePath())) { - emitFailed("Failed to back up minecraft.jar"); + emitFailed("It seems both the active and base jar are gone. A fresh base jar will be used on next run."); + inst->setShouldRebuild(true); + inst->setShouldUpdate(true); + inst->setShouldUseCustomBaseJar(false); return; } } |