diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
index 293af35..12284ab 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
@@ -195,7 +195,7 @@ Retry:
End If
Try
Log("[ModPack] 整合包 Forge 版本:" & Id)
- ForgeVersion = Id.Split("-")(1)
+ ForgeVersion = Id.Replace("forge-", "")
Exit For
Catch ex As Exception
Log(ex, "读取整合包 Forge 版本失败:" & Id)
@@ -204,7 +204,7 @@ Retry:
'NeoForge 指定
Try
Log("[ModPack] 整合包 NeoForge 版本:" & Id)
- NeoForgeVersion = Id.Split("-")(1)
+ NeoForgeVersion = Id.Replace("neoforge-", "")
Exit For
Catch ex As Exception
Log(ex, "读取整合包 NeoForge 版本失败:" & Id)
@@ -213,7 +213,7 @@ Retry:
'Fabric 指定
Try
Log("[ModPack] 整合包 Fabric 版本:" & Id)
- FabricVersion = Id.Split("-")(1)
+ FabricVersion = Id.Replace("fabric-", "")
Exit For
Catch ex As Exception
Log(ex, "读取整合包 Fabric 版本失败:" & Id)
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
index 1304527..9d05282 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
@@ -724,6 +724,7 @@
Private Function IsOptiFineSuitForForge(OptiFine As DlOptiFineListEntry, Forge As DlForgeVersionEntry)
If Forge.Inherit <> OptiFine.Inherit Then Return False '不是同一个大版本
If OptiFine.RequiredForgeVersion Is Nothing Then Return False '不兼容 Forge
+ If OptiFine.RequiredForgeVersion = "" Then Return True
If OptiFine.RequiredForgeVersion.Contains(".") Then 'XX.X.XXX
Return VersionSortInteger(Forge.Version.ToString, OptiFine.RequiredForgeVersion) >= 0
Else 'XXXX
diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
index 58259ad..c829231 100644
--- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
+++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
@@ -38,7 +38,7 @@
false
false
true
- D:\Minecraft\程序\
+ .\Output\
Plain Craft Launcher 2.xml
41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
false
@@ -55,7 +55,7 @@
false
false
true
- D:\Minecraft\程序\
+ .\Output\
Plain Craft Launcher 2.xml
41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
false
@@ -100,7 +100,7 @@
false
- D:\Minecraft\程序\
+ .\Output\
Plain Craft Launcher 2.xml
true
1
@@ -111,7 +111,7 @@
false
- D:\Minecraft\程序\
+ .\Output\
Plain Craft Launcher 2.xml
true
1
@@ -129,7 +129,7 @@
- D:\Minecraft\程序\
+ .\Output\
RELEASE,BY_UPDATE
Plain Craft Launcher 2.xml
true