龙腾猫跃 пре 3 година
родитељ
комит
8a770f63cf

+ 1 - 1
Plain Craft Launcher 2/FormMain.xaml.vb

@@ -116,7 +116,7 @@ Public Class FormMain
         '3:BUG+ IMP* FEAT-
         '2:BUG* IMP-
         '1:BUG-
-        If LastVersion < 295 Then 'Snapshot 2.6.3
+        If LastVersion < 297 Then 'Snapshot 2.6.3
             FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化崩溃分析,添加多种崩溃情况的判断"))
             FeatureCount += 12
             BugCount += 14

+ 1 - 1
Plain Craft Launcher 2/Modules/Base/ModBase.vb

@@ -16,7 +16,7 @@ Public Module ModBase
 #If BETA Then
     Public Const VersionCode As Integer = 293 'Release
 #Else
-    Public Const VersionCode As Integer = 295 'Snapshot
+    Public Const VersionCode As Integer = 297 'Snapshot
 #End If
     '自动生成的版本信息
     Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName

+ 0 - 1
Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb

@@ -742,7 +742,6 @@ Retry:
             .OptiFineVersion = If(Addons.ContainsKey("optifine"), Addons("optifine"), Nothing),
             .ForgeVersion = If(Addons.ContainsKey("forge"), Addons("forge"), Nothing),
             .FabricVersion = If(Addons.ContainsKey("fabric"), Addons("fabric"), Nothing)
-            .QuiltVersion = If(Addons.ContainsKey("quilt"), Hint("PCL 暂不支持安装需要 Quilt 的整合包!", HintType.Critical), Exit Sub)
         }
         Dim InstallExpectTime As Double = 0
         For Each InstallLoader In InstallLoaders

+ 2 - 1
Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb

@@ -531,7 +531,8 @@ Finish:
     End Sub
     '启动按钮
     Public Sub LaunchButtonClick() Handles BtnLaunch.Click
-        If McLaunchLoader.State = LoadState.Loading OrElse Not BtnLaunch.IsEnabled OrElse FrmMain.PageRight.PageState <> MyPageRight.PageStates.ContentStay Then Exit Sub
+        If McLaunchLoader.State = LoadState.Loading OrElse Not BtnLaunch.IsEnabled OrElse
+            (FrmMain.PageRight IsNot Nothing AndAlso FrmMain.PageRight.PageState <> MyPageRight.PageStates.ContentStay AndAlso FrmMain.PageRight.PageState <> MyPageRight.PageStates.ContentEnter) Then Exit Sub
         '愚人节处理
         If IsAprilEnabled AndAlso Not IsAprilGiveup Then
             ThemeUnlock(12, False, "隐藏主题 滑稽彩 已解锁!")