Clean up some lingering differences from upstream

unmojang · Oct 26, 2024 · da9c085 · da9c085
1 parent b496316
commit da9c085
Show file tree

Hide file tree

Showing 36 changed files with 24 additions and 1,793 deletions.
diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml
@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   update-flake:
-    if: github.repository == 'unmojang/Fjord Launcher'
+    if: github.repository == 'unmojang/FjordLauncher'
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@ resources/CMakeFiles
 html/
 
 # Project Files
-*.orig
 *.pro.user
 CMakeLists.txt.user
 CMakeLists.txt.user.*

diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
@@ -2,7 +2,6 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <[email protected]>
- *  Copyright (C) 2022 Lenny McLennington <[email protected]>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
@@ -3,7 +3,6 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <[email protected]>
  *  Copyright (C) 2022 Sefa Eyeoglu <[email protected]>
- *  Copyright (C) 2022 Lenny McLennington <[email protected]>
  *  Copyright (C) 2023 TheKodeToad <[email protected]>
  *
  *  This program is free software: you can redistribute it and/or modify

diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp
@@ -92,8 +92,9 @@ void LaunchController::decideAccount()
     if (accounts->count() <= 0 || !accounts->anyAccountIsValid()) {
         // Tell the user they need to log in at least one account in order to play.
         auto reply = CustomMessageBox::selectable(m_parentWidget, tr("No Accounts"),
-                                                  tr("In order to play Minecraft, you must pick your username or log in to an account "
-                                                     "Would you like to open the account manager to do this now?"),
+                                                  tr("In order to play Minecraft, you must have at least one Microsoft "
+                                                     "account which owns Minecraft logged in. "
+                                                     "Would you like to open the account manager to add an account now?"),
                                                   QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
                          ->exec();
 

diff --git a/launcher/java/JavaCheckerJob.h b/launcher/java/JavaCheckerJob.h
diff --git a/launcher/minecraft/MinecraftUpdate.h b/launcher/minecraft/MinecraftUpdate.h
diff --git a/launcher/minecraft/auth/flows/AuthlibInjector.cpp b/launcher/minecraft/auth/flows/AuthlibInjector.cpp
diff --git a/launcher/minecraft/auth/flows/AuthlibInjector.h b/launcher/minecraft/auth/flows/AuthlibInjector.h
diff --git a/launcher/minecraft/auth/flows/Mojang.cpp b/launcher/minecraft/auth/flows/Mojang.cpp
diff --git a/launcher/minecraft/auth/flows/Mojang.h b/launcher/minecraft/auth/flows/Mojang.h
diff --git a/launcher/minecraft/services/CapeChange.cpp b/launcher/minecraft/services/CapeChange.cpp
diff --git a/launcher/minecraft/services/CapeChange.h b/launcher/minecraft/services/CapeChange.h