diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb index 1fa91e30..4add4058 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb @@ -143,7 +143,7 @@ PanIntro.Children.Insert(0, CompItem) '决定按钮显示 - BtnIntroWeb.Text = If(Project.FromCurseForge, "转到 CurseForge", "转到 Modrinth") + BtnIntroWeb.Text = If(Project.FromCurseForge, Application.Current.FindResource("LangDownloadCompToCurseForge"), Application.Current.FindResource("LangDownloadCompToModrinth")) BtnIntroWiki.Visibility = If(Project.WikiId = 0, Visibility.Collapsed, Visibility.Visible) AniControlEnabled -= 1 diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 1ee02503..83d3cde8 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -476,7 +476,7 @@ If SelectedOptiFine IsNot Nothing Then Info += ", OptiFine " & SelectedOptiFine.NameDisplay.Replace(SelectedMinecraftId & " ", "") End If - If Info = "" Then Info = ", 无附加安装" + If Info = "" Then Info = "," & Application.Current.FindResource("LangDownloadInstallNoAdd") Return Info.TrimStart(", ".ToCharArray()) End Function ''' diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml index da78a289..c799237a 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml @@ -5,23 +5,23 @@ - - + - - + - + @@ -30,7 +30,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -47,7 +47,7 @@ LogoScale="1.02" Logo="M826.453333 170.666667c-100.266667-93.866667-248.96-76.373333-256-75.52a31.786667 31.786667 0 0 0-26.666666 22.613333c-1.066667 3.2-101.546667 330.666667-426.666667 445.013333a29.013333 29.013333 0 0 0-7.893333 4.48l-1.493334 1.066667a29.44 29.44 0 0 0-5.973333 6.613333 31.786667 31.786667 0 0 0-3.626667 7.68 5.333333 5.333333 0 0 1 0 1.493334 30.506667 30.506667 0 0 0 0 8.96c7.466667 116.266667 45.013333 204.586667 112 262.826666a303.36 303.36 0 0 0 194.773334 71.466667h11.52a32.426667 32.426667 0 0 0 27.093333-19.626667 694.186667 694.186667 0 0 1 159.36-234.666666l-7.68 55.466666A31.786667 31.786667 0 0 0 621.44 768h4.48a32.213333 32.213333 0 0 0 31.786667-27.733333l15.573333-112.426667 112.426667 8.32a32 32 0 1 0 4.693333-64l-56.96-4.266667c36.48-25.813333 74.026667-50.56 112-75.52l51.626667-34.133333a31.573333 31.573333 0 0 0 14.08-24.746667c6.186667-115.2-21.76-203.306667-84.693334-262.826666zM620.8 573.013333l-1.706667 1.493334a219.093333 219.093333 0 0 0-87.466666-116.693334 222.933333 222.933333 0 0 0-95.146667-33.28c18.986667-21.333333 36.266667-42.666667 51.626667-64a198.613333 198.613333 0 0 1 202.453333 158.08c-20.053333 14.506667-39.893333 29.44-59.52 45.226667a29.866667 29.866667 0 0 0-10.24 9.173333z m-228.693333 292.266667a238.72 238.72 0 0 1-141.44-55.893333 213.333333 213.333333 0 0 1-34.986667-39.466667 123.946667 123.946667 0 0 0 44.373333 8.106667 168.533333 168.533333 0 0 0 69.12-16.213334 29.44 29.44 0 0 0 7.04-4.266666l106.666667-85.333334a32 32 0 1 0-39.893333-49.92L298.666667 704a78.293333 78.293333 0 0 1-69.546667 1.706667c-32.426667-17.066667-52.693333-61.653333-62.506667-93.44a709.333333 709.333333 0 0 0 202.453334-123.733334 187.52 187.52 0 0 1 128 21.333334 171.946667 171.946667 0 0 1 68.906666 109.653333 756.48 756.48 0 0 0-173.866666 245.76zM810.666667 438.4l-64 42.666667A256 256 0 0 0 529.706667 298.666667a810.666667 810.666667 0 0 0 69.12-140.8c37.973333-1.066667 123.946667 4.053333 183.68 59.946666 45.866667 42.666667 67.84 108.8 65.493333 195.84z"> - + @@ -55,24 +55,24 @@ LogoScale="1.06" Logo="M517.41 186.99l22.45 83.78h-55.04l-18.76-70.02c-2.85-10.63-13.78-16.95-24.42-14.1-10.63 2.85-16.95 13.78-14.1 24.42l16 59.71H388.5l-12.31-45.95c-10.45-38.99 12.69-79.08 51.69-89.52s79.08 12.68 89.53 51.68z M538.58 98c40.37 0 73.1 32.73 73.1 73.1v79.74h-53.16V171.1c0-11.01-8.93-19.94-19.94-19.94-11.01 0-19.94 8.93-19.94 19.94v79.74h-53.16V171.1c0-40.37 32.73-73.1 73.1-73.1z M512 224.26c191.58 0 346.88 155.3 346.88 346.88v61.8c0 28.85 3.33 59.94 9.98 93.27l1.29 6.28c12.43 59.1-21.15 118.2-78.28 137.78C691.18 904.75 597.9 922 512 922c-83.94 0-174.95-16.47-273.01-49.41l-6.85-2.32c-56.4-19.32-89.85-77.16-78.74-135.5l0.46-2.27c7.51-35.71 11.27-68.89 11.27-99.55v-61.8c0-189.66 152.21-343.77 341.14-346.83l5.73-0.06z m-4.64 66.49c-151.21 2.45-273.32 124.58-275.75 275.8l-0.04 4.59v61.8l-0.04 5.93c-0.45 33.74-4.7 69.49-12.65 107.3-5.53 26.27 9.4 52.53 34.79 61.23 94.08 32.23 180.19 48.15 258.32 48.15s164.25-15.92 258.32-48.15c25.39-8.7 40.32-34.97 34.79-61.23-7.95-37.81-12.2-73.56-12.65-107.3l-0.04-5.93v-61.8c0-153.33-123.05-277.91-275.79-280.39l-4.64-0.04-4.62 0.04z M500.66 717.38l-53.28-87.19c-3.83-6.26-1.85-14.44 4.41-18.27 0.76-0.46 1.56-0.85 2.39-1.15L512 589.74l57.82 21.03c6.9 2.51 10.46 10.13 7.95 17.03-0.3 0.83-0.69 1.63-1.15 2.39l-53.28 87.19c-3.83 6.26-12.01 8.24-18.27 4.41-1.8-1.1-3.31-2.61-4.41-4.41z M684.77 689.42m-46.52 0a46.52 46.52 0 1 0 93.04 0 46.52 46.52 0 1 0-93.04 0Z M339.23 689.42m-46.52 0a46.52 46.52 0 1 0 93.04 0 46.52 46.52 0 1 0-93.04 0Z"> - + - + - + - - + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb index da173ad1..d125b7b9 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb @@ -140,15 +140,14 @@ AniControlEnabled += 1 If Not Setup.Get("HintHandInstall") Then Setup.Set("HintHandInstall", True) - If MyMsgBox("手动安装包功能提供了 OptiFine、Forge 等组件的 .jar 安装文件下载，但无法自动安装。" & vbCrLf & - "在自动安装页面先选择 MC 版本，然后就可以选择 OptiFine、Forge 等组件，让 PCL 自动进行安装了。", "自动安装提示", "返回自动安装", "继续下载手动安装包") = 1 Then + If MyMsgBox(Application.Current.FindResource("LangDownloadPageDialogManualInstallContent"), Application.Current.FindResource("LangDownloadPageDialogManualInstallTitle"), Application.Current.FindResource("LangDownloadPageDialogManualInstallBtn1"), Application.Current.FindResource("LangDownloadPageDialogManualInstallBtn2")) = 1 Then FrmMain.PageChange(New FormMain.PageStackData With {.Page = FormMain.PageType.Download}, FormMain.PageSubType.DownloadInstall) AniControlEnabled -= 1 Exit Sub End If End If ItemHand.Visibility = Visibility.Collapsed - LabGame.Visibility = Visibility.Collapsed + 'LabGame.Visibility = Visibility.Collapsed LabHand.Visibility = Visibility.Visible ItemClient.Visibility = Visibility.Visible ItemOptiFine.Visibility = Visibility.Visible @@ -166,7 +165,7 @@ e.Handled = True AniControlEnabled += 1 ItemHand.Visibility = Visibility.Visible - LabGame.Visibility = Visibility.Visible + 'LabGame.Visibility = Visibility.Visible LabHand.Visibility = Visibility.Collapsed ItemClient.Visibility = Visibility.Collapsed ItemOptiFine.Visibility = Visibility.Collapsed diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml index 69c4db0b..b2931635 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml @@ -6,20 +6,20 @@ PanScroll="{Binding ElementName=PanBack}"> - + - + - + - + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml index 814d1c83..d3748744 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml @@ -6,7 +6,7 @@ PanScroll="{Binding ElementName=PanBack}"> - + @@ -22,17 +22,17 @@ - + - + - - - + + + - + - + @@ -50,7 +50,7 @@ - + @@ -58,32 +58,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91,8 +91,8 @@ - - + + @@ -115,7 +115,7 @@ - + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb index b77199a4..25905651 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb @@ -15,7 +15,7 @@ If FrmDownloadMod IsNot Nothing Then With Request .SearchText = FrmDownloadMod.TextSearchName.Text - .GameVersion = If(FrmDownloadMod.TextSearchVersion.Text = "全部 (也可自行输入)", Nothing, + .GameVersion = If(FrmDownloadMod.TextSearchVersion.Text = Application.Current.FindResource("LangDownloadModSearchVersionAll"), Nothing, If(FrmDownloadMod.TextSearchVersion.Text.Contains(".") OrElse FrmDownloadMod.TextSearchVersion.Text.Contains("w"), FrmDownloadMod.TextSearchVersion.Text, Nothing)) .Tag = FrmDownloadMod.ComboSearchTag.SelectedItem.Tag .ModLoader = Val(FrmDownloadMod.ComboSearchLoader.SelectedItem.Tag) @@ -111,7 +111,7 @@ '重置按钮 Private Sub BtnSearchReset_Click(sender As Object, e As EventArgs) Handles BtnSearchReset.Click TextSearchName.Text = "" - TextSearchVersion.Text = "全部 (也可自行输入)" + TextSearchVersion.Text = Application.Current.FindResource("LangDownloadModSearchVersionAll") TextSearchVersion.SelectedIndex = 0 ComboSearchSource.SelectedIndex = 0 ComboSearchTag.SelectedIndex = 0 diff --git a/Plain Craft Launcher 2/Resources/Language/en_US.xaml b/Plain Craft Launcher 2/Resources/Language/en_US.xaml index 009a04af..fc115957 100644 --- a/Plain Craft Launcher 2/Resources/Language/en_US.xaml +++ b/Plain Craft Launcher 2/Resources/Language/en_US.xaml @@ -320,6 +320,7 @@ Go to CurseForge +Go to Modrinth Go to MC Encyclopedia Replication name Getting version list @@ -363,6 +364,65 @@ Instance isolation tips You have not turned on instance isolation, which will cause multiple Minecraft instances to share the same Mod folder. Therefore, when switching Minecraft instance, Minecraft will crash because it reads a Mod that does not match the current version. PCL recommends that you enable version isolation option in "Configuration → Version Isolation" before starting downloading! Cancel the download + No additional installation + + + Refresh + Automatical installation + ▼ Manual installation + The manual installation package function provides download of.jar installation files for components such as OptiFine and Forge, but cannot be automatically installed. Select MC version first on the automatic installation page, and then you can select OptiFine, Forge and other components to allow PCL to be installed automatically. + Automatic installation tips + Back to Automatic Installation + Continue downloading the manual installation package + Manual installation + Resources + Modpacks + + + Introduce to LiteLoader + Similar to Forge, LiteLoader can be used to load LiteLoader modules from older versions of Minecraft. + Open the official website + Getting LiteLoader list + + + Search Mod + Name + Source + All + CurseForge + Modrinth + Version + All (You can also enter yourself) + Any Mod loader + Search + Reset + Getting Mod list + All +World Generation +Biome +Dimension +Mineral +Structure +Technology +Pipeline and Logistics +Automation +Energy +Redstone +Food and cooking +Agricultural +Game Mechanics +Transportation +Storage +Magic +Adventure +Decoration +Mobs +Equipment +Optimization +Display +Server +Utility +Library Loading login page diff --git a/Plain Craft Launcher 2/Resources/Language/zh_CN.xaml b/Plain Craft Launcher 2/Resources/Language/zh_CN.xaml index 9981f90b..ebf1b38f 100644 --- a/Plain Craft Launcher 2/Resources/Language/zh_CN.xaml +++ b/Plain Craft Launcher 2/Resources/Language/zh_CN.xaml @@ -320,6 +320,7 @@ 转到 CurseForge + 转到 Modrinth 转到 MC 百科 复制名称 正在获取版本列表 @@ -363,6 +364,65 @@ 版本隔离提示 你尚未开启版本隔离，这会导致多个 MC 共用同一个 Mod 文件夹。 因此在切换 MC 版本时，MC 会因为读取到与当前版本不符的 Mod 而崩溃。 PCL 推荐你在开始下载前，在 设置 → 版本隔离 中开启版本隔离选项！ 取消下载 + 无附加安装 + + + 刷新 + 自动安装 + ▼ 手动安装包 + 手动安装包功能提供了 OptiFine、Forge 等组件的 .jar 安装文件下载，但无法自动安装。 在自动安装页面先选择 MC 版本，然后就可以选择 OptiFine、Forge 等组件，让 PCL 自动进行安装了。 + 自动安装提示 + 返回自动安装 + 继续下载手动安装包 + 手动安装包 + 资源 + 整合包 + + + LiteLoader 简介 + 与 Forge 类似，LiteLoader 可以用于加载老版本 Minecraft 中的 LiteLoader 模组。 + 打开官网 + 正在获取 LiteLoader 列表 + + + 搜索 Mod + 名称 + 来源 + 全部 + CurseForge + Modrinth + 版本 + 全部 (也可自行输入) + 任意 Mod 加载器 + 搜索 + 重置条件 + 正在获取 Mod 列表 + 全部 + 世界元素 + 生物群系 + 维度 + 矿物与资源 + 天然结构 + 科技 + 管道与物流 + 自动化 + 能源 + 红石 + 食物与烹饪 + 农业 + 游戏机制 + 运输 + 仓储 + 魔法 + 冒险 + 装饰 + 生物 + 装备与工具 + 性能优化 + 信息显示 + 服务器 + 改良 + 支持库 正在加载登录页面