Skip to content

Commit 4f64873

Browse files
Pigeon0v0Pigeon0v0
authored
Merge pull request PCL-Community#181 from PCL-Community/main
bump: 2.10.0
2 parents ca4a126 + 172deac commit 4f64873

File tree

3 files changed

+27
-178
lines changed

3 files changed

+27
-178
lines changed

‎Plain Craft Launcher 2/FormMain.xaml.vb

+20-171
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ Public Class FormMain
1212
Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
1313
'统计更新日志条目
1414
#If RELEASE Then
15+
If LastVersion < 355 Then
16+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "同步官方版 2.8.13 代码，详情查阅龙猫专栏"))
17+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "已有版本支持自动安装修改"))
18+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持深色模式"))
19+
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "播放音乐接入 SMTC，允许使用键盘等控制"))
20+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持下载更多远古版本 MC"))
21+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优先使用高性能显卡启动游戏"))
22+
FeatureCount += 5
23+
BugCount += 9
24+
End If
1525
If LastVersion < 354 Then
1626
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持识别剪贴板资源链接并提示跳转"))
1727
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "允许禁用 Java Wrapper"))
@@ -54,78 +64,22 @@ Public Class FormMain
5464
FeatureCount += 43
5565
BugCount += 37
5666
End If
57-
If LastVersion < 342 Then 'Release 2.8.9
58-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持下载原版服务端"))
59-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "本地 Mod 的标题支持选择显示 Mod 原始文件名"))
60-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复搜索后启用/禁用 Mod 时出错的 Bug"))
61-
FeatureCount += 17
62-
BugCount += 13
63-
End If
64-
If LastVersion < 340 Then 'Release 2.8.8
65-
If LastVersion = 338 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复数个与新正版登录相关的严重 Bug"))
66-
FeatureCount += 3
67-
BugCount += 7
68-
End If
69-
If LastVersion < 338 Then 'Release 2.8.7
70-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "使用新的正版登录方式，以提高安全性"))
71-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化安装整合包、检索 Mod 的稳定性"))
72-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法加载部分 Mod 的图标的 Bug"))
73-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复在 Mod 管理页面删除 Mod 导致报错的 Bug"))
74-
FeatureCount += 11
75-
BugCount += 21
76-
End If
77-
If LastVersion < 336 Then 'Release 2.8.6
78-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "下载 Mod 时会使用 MCIM 国内镜像源"))
79-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 管理页面允许筛选可更新/启用/禁用的 Mod"))
80-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "打开 PCL 时会自动安装同目录下的 modpack.zip"))
81-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "爱发电域名迁移至 afdian.com"))
82-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复 1.20.1+ 离线登录使用正版皮肤时无法保存游戏的 Bug"))
83-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复安装的 1.14~1.15 Forge+OptiFine 无法进入世界的 Bug"))
84-
FeatureCount += 19
85-
BugCount += 24
86-
End If
87-
If LastVersion < 332 Then 'Release 2.8.3
88-
If LastVersion = 330 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复部分玩家无法启动 MC 的 Bug"))
89-
End If
90-
If LastVersion < 330 Then 'Release 2.8.2
91-
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "NeoForge 兼容与自动安装"))
92-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持编译、运行 PCL 开源代码"))
93-
FeatureCount += 15
94-
BugCount += 22
95-
End If
96-
If LastVersion < 326 Then 'Release 2.7.4
97-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "会自动隐藏明显不可用的自动安装选项"))
98-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化正版登录流程和 MC 性能"))
99-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复正版登录时弹出脚本错误提示的 Bug"))
100-
FeatureCount += 17
101-
BugCount += 19
102-
End If
103-
If LastVersion < 323 Then 'Release 2.7.3
104-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "添加 启动游戏前进行内存优化 设置"))
105-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化 MC 性能"))
106-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复安装 OptiFine 有概率失败的 Bug"))
107-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复启动 Fabric 1.20.5+ 时无法正确选择 Java 的 Bug"))
108-
FeatureCount += 22
109-
BugCount += 21
110-
End If
111-
If LastVersion < 321 Then 'Release 2.7.1
112-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复启动部分整合包导致设置丢失的 Bug"))
113-
BugCount += 1
114-
End If
115-
If LastVersion < 319 Then 'Release 2.7.0
116-
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持更新 Mod"))
117-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持查看可更新的 Mod 的更新日志"))
118-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持滑动鼠标快速选中、取消选中多个 Mod"))
119-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法启动 MC 24w14a+ 的 Bug"))
120-
FeatureCount += 10
121-
BugCount += 10
122-
End If
12367
#Else
12468
'5： FEAT+
12569
'4： IMP+ FEAT*
12670
'3：BUG+ IMP* FEAT-
12771
'2：BUG* IMP-
12872
'1：BUG-
73+
If LastVersion < 355 Then
74+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "同步官方版 2.8.13 代码，详情查阅龙猫专栏"))
75+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "已有版本支持自动安装修改"))
76+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持深色模式"))
77+
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "播放音乐接入 SMTC，允许使用键盘等控制"))
78+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持下载更多远古版本 MC"))
79+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优先使用高性能显卡启动游戏"))
80+
FeatureCount += 5
81+
BugCount += 9
82+
End If
12983
If LastVersion < 354 Then
13084
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持识别剪贴板资源链接并提示跳转"))
13185
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "允许禁用 Java Wrapper"))
@@ -163,111 +117,6 @@ Public Class FormMain
163117
If LastVersion < 346 Then 'Snapshot 2.8.12
164118
If LastVersion = 345 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复帮助页面报错的 Bug"))
165119
End If
166-
If LastVersion < 345 Then 'Snapshot 2.8.11
167-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 管理页面添加下载 Mod、安装 Mod 选项"))
168-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 详情页面支持按加载器、游戏版本进行分类和筛选"))
169-
FeatureCount += 23
170-
BugCount += 21
171-
End If
172-
If LastVersion < 343 Then 'Snapshot 2.8.10
173-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持安装同时包含 modpack 文件和启动器的懒人包"))
174-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "优化整合包导入流程"))
175-
FeatureCount += 20
176-
BugCount += 16
177-
End If
178-
If LastVersion < 341 Then 'Snapshot 2.8.9
179-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持下载原版服务端"))
180-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "本地 Mod 的标题支持选择显示 Mod 原始文件名"))
181-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复搜索后启用/禁用 Mod 时出错的 Bug"))
182-
FeatureCount += 17
183-
BugCount += 13
184-
End If
185-
If LastVersion < 339 Then 'Snapshot 2.8.8
186-
If LastVersion = 337 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复数个与新正版登录相关的严重 Bug"))
187-
FeatureCount += 3
188-
BugCount += 7
189-
End If
190-
If LastVersion < 337 Then 'Snapshot 2.8.7
191-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "使用新的正版登录方式，以提高安全性"))
192-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化安装整合包、检索 Mod 的稳定性"))
193-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法加载部分 Mod 的图标的 Bug"))
194-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复在 Mod 管理页面删除 Mod 导致报错的 Bug"))
195-
FeatureCount += 11
196-
BugCount += 21
197-
End If
198-
If LastVersion < 335 Then 'Snapshot 2.8.6
199-
BugCount += 2
200-
End If
201-
If LastVersion < 334 Then 'Snapshot 2.8.5
202-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 管理页面允许筛选可更新/启用/禁用的 Mod"))
203-
If LastVersion = 333 Then
204-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装愚人节和预发布版本的 Bug"))
205-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法导出错误报告的 Bug"))
206-
End If
207-
FeatureCount += 6
208-
BugCount += 7
209-
End If
210-
If LastVersion < 333 Then 'Snapshot 2.8.4
211-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "下载 Mod 时会使用 MCIM 国内镜像源"))
212-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "打开 PCL 时会自动安装同目录下的 modpack.zip"))
213-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "爱发电域名迁移至 afdian.com"))
214-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复 1.20.1+ 离线登录使用正版皮肤时无法保存游戏的 Bug"))
215-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复安装的 1.14~1.15 Forge+OptiFine 无法进入世界的 Bug"))
216-
FeatureCount += 13
217-
BugCount += 17
218-
End If
219-
If LastVersion < 331 Then 'Snapshot 2.8.3
220-
If LastVersion = 329 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复部分玩家无法启动 MC 的 Bug"))
221-
End If
222-
If LastVersion < 329 Then 'Snapshot 2.8.2
223-
If LastVersion >= 327 Then
224-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装 Beta 版 NeoForge 的整合包的 Bug"))
225-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复自动安装无法选择部分 OptiFine 的 Bug"))
226-
End If
227-
FeatureCount += 4
228-
BugCount += 8
229-
End If
230-
If LastVersion < 328 Then 'Snapshot 2.8.1
231-
If LastVersion = 327 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装 Forge 1.12.2- 的 Bug"))
232-
If LastVersion = 327 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法输入解锁码的 Bug"))
233-
If LastVersion = 327 Then BugCount += 1
234-
End If
235-
If LastVersion < 327 Then 'Snapshot 2.8.0
236-
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "NeoForge 兼容与自动安装"))
237-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持编译、运行 PCL 开源代码"))
238-
FeatureCount += 11
239-
BugCount += 14
240-
End If
241-
If LastVersion < 325 Then 'Snapshot 2.7.4
242-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "会自动隐藏明显不可用的自动安装选项"))
243-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化正版登录流程和 MC 性能"))
244-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复正版登录时弹出脚本错误提示的 Bug"))
245-
FeatureCount += 17
246-
BugCount += 19
247-
End If
248-
If LastVersion < 324 Then 'Snapshot 2.7.3
249-
FeatureCount += 4
250-
BugCount += 3
251-
End If
252-
If LastVersion < 322 Then 'Snapshot 2.7.2
253-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "添加 启动游戏前进行内存优化 设置"))
254-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复安装 OptiFine 有概率失败的 Bug"))
255-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复启动 Fabric 1.20.5+ 时无法正确选择 Java 的 Bug"))
256-
FeatureCount += 18
257-
BugCount += 18
258-
End If
259-
If LastVersion < 320 Then 'Snapshot 2.7.1
260-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复启动部分整合包导致设置丢失的 Bug"))
261-
BugCount += 1
262-
End If
263-
If LastVersion < 318 Then 'Snapshot 2.7.0
264-
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持更新 Mod"))
265-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持查看可更新的 Mod 的更新日志"))
266-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持滑动鼠标快速选中、取消选中多个 Mod"))
267-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法启动 MC 24w14a+ 的 Bug"))
268-
FeatureCount += 10
269-
BugCount += 10
270-
End If
271120
#End If
272121
'整理更新日志文本
273122
Dim ContentList As New List(Of String)

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Public Module ModBase
1212
#Region "声明"
1313

