InfStarMC/PCL-ISE
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'Hex-Dragon:main' into main

Browse Source
This commit is contained in:
allMagic
2024-07-11 16:41:50 +08:00
committed by GitHub
parent e0bd274e0d 5fb3e3a786
commit 59a05a8c71
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
+3 -3
View File
@@ -195,7 +195,7 @@ Retry:
End If End If
Try Try
Log("[ModPack] 整合包 Forge 版本：" & Id) Log("[ModPack] 整合包 Forge 版本：" & Id)
ForgeVersion = Id.Split("-")(1) ForgeVersion = Id.Replace("forge-", "")
Exit For Exit For
Catch ex As Exception Catch ex As Exception
Log(ex, "读取整合包 Forge 版本失败：" & Id) Log(ex, "读取整合包 Forge 版本失败：" & Id)
@@ -204,7 +204,7 @@ Retry:
'NeoForge 指定 'NeoForge 指定
Try Try
Log("[ModPack] 整合包 NeoForge 版本：" & Id) Log("[ModPack] 整合包 NeoForge 版本：" & Id)
NeoForgeVersion = Id.Split("-")(1) NeoForgeVersion = Id.Replace("neoforge-", "")
Exit For Exit For
Catch ex As Exception Catch ex As Exception
Log(ex, "读取整合包 NeoForge 版本失败：" & Id) Log(ex, "读取整合包 NeoForge 版本失败：" & Id)
@@ -213,7 +213,7 @@ Retry:
'Fabric 指定 'Fabric 指定
Try Try
Log("[ModPack] 整合包 Fabric 版本：" & Id) Log("[ModPack] 整合包 Fabric 版本：" & Id)
FabricVersion = Id.Split("-")(1) FabricVersion = Id.Replace("fabric-", "")
Exit For Exit For
Catch ex As Exception Catch ex As Exception
Log(ex, "读取整合包 Fabric 版本失败：" & Id) Log(ex, "读取整合包 Fabric 版本失败：" & Id)
Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
+1
View File
@@ -724,6 +724,7 @@
Private Function IsOptiFineSuitForForge(OptiFine As DlOptiFineListEntry, Forge As DlForgeVersionEntry) Private Function IsOptiFineSuitForForge(OptiFine As DlOptiFineListEntry, Forge As DlForgeVersionEntry)
If Forge.Inherit <> OptiFine.Inherit Then Return False '不是同一个大版本 If Forge.Inherit <> OptiFine.Inherit Then Return False '不是同一个大版本
If OptiFine.RequiredForgeVersion Is Nothing Then Return False '不兼容 Forge If OptiFine.RequiredForgeVersion Is Nothing Then Return False '不兼容 Forge
If OptiFine.RequiredForgeVersion = "" Then Return True
If OptiFine.RequiredForgeVersion.Contains(".") Then 'XX.X.XXX If OptiFine.RequiredForgeVersion.Contains(".") Then 'XX.X.XXX
Return VersionSortInteger(Forge.Version.ToString, OptiFine.RequiredForgeVersion) >= 0 Return VersionSortInteger(Forge.Version.ToString, OptiFine.RequiredForgeVersion) >= 0
Else 'XXXX Else 'XXXX
Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
+5 -5
View File
@@ -38,7 +38,7 @@
<DefineDebug>false</DefineDebug> <DefineDebug>false</DefineDebug>
<DefineTrace>false</DefineTrace> <DefineTrace>false</DefineTrace>
<IncrementalBuild>true</IncrementalBuild> <IncrementalBuild>true</IncrementalBuild>
<OutputPath>D:\Minecraft\程序\</OutputPath> <OutputPath>.\Output\</OutputPath>
<DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile> <DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn> <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
@@ -55,7 +55,7 @@
<DefineTrace>false</DefineTrace> <DefineTrace>false</DefineTrace>
<IncrementalBuild>false</IncrementalBuild> <IncrementalBuild>false</IncrementalBuild>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>D:\Minecraft\程序\</OutputPath> <OutputPath>.\Output\</OutputPath>
<DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile> <DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn> <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
@@ -100,7 +100,7 @@
<SignManifests>false</SignManifests> <SignManifests>false</SignManifests>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Snapshot|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Snapshot|AnyCPU'">
<OutputPath>D:\Minecraft\程序\</OutputPath> <OutputPath>.\Output\</OutputPath>
<DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile> <DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<WarningLevel>1</WarningLevel> <WarningLevel>1</WarningLevel>
@@ -111,7 +111,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'BETA|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'BETA|AnyCPU'">
<OutputPath>D:\Minecraft\程序\</OutputPath> <OutputPath>.\Output\</OutputPath>
<DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile> <DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<WarningLevel>1</WarningLevel> <WarningLevel>1</WarningLevel>
@@ -129,7 +129,7 @@
</AssemblyOriginatorKeyFile> </AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseUpdate|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseUpdate|AnyCPU'">
<OutputPath>D:\Minecraft\程序\</OutputPath> <OutputPath>.\Output\</OutputPath>
<DefineConstants>RELEASE,BY_UPDATE</DefineConstants> <DefineConstants>RELEASE,BY_UPDATE</DefineConstants>
<DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile> <DocumentationFile>Plain Craft Launcher 2.xml</DocumentationFile>
<Optimize>true</Optimize> <Optimize>true</Optimize>