Skip to content

Commit 9be217f

Browse files
LTCattLTCatt
committed
2.12.8.2
1 parent 4d51dda commit 9be217f

8 files changed

Lines changed: 69 additions & 13 deletions

File tree

‎MeloongCore‎

‎PCLCS/Constants.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ public static class Versions {
7171
/// <summary>
7272
/// Minecraft 本地实例信息缓存的版本号。
7373
/// </summary>
74-
public const int MCINSTANCE_CACHE_VERSION = 37;
74+
public const int MCINSTANCE_CACHE_VERSION = 38;
7575
}

‎Plain Craft Launcher 2/Application.xaml.vb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ RetryCacheCheck:
106106
ServicePointManager.UseNagleAlgorithm = False
107107
ServicePointManager.EnableDnsRoundRobin = True
108108
ServicePointManager.ReusePort = True
109+
If Environment.OSVersion.Version < New Version(6, 2) Then 'Windows 7 回退（#8519）
110+
ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 Or SecurityProtocolType.Tls Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12
111+
End If
109112
'设置初始窗口
110113
If Settings.Get(Of Boolean)("UiLauncherLogo") Then
111114
FrmStart = New SplashScreen("Images\icon.ico")

‎Plain Craft Launcher 2/FormMain.xaml.vb‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ Public Class FormMain
1111
Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
1212
'统计更新日志条目
1313
If BuildType = BuildTypes.Release Then
14+
If LastVersion < 404 Then 'Release 2.12.8.2
15+
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：Windows 7 无法正常联网"))
16+
FeatureCount += 1
17+
BugCount += 2
18+
End If
1419
If LastVersion < 402 Then 'Release 2.12.8.1
1520
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：升级框架到 .NET Framework 4.8"))
1621
FeatureCount += 35
@@ -74,6 +79,11 @@ Public Class FormMain
7479
'3：BUG+ IMP* FEAT-
7580
'2：BUG* IMP-
7681
'1：BUG-
82+
If LastVersion < 403 Then 'Snapshot 2.12.8.2
83+
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：Windows 7 无法正常联网"))
84+
FeatureCount += 1
85+
BugCount += 2
86+
End If
7787
If LastVersion < 401 Then 'Snapshot 2.12.8.1
7888
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：可能无法更换披风"))
7989
FeatureCount += 8

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ Public Module ModBase
1010
#Region "声明"
1111

1212
'下列版本信息由更新器自动修改
13-
Public Const VersionBaseName As String = "2.12.8.1" '显示用版本名
13+
Public Const VersionBaseName As String = "2.12.8.2" '显示用版本名
1414
Public Const CommitHash As String = "" 'Commit Hash，由 GitHub Workflow 自动替换
1515
#If RELEASE Then
16-
Public Const VersionCode As Integer = 402 '正式版
16+
Public Const VersionCode As Integer = 404 '正式版
1717
#Else
18-
Public Const VersionCode As Integer = 401 '快照版
18+
Public Const VersionCode As Integer = 403 '快照版
1919
#End If
2020

