2.12.8.2

MeloongCore

@@ -1 +1 @@
-Subproject commit f30c861f6ea5ae9a52a93ffa71357d20ce0090ab
+Subproject commit 4d389f4375aa60e977f512690219a1fa4476838a

PCLCS/Constants.cs

@@ -71,5 +71,5 @@ public static class Versions {
     /// <summary>
     /// Minecraft 本地实例信息缓存的版本号。
     /// </summary>
-    public const int MCINSTANCE_CACHE_VERSION = 37;
+    public const int MCINSTANCE_CACHE_VERSION = 38;
 }

Plain Craft Launcher 2/Application.xaml.vb

@@ -106,6 +106,9 @@ RetryCacheCheck:
             ServicePointManager.UseNagleAlgorithm = False
             ServicePointManager.EnableDnsRoundRobin = True
             ServicePointManager.ReusePort = True
+            If Environment.OSVersion.Version < New Version(6, 2) Then 'Windows 7 回退（#8519）
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 Or SecurityProtocolType.Tls Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12
+            End If
             '设置初始窗口
             If Settings.Get(Of Boolean)("UiLauncherLogo") Then
                 FrmStart = New SplashScreen("Images\icon.ico")

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -11,6 +11,11 @@ Public Class FormMain
         Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
         '统计更新日志条目
         If BuildType = BuildTypes.Release Then
+            If LastVersion < 404 Then 'Release 2.12.8.2
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：Windows 7 无法正常联网"))
+                FeatureCount += 1
+                BugCount += 2
+            End If
             If LastVersion < 402 Then 'Release 2.12.8.1
                 FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：升级框架到 .NET Framework 4.8"))
                 FeatureCount += 35
@@ -74,6 +79,11 @@ Public Class FormMain
             '3：BUG+ IMP* FEAT-
             '2：BUG* IMP-
             '1：BUG-
+            If LastVersion < 403 Then 'Snapshot 2.12.8.2
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：Windows 7 无法正常联网"))
+                FeatureCount += 1
+                BugCount += 2
+            End If
             If LastVersion < 401 Then 'Snapshot 2.12.8.1
                 FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：可能无法更换披风"))
                 FeatureCount += 8

Plain Craft Launcher 2/Modules/Base/ModBase.vb

@@ -10,12 +10,12 @@ Public Module ModBase
 #Region "声明"
 
     '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.12.8.1" '显示用版本名
+    Public Const VersionBaseName As String = "2.12.8.2" '显示用版本名
     Public Const CommitHash As String = "" 'Commit Hash，由 GitHub Workflow 自动替换
 #If RELEASE Then
-    Public Const VersionCode As Integer = 402 '正式版
+    Public Const VersionCode As Integer = 404 '正式版
 #Else
-    Public Const VersionCode As Integer = 401 '快照版
+    Public Const VersionCode As Integer = 403 '快照版
 #End If
 
     '版本信息

Plain Craft Launcher 2/Modules/Resource/ResourceVersion.vb

@@ -178,19 +178,21 @@ Public Class ResourceVersion
                     .Size = File("size")
                     .Hash = File("hashes")("sha1")
                 End If
-                'Loaders
+                '类别
                 '结果可能混杂着 Mod、数据包和服务端插件
                 Dim RawLoaders As List(Of String) = Data("loaders").Select(Function(v) v.ToString).ToList
                 .ModLoaders = ModLoaders.None
                 If .ResourceType.HasFlag(ResourceTypes.Mod) OrElse .ResourceType.HasFlag(ResourceTypes.DataPack) Then
                     If RawLoaders.Intersect({"bukkit", "folia", "paper", "purpur", "spigot"}).Any() Then .ResourceType = ResourceTypes.Plugin 'Veinminer Enchantment 同时支持服务端与 Fabric
                     If RawLoaders.Contains("datapack") Then .ResourceType = ResourceTypes.DataPack
-                    For Each Loader As ModLoaders In EnumUtils.GetAllFlags(Of ModLoaders)()
-                        If RawLoaders.Contains(Loader.ToString.Lower) Then .ModLoaders = .ModLoaders Or Loader : .ResourceType = ResourceTypes.Mod
-                    Next
+                    If EnumUtils.GetAllFlags(Of ModLoaders)().Any() Then .ResourceType = ResourceTypes.Mod
                 Else
                     '使用传入的类别，不作修改（#8377）
                 End If
