Merge tag '9.4.1' into develop

Author: hero-persson

CMakeLists.txt

@@ -189,7 +189,7 @@ set(Launcher_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE S
 ######## Set version numbers ########
 set(Launcher_VERSION_MAJOR 9)
 set(Launcher_VERSION_MINOR 4)
-set(Launcher_VERSION_PATCH 0)
+set(Launcher_VERSION_PATCH 1)
 
 set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_PATCH}")
 set(Launcher_VERSION_NAME4 "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_PATCH}.0")

README.md

@@ -10,13 +10,7 @@ Fjord Launcher Unlocked is a **fork** of Fjord Launcher, which is a fork of Pris
 
 ## Having a problem with the launcher?
 
-You **will not** open an issue in the Prism Launcher repo.
-
-You **will not** ask about Fjord Launcher in the Prism Launcher discord.
-
-You **will** ask in #fjord-launcher in their [Matrix space](https://matrix.to/#/#unmojang:matrix.org).
-
-You **will** open an issue [here](https://github.com/unmojang/FjordLauncher/issues).
+**Do not** open an issue in the Prism Launcher repo, and **do not** ask about Fjord Launcher in the Prism Launcher Discord server. Instead, ask in #fjord-launcher in their [Matrix space](https://matrix.to/#/#unmojang:matrix.org), or open an issue [here](https://github.com/unmojang/FjordLauncher/issues).
 
 ## Installation
 

launcher/FileSystem.cpp

@@ -123,6 +123,10 @@ namespace fs = ghc::filesystem;
 
 #if defined(__MINGW32__)
 
+// Avoid re-defining structs retroactively added to MinGW
+// https://github.com/mingw-w64/mingw-w64/issues/90#issuecomment-2829284729
+#if __MINGW64_VERSION_MAJOR < 13
+
 struct _DUPLICATE_EXTENTS_DATA {
     HANDLE FileHandle;
     LARGE_INTEGER SourceFileOffset;
@@ -132,6 +136,7 @@ struct _DUPLICATE_EXTENTS_DATA {
 
 using DUPLICATE_EXTENTS_DATA = _DUPLICATE_EXTENTS_DATA;
 using PDUPLICATE_EXTENTS_DATA = _DUPLICATE_EXTENTS_DATA*;
+#endif
 
 struct _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER {
     WORD ChecksumAlgorithm;  // Checksum algorithm. e.g. CHECKSUM_TYPE_UNCHANGED, CHECKSUM_TYPE_NONE, CHECKSUM_TYPE_CRC32

libraries/launcher/legacy/org/prismlauncher/legacy/fix/online/SkinFix.java

@@ -143,6 +143,12 @@ private static String findSkinOwner(URL address) {
             case "s3.amazonaws.com":
             case "skins.minecraft.net":
                 return stripIfPrefixed(address.getPath(), "/MinecraftSkins/");
+
+            case "betacraft.uk":
+                for (String prefix : new String[]{"/skin/", "/MinecraftSkins/"}) {
+                    String result = stripIfPrefixed(address.getPath(), prefix);
+                    if (result != null) return result;
+                }
         }
 
         return null;
@@ -159,6 +165,12 @@ private static String findCapeOwner(URL address) {
             case "s3.amazonaws.com":
             case "skins.minecraft.net":
                 return stripIfPrefixed(address.getPath(), "/MinecraftCloaks/");
+
+            case "betacraft.uk":
+                if (address.getPath().equals("/cloak/get.jsp"))
+                    return stripIfPrefixed(address.getQuery(), "user=");
+
+                return stripIfPrefixed(address.getPath(), "/MinecraftCloaks/");
         }
 
         return null;