From ad7c41114ff2fd2220111fd0f71f052375aed68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 7 Nov 2013 22:31:15 +0100
Subject: Fix layout margins in console window

---
 gui/ConsoleWindow.ui | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 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>&amp;Kill Minecraft</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="closeButton">
        <property name="text">
-        <string>Close</string>
+        <string>&amp;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>
-- 
cgit v1.2.3


From b097d2f744a5f9152700a3df27c56b3fc8d203b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 11 Nov 2013 03:47:14 +0100
Subject: Use the right LWJGL path while creating an instance

---
 logic/LegacyUpdate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp
index 9533f8ff..5008a346 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
-- 
cgit v1.2.3


From e611aef0e77f727d0c77f6dea0d373e7a12b241c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 11 Nov 2013 04:45:31 +0100
Subject: Recover from the bin folder of converted legacy instance being
 deleted.

Use the new vanilla jar as the base jar if mcbackup.jar is missing.
---
 logic/LegacyUpdate.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp
index 5008a346..8ba97827 100644
--- a/logic/LegacyUpdate.cpp
+++ b/logic/LegacyUpdate.cpp
@@ -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;
 		}
 	}
-- 
cgit v1.2.3