+                'Loaders
+                For Each Loader As ModLoaders In EnumUtils.GetAllFlags(Of ModLoaders)()
+                    If RawLoaders.Contains(Loader.ToString.Lower) Then .ModLoaders = .ModLoaders Or Loader
+                Next
                 'Dependencies
                 If Data.ContainsKey("dependencies") Then
                     .RawDependencies = Data("dependencies").
@@ -350,14 +352,14 @@ Public Class ResourceVersion
                 .Title = If(IsBadDisplay, FileName, Display)
                 .Logo = $"{PathImage}ReleaseTypes/{ReleaseType}.png"
                 AddHandler .Click, ClickHandler
-
                 '描述
                 .Info =
                 Iterator Function()
+                    If ModLoaders <> ModLoaders.None Then Yield ModLoaders.Flags.Join("、"c)
                     If .Title <> FileName.BeforeLast(".") Then Yield FileName.BeforeLast(".")
                     If Dependencies.Any Then Yield $"{Dependencies.Count} 项前置"
                     If GameVersions.All(Function(v) Not v.Contains(".") OrElse {"w", "snapshot", "rc", "pre", "experimental", "-"}.Any(Function(s) v.ContainsIgnoreCase(s))) Then Yield $"游戏版本 {GameVersions.Join("、"c)}"
-                    If DownloadCount > 0 Then Yield $"下载 {If(DownloadCount > 100000, Math.Round(DownloadCount / 10000) & " 万", DownloadCount)} 次" 'CurseForge 的下载次数经常错误地返回 0
+                    If DownloadCount > 0 Then Yield $"下载 {If(DownloadCount > 100000, Math.Round(DownloadCount / 10000) & " 万", DownloadCount & " ")}次" 'CurseForge 的下载次数经常错误地返回 0
                     Yield $"更新于 {GetTimeSpanString(ReleaseDate - Date.Now, False)}"
                     If ReleaseType <> ReleaseTypes.Release Then Yield ReleaseTypeDisplay
                 End Function().Join("，"c)

Plain Craft Launcher 2/My Project/AssemblyInfo.vb

@@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices
 ' 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 ' 方法是按如下所示使用“*”
 
-<Assembly: AssemblyVersion("2.12.8.1")>
-<Assembly: AssemblyFileVersion("2.12.8.1")>
+<Assembly: AssemblyVersion("2.12.8.2")>
+<Assembly: AssemblyFileVersion("2.12.8.2")>
 <Assembly: NeutralResourcesLanguage("")>

Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml

@@ -125,6 +125,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="玖" />
                         <TextBlock Margin="0,1.5,6,0" Text="自" />
                         <TextBlock Margin="0,1.5,6,0" Text="辰" />
+                        <TextBlock Margin="0,1.5,6,0" Text="程" />
                         <TextBlock Margin="0,1.5,6,0" Text="顺" />
                         <TextBlock Margin="0,1.5,6,0" Text="茧" />
                         <TextBlock Margin="0,1.5,6,0" Text="烬" />
@@ -153,6 +154,8 @@
                         <TextBlock Margin="0,1.5,6,0" Text="烨" />
                         <TextBlock Margin="0,1.5,6,0" Text="煌" />
                         <TextBlock Margin="0,1.5,6,0" Text="雲" />
+                        <TextBlock Margin="0,1.5,6,0" Text="权" />
+                        <TextBlock Margin="0,1.5,6,0" Text="91" />
                         <TextBlock Margin="0,1.5,6,0" Text="yu" />
                         <TextBlock Margin="0,1.5,6,0" Text="💬" />
                         <TextBlock Margin="0,1.5,6,0" Text="7%" />
@@ -165,9 +168,12 @@
                         <TextBlock Margin="0,1.5,6,0" Text="ZJL" />
                         <TextBlock Margin="0,1.5,6,0" Text="汐a" />
                         <TextBlock Margin="0,1.5,6,0" Text="PFF" />
