diff --git a/FModel/App.config b/FModel/App.config index a329cfed..7caf235c 100644 --- a/FModel/App.config +++ b/FModel/App.config @@ -1,4 +1,4 @@ - + @@ -190,6 +190,18 @@ + + + + + + + + + + + + diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 8247097a..e3f8d3ca 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -64,17 +64,17 @@ FModel.Program - - ..\packages\Autoupdater.NET.Official.1.5.7\lib\net40\AutoUpdater.NET.dll + + ..\packages\Autoupdater.NET.Official.1.5.8\lib\net40\AutoUpdater.NET.dll - - ..\packages\HtmlAgilityPack.1.11.16\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.11.17\lib\Net45\HtmlAgilityPack.dll ..\packages\AvalonEdit.6.0.0\lib\net45\ICSharpCode.AvalonEdit.dll - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Ookii.Dialogs.Wpf.1.1.0\lib\net45\Ookii.Dialogs.Wpf.dll @@ -83,12 +83,25 @@ ..\packages\RestSharp.106.6.10\lib\net452\RestSharp.dll - ..\packages\SkiaSharp.1.68.0\lib\net45\SkiaSharp.dll + ..\packages\SkiaSharp.1.68.1\lib\net45\SkiaSharp.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + + + ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.6.0-preview5.19224.8\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0-preview3.19551.4\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + @@ -609,11 +622,11 @@ - + Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}. - + \ No newline at end of file diff --git a/FModel/FModel_Main.xaml.cs b/FModel/FModel_Main.xaml.cs index b2bd8410..fedd262d 100644 --- a/FModel/FModel_Main.xaml.cs +++ b/FModel/FModel_Main.xaml.cs @@ -53,7 +53,6 @@ namespace FModel await Task.Run(() => { - FoldersUtility.LoadFolders(); FoldersUtility.CheckWatermark(); RegisterFromPath.FilterPAKs(); DynamicKeysChecker.SetDynamicKeys(); diff --git a/FModel/Methods/Utilities/PAKsUtility.cs b/FModel/Methods/Utilities/PAKsUtility.cs index 771bf1ff..9d139452 100644 --- a/FModel/Methods/Utilities/PAKsUtility.cs +++ b/FModel/Methods/Utilities/PAKsUtility.cs @@ -10,8 +10,6 @@ namespace FModel.Methods.Utilities { static class PAKsUtility { - private const int _SIZE = 4 * 2 + 8 * 2 + 20 + /* new fields */ 1 + 16; - public static string GetPAKGuid(string PAKPath) { using (BinaryReader reader = new BinaryReader(File.Open(PAKPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))) diff --git a/FModel/Program.cs b/FModel/Program.cs index 1ba059d0..7219f68d 100644 --- a/FModel/Program.cs +++ b/FModel/Program.cs @@ -87,8 +87,6 @@ namespace FModel isClosing = true; DebugHelper.Logger.AsyncWrite = false; - DebugHelper.WriteLine("FModel closing."); - Properties.Settings.Default.Save(); DebugHelper.WriteLine("FModel closed."); @@ -100,6 +98,7 @@ namespace FModel get { string filename = string.Format("FModel-Log-{0:yyyy-MM-dd}.txt", DateTime.Now); + FoldersUtility.LoadFolders(); return Path.Combine(Properties.Settings.Default.FOutput_Path + "\\Logs", filename); } } diff --git a/FModel/packages.config b/FModel/packages.config index f270c983..a4fc1ad6 100644 --- a/FModel/packages.config +++ b/FModel/packages.config @@ -1,12 +1,16 @@  - + - - + + - + + + + + \ No newline at end of file