2121
'版本信息

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,19 +178,21 @@ Public Class ResourceVersion
178178
.Size = File("size")
179179
.Hash = File("hashes")("sha1")
180180
End If
181-
'Loaders
181+
'类别
182182
'结果可能混杂着 Mod、数据包和服务端插件
183183
Dim RawLoaders As List(Of String) = Data("loaders").Select(Function(v) v.ToString).ToList
184184
.ModLoaders = ModLoaders.None
185185
If .ResourceType.HasFlag(ResourceTypes.Mod) OrElse .ResourceType.HasFlag(ResourceTypes.DataPack) Then
186186
If RawLoaders.Intersect({"bukkit", "folia", "paper", "purpur", "spigot"}).Any() Then .ResourceType = ResourceTypes.Plugin 'Veinminer Enchantment 同时支持服务端与 Fabric
187187
If RawLoaders.Contains("datapack") Then .ResourceType = ResourceTypes.DataPack
188-
For Each Loader As ModLoaders In EnumUtils.GetAllFlags(Of ModLoaders)()
189-
If RawLoaders.Contains(Loader.ToString.Lower) Then .ModLoaders = .ModLoaders Or Loader : .ResourceType = ResourceTypes.Mod
190-
Next
188+
If EnumUtils.GetAllFlags(Of ModLoaders)().Any() Then .ResourceType = ResourceTypes.Mod
191189
Else
192190
'使用传入的类别，不作修改（#8377）
193191
End If
192+
'Loaders
193+
For Each Loader As ModLoaders In EnumUtils.GetAllFlags(Of ModLoaders)()
194+
If RawLoaders.Contains(Loader.ToString.Lower) Then .ModLoaders = .ModLoaders Or Loader
195+
Next
194196
'Dependencies
195197
If Data.ContainsKey("dependencies") Then
196198
.RawDependencies = Data("dependencies").
@@ -350,14 +352,14 @@ Public Class ResourceVersion
350352
.Title = If(IsBadDisplay, FileName, Display)
351353
.Logo = $"{PathImage}ReleaseTypes/{ReleaseType}.png"
352354
AddHandler .Click, ClickHandler
353-
354355
'描述
355356
.Info =
356357
Iterator Function()
358+
If ModLoaders <> ModLoaders.None Then Yield ModLoaders.Flags.Join("、"c)
357359
If .Title <> FileName.BeforeLast(".") Then Yield FileName.BeforeLast(".")
358360
If Dependencies.Any Then Yield $"{Dependencies.Count} 项前置"
359361
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)}"
360-
If DownloadCount > 0 Then Yield $"下载 {If(DownloadCount > 100000, Math.Round(DownloadCount / 10000) & " 万", DownloadCount)} 次" 'CurseForge 的下载次数经常错误地返回 0
362+
If DownloadCount > 0 Then Yield $"下载 {If(DownloadCount > 100000, Math.Round(DownloadCount / 10000) & " 万", DownloadCount & " ")}次" 'CurseForge 的下载次数经常错误地返回 0
361363
Yield $"更新于 {GetTimeSpanString(ReleaseDate - Date.Now, False)}"
362364
If ReleaseType <> ReleaseTypes.Release Then Yield ReleaseTypeDisplay
363365
End Function().Join("，"c)

‎Plain Craft Launcher 2/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices
5151
' 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
5252
' 方法是按如下所示使用“*”
5353