+                        <TextBlock Margin="0,1.5,6,0" Text="293" />
+                        <TextBlock Margin="0,1.5,6,0" Text="Gxx" />
                         <TextBlock Margin="0,1.5,6,0" Text="ZYL" />
                         <TextBlock Margin="0,1.5,6,0" Text="LSP" />
                         <TextBlock Margin="0,1.5,6,0" Text="110" />
+                        <TextBlock Margin="0,1.5,6,0" Text="yCC" />
                         <TextBlock Margin="0,1.5,6,0" Text="Van" />
                         <TextBlock Margin="0,1.5,6,0" Text="TKK" />
                         <TextBlock Margin="0,1.5,6,0" Text="hhh" />
@@ -178,6 +184,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="君猫" />
                         <TextBlock Margin="0,1.5,6,0" Text="離鬯" />
                         <TextBlock Margin="0,1.5,6,0" Text="yihe" />
+                        <TextBlock Margin="0,1.5,6,0" Text="紫夜" />
                         <TextBlock Margin="0,1.5,6,0" Text="泽涛" />
                         <TextBlock Margin="0,1.5,6,0" Text="习页" />
                         <TextBlock Margin="0,1.5,6,0" Text="方十" />
@@ -250,6 +257,13 @@
                         <TextBlock Margin="0,1.5,6,0" Text="白杨" />
                         <TextBlock Margin="0,1.5,6,0" Text="蜼鸣" />
                         <TextBlock Margin="0,1.5,6,0" Text="皮皮" />
+                        <TextBlock Margin="0,1.5,6,0" Text="雪乃" />
+                        <TextBlock Margin="0,1.5,6,0" Text="大大" />
+                        <TextBlock Margin="0,1.5,6,0" Text="雨协" />
+                        <TextBlock Margin="0,1.5,6,0" Text="PSD" />
+                        <TextBlock Margin="0,1.5,6,0" Text="ㅤㅤ" />
+                        <TextBlock Margin="0,1.5,6,0" Text="云祈" />
+                        <TextBlock Margin="0,1.5,6,0" Text="千和" />
                         <TextBlock Margin="0,1.5,6,0" Text="YmY" />
                         <TextBlock Margin="0,1.5,6,0" Text="Enss" />
                         <TextBlock Margin="0,1.5,6,0" Text="ZHH" />
@@ -271,6 +285,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="⁣ 　 　​" />
                         <TextBlock Margin="0,1.5,6,0" Text="RKRK" />
                         <TextBlock Margin="0,1.5,6,0" Text="Neko" />
+                        <TextBlock Margin="0,1.5,6,0" Text="OMO" />
                         <TextBlock Margin="0,1.5,6,0" Text="verge" />
                         <TextBlock Margin="0,1.5,6,0" Text="ciel希" />
                         <TextBlock Margin="0,1.5,6,0" Text="Tarka" />
@@ -280,6 +295,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="Eiligo" />
                         <TextBlock Margin="0,1.5,6,0" Text="友人A" />
                         <TextBlock Margin="0,1.5,6,0" Text="jiagar" />
+                        <TextBlock Margin="0,1.5,6,0" Text="TGBN" />
                         <TextBlock Margin="0,1.5,6,0" Text="RANX" />
                         <TextBlock Margin="0,1.5,6,0" Text="hanm" />
                         <TextBlock Margin="0,1.5,6,0" Text="Akula" />
@@ -348,6 +364,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="辞熙语" />
                         <TextBlock Margin="0,1.5,6,0" Text="鸿小运" />
                         <TextBlock Margin="0,1.5,6,0" Text="陈两仪" />
+                        <TextBlock Margin="0,1.5,6,0" Text="耶木木" />
                         <TextBlock Margin="0,1.5,6,0" Text="叶辛梓" />
                         <TextBlock Margin="0,1.5,6,0" Text="窗锁昼" />
                         <TextBlock Margin="0,1.5,6,0" Text="泠晖晖" />
@@ -361,11 +378,20 @@
                         <TextBlock Margin="0,1.5,6,0" Text="滑稽君" />
                         <TextBlock Margin="0,1.5,6,0" Text="悔轮台" />
                         <TextBlock Margin="0,1.5,6,0" Text="懒洋洋" />
