Merge remote-tracking branch 'upstreamfork/develop' into develop

application/pages/modplatform/atlauncher/AtlPage.ui

@@ -6,11 +6,45 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>875</width>
-    <height>745</height>
+    <width>837</width>
+    <height>685</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout_3">
+     <item row="1" column="0">
+      <widget class="QTreeView" name="packView">
+       <property name="iconSize">
+        <size>
+         <width>96</width>
+         <height>48</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QTextBrowser" name="packDescription">
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+       <property name="openLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" colspan="2">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Warning: This is still a work in progress. If you run into issues with the imported modpack, it may be a bug.</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item row="2" column="0" colspan="2">
     <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0" rowminimumheight="0" columnminimumwidth="0,0,0">
      <item row="0" column="2">
@@ -31,9 +65,6 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="0">
-    <widget class="QLineEdit" name="searchEdit"/>
-   </item>
    <item row="0" column="1">
     <widget class="QPushButton" name="resetButton">
      <property name="text">
@@ -41,35 +72,21 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
-    <layout class="QGridLayout" name="gridLayout_3">
-     <item row="0" column="0">
-      <widget class="QTreeView" name="packView">
-       <property name="iconSize">
-        <size>
-         <width>96</width>
-         <height>48</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QTextBrowser" name="packDescription">
-       <property name="openExternalLinks">
-        <bool>true</bool>
-       </property>
-       <property name="openLinks">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item row="0" column="0">
+    <widget class="QLineEdit" name="searchEdit">
+     <property name="placeholderText">
+      <string>Search and filter ...</string>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>searchEdit</tabstop>
   <tabstop>resetButton</tabstop>
+  <tabstop>packView</tabstop>
+  <tabstop>packDescription</tabstop>
+  <tabstop>sortByBox</tabstop>
   <tabstop>versionSelectionBox</tabstop>
  </tabstops>
  <resources/>

changelog.md

@@ -2,9 +2,11 @@
 
 After roughly one year of maintenance and development work by various contributors, we're just calling it a good time to release.
 
-What got added since the last time? Quite a bit!
+What got added since the last time? Quite a bit! But in general, this is more of a spring cleaning before the major changes that we need to make come in.
 
-### Visible changes
+### Modpack platforms
+
+We've added a whole bunch of new modpack platforms to pick from right into the new instance dialog. If you run into any unusual issues with the imported packs, report them on the bug tracker.
 
 - Added a CurseForge pack browser
 
@@ -14,21 +16,35 @@ What got added since the last time? Quite a bit!
 
 - GH-469: Added a Technic/Solder pack browser
 
-- Fixed online saving in Classic versions
+- GH-405: Added a ATLauncher pack browser
 
-- GH-3131: Fixed not working with proxy ports greater than 32767.
-
-- Skins (the part used for account icons) are now rendered with the overlay on.
-
-- GH-3189: Updated nbt library - this makes `View Worlds` work properly again for newer versions of the game.
-
-- MultiMC now shows world icons and allows resetting world icons in `View Worlds`.
-
-- GH-3427: `View Worlds` now has a very simple `Datapacks` button - it just opens the system file browser.
+### Other changes
 
 - Added the option to not use OpenAL and/or GLFW libraries bundled with the game.
 
-  This is interesting if you have ones that come with youre system and work better.
+  This is interesting if you have ones that come with your system and work better.
+
+- Skins (the part used for account icons) are now rendered with the overlay on.
+
+- GH-3130: Skin upload has been switched over to the new Mojang API and should have less issues.
+
+- MultiMC now shows world icons and allows resetting world icons in `View Worlds`.
+
+- GH-3229: Copy seed button has been updated to be compatible with newer versions of the game.
+
+- GH-3427: `View Worlds` now has a very simple `Datapacks` button - it just opens the system file browser.
+
+- GH-3189: Updated nbt library - this makes `View Worlds` work properly again for newer versions of the game.
+
+- Fixed online saving in Classic versions.
+
+- GH-3131: Fixed not working with proxy ports greater than 32767.
+
+- Proxy login details are no longer logged in files.
+
+- GH-3467: The launch could stall in the ScanModFolders task if the mod folders didn't exist yet.
+
+- GH-3602: Pre-launch commands could fail on first launch of the instance because the .minecraft folder has not been created yet.
 
 ### Technical changes
 
@@ -40,6 +56,8 @@ What got added since the last time? Quite a bit!
 
 - Some preparations have been done to allow downloading Java runtimes from Mojang - support for the Piston repository.
 
+- Compatibility with unusual build environments has been increased
+
 # Previous releases
 
 ## MultiMC 0.6.11