1414
'下列版本信息由更新器自动修改
15-
Public Const VersionBaseName As String = "2.9.5" '不含分支前缀的显示用版本名
16-
Public Const VersionStandardCode As String = "2.9.5." & VersionBranchCode '标准格式的四段式版本号
15+
Public Const VersionBaseName As String = "2.10.0" '不含分支前缀的显示用版本名
16+
Public Const VersionStandardCode As String = "2.10.0." & VersionBranchCode '标准格式的四段式版本号
1717
Public Const CommitHash As String = "native" 'Commit Hash，由 GitHub Workflow 自动替换
1818
Public CommitHashShort As String = If(CommitHash = "native", "native", CommitHash.Substring(0, 7)) 'Commit Hash，取前 7 位
19-
Public Const UpstreamVersion As String = "2.8.12" '上游版本
19+
Public Const UpstreamVersion As String = "2.8.13" '上游版本
2020
#If RELEASE Then
21-
Public Const VersionCode As Integer = 354 'Release
21+
Public Const VersionCode As Integer = 355 'Release
2222
#Else
23-
Public Const VersionCode As Integer = 354 'Snapshot
23+
Public Const VersionCode As Integer = 355 'Snapshot
2424
#End If
2525
'自动生成的版本信息
2626
Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ Imports System.Runtime.InteropServices
5252
' 方法是按如下所示使用“*”
5353

5454

55-
<Assembly: AssemblyVersion("2.9.5.0")>
56-
<Assembly: AssemblyFileVersion("2.9.5.0")>
55+
<Assembly: AssemblyVersion("2.10.0.0")>
56+
<Assembly: AssemblyFileVersion("2.10.0.0")>
5757
<Assembly: NeutralResourcesLanguage("")>

0 commit comments

Comments
 (0)