+                        <TextBlock Margin="0,1.5,6,0" Text="杜子春" />
+                        <TextBlock Margin="0,1.5,6,0" Text="狐小依" />
+                        <TextBlock Margin="0,1.5,6,0" Text="秦小康" />
+                        <TextBlock Margin="0,1.5,6,0" Text="步弑衰" />
+                        <TextBlock Margin="0,1.5,6,0" Text="离弥夜" />
+                        <TextBlock Margin="0,1.5,6,0" Text="泉此方" />
+                        <TextBlock Margin="0,1.5,6,0" Text="大鹅肝" />
+                        <TextBlock Margin="0,1.5,6,0" Text="陈曦涵" />
                         <TextBlock Margin="0,1.5,6,0" Text="ITMTX" />
                         <TextBlock Margin="0,1.5,6,0" Text="SEKGY" />
                         <TextBlock Margin="0,1.5,6,0" Text="111sui" />
                         <TextBlock Margin="0,1.5,6,0" Text="0fore0" />
                         <TextBlock Margin="0,1.5,6,0" Text="zkmz4" />
+                        <TextBlock Margin="0,1.5,6,0" Text="kakuxi" />
                         <TextBlock Margin="0,1.5,6,0" Text="Du1yn" />
                         <TextBlock Margin="0,1.5,6,0" Text="Dshiya" />
                         <TextBlock Margin="0,1.5,6,0" Text="G-next" />
@@ -398,10 +424,13 @@
                         <TextBlock Margin="0,1.5,6,0" Text="super9y" />
                         <TextBlock Margin="0,1.5,6,0" Text="DUANG" />
                         <TextBlock Margin="0,1.5,6,0" Text="Foxman" />
+                        <TextBlock Margin="0,1.5,6,0" Text="夜Ynigh" />
                         <TextBlock Margin="0,1.5,6,0" Text="goblind" />
                         <TextBlock Margin="0,1.5,6,0" Text="NeroicX" />
                         <TextBlock Margin="0,1.5,6,0" Text="章鱼B26" />
                         <TextBlock Margin="0,1.5,6,0" Text="李領link" />
+                        <TextBlock Margin="0,1.5,6,0" Text="BugXLG" />
+                        <TextBlock Margin="0,1.5,6,0" Text="big bird" />
                         <TextBlock Margin="0,1.5,6,0" Text="^－_－^" />
                         <TextBlock Margin="0,1.5,6,0" Text="筱星辰⭐" />
                         <TextBlock Margin="0,1.5,6,0" Text="Flawless" />
@@ -477,6 +506,9 @@
                         <TextBlock Margin="0,1.5,6,0" Text="隔壁的熊" />
                         <TextBlock Margin="0,1.5,6,0" Text="星辰彼方" />
                         <TextBlock Margin="0,1.5,6,0" Text="霜笙雪落" />
+                        <TextBlock Margin="0,1.5,6,0" Text="阿八阿八" />
+                        <TextBlock Margin="0,1.5,6,0" Text="。。。。" />
+                        <TextBlock Margin="0,1.5,6,0" Text="秋雨随深" />
                         <TextBlock Margin="0,1.5,6,0" Text="muming" />
                         <TextBlock Margin="0,1.5,6,0" Text="纸币ORZ" />
                         <TextBlock Margin="0,1.5,6,0" Text="Thorium" />
@@ -503,6 +535,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="PierceShi" />
                         <TextBlock Margin="0,1.5,6,0" Text="Bu1e_Cat" />
                         <TextBlock Margin="0,1.5,6,0" Text="NuoMi_Z" />
+                        <TextBlock Margin="0,1.5,6,0" Text="Reznorak" />
                         <TextBlock Margin="0,1.5,6,0" Text="Zikyeung" />
                         <TextBlock Margin="0,1.5,6,0" Text="添加剂ing" />
                         <TextBlock Margin="0,1.5,6,0" Text="Luangum" />
@@ -510,6 +543,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="wanglizhi" />
                         <TextBlock Margin="0,1.5,6,0" Text="chen0701" />
                         <TextBlock Margin="0,1.5,6,0" Text="FXXKGUN" />
+                        <TextBlock Margin="0,1.5,6,0" Text="王柴柴MC" />
                         <TextBlock Margin="0,1.5,6,0" Text="江寒_John" />
                         <TextBlock Margin="0,1.5,6,0" Text="bentianjia" />
                         <TextBlock Margin="0,1.5,6,0" Text="yukihomu" />
