Merge branch 'PolyMC:develop' into feature/download_mods

29 files changed, 229 insertions, 706 deletions

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index a3e2c44f..b605e54b 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -14,7 +14,7 @@
 #include "ui/pages/global/ProxyPage.h"
 #include "ui/pages/global/ExternalToolsPage.h"
 #include "ui/pages/global/AccountListPage.h"
-#include "ui/pages/global/PasteEEPage.h"
+#include "ui/pages/global/PastePage.h"
 #include "ui/pages/global/CustomCommandsPage.h"
 
 #include "ui/themes/ITheme.h"
@@ -595,7 +595,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("AutoUpdate", true);
 
         // Theming
-        m_settings->registerSetting("IconTheme", QString("multimc"));
+        m_settings->registerSetting("IconTheme", QString("pe_colored"));
         m_settings->registerSetting("ApplicationTheme", QString("system"));
 
         // Notifications
@@ -662,7 +662,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         // Memory
         m_settings->registerSetting({"MinMemAlloc", "MinMemoryAlloc"}, 512);
-        m_settings->registerSetting({"MaxMemAlloc", "MaxMemoryAlloc"}, 1024);
+        m_settings->registerSetting({"MaxMemAlloc", "MaxMemoryAlloc"}, 4096);
         m_settings->registerSetting("PermGen", 128);
 
         // Java Settings
@@ -714,8 +714,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         m_settings->registerSetting("UpdateDialogGeometry", "");
 
-        // paste.ee API key
-        m_settings->registerSetting("PasteEEAPIKey", "multimc");
+        // pastebin URL
+        m_settings->registerSetting("PastebinURL", "https://0x0.st");
 
         // Init page provider
         {
@@ -728,7 +728,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
             m_globalSettingsProvider->addPage<ProxyPage>();
             m_globalSettingsProvider->addPage<ExternalToolsPage>();
             m_globalSettingsProvider->addPage<AccountListPage>();
-            m_globalSettingsProvider->addPage<PasteEEPage>();
+            m_globalSettingsProvider->addPage<PastePage>();
         }
         qDebug() << "<> Settings loaded.";
     }
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index a1aae524..8d8b4d02 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -181,15 +181,6 @@ set(NOTIFICATIONS_SOURCES
     notifications/NotificationChecker.cpp
 )
 
