Merge branch 'main' of github.com:CollapseLauncher/Collapse

Author: Cryotechnic

.all-contributorsrc

@@ -14,7 +14,7 @@
       "login": "neon-nyan",
       "name": "Kemal Setya Adhi",
       "avatar_url": "https://avatars.githubusercontent.com/u/30566970?v=4",
-      "profile": "https://prophost.ironmaid.xyz",
+      "profile": "https://github.com/neon-nyan",
       "contributions": [
         "code",
         "design",
@@ -208,10 +208,10 @@
       ]
     },
     {
-      "login": "kujou-kju",
-      "name": "kujou",
+      "login": "puyomi2k",
+      "name": "puyomi",
       "avatar_url": "https://avatars.githubusercontent.com/u/23724383?v=4",
-      "profile": "https://github.com/kujou-kju",
+      "profile": "https://github.com/puyomi2k",
       "contributions": [
         "translation"
       ]

ClearCache.bat

@@ -1,33 +1,31 @@
 @echo off
-echo 	Clearing Collapse cache
+echo     Clearing Collapse cache
 rmdir /S /Q CollapseLauncher\bin && rmdir /S /Q CollapseLauncher\obj
-echo 	Clearing ColorThief cache
+echo     Clearing ColorThief cache
 rmdir /S /Q ColorThief\ColorThief\bin && rmdir /S /Q ColorThief\ColorThief\obj
-echo 	Clearing CommunityToolkit.ImageCropper cache
+echo     Clearing CommunityToolkit.ImageCropper cache
 rmdir /S /Q Hi3Helper.CommunityToolkit\ImageCropper\bin && rmdir /S /Q Hi3Helper.CommunityToolkit\ImageCropper\obj
-echo 	Clearing CommunityToolkit.SettingsControls cache
+echo     Clearing CommunityToolkit.SettingsControls cache
 rmdir /S /Q Hi3Helper.CommunityToolkit\SettingsControls\bin && rmdir /S /Q Hi3Helper.CommunityToolkit\SettingsControls\obj
-echo 	Clearing Core cache
+echo     Clearing Core cache
 rmdir /S /Q Hi3Helper.Core\bin && rmdir /S /Q Hi3Helper.Core\obj
-echo 	Clearing EncTool cache
+echo     Clearing EncTool cache
 rmdir /S /Q Hi3Helper.EncTool\bin && rmdir /S /Q Hi3Helper.EncTool\obj
-echo 	Clearing EncTool tester cache
-rmdir /S /Q Hi3Helper.EncTool.Test\bin && rmdir /S /Q Hi3Helper.EncTool.Test\obj
-echo 	Clearing Http cache
+echo     Clearing Http cache
 rmdir /S /Q Hi3Helper.Http\bin && rmdir /S /Q Hi3Helper.Http\obj
-echo 	Clearing Http tester cache
-rmdir /S /Q Hi3Helper.Http\Test\bin && rmdir /S /Q Hi3Helper.Http\Test\obj
-echo 	Clearing TaskScheduler cache
+echo     Clearing TaskScheduler cache
 rmdir /S /Q Hi3Helper.TaskScheduler\bin && rmdir /S /Q Hi3Helper.TaskScheduler\obj
-echo 	Clearing HDiff cache
-rmdir /S /Q Hi3Helper.SharpHDiffPatch\Hi3Helper.SharpHDiffPatch\bin && rmdir /S /Q Hi3Helper.SharpHDiffPatch\Hi3Helper.SharpHDiffPatch\obj
-echo 	Clearing 2nd HDiff cache
-rmdir /S /Q Hi3Helper.SharpHDiffPatch\SharpHDiffPatch\bin && rmdir /S /Q Hi3Helper.SharpHDiffPatch\SharpHDiffPatch\obj
-echo 	Clearing InnoSetupHelper cache
+echo     Clearing InnoSetupHelper cache
 rmdir /S /Q InnoSetupHelper\bin && rmdir /S /Q InnoSetupHelper\obj
-echo 	Clearing ImageEx cache
+echo     Clearing ImageEx cache
 rmdir /S /Q ImageEx\ImageEx\bin && rmdir /S /Q ImageEx\ImageEx\obj
-echo 	Clearing 7z cache
-rmdir /S /Q Hi3Helper.Core\Classes\Data\Tools\SevenZipTool\SevenZipExtractor\SevenZipExtractor\bin && rmdir /S /Q Hi3Helper.Core\Classes\Data\Tools\SevenZipTool\SevenZipExtractor\SevenZipExtractor\obj
-echo 	Clearing SharpDiscordRPC cache
-rmdir /S /Q Hi3Helper.SharpDiscordRPC\DiscordRPC\bin && rmdir /S /Q Hi3Helper.SharpDiscordRPC\DiscordRPC\obj
+echo     Clearing 7z cache
+rmdir /S /Q SevenZipExtractor\SevenZipExtractor\bin && rmdir /S /Q SevenZipExtractor\SevenZipExtractor\obj
+echo     Clearing SharpDiscordRPC cache
+rmdir /S /Q Hi3Helper.SharpDiscordRPC\DiscordRPC\bin && rmdir /S /Q Hi3Helper.SharpDiscordRPC\DiscordRPC\obj
+echo     Clearing Hi3Helper.SourceGen cache
+rmdir /S /Q Hi3Helper.SourceGen\bin && rmdir /S /Q Hi3Helper.SourceGen\obj
+echo     Clearing Hi3Helper.LocaleSourceGen cache
+rmdir /S /Q Hi3Helper.LocaleSourceGen\bin && rmdir /S /Q Hi3Helper.LocaleSourceGen\obj
+echo     Clearing Hi3Helper.Plugin.Core cache
+rmdir /S /Q Hi3Helper.Plugin.Core\bin && rmdir /S /Q Hi3Helper.Plugin.Core\obj

CollapseLauncher/Assets/CollapseLauncherLogoWithTextDark.png

@@ -1,2 +1,2 @@
 https://www.ffmpeg.org/
-LicenseHref;https://raw.githubusercontent.com/FFmpeg/FFmpeg/refs/heads/master/COPYING.LGPLv3;GNU Lesser General Public License (LGPLv3)
+LicenseHref;https://raw.githubusercontent.com/FFmpeg/FFmpeg/refs/heads/master/COPYING.LGPLv2.1;GNU Lesser General Public License (LGPLv2.1)

CollapseLauncher/Assets/FFmpegLogo.svg

@@ -2,7 +2,6 @@
 using CollapseLauncher.Extension;
 using CollapseLauncher.Helper;
 using CollapseLauncher.XAMLs.Theme.ContentDialog;
-using Hi3Helper;
 using Hi3Helper.Data;
 using Hi3Helper.Shared.Region;
 using Hi3Helper.Win32.FileDialogCOM;

CollapseLauncher/Assets/Licenses/FFmpeg/Homepage

@@ -1,6 +1,5 @@
 using CollapseLauncher.Extension;
 using CollapseLauncher.Helper;
-using Hi3Helper;
 using Hi3Helper.Data;
 using System;
 using System.Threading;

CollapseLauncher/Classes/FileDialog/FileDialogHelper.cs

@@ -4,7 +4,6 @@
 using CollapseLauncher.Helper;
 using CollapseLauncher.Helper.StreamUtility;
 using CollapseLauncher.XAMLs.Theme.ContentDialog;
-using Hi3Helper;
 using Hi3Helper.Data;
 using Hi3Helper.Win32.FileDialogCOM;
 using Microsoft.UI.Text;

CollapseLauncher/Classes/FileMigrationProcess/Events.cs

@@ -5,7 +5,6 @@
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;

CollapseLauncher/Classes/FileMigrationProcess/UIBuilder.cs

@@ -193,7 +193,7 @@ private static void MergeCanvasTargetWith(CanvasRenderTarget sourceCanvasTarget,
             return;
         }
 
-        DispatcherQueueExtensions.CurrentDispatcherQueue.TryEnqueue(DispatcherQueuePriority.High, () => ds.Dispose());
+        DispatcherQueueExtensions.CurrentDispatcherQueue.TryEnqueue(DispatcherQueuePriority.High, ds.Dispose);
     }
 
     private static double GetBitmapBitSize(DirectXPixelFormat pixelFormat)