@@ -552,6 +586,8 @@
                         <TextBlock Margin="0,1.5,6,0" Text="一只木元鸽" />
                         <TextBlock Margin="0,1.5,6,0" Text="这是江江叭" />
                         <TextBlock Margin="0,1.5,6,0" Text="柒月贰拾捌" />
+                        <TextBlock Margin="0,1.5,6,0" Text="阳光猪肉佬" />
+                        <TextBlock Margin="0,1.5,6,0" Text="一只胖头鱼" />
                         <TextBlock Margin="0,1.5,6,0" Text="kiboAlong" />
                         <TextBlock Margin="0,1.5,6,0" Text="W.D.gaster" />
                         <TextBlock Margin="0,1.5,6,0" Text="星野源.小毅" />
@@ -561,6 +597,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="Stevens520" />
                         <TextBlock Margin="0,1.5,6,0" Text="123456。？" />
                         <TextBlock Margin="0,1.5,6,0" Text="蛋白质_变质" />
+                        <TextBlock Margin="0,1.5,6,0" Text="鸽子202408" />
                         <TextBlock Margin="0,1.5,6,0" Text="LMY666888" />
                         <TextBlock Margin="0,1.5,6,0" Text="青灯诗酒Lily" />
                         <TextBlock Margin="0,1.5,6,0" Text="sheng_1062" />
@@ -599,6 +636,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="ン黑色幽默🏮" />
                         <TextBlock Margin="0,1.5,6,0" Text="Rinshonagon" />
                         <TextBlock Margin="0,1.5,6,0" Text="esj554611445" />
+                        <TextBlock Margin="0,1.5,6,0" Text="WildJadeLore" />
                         <TextBlock Margin="0,1.5,6,0" Text="Chara＆Chara" />
                         <TextBlock Margin="0,1.5,6,0" Text="lightning_bolt" />
                         <TextBlock Margin="0,1.5,6,0" Text="卡壬纳_Karena" />
@@ -614,6 +652,7 @@
                         <TextBlock Margin="0,1.5,6,0" Text="玩魔术的暗杀者" />
                         <TextBlock Margin="0,1.5,6,0" Text="只留清白在人间" />
                         <TextBlock Margin="0,1.5,6,0" Text="最美不过你深爱" />
+                        <TextBlock Margin="0,1.5,6,0" Text="共携赏凤城寒食" />
                         <TextBlock Margin="0,1.5,6,0" Text="maboyuaneasy" />
                         <TextBlock Margin="0,1.5,6,0" Text="Kiana   Kasiana" />
                         <TextBlock Margin="0,1.5,6,0" Text="南ིྀ熙ིྀ寒ིྀ笙ིྀ" />
@@ -635,11 +674,13 @@
                         <TextBlock Margin="0,1.5,6,0" Text="爱吃蛋白的丶圆周率" />
                         <TextBlock Margin="0,1.5,6,0" Text="祖国未来的狗尾巴草" />
                         <TextBlock Margin="0,1.5,6,0" Text="化权埵萨柯摩，隆奎" />
+                        <TextBlock Margin="0,1.5,6,0" Text="轻音部扛把子平泽唯" />
                         <TextBlock Margin="0,1.5,6,0" Text="AAA今州耙耙柑批发" />
                         <TextBlock Margin="0,1.5,6,0" Text="W0nd3rfu1 H34v3n" />
                         <TextBlock Margin="0,1.5,6,0" Text="So Sweet Bitter Days" />
                         <TextBlock Margin="0,1.5,6,0" Text="没有翅膀却想飞上天空" />
                         <TextBlock Margin="0,1.5,6,0" Text="牛至涂芥末越冲越上头" />
+                        <TextBlock Margin="0,1.5,6,0" Text="B站ID:Interesting一天" />
                         <TextBlock Margin="0,1.5,6,0" Text="正电荷PositiveCharge" />
                         <TextBlock Margin="0,1.5,6,0" Text="(ꐦ°᷄д°᷅)咱也不敢问啊" />
                         <TextBlock Margin="0,1.5,6,0" Text="༺东༃方༒闲༒人༃家༻" />