54-
<Assembly: AssemblyVersion("2.12.8.1")>
55-
<Assembly: AssemblyFileVersion("2.12.8.1")>
54+
<Assembly: AssemblyVersion("2.12.8.2")>
55+
<Assembly: AssemblyFileVersion("2.12.8.2")>
5656
<Assembly: NeutralResourcesLanguage("")>

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
<TextBlock Margin="0,1.5,6,0" Text="玖" />
126126
<TextBlock Margin="0,1.5,6,0" Text="自" />
127127
<TextBlock Margin="0,1.5,6,0" Text="辰" />
128+
<TextBlock Margin="0,1.5,6,0" Text="程" />
128129
<TextBlock Margin="0,1.5,6,0" Text="顺" />
129130
<TextBlock Margin="0,1.5,6,0" Text="茧" />
130131
<TextBlock Margin="0,1.5,6,0" Text="烬" />
@@ -153,6 +154,8 @@
153154
<TextBlock Margin="0,1.5,6,0" Text="烨" />
154155
<TextBlock Margin="0,1.5,6,0" Text="煌" />
155156
<TextBlock Margin="0,1.5,6,0" Text="雲" />
157+
<TextBlock Margin="0,1.5,6,0" Text="权" />
158+
<TextBlock Margin="0,1.5,6,0" Text="91" />
156159
<TextBlock Margin="0,1.5,6,0" Text="yu" />
157160
<TextBlock Margin="0,1.5,6,0" Text="💬" />
158161
<TextBlock Margin="0,1.5,6,0" Text="7%" />
@@ -165,9 +168,12 @@
165168
<TextBlock Margin="0,1.5,6,0" Text="ZJL" />
166169
<TextBlock Margin="0,1.5,6,0" Text="汐a" />
167170
<TextBlock Margin="0,1.5,6,0" Text="PFF" />
171+
<TextBlock Margin="0,1.5,6,0" Text="293" />
172+
<TextBlock Margin="0,1.5,6,0" Text="Gxx" />
168173
<TextBlock Margin="0,1.5,6,0" Text="ZYL" />
169174
<TextBlock Margin="0,1.5,6,0" Text="LSP" />
170175
<TextBlock Margin="0,1.5,6,0" Text="110" />
176+
<TextBlock Margin="0,1.5,6,0" Text="yCC" />
171177
<TextBlock Margin="0,1.5,6,0" Text="Van" />
172178
<TextBlock Margin="0,1.5,6,0" Text="TKK" />
173179
<TextBlock Margin="0,1.5,6,0" Text="hhh" />
@@ -178,6 +184,7 @@
178184
<TextBlock Margin="0,1.5,6,0" Text="君猫" />
179185
<TextBlock Margin="0,1.5,6,0" Text="離鬯" />
180186
<TextBlock Margin="0,1.5,6,0" Text="yihe" />
187+
<TextBlock Margin="0,1.5,6,0" Text="紫夜" />
181188
<TextBlock Margin="0,1.5,6,0" Text="泽涛" />
182189
<TextBlock Margin="0,1.5,6,0" Text="习页" />
183190
<TextBlock Margin="0,1.5,6,0" Text="方十" />
@@ -250,6 +257,13 @@
250257
<TextBlock Margin="0,1.5,6,0" Text="白杨" />
251258
<TextBlock Margin="0,1.5,6,0" Text="蜼鸣" />
252259
<TextBlock Margin="0,1.5,6,0" Text="皮皮" />
260+
<TextBlock Margin="0,1.5,6,0" Text="雪乃" />
261+
<TextBlock Margin="0,1.5,6,0" Text="大大" />
262+
<TextBlock Margin="0,1.5,6,0" Text="雨协" />
263+
<TextBlock Margin="0,1.5,6,0" Text="PSD" />
264+
<TextBlock Margin="0,1.5,6,0" Text="ㅤㅤ" />
265+
<TextBlock Margin="0,1.5,6,0" Text="云祈" />
266+
<TextBlock Margin="0,1.5,6,0" Text="千和" />
253267
<TextBlock Margin="0,1.5,6,0" Text="YmY" />
254268
<TextBlock Margin="0,1.5,6,0" Text="Enss" />
255269
<TextBlock Margin="0,1.5,6,0" Text="ZHH" />
@@ -271,6 +285,7 @@
271285
<TextBlock Margin="0,1.5,6,0" Text="⁣ 　 　​" />
272286
<TextBlock Margin="0,1.5,6,0" Text="RKRK" />
273287
<TextBlock Margin="0,1.5,6,0" Text="Neko" />
288+
<TextBlock Margin="0,1.5,6,0" Text="OMO" />
274289
<TextBlock Margin="0,1.5,6,0" Text="verge" />
275290
<TextBlock Margin="0,1.5,6,0" Text="ciel希" />
276291
<TextBlock Margin="0,1.5,6,0" Text="Tarka" />
@@ -280,6 +295,7 @@
280295
<TextBlock Margin="0,1.5,6,0" Text="Eiligo" />
281296
<TextBlock Margin="0,1.5,6,0" Text="友人A" />
282297
<TextBlock Margin="0,1.5,6,0" Text="jiagar" />
298+
<TextBlock Margin="0,1.5,6,0" Text="TGBN" />
283299
<TextBlock Margin="0,1.5,6,0" Text="RANX" />
284300
<TextBlock Margin="0,1.5,6,0" Text="hanm" />
285301
<TextBlock Margin="0,1.5,6,0" Text="Akula" />
@@ -348,6 +364,7 @@
348364
<TextBlock Margin="0,1.5,6,0" Text="辞熙语" />
349365
<TextBlock Margin="0,1.5,6,0" Text="鸿小运" />
350366
<TextBlock Margin="0,1.5,6,0" Text="陈两仪" />
367+
<TextBlock Margin="0,1.5,6,0" Text="耶木木" />
351368
<TextBlock Margin="0,1.5,6,0" Text="叶辛梓" />
352369
<TextBlock Margin="0,1.5,6,0" Text="窗锁昼" />
353370
<TextBlock Margin="0,1.5,6,0" Text="泠晖晖" />
@@ -361,11 +378,20 @@
361378
<TextBlock Margin="0,1.5,6,0" Text="滑稽君" />
362379
<TextBlock Margin="0,1.5,6,0" Text="悔轮台" />
363380
<TextBlock Margin="0,1.5,6,0" Text="懒洋洋" />
381+
<TextBlock Margin="0,1.5,6,0" Text="杜子春" />
382+
<TextBlock Margin="0,1.5,6,0" Text="狐小依" />
383+
<TextBlock Margin="0,1.5,6,0" Text="秦小康" />
384+
<TextBlock Margin="0,1.5,6,0" Text="步弑衰" />
385+
<TextBlock Margin="0,1.5,6,0" Text="离弥夜" />
386+
<TextBlock Margin="0,1.5,6,0" Text="泉此方" />
387+
<TextBlock Margin="0,1.5,6,0" Text="大鹅肝" />
388+
<TextBlock Margin="0,1.5,6,0" Text="陈曦涵" />
364389
<TextBlock Margin="0,1.5,6,0" Text="ITMTX" />
365390
<TextBlock Margin="0,1.5,6,0" Text="SEKGY" />
366391
<TextBlock Margin="0,1.5,6,0" Text="111sui" />
367392
<TextBlock Margin="0,1.5,6,0" Text="0fore0" />
368393
<TextBlock Margin="0,1.5,6,0" Text="zkmz4" />
394+
<TextBlock Margin="0,1.5,6,0" Text="kakuxi" />
369395
<TextBlock Margin="0,1.5,6,0" Text="Du1yn" />
370396
<TextBlock Margin="0,1.5,6,0" Text="Dshiya" />
371397
<TextBlock Margin="0,1.5,6,0" Text="G-next" />
@@ -398,10 +424,13 @@
398424
<TextBlock Margin="0,1.5,6,0" Text="super9y" />
399425
<TextBlock Margin="0,1.5,6,0" Text="DUANG" />
400426
<TextBlock Margin="0,1.5,6,0" Text="Foxman" />
427+
<TextBlock Margin="0,1.5,6,0" Text="夜Ynigh" />
401428
<TextBlock Margin="0,1.5,6,0" Text="goblind" />
402429
<TextBlock Margin="0,1.5,6,0" Text="NeroicX" />
403430
<TextBlock Margin="0,1.5,6,0" Text="章鱼B26" />
404431
<TextBlock Margin="0,1.5,6,0" Text="李領link" />
432+
<TextBlock Margin="0,1.5,6,0" Text="BugXLG" />
433+
<TextBlock Margin="0,1.5,6,0" Text="big bird" />
405434
<TextBlock Margin="0,1.5,6,0" Text="^－_－^" />
406435
<TextBlock Margin="0,1.5,6,0" Text="筱星辰⭐" />
407436
<TextBlock Margin="0,1.5,6,0" Text="Flawless" />
@@ -477,6 +506,9 @@
477506
<TextBlock Margin="0,1.5,6,0" Text="隔壁的熊" />
478507
<TextBlock Margin="0,1.5,6,0" Text="星辰彼方" />
479508
<TextBlock Margin="0,1.5,6,0" Text="霜笙雪落" />
509+
<TextBlock Margin="0,1.5,6,0" Text="阿八阿八" />
510+
<TextBlock Margin="0,1.5,6,0" Text="。。。。" />
511+
<TextBlock Margin="0,1.5,6,0" Text="秋雨随深" />
480512
<TextBlock Margin="0,1.5,6,0" Text="muming" />
481513
<TextBlock Margin="0,1.5,6,0" Text="纸币ORZ" />
482514
<TextBlock Margin="0,1.5,6,0" Text="Thorium" />
@@ -503,13 +535,15 @@
503535
<TextBlock Margin="0,1.5,6,0" Text="PierceShi" />
504536
<TextBlock Margin="0,1.5,6,0" Text="Bu1e_Cat" />
505537
<TextBlock Margin="0,1.5,6,0" Text="NuoMi_Z" />
538+
<TextBlock Margin="0,1.5,6,0" Text="Reznorak" />
506539
<TextBlock Margin="0,1.5,6,0" Text="Zikyeung" />
507540
<TextBlock Margin="0,1.5,6,0" Text="添加剂ing" />
508541
<TextBlock Margin="0,1.5,6,0" Text="Luangum" />
509542
<TextBlock Margin="0,1.5,6,0" Text="CHLSama" />
510543
<TextBlock Margin="0,1.5,6,0" Text="wanglizhi" />
511544
<TextBlock Margin="0,1.5,6,0" Text="chen0701" />
512545
<TextBlock Margin="0,1.5,6,0" Text="FXXKGUN" />
546+
<TextBlock Margin="0,1.5,6,0" Text="王柴柴MC" />
513547
<TextBlock Margin="0,1.5,6,0" Text="江寒_John" />
514548
<TextBlock Margin="0,1.5,6,0" Text="bentianjia" />
515549
<TextBlock Margin="0,1.5,6,0" Text="yukihomu" />
@@ -552,6 +586,8 @@
552586
<TextBlock Margin="0,1.5,6,0" Text="一只木元鸽" />
553587
<TextBlock Margin="0,1.5,6,0" Text="这是江江叭" />
554588
<TextBlock Margin="0,1.5,6,0" Text="柒月贰拾捌" />
589+
<TextBlock Margin="0,1.5,6,0" Text="阳光猪肉佬" />
590+
<TextBlock Margin="0,1.5,6,0" Text="一只胖头鱼" />
555591
<TextBlock Margin="0,1.5,6,0" Text="kiboAlong" />
556592
<TextBlock Margin="0,1.5,6,0" Text="W.D.gaster" />
557593
<TextBlock Margin="0,1.5,6,0" Text="星野源.小毅" />
@@ -561,6 +597,7 @@
561597
<TextBlock Margin="0,1.5,6,0" Text="Stevens520" />
562598
<TextBlock Margin="0,1.5,6,0" Text="123456。？" />
563599
<TextBlock Margin="0,1.5,6,0" Text="蛋白质_变质" />
600+
<TextBlock Margin="0,1.5,6,0" Text="鸽子202408" />
564601
<TextBlock Margin="0,1.5,6,0" Text="LMY666888" />
565602
<TextBlock Margin="0,1.5,6,0" Text="青灯诗酒Lily" />
566603
<TextBlock Margin="0,1.5,6,0" Text="sheng_1062" />
@@ -599,6 +636,7 @@
599636
<TextBlock Margin="0,1.5,6,0" Text="ン黑色幽默🏮" />
600637
<TextBlock Margin="0,1.5,6,0" Text="Rinshonagon" />
601638
<TextBlock Margin="0,1.5,6,0" Text="esj554611445" />
639+
<TextBlock Margin="0,1.5,6,0" Text="WildJadeLore" />
602640
<TextBlock Margin="0,1.5,6,0" Text="Chara＆Chara" />
603641
<TextBlock Margin="0,1.5,6,0" Text="lightning_bolt" />
604642
<TextBlock Margin="0,1.5,6,0" Text="卡壬纳_Karena" />
@@ -614,6 +652,7 @@
614652
<TextBlock Margin="0,1.5,6,0" Text="玩魔术的暗杀者" />
615653
<TextBlock Margin="0,1.5,6,0" Text="只留清白在人间" />
616654
<TextBlock Margin="0,1.5,6,0" Text="最美不过你深爱" />
655+
<TextBlock Margin="0,1.5,6,0" Text="共携赏凤城寒食" />
617656
<TextBlock Margin="0,1.5,6,0" Text="maboyuaneasy" />
618657
<TextBlock Margin="0,1.5,6,0" Text="Kiana Kasiana" />
619658
<TextBlock Margin="0,1.5,6,0" Text="南ིྀ熙ིྀ寒ིྀ笙ིྀ" />
@@ -635,11 +674,13 @@
635674
<TextBlock Margin="0,1.5,6,0" Text="爱吃蛋白的丶圆周率" />
636675
<TextBlock Margin="0,1.5,6,0" Text="祖国未来的狗尾巴草" />
637676
<TextBlock Margin="0,1.5,6,0" Text="化权埵萨柯摩，隆奎" />
677+
<TextBlock Margin="0,1.5,6,0" Text="轻音部扛把子平泽唯" />
638678
<TextBlock Margin="0,1.5,6,0" Text="AAA今州耙耙柑批发" />
639679
<TextBlock Margin="0,1.5,6,0" Text="W0nd3rfu1 H34v3n" />
640680
<TextBlock Margin="0,1.5,6,0" Text="So Sweet Bitter Days" />
641681
<TextBlock Margin="0,1.5,6,0" Text="没有翅膀却想飞上天空" />
642682
<TextBlock Margin="0,1.5,6,0" Text="牛至涂芥末越冲越上头" />
683+
<TextBlock Margin="0,1.5,6,0" Text="B站ID:Interesting一天" />
643684
<TextBlock Margin="0,1.5,6,0" Text="正电荷PositiveCharge" />
644685
<TextBlock Margin="0,1.5,6,0" Text="(ꐦ°᷄д°᷅)咱也不敢问啊" />
645686
<TextBlock Margin="0,1.5,6,0" Text="༺东༃方༒闲༒人༃家༻" />

0 commit comments

Comments
 (0)