===== PCL/Application.cs ===== --- a/PCL/Application.cs (2.99.0.0) +++ b/PCL/Application.cs (2.99.0.1) @@ -220,7 +220,7 @@ ModMain.FrmStart = new SplashScreen("Images\\icon.ico"); ModMain.FrmStart.Show(false, true); } - Logger.Info(string.Format("程序版本：{0} ({1}{2})", "正式版 2.99.0.0", 413, ""), (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb"); + Logger.Info(string.Format("程序版本：{0} ({1}{2})", "正式版 2.99.0.1", 415, ""), (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb"); Logger.Info($"识别码：{ModBase.Identify}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb"); Logger.Info($"程序路径：{ModBase.PathExe}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb"); Logger.Info($"系统编码：{Encoding.Default.HeaderName} ({Encoding.Default.CodePage}, GBK={ModBase.IsGBKEncoding})", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb"); ===== PCL/FormMain.cs ===== --- a/PCL/FormMain.cs (2.99.0.0) +++ b/PCL/FormMain.cs (2.99.0.1) @@ -143,7 +143,7 @@ [SpecialName] internal void _Lambda_0024__1() { - if (ModMain.MyMsgBox(_0024VB_0024Local_Content, "PCL 已更新至正式版 2.99.0.0", "确定", "完整更新日志") == 2) + if (ModMain.MyMsgBox(_0024VB_0024Local_Content, "PCL 已更新至正式版 2.99.0.1", "确定", "完整更新日志") == 2) { ModBase.OpenWebsite("https://meloong.com/afd/a/LTCat?tab=feed"); } @@ -258,7 +258,7 @@ { ProjectData.SetProjectError(ex); Exception ex2 = ex; - if (Operators.CompareString(ex2.Message, "为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……", false) == 0) + if (Operators.CompareString(ex2.Message, "为遵守相关法律法规，PCL 不再提供 MC 下载功能，非常抱歉 qwq……", false) == 0) { ModMain.Hint(ex2.Message, ModMain.HintType.Red); ProjectData.ClearProjectError(); @@ -1264,9 +1264,14 @@ int num = 0; int num2 = 0; List> list = new List>(); + if (LastVersion < 415) + { + list.Add(new KeyValuePair(4, "删除：MC 下载功能相关入口")); + list.Add(new KeyValuePair(1, "优化：为设置更新添加部分黑名单")); + } if (LastVersion < 413) { - list.Add(new KeyValuePair(5, "删除：为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……")); + list.Add(new KeyValuePair(5, "删除：为遵守相关法律法规，PCL 不再提供 MC 下载功能，非常抱歉 qwq……")); } checked { @@ -1391,7 +1396,7 @@ CS_0024_003C_003E8__locals2._0024VB_0024Local_Content = "· " + EnumerableExtensions.Join((IEnumerable)list2, "\r\n· "); ModBase.RunInNewThread([SpecialName] () => { - if (ModMain.MyMsgBox(CS_0024_003C_003E8__locals2._0024VB_0024Local_Content, "PCL 已更新至正式版 2.99.0.0", "确定", "完整更新日志") == 2) + if (ModMain.MyMsgBox(CS_0024_003C_003E8__locals2._0024VB_0024Local_Content, "PCL 已更新至正式版 2.99.0.1", "确定", "完整更新日志") == 2) { ModBase.OpenWebsite("https://meloong.com/afd/a/LTCat?tab=feed"); } @@ -1454,11 +1459,11 @@ ModMain.FrmLaunchLeft = new PageLaunchLeft(); ModMain.FrmLaunchRight = new PageLaunchRight(); int num = Settings.Get("SystemLastVersionReg"); - if (num < 413) + if (num < 415) { UpgradeSub(num); } - else if (num > 413) + else if (num > 415) { DowngradeSub(num); } @@ -1692,13 +1697,13 @@ private void UpgradeSub(int LastVersionCode) { - Logger.Info($"版本号从 {LastVersionCode} 升高到 {413}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb"); - Settings.Set("SystemLastVersionReg", 413); + Logger.Info($"版本号从 {LastVersionCode} 升高到 {415}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb"); + Settings.Set("SystemLastVersionReg", 415); int num = Settings.Get("SystemHighestBetaVersionReg"); - if (num < 413) + if (num < 415) { - Settings.Set("SystemHighestBetaVersionReg", 413); - Logger.Info($"最高版本号从 {num} 升高到 {413}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb"); + Settings.Set("SystemHighestBetaVersionReg", 415); + Logger.Info($"最高版本号从 {num} 升高到 {415}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb"); } if (Settings.Get("LaunchArgumentWindowType") == 5) { @@ -1762,7 +1767,7 @@ Settings.Reset("LaunchAdvanceJvm"); Logger.Info("已重置 JVM 参数设置", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb"); } - if (LastVersionCode > 0 && num < 413) + if (LastVersionCode > 0 && num < 415) { ShowUpdateLog(num); } @@ -1770,8 +1775,8 @@ private void DowngradeSub(int LastVersionCode) { - Logger.Info($"版本号从 {LastVersionCode} 降低到 {413}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb"); - Settings.Set("SystemLastVersionReg", 413); + Logger.Info($"版本号从 {LastVersionCode} 降低到 {415}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb"); + Settings.Set("SystemLastVersionReg", 415); } private void FormMain_Closing(object sender, CancelEventArgs e) @@ -2692,7 +2697,7 @@ { ProjectData.SetProjectError(ex); Exception ex2 = ex; - if (Operators.CompareString(ex2.Message, "为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……", false) == 0) + if (Operators.CompareString(ex2.Message, "为遵守相关法律法规，PCL 不再提供 MC 下载功能，非常抱歉 qwq……", false) == 0) { ModMain.Hint(ex2.Message, ModMain.HintType.Red); ProjectData.ClearProjectError(); ===== PCL/ModBase.cs ===== --- a/PCL/ModBase.cs (2.99.0.0) +++ b/PCL/ModBase.cs (2.99.0.1) @@ -645,13 +645,13 @@ } } - public const string VersionBaseName = "2.99.0.0"; + public const string VersionBaseName = "2.99.0.1"; public const string CommitHash = ""; - public const int VersionCode = 413; + public const int VersionCode = 415; - public const string VersionDisplay = "正式版 2.99.0.0"; + public const string VersionDisplay = "正式版 2.99.0.1"; public const string BuildTypeDisplay = "正式版"; ===== PCL/ModLaunch.cs ===== --- a/PCL/ModLaunch.cs (2.99.0.0) +++ b/PCL/ModLaunch.cs (2.99.0.1) @@ -2238,7 +2238,7 @@ yield return (Key: "${libraries_directory}", Value: PathUtils.ToShortPath(ModMinecraft.McFolderSelected + "libraries")); yield return (Key: "${pure_directory}", Value: PathUtils.RemoveSlashSuffix(ModBase.PathPure.Value)); yield return (Key: "${launcher_name}", Value: "PCL"); - yield return (Key: "${launcher_version}", Value: Conversions.ToString(413)); + yield return (Key: "${launcher_version}", Value: Conversions.ToString(415)); yield return (Key: "${version_name}", Value: ModMinecraft.McInstanceSelected.Name); checked { @@ -3033,7 +3033,7 @@ { McLaunchLog("", (LogLevel)1); McLaunchLog("~ 基础参数 ~", (LogLevel)1); - McLaunchLog("PCL 版本：正式版 2.99.0.0 (" + Conversions.ToString(413) + ")", (LogLevel)1); + McLaunchLog("PCL 版本：正式版 2.99.0.1 (" + Conversions.ToString(415) + ")", (LogLevel)1); McLaunchLog(string.Format("游戏版本：{0}（{1}，Drop {2}{3}）", ModMinecraft.McInstanceSelected.VersionDisplayName(), ModMinecraft.McInstanceSelected.Version.Vanilla, ModMinecraft.McInstanceSelected.Version.Drop, ModMinecraft.McInstanceSelected.Version.Reliable ? "" : "，无法完全确定"), (LogLevel)1); McLaunchLog("资源版本：" + ModMinecraft.McAssetsGetIndexName(ModMinecraft.McInstanceSelected), (LogLevel)1); McLaunchLog("版本继承：" + ((Operators.CompareString(ModMinecraft.McInstanceSelected.InheritName, "", false) == 0) ? "无" : ModMinecraft.McInstanceSelected.InheritName), (LogLevel)1); ===== PCL/ModMain.cs ===== --- a/PCL/ModMain.cs (2.99.0.0) +++ b/PCL/ModMain.cs (2.99.0.1) @@ -1091,12 +1091,12 @@ public static void HelpTryExtract() { - if (Settings.Get("SystemHelpVersion") != 413 || !FileUtils.Exists(ModBase.PathTemp + "Help\\启动器\\备份设置.xaml")) + if (Settings.Get("SystemHelpVersion") != 415 || !FileUtils.Exists(ModBase.PathTemp + "Help\\启动器\\备份设置.xaml")) { DirectoryUtils.Delete(ModBase.PathTemp + "Help", false); ModBase.ExtractResources(ModBase.PathTemp + "Cache\\Help.zip", "Help"); FileUtils.ExtractToDirectory(ModBase.PathTemp + "Cache\\Help.zip", ModBase.PathTemp + "Help", default(CancellationToken), (ProgressProvider)null); - Settings.Set("SystemHelpVersion", 413); + Settings.Set("SystemHelpVersion", 415); Logger.Info(string.Format("已解压内置帮助文件，目前状态：{0}", FileUtils.Exists(ModBase.PathTemp + "Help\\启动器\\备份设置.xaml")), (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Modules\\ModMain.vb"); } } @@ -1506,8 +1506,8 @@ Monitor.Exit(_0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer_0024Init); } } - Text = Text.Replace("{pcl_version}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer("2.99.0.0")); - Text = Text.Replace("{pcl_version_code}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer(Conversions.ToString(413))); + Text = Text.Replace("{pcl_version}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer("2.99.0.1")); + Text = Text.Replace("{pcl_version_code}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer(Conversions.ToString(415))); Text = Text.Replace("{pcl_version_branch}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer("正式版")); Text = Text.Replace("{pcl_build_type}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer(ModBase.BuildTypes.Release.ToString())); Text = Text.Replace("{pcl_branch}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer("Official")); ===== PCL/ModMinecraft.cs ===== --- a/PCL/ModMinecraft.cs (2.99.0.0) +++ b/PCL/ModMinecraft.cs (2.99.0.1) @@ -2915,7 +2915,7 @@ return; } DateTime dateTime = (DateTime)CS_0024_003C_003E8__locals10._0024VB_0024Local_Version[(object)"releaseTime"]; - if (ModMain.MyMsgBox(string.Format("新版本：{0}{1}", CS_0024_003C_003E8__locals11._0024VB_0024Local_VersionName, "\r\n") + (((DateTime.Now - dateTime).TotalDays > 1.0) ? ("更新时间：" + dateTime) : ("更新于：" + StringUtils.FormatTimeSpan(dateTime - DateTime.Now, false))), "Minecraft 更新提示", "确定", "下载", ((DateTime.Now - dateTime).TotalHours > 3.0) ? "更新日志" : "", IsWarn: false, HighLight: true, ForceWait: false, null, null, [SpecialName] () => + if (ModMain.MyMsgBox(string.Format("新版本：{0}{1}", CS_0024_003C_003E8__locals11._0024VB_0024Local_VersionName, "\r\n") + (((DateTime.Now - dateTime).TotalDays > 1.0) ? ("更新时间：" + dateTime) : ("更新于：" + StringUtils.FormatTimeSpan(dateTime - DateTime.Now, false))), "Minecraft 更新提示", "确定", "", ((DateTime.Now - dateTime).TotalHours > 3.0) ? "更新日志" : "", IsWarn: false, HighLight: true, ForceWait: false, null, null, [SpecialName] () => { ModDownloadLib.McUpdateLogShow(CS_0024_003C_003E8__locals10._0024VB_0024Local_Version); }) == 2) ===== PCL/ModModpack.cs ===== --- a/PCL/ModModpack.cs (2.99.0.0) +++ b/PCL/ModModpack.cs (2.99.0.1) @@ -713,7 +713,7 @@ public static void ModpackInstall() { _Closure_0024__0_002D0 closure_0024__0_002D = new _Closure_0024__0_002D0(); - ModMain.Hint("为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……", ModMain.HintType.Red); + ModMain.Hint("为遵守相关法律法规，PCL 不再提供 MC 下载功能，非常抱歉 qwq……", ModMain.HintType.Red); } public static ModLoader.LoaderCombo ModpackInstall(string File, string InstanceName = null, string Logo = null) @@ -829,7 +829,7 @@ } throw new Exception("打开整合包文件失败，文件可能损坏或为不支持的压缩包格式", ex2); } - throw new Exception("为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……"); + throw new Exception("为遵守相关法律法规，PCL 不再提供 MC 下载功能，非常抱歉 qwq……"); } finally { ===== PCL/PageDownloadInstall.cs ===== --- a/PCL/PageDownloadInstall.cs (2.99.0.0) +++ b/PCL/PageDownloadInstall.cs (2.99.0.1) @@ -56,14 +56,14 @@ { ((VB_0024AnonymousDelegate_10)([SpecialName] () => { - throw new Exception("为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……"); + throw new Exception("为遵守相关法律法规，PCL 不再提供 MC 下载功能，非常抱歉 qwq……"); }))(); } [SpecialName] internal void _Lambda_0024__3_002D0() { - throw new Exception("为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……"); + throw new Exception("为遵守相关法律法规，PCL 不再提供 MC 下载功能，非常抱歉 qwq……"); } [SpecialName] @@ -1561,7 +1561,7 @@ { ((VB_0024AnonymousDelegate_10)([SpecialName] () => { - throw new Exception("为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……"); + throw new Exception("为遵守相关法律法规，PCL 不再提供 MC 下载功能，非常抱歉 qwq……"); }))(); }), [SpecialName] (ModLoader.LoaderTask a0) => { ===== PCL/PageDownloadLeft.cs ===== --- a/PCL/PageDownloadLeft.cs (2.99.0.0) +++ b/PCL/PageDownloadLeft.cs (2.99.0.1) @@ -84,6 +84,13 @@ } } + [field: AccessedThroughProperty("LabResource")] + internal virtual TextBlock LabResource + { + get; [MethodImpl(MethodImplOptions.Synchronized)] + set; + } + internal virtual MyListItem ItemMod { [CompilerGenerated] @@ -243,6 +250,10 @@ { PageID = FormMain.PageSubType.Default; InitializeComponent(); + ((UIElement)ItemInstall).Visibility = (Visibility)2; + ((UIElement)LabResource).Visibility = (Visibility)2; + PageID = FormMain.PageSubType.DownloadMod; + ItemMod.Checked = true; } private void PageCheck(FrameworkElement sender, ModBase.RouteEventArgs e) @@ -471,6 +482,8 @@ { //IL_0006: Unknown result type (might be due to invalid IL or missing references) //IL_0010: Expected O, but got Unknown + //IL_0028: Unknown result type (might be due to invalid IL or missing references) + //IL_0032: Expected O, but got Unknown switch (connectionId) { case 1: @@ -480,18 +493,21 @@ ItemInstall = (MyListItem)target; break; case 3: - ItemMod = (MyListItem)target; + LabResource = (TextBlock)target; break; case 4: - ItemPack = (MyListItem)target; + ItemMod = (MyListItem)target; break; case 5: - ItemDataPack = (MyListItem)target; + ItemPack = (MyListItem)target; break; case 6: - ItemResourcePack = (MyListItem)target; + ItemDataPack = (MyListItem)target; break; case 7: + ItemResourcePack = (MyListItem)target; + break; + case 8: ItemShader = (MyListItem)target; break; default: ===== PCL/PageInstanceModDisabled.cs ===== --- a/PCL/PageInstanceModDisabled.cs (2.99.0.0) +++ b/PCL/PageInstanceModDisabled.cs (2.99.0.1) @@ -107,11 +107,11 @@ public void BtnDownload_Loaded() { - //IL_002e: Unknown result type (might be due to invalid IL or missing references) - //IL_0035: Unknown result type (might be due to invalid IL or missing references) - //IL_003a: Unknown result type (might be due to invalid IL or missing references) - //IL_0043: Unknown result type (might be due to invalid IL or missing references) - Visibility val = (Visibility)(((Settings.Get("UiHiddenPageDownload") && !PageSetupUI.HiddenForceShow) || (ModMain.FrmSelectRight != null && ModMain.FrmSelectRight.ShowHidden)) ? 2 : 0); + //IL_0001: Unknown result type (might be due to invalid IL or missing references) + //IL_0008: Unknown result type (might be due to invalid IL or missing references) + //IL_000d: Unknown result type (might be due to invalid IL or missing references) + //IL_0016: Unknown result type (might be due to invalid IL or missing references) + Visibility val = (Visibility)2; if (((UIElement)BtnDownload).Visibility != val) { ((UIElement)BtnDownload).Visibility = val; ===== PCL/PageLaunchLeft.cs ===== --- a/PCL/PageLaunchLeft.cs (2.99.0.0) +++ b/PCL/PageLaunchLeft.cs (2.99.0.1) @@ -1377,12 +1377,12 @@ public void RefreshButtonsUI() { - //IL_02bd: Unknown result type (might be due to invalid IL or missing references) + //IL_02a5: Unknown result type (might be due to invalid IL or missing references) if (!((FrameworkElement)BtnLaunch).IsLoaded) { return; } - int num = ((IsLoadFinished && ModMinecraft.McInstanceListLoader.State != ModBase.LoadState.Loading && ModMinecraft.McFolderListLoader.State != ModBase.LoadState.Loading) ? (((object)ModMinecraft.McInstanceSelected != null) ? 3 : ((Settings.Get("UiHiddenPageDownload") && !PageSetupUI.HiddenForceShow) ? 1 : 2)) : 0); + int num = ((IsLoadFinished && ModMinecraft.McInstanceListLoader.State != ModBase.LoadState.Loading && ModMinecraft.McFolderListLoader.State != ModBase.LoadState.Loading) ? (((object)ModMinecraft.McInstanceSelected == null) ? 1 : 3) : 0); if (num != BtnLaunchState || Operators.CompareString(((object)ModMinecraft.McInstanceSelected == null) ? "" : ModMinecraft.McInstanceSelected.PathVersion, ((object)BtnLaunchInstance == null) ? "" : BtnLaunchInstance.PathVersion, false) != 0) { BtnLaunchInstance = ModMinecraft.McInstanceSelected; ===== PCL/PageLinkMain.cs ===== --- a/PCL/PageLinkMain.cs (2.99.0.0) +++ b/PCL/PageLinkMain.cs (2.99.0.1) @@ -1284,7 +1284,7 @@ { throw new Exception("$" + text); } - if (((JObject)ModSecret.ServerConfig["Link"]).ContainsKey("MinVersionCode") && 413 < ModSecret.ServerConfig["Link"][(object)"MinVersionCode"].ToObject()) + if (((JObject)ModSecret.ServerConfig["Link"]).ContainsKey("MinVersionCode") && 415 < ModSecret.ServerConfig["Link"][(object)"MinVersionCode"].ToObject()) { throw new Exception("$你的 PCL 版本太老了，请在更新 PCL 之后再联机！"); } ===== PCL/PageOtherAbout.cs ===== --- a/PCL/PageOtherAbout.cs (2.99.0.0) +++ b/PCL/PageOtherAbout.cs (2.99.0.1) @@ -187,7 +187,7 @@ if (!IsLoaded) { IsLoaded = true; - ItemAboutPcl.Info = ItemAboutPcl.Info.Replace("%VERSION%", "正式版 2.99.0.0").Replace("%VERSIONCODE%", Conversions.ToString(413)).Replace("%BRANCH%", Conversions.ToString(50)); + ItemAboutPcl.Info = ItemAboutPcl.Info.Replace("%VERSION%", "正式版 2.99.0.1").Replace("%VERSIONCODE%", Conversions.ToString(415)).Replace("%BRANCH%", Conversions.ToString(50)); } } ===== PCL/PageResource.cs ===== --- a/PCL/PageResource.cs (2.99.0.0) +++ b/PCL/PageResource.cs (2.99.0.1) @@ -132,11 +132,12 @@ //IL_000a: Unknown result type (might be due to invalid IL or missing references) //IL_000b: Unknown result type (might be due to invalid IL or missing references) //IL_0016: Unknown result type (might be due to invalid IL or missing references) - //IL_0018: Invalid comparison between Unknown and I4 if (_Type != value) { _Type = value; - ((UIElement)BtnSearchInstallModPack).Visibility = (Visibility)(((int)value != 2) ? 2 : 0); + MyButton btnSearchInstallModPack = BtnSearchInstallModPack; + _ = 2; + ((UIElement)btnSearchInstallModPack).Visibility = (Visibility)2; } } } ===== PCL/PageSelectLeft.cs ===== --- a/PCL/PageSelectLeft.cs (2.99.0.0) +++ b/PCL/PageSelectLeft.cs (2.99.0.1) @@ -518,10 +518,10 @@ //IL_0a06: Expected O, but got Unknown //IL_0a06: Unknown result type (might be due to invalid IL or missing references) //IL_0a10: Expected O, but got Unknown - //IL_0ec3: Unknown result type (might be due to invalid IL or missing references) - //IL_0ec8: Unknown result type (might be due to invalid IL or missing references) - //IL_0ed7: Unknown result type (might be due to invalid IL or missing references) - //IL_0ee3: Expected O, but got Unknown + //IL_0ead: Unknown result type (might be due to invalid IL or missing references) + //IL_0eb2: Unknown result type (might be due to invalid IL or missing references) + //IL_0ec1: Unknown result type (might be due to invalid IL or missing references) + //IL_0ecd: Expected O, but got Unknown //IL_0acb: Unknown result type (might be due to invalid IL or missing references) //IL_0ad5: Expected O, but got Unknown //IL_0afb: Unknown result type (might be due to invalid IL or missing references) @@ -774,7 +774,6 @@ ((FrameworkElement)obj4).ToolTip = "在当前选择的 Minecraft 文件夹下安装整合包"; obj4.Logo = "M512 40.96C249.344 40.96 35.84 252.416 35.84 512s213.504 471.04 476.16 471.04c103.424 0 202.752-33.28 286.72-96.256l1.536-1.536c5.12-5.632 7.68-12.8 7.68-19.968 0-16.896-13.824-30.208-30.72-30.208-7.68 0-15.36 2.56-20.992 7.68h-0.512c-71.68 52.224-155.648 79.36-243.712 79.36-227.328 0-412.16-182.784-412.16-407.552 0-224.768 184.832-407.552 412.16-407.552s412.16 182.784 412.16 407.552c0 68.608-15.872 132.608-46.592 190.464-0.512 1.024-1.024 2.048-1.024 3.072-0.512 2.048-1.536 4.608-1.536 8.192 0 16.896 13.824 30.208 30.72 30.208 12.288 0 23.04-7.168 28.16-18.432 35.84-68.608 53.76-141.312 53.76-216.064 0.512-259.584-212.992-471.04-475.648-471.04z M812.032 483.328c-31.744-20.992-71.68 1.536-78.848 6.144-1.024 0.512-104.448 61.44-128 74.752-8.192 4.608-22.528-0.512-27.136-4.096-31.232-36.352-54.272-70.656-68.608-102.4-13.312-29.184 0.512-41.472 3.072-43.52 7.168-4.608 114.688-68.608 143.36-83.456 24.064-12.288 40.96-25.088 46.08-45.056 3.072-13.312 0-27.136-9.216-39.936-22.016-31.744-172.544-84.992-311.296-3.584-157.184 91.648-152.064 242.688-150.528 292.352v9.216c0 18.944-12.8 37.376-14.848 40.448l-20.992 21.504c-6.144 6.144-9.216 13.824-9.216 22.528 0 8.704 3.584 16.384 9.728 22.528 12.8 12.288 32.768 11.776 45.056-0.512l22.528-23.552 0.512-0.512c3.072-3.584 30.208-38.4 30.208-81.92l-0.512-11.264c-1.536-44.544-5.632-162.816 119.296-235.52 88.064-51.2 173.056-32.256 208.896-19.968-36.864 19.456-143.36 83.456-144.896 84.48-22.016 14.336-55.808 58.88-26.112 122.88 17.408 37.376 43.52 76.8 80.896 120.32 14.336 17.408 62.976 37.376 103.424 15.36 24.576-13.312 125.44-73.216 130.048-75.776 2.048-1.024 4.608-2.56 7.68-3.584 0 2.56-0.512 6.144-1.024 10.752-5.632 35.84-35.328 155.136-191.488 181.76-49.664 8.704-89.6 3.584-121.856-0.512h-0.512c-37.888-4.608-73.216-9.216-101.888 14.336-31.232 26.112-40.96 34.304-35.84 54.272 3.584 14.336 16.384 24.064 30.72 24.064 2.56 0 5.12-0.512 7.68-1.024 6.656-1.536 12.8-5.632 16.896-10.752 2.048-2.048 7.68-6.656 20.992-18.432 6.656-5.632 25.088-3.584 52.736 0 34.816 4.608 81.92 10.24 141.312 0.512 157.184-26.624 228.864-138.752 243.2-234.496 7.68-38.912 0-64.512-21.504-78.336z"; MyListItem myListItem4 = obj4; - ((Panel)ModMain.FrmSelectLeft.PanList).Children.Add((UIElement)(object)myListItem4); myListItem4.Click += [SpecialName] (object a0, MouseButtonEventArgs a1) => { ModModpack.ModpackInstall(); ===== PCL/PageSelectRight.cs ===== --- a/PCL/PageSelectRight.cs (2.99.0.0) +++ b/PCL/PageSelectRight.cs (2.99.0.1) @@ -387,7 +387,7 @@ { LabEmptyTitle.Text = "无可用版本"; LabEmptyContent.Text = "未找到任何版本的游戏，请先下载任意版本的游戏。\r\n若有已存在的游戏，请在左边的列表中选择添加文件夹，选择 .minecraft 文件夹将其导入。"; - ((UIElement)BtnEmptyDownload).Visibility = (Visibility)((Settings.Get("UiHiddenPageDownload") && !PageSetupUI.HiddenForceShow) ? 2 : 0); + ((UIElement)BtnEmptyDownload).Visibility = (Visibility)2; } } else ===== PCL/PageSetupSystem.cs ===== --- a/PCL/PageSetupSystem.cs (2.99.0.0) +++ b/PCL/PageSetupSystem.cs (2.99.0.1) @@ -596,7 +596,7 @@ string text = FileUtils.TryReadAsString(ModBase.PathTemp + "Cache\\Notice.cfg", (Encoding)null, (Type)null) ?? ""; if (StringExtensions.Split(text, "|", false).Count() >= 3) { - return Conversions.ToDouble(StringExtensions.Split(text, "|", false)[2]) <= 413.0; + return Conversions.ToDouble(StringExtensions.Split(text, "|", false)[2]) <= 415.0; } result = null; } ===== Properties/AssemblyInfo.cs ===== --- a/Properties/AssemblyInfo.cs (2.99.0.0) +++ b/Properties/AssemblyInfo.cs (2.99.0.1) @@ -17,8 +17,8 @@ [assembly: ComVisible(false)] [assembly: ThemeInfo(/*Could not decode attribute arguments.*/)] [assembly: Guid("fc6bb5fb-fe5c-4b25-84d7-2effb821c4bd")] -[assembly: AssemblyFileVersion("2.99.0.0")] +[assembly: AssemblyFileVersion("2.99.0.1")] [assembly: NeutralResourcesLanguage("")] [assembly: AssemblyAssociatedContentFile("maskfiles/plain%20craft%20launcher%202.sln")] [assembly: RootNamespace("PCL")] -[assembly: AssemblyVersion("2.99.0.0")] +[assembly: AssemblyVersion("2.99.0.1")]