diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index d5a0738..e25534b 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -14,9 +14,9 @@ Public Module ModBase Public Const VersionBaseName As String = "2.5.3" '不含分支前缀的显示用版本名 Public Const VersionStandardCode As String = "2.5.3." & VersionBranchCode '标准格式的四段式版本号 #If BETA Then - Public Const VersionCode As Integer = 287 'Release + Public Const VersionCode As Integer = 286 'Release #Else - Public Const VersionCode As Integer = 285 'Snapshot + Public Const VersionCode As Integer = 288 'Snapshot #End If '自动生成的版本信息 Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName @@ -1358,8 +1358,6 @@ Re: CommonReason = "PCL 的运行环境存在问题。请尝试重新安装 .NET Framework 4.6.2 然后再试。" ElseIf TypeOf InnerEx Is UnauthorizedAccessException Then CommonReason = "PCL 的权限不足。请尝试右键 PCL,选择以管理员身份运行。" - ElseIf TypeOf InnerEx Is System.Runtime.InteropServices.COMException Then - CommonReason = "你的电脑系统进程崩溃,PCL 的运行环境出现问题,或者电脑设置、驱动存在问题。请尝试重启 PCL。" ElseIf TypeOf InnerEx Is OutOfMemoryException Then CommonReason = "你的电脑运行内存不足,导致 PCL 无法继续运行。请在关闭一部分不需要的程序后再试。" ElseIf TypeOf InnerEx Is Runtime.InteropServices.COMException Then diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb index 93b7769..b903d13 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb @@ -596,8 +596,8 @@ NoExName: ''' Public ReadOnly Property CanContinue As Boolean Get - If Tag.StartsWith("/") Then Storage.CurseForgeTotal = 0 - If Tag.EndsWith("/") Then Storage.ModrinthTotal = 0 + If Tag.StartsWith("/") OrElse Not Source.HasFlag(CompSourceType.CurseForge) Then Storage.CurseForgeTotal = 0 + If Tag.EndsWith("/") OrElse Not Source.HasFlag(CompSourceType.Modrinth) Then Storage.ModrinthTotal = 0 If Storage.CurseForgeTotal = -1 OrElse Storage.ModrinthTotal = -1 Then Return True Return Storage.CurseForgeOffset < Storage.CurseForgeTotal OrElse Storage.ModrinthOffset < Storage.ModrinthTotal End Get diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb index 4eb1288..79bd552 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb @@ -485,7 +485,6 @@ Done: If LogMc.Contains("Unsupported class file major version") Then AppendReason(CrashReason.Java版本不兼容) If LogMc.Contains("Invalid module name: '' is not a Java identifier") Then AppendReason(CrashReason.Mod名称包含特殊字符) If LogMc.Contains("java.lang.UnsupportedClassVersionError: net/fabricmc/loader/impl/launch/knot/KnotClient : Unsupported major.minor version") Then AppendReason(CrashReason.Java版本不兼容) - If LogMc.Contains("Invalid module name: '' is not a Java identifier") Then AppendReason(CrashReason.模组名称中未含合法字符) If LogMc.Contains("Could not reserve enough space") Then If LogMc.Contains("for 1048576KB object heap") Then AppendReason(CrashReason.使用32位Java导致JVM无法分配足够多的内存)