Skip to content

Commit d3ebf61

Browse files
authored
Merge branch 'PCL-Community:dev' into nzdm
2 parents b1822fe + 3bdb7dd commit d3ebf61

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

Plain Craft Launcher 2/FormMain.xaml.vb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Imports System.Windows.Interop
44
Imports System.Windows.Media.Effects
55
Imports PCL.Core.App
66
Imports PCL.Core.Logging
7+
Imports PCL.Core.UI
78
Imports PCL.Core.Utils
89
Imports PCL.Core.Utils.OS
910

@@ -74,6 +75,8 @@ Public Class FormMain
7475
'注册拖拽事件(不能直接加 Handles,否则没用;#6340)
7576
[AddHandler](DragDrop.DragEnterEvent, New DragEventHandler(AddressOf HandleDrag), handledEventsToo:=True)
7677
[AddHandler](DragDrop.DragOverEvent, New DragEventHandler(AddressOf HandleDrag), handledEventsToo:=True)
78+
‘注册 Hint 事件
79+
AddHandler HintWrapper.OnShow, AddressOf Hint
7780
'加载 UI
7881
InitializeComponent()
7982
Opacity = 0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Public Module ModBase
1919
#Region "声明"
2020

2121
'下列版本信息由更新器自动修改
22-
Public Const VersionBaseName As String = "2.13.4-beta.4" '不含分支前缀的显示用版本名
22+
Public Const VersionBaseName As String = "2.13.4-beta.5" '不含分支前缀的显示用版本名
2323
Public Const VersionStandardCode As String = "2.13.4." & VersionBranchCode
2424
Public Const UpstreamVersion As String = "2.10.5" '上游版本
2525
Public ReadOnly CommitHash As String = If(EnvironmentInterop.GetSecret("GITHUB_SHA", False), "native") 'Commit Hash
2626
Public ReadOnly CommitHashShort As String = If(CommitHash = "native", "native", CommitHash.Substring(0, 7)) 'Commit Hash,取前 7 位
27-
Public Const VersionCode As Integer = 416 '内部版本号
27+
Public Const VersionCode As Integer = 417 '内部版本号
2828
'自动生成的版本信息
2929
#If DEBUG Then
3030
Public Const VersionBranchName As String = "Debug"

Plain Craft Launcher 2/Pages/PageOther/PageOtherLog.xaml.vb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ Class PageOtherLog
3232
Public Sub LoadList()
3333
PanList.Children.Clear()
3434
Dim current = CurrentLogs
35-
For Each item In Directory.GetFiles(LogDirectory)
35+
Dim logFiles = Directory.GetFiles(LogDirectory).OrderByDescending(Function(f) File.GetLastWriteTime(f)).ToArray()
36+
For Each item In logFiles
3637
Dim fullPath = IO.Path.GetFullPath(item)
3738
Dim title = IO.Path.GetFileName(item)
3839
If title.StartsWith("Launch") Then

0 commit comments

Comments
 (0)