Merge branch 'main' into fix#5966

Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb

@@ -1899,6 +1899,7 @@ NextVersion:
             '1.6 ~ 10 ：zh_CN 时正常，zh_cn 时自动切换为英文
             '1.11 ~ 12：zh_cn 时正常，zh_CN 时虽然显示了中文但语言设置会错误地显示选择英文
             '1.13+    ：zh_cn 时正常，zh_CN 时自动切换为英文
+            IniClearCache(SetupFileAddress) '清除缓存（#2294）
             Dim CurrentLang As String = ReadIni(SetupFileAddress, "lang", "none")
             Dim RequiredLang As String = If(CurrentLang = "none" OrElse Not Directory.Exists(McVersionCurrent.PathIndie & "saves"), '#3844，整合包可能已经自带了 options.txt
                 If(Setup.Get("ToolHelpChinese"), "zh_cn", "en_us"), CurrentLang.ToLower)

Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb

@@ -545,7 +545,7 @@ pause"
         Dim VersionFolder As String = McFolder & "versions\" & Id & "\"
         Dim IsNewVersion As Boolean = DownloadInfo.Inherit.Contains("w") OrElse Val(DownloadInfo.Inherit.Split(".")(1)) >= 14
         Dim Target As String = If(IsNewVersion,
-            RequestTaskTempFolder(),
+            RequestTaskTempFolder() & "temp",
             McFolder & "libraries\optifine\OptiFine\" & DownloadInfo.NameFile.Replace("OptiFine_", "").Replace(".jar", "").Replace("preview_", "") & "\" & DownloadInfo.NameFile.Replace("OptiFine_", "OptiFine-").Replace("preview_", ""))
         Dim Loaders As New List(Of LoaderBase)
 
@@ -613,8 +613,8 @@ pause"
             Log("[Download] 检测为新版 OptiFine：" & DownloadInfo.Inherit)
             Loaders.Add(New LoaderTask(Of List(Of NetFile), Boolean)("安装 OptiFine（方式 A）",
             Sub(Task As LoaderTask(Of List(Of NetFile), Boolean))
-                Dim BaseMcFolderHome As String = RequestTaskTempFolder()
-                Dim BaseMcFolder As String = BaseMcFolderHome & ".minecraft\"
+                Dim BaseMcFolderHome As String = BaseMcFolderHome.TrimEnd("\")
+                Dim BaseMcFolder As String = BaseMcFolderHome & "\.minecraft\"
                 Try
                     '准备安装环境
                     If Directory.Exists(BaseMcFolder & "versions\" & DownloadInfo.Inherit) Then

Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb

@@ -243,7 +243,7 @@ Retry:
                             {"Minecon2013", "Minecon 2013 参与者披风"}, {"Minecon2015", "Minecon 2015 参与者披风"}, {"Minecon2016", "Minecon 2016 参与者披风"},
                             {"Cherry Blossom", "樱花披风"}, {"15th Anniversary", "15 周年纪念披风"}, {"Purple Heart", "紫色心形披风"},
                             {"Follower's", "追随者披风"}, {"MCC 15th Year", "MCC 15 周年披风"}, {"Minecraft Experience", "村民救援披风"},
-                            {"Mojang Office", "Mojang 办公室披风"}, {"Yearn", "渴望披风"}
+                            {"Mojang Office", "Mojang 办公室披风"}, {"Home", "家园披风"}, {"Menace", "入侵披风"}, {"Yearn", "渴望披风"}
                         }
                         Dim SelectionControl As New List(Of IMyRadio) From {New MyRadioBox With {.Text = "无披风"}}
                         For Each Cape In SkinData("capes")

Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml

@@ -176,6 +176,9 @@
                                         <System:String>"</System:String>
                                         <System:String>“</System:String>
                                         <System:String>”</System:String>
+                                        <System:String>/</System:String>
+                                        <System:String>http://</System:String>
+                                        <System:String>https://</System:String>
                                     </local:ValidateExcept.Excepts>
                                 </local:ValidateExcept>
                             </local:MyTextBox.ValidateRules>