prismlauncher.diff (4519B)

      1 diff --git a/CMakeLists.txt b/CMakeLists.txt
      2 index 808c7d8cd..b6fb57e0a 100644
      3 --- a/CMakeLists.txt
      4 +++ b/CMakeLists.txt
      5 @@ -180,8 +180,8 @@ endif()
      6  ##################################### Set Application options #####################################
      7  
      8  ######## Set URLs ########
      9 -set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING "URL to fetch Prism Launcher's news RSS feed from.")
     10 -set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'")
     11 +set(Launcher_NEWS_RSS_URL "https://www.minecraft.net/en-us/feeds/community-content/rss" CACHE STRING "URL to fetch Prism Launcher's news RSS feed from.")
     12 +set(Launcher_NEWS_OPEN_URL "https://www.minecraft.net/en-us/articles" CACHE STRING "URL that gets opened when the user clicks 'More News'")
     13  set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help")
     14  set(Launcher_LOGIN_CALLBACK_URL "https://prismlauncher.org/successful-login" CACHE STRING "URL that gets opened when the user successfully logins.")
     15  set(Launcher_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE STRING "URL for FML Libraries.")
     16 diff --git a/launcher/Application.cpp b/launcher/Application.cpp
     17 index 9ecde7bd2..f5b659f26 100644
     18 --- a/launcher/Application.cpp
     19 +++ b/launcher/Application.cpp
     20 @@ -660,9 +660,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
     21          m_settings->registerSetting("OnlineFixes", false);
     22  
     23          // Native library workarounds
     24 -        m_settings->registerSetting("UseNativeOpenAL", false);
     25 +        m_settings->registerSetting("UseNativeOpenAL", true);
     26          m_settings->registerSetting("CustomOpenALPath", "");
     27 -        m_settings->registerSetting("UseNativeGLFW", false);
     28 +        m_settings->registerSetting("UseNativeGLFW", true);
     29          m_settings->registerSetting("CustomGLFWPath", "");
     30  
     31          // Performance related options
     32 @@ -1934,4 +1934,4 @@ bool Application::checkQSavePath(QString path)
     33          }
     34      }
     35      return false;
     36 -}
     37 \ No newline at end of file
     38 +}
     39 diff --git a/launcher/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc
     40 index e63a25b5a..e55faf15e 100644
     41 --- a/launcher/resources/backgrounds/backgrounds.qrc
     42 +++ b/launcher/resources/backgrounds/backgrounds.qrc
     43 @@ -13,17 +13,5 @@
     44          <file alias="rory-flat-xmas">rory-flat-xmas.png</file>
     45          <file alias="rory-flat-bday">rory-flat-bday.png</file>
     46          <file alias="rory-flat-spooky">rory-flat-spooky.png</file>
     47 -        <!-- teawie images -->
     48 -        <!-- copyright (c) SympathyTea 2023 -->
     49 -        <!-- these are licensed under the CC BY-SA 4.0 and have been unmodified aside from downscaling -->
     50 -        <!-- the full license with appropriate notices is avalible at https://creativecommons.org/licenses/by-sa/4.0/ -->
     51 -        <file alias="teawie">teawie.png</file>
     52 -        <!-- https://commons.wikimedia.org/wiki/File:Teawie.png -->
     53 -        <file alias="teawie-xmas">teawie-xmas.png</file>
     54 -        <!-- https://commons.wikimedia.org/wiki/File:Teawie_Holiday.png -->
     55 -        <file alias="teawie-bday">teawie-bday.png</file>
     56 -        <!-- https://commons.wikimedia.org/wiki/File:Teawie_Party.png -->
     57 -        <file alias="teawie-spooky">teawie-spooky.png</file>
     58 -        <!-- https://commons.wikimedia.org/wiki/File:Teawie_Halloween.png -->
     59      </qresource>
     60  </RCC>
     61 diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
     62 index 30a1fe7be..397561a03 100644
     63 --- a/launcher/ui/themes/ThemeManager.cpp
     64 +++ b/launcher/ui/themes/ThemeManager.cpp
     65 @@ -295,8 +295,7 @@ void ThemeManager::initializeCatPacks()
     66  {
     67      QList<std::pair<QString, QString>> defaultCats{ { "kitteh", QObject::tr("Background Cat (from MultiMC)") },
     68                                                      { "rory", QObject::tr("Rory ID 11 (drawn by Ashtaka)") },
     69 -                                                    { "rory-flat", QObject::tr("Rory ID 11 (flat edition, drawn by Ashtaka)") },
     70 -                                                    { "teawie", QObject::tr("Teawie (drawn by SympathyTea)") } };
     71 +                                                    { "rory-flat", QObject::tr("Rory ID 11 (flat edition, drawn by Ashtaka)") } };
     72      for (auto [id, name] : defaultCats) {
     73          addCatPack(std::unique_ptr<CatPack>(new BasicCatPack(id, name)));
     74      }