-# Backend for the news bar... there's usually no news.
-set(NEWS_SOURCES
-    # News System
-    news/NewsChecker.h
-    news/NewsChecker.cpp
-    news/NewsEntry.h
-    news/NewsEntry.cpp
-)
-
 # Icon interface
 set(ICONS_SOURCES
     # Icons System and related code
@@ -719,8 +710,8 @@ SET(LAUNCHER_SOURCES
     ui/pages/global/LauncherPage.h
     ui/pages/global/ProxyPage.cpp
     ui/pages/global/ProxyPage.h
-    ui/pages/global/PasteEEPage.cpp
-    ui/pages/global/PasteEEPage.h
+    ui/pages/global/PastePage.cpp
+    ui/pages/global/PastePage.h
 
     # GUI - platform pages
     ui/pages/modplatform/VanillaPage.cpp
@@ -865,7 +856,7 @@ qt5_wrap_ui(LAUNCHER_UI
     ui/pages/global/AccountListPage.ui
     ui/pages/global/JavaPage.ui
     ui/pages/global/LauncherPage.ui
-    ui/pages/global/PasteEEPage.ui
+    ui/pages/global/PastePage.ui
     ui/pages/global/ProxyPage.ui
     ui/pages/global/MinecraftPage.ui
     ui/pages/global/ExternalToolsPage.ui
diff --git a/launcher/Launcher.in b/launcher/Launcher.in
index b79b276b..5e5e2c2b 100755
--- a/launcher/Launcher.in
+++ b/launcher/Launcher.in
@@ -14,7 +14,7 @@ if [[ $EUID -eq 0 ]]; then
 fi
 
 
-LAUNCHER_NAME=@Launcher_Name@
+LAUNCHER_NAME=@Launcher_APP_BINARY_NAME@
 LAUNCHER_DIR="$(dirname "$(readlink -f "$0")")"
 echo "Launcher Dir: ${LAUNCHER_DIR}"
 
diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp
index 80c599cc..35ddc35c 100644
--- a/launcher/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.cpp
@@ -103,11 +103,15 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     for(QString line : lines)
     {
         line = line.trimmed();
+        // NOTE: workaround for GH-4125, where garbage is getting printed into stdout on bedrock linux
+        if (line.contains("/bedrock/strata")) {
+            continue;
+        }
 
         auto parts = line.split('=', QString::SkipEmptyParts);
         if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
         {
-            success = false;
+            continue;
         }
         else
         {
diff --git a/launcher/minecraft/auth/AuthRequest.cpp b/launcher/minecraft/auth/AuthRequest.cpp
index 459d2354..feface80 100644
--- a/launcher/minecraft/auth/AuthRequest.cpp
+++ b/launcher/minecraft/auth/AuthRequest.cpp
@@ -44,7 +44,7 @@ void AuthRequest::onRequestFinished() {
     if (reply_ != qobject_cast<QNetworkReply *>(sender())) {
         return;
     }
-    httpStatus_ = 200;
+    httpStatus_ = reply_->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
     finish();
 }
 
diff --git a/launcher/minecraft/auth/Parsers.cpp b/launcher/minecraft/auth/Parsers.cpp
index ed31e934..2dd36562 100644
--- a/launcher/minecraft/auth/Parsers.cpp
+++ b/launcher/minecraft/auth/Parsers.cpp
@@ -94,7 +94,7 @@ bool parseXTokenResponse(QByteArray & data, Katabasis::Token &output, QString na
         return false;
     }
     if(!getString(obj.value("Token"), output.token)) {
-        qWarning() << "User Token is not a timestamp";
+        qWarning() << "User Token is not a string";
         return false;
     }
     auto arrayVal = obj.value("DisplayClaims").toObject().value("xui");
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
index 9fef99b0..add91659 100644
--- a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
+++ b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
@@ -56,6 +56,14 @@ void MinecraftProfileStep::onRequestDone(
         return;
     }
     if (error != QNetworkReply::NoError) {
+        qWarning() << "Error getting profile:";
+        qWarning() << " HTTP Status:        " << requestor->httpStatus_;
+        qWarning() << " Internal error no.: " << error;
+        qWarning() << " Error string:       " << requestor->errorString_;
+
+        qWarning() << " Response:";
+        qWarning() << QString::fromUtf8(data);
+
         emit finished(
             AccountTaskState::STATE_FAILED_SOFT,
             tr("Minecraft Java profile acquisition failed.")
diff --git a/launcher/net/PasteUpload.cpp b/launcher/net/PasteUpload.cpp
index 4b69b68a..52b82a0e 100644
--- a/launcher/net/PasteUpload.cpp
+++ b/launcher/net/PasteUpload.cpp
@@ -8,44 +8,34 @@
 #include <QJsonDocument>
 #include <QFile>
 
-PasteUpload::PasteUpload(QWidget *window, QString text, QString key) : m_window(window)
+PasteUpload::PasteUpload(QWidget *window, QString text, QString url) : m_window(window), m_uploadUrl(url), m_text(text.toUtf8())
 {
-    m_key = key;
-    QByteArray temp;
-    QJsonObject topLevelObj;
-    QJsonObject sectionObject;
-    sectionObject.insert("contents", text);
-    QJsonArray sectionArray;
-    sectionArray.append(sectionObject);
-    topLevelObj.insert("description", "Log Upload");
-    topLevelObj.insert("sections", sectionArray);
-    QJsonDocument docOut;
-    docOut.setObject(topLevelObj);
-    m_jsonContent = docOut.toJson();
 }
 
 PasteUpload::~PasteUpload()
 {
 }
 
-bool PasteUpload::validateText()
-{
-    return m_jsonContent.size() <= maxSize();
-}
-
 void PasteUpload::executeTask()
 {
-    QNetworkRequest request(QUrl("https://api.paste.ee/v1/pastes"));
+    QNetworkRequest request{QUrl(m_uploadUrl)};
     request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT_UNCACHED);
 
-    request.setRawHeader("Content-Type", "application/json");
-    request.setRawHeader("Content-Length", QByteArray::number(m_jsonContent.size()));
-    request.setRawHeader("X-Auth-Token", m_key.toStdString().c_str());
+    QHttpMultiPart *multiPart = new QHttpMultiPart{QHttpMultiPart::FormDataType};
+
+    QHttpPart filePart;
+    filePart.setBody(m_text);
+    filePart.setHeader(QNetworkRequest::ContentTypeHeader, "text/plain");
+    filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"file\"; filename=\"log.txt\"");
 
-    QNetworkReply *rep = APPLICATION->network()->post(request, m_jsonContent);
+    multiPart->append(filePart);
+
+    QNetworkReply *rep = APPLICATION->network()->post(request, multiPart);
+    multiPart->setParent(rep);
 
     m_reply = std::shared_ptr<QNetworkReply>(rep);
-    setStatus(tr("Uploading to paste.ee"));
+    setStatus(tr("Uploading to %1").arg(m_uploadUrl));
+
     connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress);
     connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError)));
     connect(rep, SIGNAL(finished()), this, SLOT(downloadFinished()));
@@ -61,45 +51,23 @@ void PasteUpload::downloadError(QNetworkReply::NetworkError error)
 void PasteUpload::downloadFinished()
 {
     QByteArray data = m_reply->readAll();
-    // if the download succeeded
-    if (m_reply->error() == QNetworkReply::NetworkError::NoError)
+    int statusCode = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+
+    if (m_reply->error() != QNetworkReply::NetworkError::NoError)
     {
+        emitFailed(tr("Network error: %1").arg(m_reply->errorString()));
         m_reply.reset();
-        QJsonParseError jsonError;
-        QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-        if (jsonError.error != QJsonParseError::NoError)
-        {
-            emitFailed(jsonError.errorString());
-            return;
-        }
-        if (!parseResult(doc))
-        {
-            emitFailed(tr("paste.ee returned an error. Please consult the logs for more information"));
-            return;
-        }
+        return;
     }
-    // else the download failed
-    else
+    else if (statusCode != 200 && statusCode != 201)
     {
-        emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
+        QString reasonPhrase = m_reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
+        emitFailed(tr("Error: %1 returned unexpected status code %2 %3").arg(m_uploadUrl).arg(statusCode).arg(reasonPhrase));
+        qCritical() << m_uploadUrl << " returned unexpected status code " << statusCode << " with body: " << data;
         m_reply.reset();
         return;
     }
-    emitSucceeded();
-}
 
-bool PasteUpload::parseResult(QJsonDocument doc)
-{
-    auto object = doc.object();
-    auto status = object.value("success").toBool();
-    if (!status)
-    {
-        qCritical() << "paste.ee reported error:" << QString(object.value("error").toString());
-        return false;
-    }
-    m_pasteLink = object.value("link").toString();
-    m_pasteID = object.value("id").toString();
-    qDebug() << m_pasteLink;
-    return true;
+    m_pasteLink = QString::fromUtf8(data).trimmed();
+    emitSucceeded();
 }
-
diff --git a/launcher/net/PasteUpload.h b/launcher/net/PasteUpload.h
index 5514e058..62b2dc36 100644
--- a/launcher/net/PasteUpload.h
+++ b/launcher/net/PasteUpload.h
@@ -8,37 +8,21 @@ class PasteUpload : public Task
 {
     Q_OBJECT
 public:
-    PasteUpload(QWidget *window, QString text, QString key = "public");
+    PasteUpload(QWidget *window, QString text, QString url);
     virtual ~PasteUpload();
 
     QString pasteLink()
     {
         return m_pasteLink;
     }
-    QString pasteID()
-    {
-        return m_pasteID;
-    }
-    int maxSize()
-    {
-        // 2MB for paste.ee - public
-        if(m_key == "public")
-            return 1024*1024*2;
-        // 12MB for paste.ee - with actual key
-        return 1024*1024*12;
-    }
-    bool validateText();
 protected:
     virtual void executeTask();
 
 private:
-    bool parseResult(QJsonDocument doc);
-    QString m_error;
     QWidget *m_window;
-    QString m_pasteID;
     QString m_pasteLink;
-    QString m_key;
-    QByteArray m_jsonContent;
+    QString m_uploadUrl;
+    QByteArray m_text;
     std::shared_ptr<QNetworkReply> m_reply;
 public
 slots:
diff --git a/launcher/news/NewsChecker.cpp b/launcher/news/NewsChecker.cpp
deleted file mode 100644
index 4f4359b8..00000000
--- a/launcher/news/NewsChecker.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NewsChecker.h"
-
-#include <QByteArray>
-#include <QDomDocument>
-
-#include <QDebug>
-
-NewsChecker::NewsChecker(shared_qobject_ptr<QNetworkAccessManager> network, const QString& feedUrl)
-{
-    m_network = network;
-    m_feedUrl = feedUrl;
-}
-
-void NewsChecker::reloadNews()
-{
-    // Start a netjob to download the RSS feed and call rssDownloadFinished() when it's done.
-    if (isLoadingNews())
-    {
-        qDebug() << "Ignored request to reload news. Currently reloading already.";
-        return;
-    }
-
-    qDebug() << "Reloading news.";
-
-    NetJob* job = new NetJob("News RSS Feed", m_network);
-    job->addNetAction(Net::Download::makeByteArray(m_feedUrl, &newsData));
-    QObject::connect(job, &NetJob::succeeded, this, &NewsChecker::rssDownloadFinished);
-    QObject::connect(job, &NetJob::failed, this, &NewsChecker::rssDownloadFailed);
-    m_newsNetJob.reset(job);
-    job->start();
-}
-
-void NewsChecker::rssDownloadFinished()
-{
-    // Parse the XML file and process the RSS feed entries.
-    qDebug() << "Finished loading RSS feed.";
-
-    m_newsNetJob.reset();
-    QDomDocument doc;
-    {
-        // Stuff to store error info in.
-        QString errorMsg = "Unknown error.";
-        int errorLine = -1;
-        int errorCol = -1;
-
-        // Parse the XML.
-        if (!doc.setContent(newsData, false, &errorMsg, &errorLine, &errorCol))
-        {
-            QString fullErrorMsg = QString("Error parsing RSS feed XML. %s at %d:%d.").arg(errorMsg, errorLine, errorCol);
-            fail(fullErrorMsg);
-            newsData.clear();
-            return;
-        }
-        newsData.clear();
-    }
-
-    // If the parsing succeeded, read it.
-    QDomNodeList items = doc.elementsByTagName("item");
-    m_newsEntries.clear();
-    for (int i = 0; i < items.length(); i++)
-    {
-        QDomElement element = items.at(i).toElement();
-        NewsEntryPtr entry;
-        entry.reset(new NewsEntry());
-        QString errorMsg = "An unknown error occurred.";
-        if (NewsEntry::fromXmlElement(element, entry.get(), &errorMsg))
-        {
-            qDebug() << "Loaded news entry" << entry->title;
-            m_newsEntries.append(entry);
-        }
-        else
-        {
-            qWarning() << "Failed to load news entry at index" << i << ":" << errorMsg;
-        }
-    }
-
-    succeed();
-}
-
-void NewsChecker::rssDownloadFailed(QString reason)
-{
-    // Set an error message and fail.
-    fail(tr("Failed to load news RSS feed:\n%1").arg(reason));
-}
-
-
-QList<NewsEntryPtr> NewsChecker::getNewsEntries() const
-{
-    return m_newsEntries;
-}
-
-bool NewsChecker::isLoadingNews() const
-{
-    return m_newsNetJob.get() != nullptr;
-}
-
-QString NewsChecker::getLastLoadErrorMsg() const
-{
-    return m_lastLoadError;
-}
-
-void NewsChecker::succeed()
-{
-    m_lastLoadError = "";
-    qDebug() << "News loading succeeded.";
-    m_newsNetJob.reset();
-    emit newsLoaded();
-}
-
-void NewsChecker::fail(const QString& errorMsg)
-{
-    m_lastLoadError = errorMsg;
-    qDebug() << "Failed to load news:" << errorMsg;
-    m_newsNetJob.reset();
-    emit newsLoadingFailed(errorMsg);
-}
-
diff --git a/launcher/news/NewsChecker.h b/launcher/news/NewsChecker.h
deleted file mode 100644
index 8467a541..00000000
--- a/launcher/news/NewsChecker.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QList>
-
-#include <net/NetJob.h>
-
-#include "NewsEntry.h"
-
-class NewsChecker : public QObject
-{
-    Q_OBJECT
-public:
-    /*!
-     * Constructs a news reader to read from the given RSS feed URL.
-     */
-    NewsChecker(shared_qobject_ptr<QNetworkAccessManager> network, const QString& feedUrl);
-
-    /*!
-     * Returns the error message for the last time the news was loaded.
-     * Empty string if the last load was successful.
-     */
-    QString getLastLoadErrorMsg() const;
-
-    /*!
-     * Returns true if the news has been loaded successfully.
-     */
-    bool isNewsLoaded() const;
-
-    //! True if the news is currently loading. If true, reloadNews() will do nothing.
-    bool isLoadingNews() const;
-
-    /*!
-     * Returns a list of news entries.
-     */
-    QList<NewsEntryPtr> getNewsEntries() const;
-
-    /*!
-     * Reloads the news from the website's RSS feed.
-     * If the news is already loading, this does nothing.
-     */
-    void Q_SLOT reloadNews();
-
-signals:
-    /*!
-     * Signal fired after the news has finished loading.
-     */
-    void newsLoaded();
-
-    /*!
-     * Signal fired after the news fails to load.
-     */
-    void newsLoadingFailed(QString errorMsg);
-
-protected slots:
-    void rssDownloadFinished();
-    void rssDownloadFailed(QString reason);
-
-protected: /* data */
-    //! The URL for the RSS feed to fetch.
-    QString m_feedUrl;
-
-    //! List of news entries.
-    QList<NewsEntryPtr> m_newsEntries;
-
-    //! The network job to use to load the news.
-    NetJob::Ptr m_newsNetJob;
-
-    //! True if news has been loaded.
-    bool m_loadedNews;
-
-    QByteArray newsData;
-
-    /*!
-     * Gets the error message that was given last time the news was loaded.
-     * If the last news load succeeded, this will be an empty string.
-     */
-    QString m_lastLoadError;
-
-    shared_qobject_ptr<QNetworkAccessManager> m_network;
-
-protected slots:
-    /// Emits newsLoaded() and sets m_lastLoadError to empty string.
-    void succeed();
-
-    /// Emits newsLoadingFailed() and sets m_lastLoadError to the given message.
-    void fail(const QString& errorMsg);
-};
-
diff --git a/launcher/news/NewsEntry.cpp b/launcher/news/NewsEntry.cpp
deleted file mode 100644
index 7eff657b..00000000
--- a/launcher/news/NewsEntry.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NewsEntry.h"
-
-#include <QDomNodeList>
-#include <QVariant>
-
-NewsEntry::NewsEntry(QObject* parent) :
-    QObject(parent)
-{
-    this->title = tr("Untitled");
-    this->content = tr("No content.");
-    this->link = "";
-    this->author = tr("Unknown Author");
-    this->pubDate = QDateTime::currentDateTime();
-}
-
-NewsEntry::NewsEntry(const QString& title, const QString& content, const QString& link, const QString& author, const QDateTime& pubDate, QObject* parent) :
-    QObject(parent)
-{
-    this->title = title;
-    this->content = content;
-    this->link = link;
-    this->author = author;
-    this->pubDate = pubDate;
-}
-
-/*!
- * Gets the text content of the given child element as a QVariant.
- */
-inline QString childValue(const QDomElement& element, const QString& childName, QString defaultVal="")
-{
-    QDomNodeList nodes = element.elementsByTagName(childName);
-    if (nodes.count() > 0)
-    {
-        QDomElement element = nodes.at(0).toElement();
-        return element.text();
-    }
-    else
-    {
-        return defaultVal;
-    }
-}
-
-bool NewsEntry::fromXmlElement(const QDomElement& element, NewsEntry* entry, QString* errorMsg)
-{
-    QString title = childValue(element, "title", tr("Untitled"));
-    QString content = childValue(element, "description", tr("No content."));
-    QString link = childValue(element, "link");
-    QString author = childValue(element, "dc:creator", tr("Unknown Author"));
-    QString pubDateStr = childValue(element, "pubDate");
-
-    // FIXME: For now, we're just ignoring timezones. We assume that all time zones in the RSS feed are the same.
-    QString dateFormat("ddd, dd MMM yyyy hh:mm:ss");
-    QDateTime pubDate = QDateTime::fromString(pubDateStr, dateFormat);
-
-    entry->title = title;
-    entry->content = content;
-    entry->link = link;
-    entry->author = author;
-    entry->pubDate = pubDate;
-    return true;
-}
-
diff --git a/launcher/news/NewsEntry.h b/launcher/news/NewsEntry.h
deleted file mode 100644
index 0dbc70a5..00000000
--- a/launcher/news/NewsEntry.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QDomElement>
-#include <QDateTime>
-
-#include <memory>
-
-class NewsEntry : public QObject
-{
-    Q_OBJECT
-
-public:
-    /*!
-     * Constructs an empty news entry.
-     */
-    explicit NewsEntry(QObject* parent=0);
-
-    /*!
-     * Constructs a new news entry.
-     * Note that content may contain HTML.
-     */
-    NewsEntry(const QString& title, const QString& content, const QString& link, const QString& author, const QDateTime& pubDate, QObject* parent=0);
-
-    /*!
-     * Attempts to load information from the given XML element into the given news entry pointer.
-     * If this fails, the function will return false and store an error message in the errorMsg pointer.
-     */
-    static bool fromXmlElement(const QDomElement& element, NewsEntry* entry, QString* errorMsg=0);
-
-
-    //! The post title.
-    QString title;
-
-    //! The post's content. May contain HTML.
-    QString content;
-
-    //! URL to the post.
-    QString link;
-
-    //! The post's author.
-    QString author;
-    
-    //! The date and time that this post was published.
-    QDateTime pubDate;
-};
-
-typedef std::shared_ptr<NewsEntry> NewsEntryPtr;
-
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
index 2e744007..0fa82e35 100644
--- a/launcher/translations/TranslationsModel.cpp
+++ b/launcher/translations/TranslationsModel.cpp
@@ -143,6 +143,11 @@ struct TranslationsModel::Private
 
     std::unique_ptr<POTranslator> m_po_translator;
     QFileSystemWatcher *watcher;
+
+    const QString m_system_locale = QLocale::system().name();
+    const QString m_system_language = m_system_locale.split('_').front();
+
+    bool no_language_set = false;
 };
 
 TranslationsModel::TranslationsModel(QString path, QObject* parent): QAbstractListModel(parent)
@@ -164,7 +169,10 @@ TranslationsModel::~TranslationsModel()
 void TranslationsModel::translationDirChanged(const QString& path)
 {
     qDebug() << "Dir changed:" << path;
-    reloadLocalFiles();
+    if (!d->no_language_set)
+    {
+        reloadLocalFiles();
+    }
     selectLanguage(selectedLanguage());
 }
 
@@ -172,7 +180,26 @@ void TranslationsModel::indexReceived()
 {
     qDebug() << "Got translations index!";
     d->m_index_job.reset();
-    if(d->m_selectedLanguage != defaultLangCode)
+
+    if (d->no_language_set)
+    {
+        reloadLocalFiles();
+
+        auto language = d->m_system_locale;
+        if (!findLanguage(language))
+        {
+            language = d->m_system_language;
+        }
+        selectLanguage(language);
+        if (selectedLanguage() != defaultLangCode)
+        {
+            updateLanguage(selectedLanguage());
+        }
+        APPLICATION->settings()->set("Language", selectedLanguage());
+        d->no_language_set = false;
+    }
+
+    else if(d->m_selectedLanguage != defaultLangCode)
     {
         downloadTranslation(d->m_selectedLanguage);
     }
@@ -319,8 +346,19 @@ void TranslationsModel::reloadLocalFiles()
     {
         d->m_languages.append(language);
     }
-    std::sort(d->m_languages.begin(), d->m_languages.end(), [](const Language& a, const Language& b) {
-        return a.key.compare(b.key) < 0;
+    std::sort(d->m_languages.begin(), d->m_languages.end(), [this](const Language& a, const Language& b) {
+        if (a.key != b.key)
+        {
+            if (a.key == d->m_system_locale || a.key == d->m_system_language)
+            {
+                return true;
+            }
+            if (b.key == d->m_system_locale || b.key == d->m_system_language)
+            {
+                return false;
+            }
+        }
+        return a.key < b.key;
     });
     endInsertRows();
 }
@@ -439,6 +477,12 @@ bool TranslationsModel::selectLanguage(QString key)
 {
     QString &langCode = key;
     auto langPtr = findLanguage(key);
+
+    if (langCode.isEmpty())
+    {
+        d->no_language_set = true;
+    }
+
     if(!langPtr)
     {
         qWarning() << "Selected invalid language" << key << ", defaulting to" << defaultLangCode;
diff --git a/launcher/ui/GuiUtil.cpp b/launcher/ui/GuiUtil.cpp
index efb1a4df..9eb658e2 100644
--- a/launcher/ui/GuiUtil.cpp
+++ b/launcher/ui/GuiUtil.cpp
@@ -16,21 +16,8 @@
 QString GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 {
     ProgressDialog dialog(parentWidget);
-    auto APIKeySetting = APPLICATION->settings()->get("PasteEEAPIKey").toString();
-    if(APIKeySetting == "multimc")
-    {
-        APIKeySetting = BuildConfig.PASTE_EE_KEY;
-    }
-    std::unique_ptr<PasteUpload> paste(new PasteUpload(parentWidget, text, APIKeySetting));
-
-    if (!paste->validateText())
-    {
-        CustomMessageBox::selectable(
-            parentWidget, QObject::tr("Upload failed"),
-            QObject::tr("The log file is too big. You'll have to upload it manually."),
-            QMessageBox::Warning)->exec();
-        return QString();
-    }
+    auto pasteUrlSetting = APPLICATION->settings()->get("PastebinURL").toString();
+    std::unique_ptr<PasteUpload> paste(new PasteUpload(parentWidget, text, pasteUrlSetting));
 
     dialog.execWithTask(paste.get());
     if (!paste->wasSuccessful())
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 3dcc8ee9..202924ff 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -58,7 +58,6 @@
 #include <BuildConfig.h>
 #include <net/NetJob.h>
 #include <net/Download.h>
-#include <news/NewsChecker.h>
 #include <notifications/NotificationChecker.h>
 #include <tools/BaseProfiler.h>
 #include <updater/DownloadTask.h>
@@ -201,7 +200,6 @@ public:
     //TranslatedAction actionRefresh;
     TranslatedAction actionCheckUpdate;
     TranslatedAction actionSettings;
-    TranslatedAction actionMoreNews;
     TranslatedAction actionManageAccounts;
     TranslatedAction actionLaunchInstance;
     TranslatedAction actionRenameInstance;
@@ -246,7 +244,6 @@ public:
 
     TranslatedToolbar mainToolBar;
     TranslatedToolbar instanceToolBar;
-    TranslatedToolbar newsToolBar;
     QVector<TranslatedToolbar *> all_toolbars;
     bool m_kill = false;
 
@@ -429,29 +426,6 @@ public:
         MainWindow->setStatusBar(statusBar);
     }
 
-    void createNewsToolbar(QMainWindow *MainWindow)
-    {
-        newsToolBar = TranslatedToolbar(MainWindow);
-        newsToolBar->setObjectName(QStringLiteral("newsToolBar"));
-        newsToolBar->setMovable(false);
-        newsToolBar->setAllowedAreas(Qt::BottomToolBarArea);
-        newsToolBar->setIconSize(QSize(16, 16));
-        newsToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-        newsToolBar->setFloatable(false);
-        newsToolBar->setWindowTitle(QT_TRANSLATE_NOOP("MainWindow", "News Toolbar"));
-
-        actionMoreNews = TranslatedAction(MainWindow);
-        actionMoreNews->setObjectName(QStringLiteral("actionMoreNews"));
-        actionMoreNews->setIcon(APPLICATION->getThemedIcon("news"));
-        actionMoreNews.setTextId(QT_TRANSLATE_NOOP("MainWindow", "More news..."));
-        actionMoreNews.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the development blog to read more news about %1."));
-        all_actions.append(&actionMoreNews);
-        newsToolBar->addAction(actionMoreNews);
-
-        all_toolbars.append(&newsToolBar);
-        MainWindow->addToolBar(Qt::BottomToolBarArea, newsToolBar);
-    }
-
     void createInstanceToolbar(QMainWindow *MainWindow)
     {
         instanceToolBar = TranslatedToolbar(MainWindow);
@@ -636,7 +610,6 @@ public:
         MainWindow->setCentralWidget(centralWidget);
 
         createStatusBar(MainWindow);
-        createNewsToolbar(MainWindow);
         createInstanceToolbar(MainWindow);
 
         retranslateUi(MainWindow);
@@ -691,20 +664,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
         connect(secretEventFilter, &KonamiCode::triggered, this, &MainWindow::konamiTriggered);
     }
 
-    // Add the news label to the news toolbar.
-    {
-        m_newsChecker.reset(new NewsChecker(APPLICATION->network(), BuildConfig.NEWS_RSS_URL));
-        newsLabel = new QToolButton();
-        newsLabel->setIcon(APPLICATION->getThemedIcon("news"));
-        newsLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-        newsLabel->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-        newsLabel->setFocusPolicy(Qt::NoFocus);
-        ui->newsToolBar->insertWidget(ui->actionMoreNews, newsLabel);
-        QObject::connect(newsLabel, &QAbstractButton::clicked, this, &MainWindow::newsButtonClicked);
-        QObject::connect(m_newsChecker.get(), &NewsChecker::newsLoaded, this, &MainWindow::updateNewsLabel);
-        updateNewsLabel();
-    }
-
     // Create the instance list widget
     {
         view = new InstanceView(ui->centralWidget);
@@ -809,13 +768,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
     // TODO: refresh accounts here?
     // auto accounts = APPLICATION->accounts();
 
-    // load the news
-    {
-        m_newsChecker->reloadNews();
-        updateNewsLabel();
-    }
-
-
     if(BuildConfig.UPDATER_ENABLED)
     {
         bool updatesAllowed = APPLICATION->updatesAreAllowed();
@@ -1189,29 +1141,6 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *ev)
     return QMainWindow::eventFilter(obj, ev);
 }
 
-void MainWindow::updateNewsLabel()
-{
-    if (m_newsChecker->isLoadingNews())
-    {
-        newsLabel->setText(tr("Loading news..."));
-        newsLabel->setEnabled(false);
-    }
-    else
-    {
-        QList<NewsEntryPtr> entries = m_newsChecker->getNewsEntries();
-        if (entries.length() > 0)
-        {
-            newsLabel->setText(entries[0]->title);
-            newsLabel->setEnabled(true);
-        }
-        else
-        {
-            newsLabel->setText(tr("No news available."));
-            newsLabel->setEnabled(false);
-        }
-    }
-}
-
 void MainWindow::updateAvailable(GoUpdate::Status status)
 {
     if(!APPLICATION->updatesAreAllowed())
@@ -1685,24 +1614,6 @@ void MainWindow::on_actionReportBug_triggered()
     DesktopServices::openUrl(QUrl(BuildConfig.BUG_TRACKER_URL));
 }
 
-void MainWindow::on_actionMoreNews_triggered()
-{
-    DesktopServices::openUrl(QUrl("https://multimc.org/posts.html"));
-}
-
-void MainWindow::newsButtonClicked()
-{
-    QList<NewsEntryPtr> entries = m_newsChecker->getNewsEntries();
-    if (entries.count() > 0)
-    {
-        DesktopServices::openUrl(QUrl(entries[0]->link));
-    }
-    else
-    {
-        DesktopServices::openUrl(QUrl("https://multimc.org/posts.html"));
-    }
-}
-
 void MainWindow::on_actionAbout_triggered()
 {
     AboutDialog dialog(this);
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index f6940ab0..38d925a9 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -27,7 +27,6 @@
 #include "updater/GoUpdate.h"
 
 class LaunchController;
-class NewsChecker;
 class NotificationChecker;
 class QToolButton;
 class InstanceProxyModel;
@@ -109,10 +108,6 @@ private slots:
 
     void on_actionReportBug_triggered();
 
-    void on_actionMoreNews_triggered();
-
-    void newsButtonClicked();
-
     void on_actionLaunchInstance_triggered();
 
     void on_actionLaunchInstanceOffline_triggered();
@@ -174,8 +169,6 @@ private slots:
 
     void repopulateAccountsMenu();
 
-    void updateNewsLabel();
-
     /*!
      * Runs the DownloadTask and installs updates.
      */
@@ -205,14 +198,12 @@ private:
     // these are managed by Qt's memory management model!
     InstanceView *view = nullptr;
     InstanceProxyModel *proxymodel = nullptr;
-    QToolButton *newsLabel = nullptr;
     QLabel *m_statusLeft = nullptr;
     QLabel *m_statusCenter = nullptr;
     QMenu *accountMenu = nullptr;
     QToolButton *accountMenuButton = nullptr;
     KonamiCode * secretEventFilter = nullptr;
 
-    unique_qobject_ptr<NewsChecker> m_newsChecker;
     unique_qobject_ptr<NotificationChecker> m_notificationChecker;
 
     InstancePtr m_selectedInstance;
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 2ba34f1a..46d2f429 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -99,7 +99,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
     QString urlText("<html><head/><body><p><a href=\"%1\">%1</a></p></body></html>");
     ui->urlLabel->setText(urlText.arg(BuildConfig.LAUNCHER_GIT));
 
-    QString copyText("© 2012-2021 %1");
+    QString copyText("© 2021-2022 %1");
     ui->copyLabel->setText(copyText.arg(BuildConfig.LAUNCHER_COPYRIGHT));
 
     connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));
diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp
index f46aa3b9..174ad46c 100644
--- a/launcher/ui/dialogs/MSALoginDialog.cpp
+++ b/launcher/ui/dialogs/MSALoginDialog.cpp
@@ -16,15 +16,19 @@
 #include "MSALoginDialog.h"
 #include "ui_MSALoginDialog.h"
 
+#include "DesktopServices.h"
 #include "minecraft/auth/AccountTask.h"
 
 #include <QtWidgets/QPushButton>
 #include <QUrl>
+#include <QApplication>
+#include <QClipboard>
 
 MSALoginDialog::MSALoginDialog(QWidget *parent) : QDialog(parent), ui(new Ui::MSALoginDialog)
 {
     ui->setupUi(this);
     ui->progressBar->setVisible(false);
+    ui->actionButton->setVisible(false);
     // ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
 
     connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
@@ -81,10 +85,17 @@ void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString&
     QString urlString = uri.toString();
     QString linkString = QString("<a href=\"%1\">%2</a>").arg(urlString, urlString);
     ui->label->setText(tr("<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>").arg(linkString, code));
+    ui->actionButton->setVisible(true);
+    connect(ui->actionButton, &QPushButton::clicked, [=]() {
+        DesktopServices::openUrl(uri);
+        QClipboard* cb = QApplication::clipboard();
+        cb->setText(code);
+    });
 }
 
 void MSALoginDialog::hideVerificationUriAndCode() {
     m_externalLoginTimer.stop();
+    ui->actionButton->setVisible(false);
 }
 
 void MSALoginDialog::setUserInputsEnabled(bool enable)
@@ -110,6 +121,7 @@ void MSALoginDialog::onTaskFailed(const QString &reason)
     // Re-enable user-interaction
     setUserInputsEnabled(true);
     ui->progressBar->setVisible(false);
+    ui->actionButton->setVisible(false);
 }
 
 void MSALoginDialog::onTaskSucceeded()
diff --git a/launcher/ui/dialogs/MSALoginDialog.ui b/launcher/ui/dialogs/MSALoginDialog.ui
index 78cbfb26..c18d01a1 100644
--- a/launcher/ui/dialogs/MSALoginDialog.ui
+++ b/launcher/ui/dialogs/MSALoginDialog.ui
@@ -49,14 +49,25 @@ aaaaa</string>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel</set>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="actionButton">
+       <property name="text">
+        <string>Open page and copy code</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 4d4d4e89..0ffe8050 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -246,32 +246,31 @@ void LauncherPage::applySettings()
     //FIXME: make generic
     switch (ui->themeComboBox->currentIndex())
     {
-    case 1:
+    case 0:
         s->set("IconTheme", "pe_dark");
         break;
-    case 2:
+    case 1:
         s->set("IconTheme", "pe_light");
         break;
-    case 3:
+    case 2:
         s->set("IconTheme", "pe_blue");
         break;
-    case 4:
+    case 3:
         s->set("IconTheme", "pe_colored");
         break;
-    case 5:
+    case 4:
         s->set("IconTheme", "OSX");
         break;
-    case 6:
+    case 5:
         s->set("IconTheme", "iOS");
         break;
-    case 7:
+    case 6:
         s->set("IconTheme", "flat");
         break;
-    case 8:
+    case 7:
         s->set("IconTheme", "custom");
         break;
-    case 0:
-    default:
+    case 8:
         s->set("IconTheme", "multimc");
         break;
     }
@@ -327,40 +326,40 @@ void LauncherPage::loadSettings()
     auto theme = s->get("IconTheme").toString();
     if (theme == "pe_dark")
     {
-        ui->themeComboBox->setCurrentIndex(1);
+        ui->themeComboBox->setCurrentIndex(0);
     }
     else if (theme == "pe_light")
     {
-        ui->themeComboBox->setCurrentIndex(2);
+        ui->themeComboBox->setCurrentIndex(1);
     }
     else if (theme == "pe_blue")
     {
-        ui->themeComboBox->setCurrentIndex(3);
+        ui->themeComboBox->setCurrentIndex(2);
     }
     else if (theme == "pe_colored")
     {
-        ui->themeComboBox->setCurrentIndex(4);
+        ui->themeComboBox->setCurrentIndex(3);
     }
     else if (theme == "OSX")
     {
-        ui->themeComboBox->setCurrentIndex(5);
+        ui->themeComboBox->setCurrentIndex(4);
     }
     else if (theme == "iOS")
     {
-        ui->themeComboBox->setCurrentIndex(6);
+        ui->themeComboBox->setCurrentIndex(5);
     }
     else if (theme == "flat")
     {
+        ui->themeComboBox->setCurrentIndex(6);
+    }
+    else if (theme == "multimc")
+    {
         ui->themeComboBox->setCurrentIndex(7);
     }
     else if (theme == "custom")
     {
         ui->themeComboBox->setCurrentIndex(8);
     }
-    else
-    {
-        ui->themeComboBox->setCurrentIndex(0);
-    }
 
     {
         auto currentTheme = s->get("ApplicationTheme").toString();
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 2b3729bc..47fed873 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -264,11 +264,6 @@
             </property>
             <item>
              <property name="text">
-              <string>Default</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
               <string>Simple (Dark Icons)</string>
              </property>
             </item>
@@ -307,6 +302,11 @@
               <string>Custom</string>
              </property>
             </item>
+            <item>
+             <property name="text">
+              <string>MultiMC</string>
+             </property>
+            </item>
            </widget>
           </item>
           <item row="1" column="1">
diff --git a/launcher/ui/pages/global/PasteEEPage.cpp b/launcher/ui/pages/global/PastePage.cpp
index 4b375d9a..7c69e1a4 100644
--- a/launcher/ui/pages/global/PasteEEPage.cpp
+++ b/launcher/ui/pages/global/PastePage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2021 MultiMC Contributors
+/* Copyright 2013-2021 MultiMC & PolyMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,69 +13,51 @@
  * limitations under the License.
  */
 
-#include "PasteEEPage.h"
-#include "ui_PasteEEPage.h"
+#include "PastePage.h"
+#include "ui_PastePage.h"
 
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QStandardPaths>
 #include <QTabBar>
+#include <QVariant>
 
 #include "settings/SettingsObject.h"
 #include "tools/BaseProfiler.h"
 #include "Application.h"
 
-PasteEEPage::PasteEEPage(QWidget *parent) :
+PastePage::PastePage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::PasteEEPage)
+    ui(new Ui::PastePage)
 {
+    static QRegularExpression validUrlRegExp("https?://.+");
     ui->setupUi(this);
+    ui->urlChoices->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->urlChoices));
     ui->tabWidget->tabBar()->hide();\
-    connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PasteEEPage::textEdited);
     loadSettings();
 }
 
-PasteEEPage::~PasteEEPage()
+PastePage::~PastePage()
 {
     delete ui;
 }
 
-void PasteEEPage::loadSettings()
+void PastePage::loadSettings()
 {
     auto s = APPLICATION->settings();
-    QString keyToUse = s->get("PasteEEAPIKey").toString();
-    if(keyToUse == "multimc")
-    {
-        ui->multimcButton->setChecked(true);
-    }
-    else
-    {
-        ui->customButton->setChecked(true);
-        ui->customAPIkeyEdit->setText(keyToUse);
-    }
+    QString pastebinURL = s->get("PastebinURL").toString();
+    ui->urlChoices->setCurrentText(pastebinURL);
 }
 
-void PasteEEPage::applySettings()
+void PastePage::applySettings()
 {
     auto s = APPLICATION->settings();
-
-    QString pasteKeyToUse;
-    if (ui->customButton->isChecked())
-        pasteKeyToUse = ui->customAPIkeyEdit->text();
-    else
-    {
-        pasteKeyToUse =  "multimc";
-    }
-    s->set("PasteEEAPIKey", pasteKeyToUse);
+    QString pastebinURL = ui->urlChoices->currentText();
+    s->set("PastebinURL", pastebinURL);
 }
 
-bool PasteEEPage::apply()
+bool PastePage::apply()
 {
     applySettings();
     return true;
 }
-
-void PasteEEPage::textEdited(const QString& text)
-{
-    ui->customButton->setChecked(true);
-}
diff --git a/launcher/ui/pages/global/PasteEEPage.h b/launcher/ui/pages/global/PastePage.h
index a1c7d434..d475dfd9 100644
--- a/launcher/ui/pages/global/PasteEEPage.h
+++ b/launcher/ui/pages/global/PastePage.h
@@ -21,16 +21,16 @@
 #include <Application.h>
 
 namespace Ui {
-class PasteEEPage;
+class PastePage;
 }
 
-class PasteEEPage : public QWidget, public BasePage
+class PastePage : public QWidget, public BasePage
 {
     Q_OBJECT
 
 public:
-    explicit PasteEEPage(QWidget *parent = 0);
-    ~PasteEEPage();
+    explicit PastePage(QWidget *parent = 0);
+    ~PastePage();
 
     QString displayName() const override
     {
@@ -54,9 +54,7 @@ private:
     void loadSettings();
     void applySettings();
 
-private slots:
-    void textEdited(const QString &text);
-
 private:
-    Ui::PasteEEPage *ui;
+    Ui::PastePage *ui;
 };
+
diff --git a/launcher/ui/pages/global/PasteEEPage.ui b/launcher/ui/pages/global/PastePage.ui
index 10883781..2d13a765 100644
--- a/launcher/ui/pages/global/PasteEEPage.ui
+++ b/launcher/ui/pages/global/PastePage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>PasteEEPage</class>
- <widget class="QWidget" name="PasteEEPage">
+ <class>PastePage</class>
+ <widget class="QWidget" name="PastePage">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -36,50 +36,55 @@
        <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
-          <string>paste.ee API key</string>
+          <string>Pastebin URL</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_10">
+         <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
-           <widget class="QRadioButton" name="multimcButton">
-            <property name="text">
-             <string>MultiMC key - 12MB &amp;upload limit</string>
+           <widget class="Line" name="line">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
-            <attribute name="buttonGroup">
-             <string notr="true">pasteButtonGroup</string>
-            </attribute>
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="customButton">
-            <property name="text">
-             <string>&amp;Your own key - 12MB upload limit:</string>
+           <widget class="QLabel" name="label_2">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+             </font>
             </property>
-            <attribute name="buttonGroup">
-             <string notr="true">pasteButtonGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="customAPIkeyEdit">
-            <property name="echoMode">
-             <enum>QLineEdit::Password</enum>
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: only input that starts with &lt;span style=&quot; font-weight:600;&quot;&gt;http://&lt;/span&gt; or &lt;span style=&quot; font-weight:600;&quot;&gt;https://&lt;/span&gt; will be accepted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
-            <property name="placeholderText">
-             <string>Paste your API key here!</string>
+            <property name="scaledContents">
+             <bool>false</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+           <widget class="QComboBox" name="urlChoices">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="insertPolicy">
+             <enum>QComboBox::NoInsert</enum>
             </property>
+            <item>
+             <property name="text">
+              <string>https://0x0.st</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>https://paste.polymc.org</string>
+             </property>
+            </item>
            </widget>
           </item>
           <item>
            <widget class="QLabel" name="label">
             <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://paste.ee&quot;&gt;paste.ee&lt;/a&gt; is used by MultiMC for log uploads. If you have a &lt;a href=&quot;https://paste.ee&quot;&gt;paste.ee&lt;/a&gt; account, you can add your API key here and have your uploaded logs paired with your account.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Here you can choose from a predefined list of paste services, or input the URL of a different paste service of your choice, provided it supports the same protocol as 0x0.st, that is POST a file parameter to the URL and return a link in the response body.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="textFormat">
              <enum>Qt::RichText</enum>
@@ -116,13 +121,7 @@
  </widget>
  <tabstops>
   <tabstop>tabWidget</tabstop>
-  <tabstop>multimcButton</tabstop>
-  <tabstop>customButton</tabstop>
-  <tabstop>customAPIkeyEdit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
- <buttongroups>
-  <buttongroup name="pasteButtonGroup"/>
- </buttongroups>
 </ui>
diff --git a/launcher/ui/pages/instance/LogPage.ui b/launcher/ui/pages/instance/LogPage.ui
index ccfc1551..31bb368c 100644
--- a/launcher/ui/pages/instance/LogPage.ui
+++ b/launcher/ui/pages/instance/LogPage.ui
@@ -100,7 +100,7 @@
          <item>
           <widget class="QPushButton" name="btnPaste">
            <property name="toolTip">
-            <string>Upload the log to paste.ee - it will stay online for a month</string>
+            <string>Upload the log to the paste service configured in preferences</string>
            </property>
            <property name="text">
             <string>Upload</string>
diff --git a/launcher/ui/pages/instance/OtherLogsPage.ui b/launcher/ui/pages/instance/OtherLogsPage.ui
index 56ff3b62..77f3e647 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.ui
+++ b/launcher/ui/pages/instance/OtherLogsPage.ui
@@ -84,7 +84,7 @@
          <item row="3" column="2">
           <widget class="QPushButton" name="btnPaste">
            <property name="toolTip">
-            <string>Upload the log to paste.ee - it will stay online for a month</string>
+            <string>Upload the log to the paste service configured in preferences.</string>
            </property>
            <property name="text">
             <string>Upload</string>
diff --git a/launcher/ui/widgets/LanguageSelectionWidget.cpp b/launcher/ui/widgets/LanguageSelectionWidget.cpp
index cf70c7b4..964d2b7c 100644
--- a/launcher/ui/widgets/LanguageSelectionWidget.cpp
+++ b/launcher/ui/widgets/LanguageSelectionWidget.cpp
@@ -6,6 +6,7 @@
 #include <QLabel>
 #include "Application.h"
 #include "translations/TranslationsModel.h"
+#include "settings/Setting.h"
 
 LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
     QWidget(parent)
@@ -37,6 +38,9 @@ LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
     languageView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
     connect(languageView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &LanguageSelectionWidget::languageRowChanged);
     verticalLayout->setContentsMargins(0,0,0,0);
+
+    auto language_setting = APPLICATION->settings()->getSetting("Language");
+    connect(language_setting.get(), &Setting::SettingChanged, this, &LanguageSelectionWidget::languageSettingChanged);
 }
 
 QString LanguageSelectionWidget::getSelectedLanguageKey() const
@@ -64,3 +68,10 @@ void LanguageSelectionWidget::languageRowChanged(const QModelIndex& current, con
     translations->selectLanguage(key);
     translations->updateLanguage(key);
 }
+
+void LanguageSelectionWidget::languageSettingChanged(const Setting &, const QVariant)
+{
+    auto translations = APPLICATION->translations();
+    auto index = translations->selectedIndex();
+    languageView->setCurrentIndex(index);
+}
diff --git a/launcher/ui/widgets/LanguageSelectionWidget.h b/launcher/ui/widgets/LanguageSelectionWidget.h
index e65936db..4a88924c 100644
--- a/launcher/ui/widgets/LanguageSelectionWidget.h
+++ b/launcher/ui/widgets/LanguageSelectionWidget.h
@@ -20,6 +20,7 @@
 class QVBoxLayout;
 class QTreeView;
 class QLabel;
+class Setting;
 
 class LanguageSelectionWidget: public QWidget
 {
@@ -33,6 +34,7 @@ public:
 
 protected slots:
     void languageRowChanged(const QModelIndex &current, const QModelIndex &previous);
+    void languageSettingChanged(const Setting &, const QVariant);
 
 private:
     QVBoxLayout *verticalLayout = nullptr;