Просмотр исходного кода

Update PageDownloadInstall.xaml.vb

Solve a conflict
JingHai-Lingyun 2 лет назад
Родитель
Сommit
27825ed107
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb

+ 2 - 2
Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb

@@ -499,7 +499,7 @@
             Name += "-Forge_" & SelectedForge.Version
             Name += "-Forge_" & SelectedForge.Version
         End If
         End If
         If SelectedNeoForge IsNot Nothing Then
         If SelectedNeoForge IsNot Nothing Then
-            Name += "-NeoForge_" & SelectedNeoForge.Version.Replace("neoforge-", "").Replace("forge-", "").Replace("1.20.1-", "")
+            Name += "-NeoForge_" & SelectedNeoForge.StdVersion & If(SelectedNeoForge.IsBeta, "-beta", "")
         End If
         End If
         If SelectedLiteLoader IsNot Nothing Then
         If SelectedLiteLoader IsNot Nothing Then
             Name += "-LiteLoader"
             Name += "-LiteLoader"
@@ -521,7 +521,7 @@
             Info += ", Forge " & SelectedForge.Version
             Info += ", Forge " & SelectedForge.Version
         End If
         End If
         If SelectedNeoForge IsNot Nothing Then
         If SelectedNeoForge IsNot Nothing Then
-            Info += ", NeoForge " & SelectedNeoForge.Version.Replace("neoforge-", "").Replace("forge-", "").Replace("1.20.1-", "")
+            Info += ", NeoForge " & SelectedNeoForge.ohao & If(SelectedNeoForge.IsBeta, "-beta", "")
         End If
         End If
         If SelectedLiteLoader IsNot Nothing Then
         If SelectedLiteLoader IsNot Nothing Then
             Info += ", LiteLoader"
             Info += ", LiteLoader"