From 715f93b07bfdabbda7432e28ad6e9888ee5b54b0 Mon Sep 17 00:00:00 2001 From: Asval Date: Sun, 23 Jun 2019 15:06:04 +0200 Subject: [PATCH] FModel 2.4.1 --- FModel/Forms/Settings.Designer.cs | 24 ++++++++++++------------ FModel/Methods/Utilities/Utilities.cs | 7 ++++++- FModel/Properties/AssemblyInfo.cs | 4 ++-- README.md | 2 +- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/FModel/Forms/Settings.Designer.cs b/FModel/Forms/Settings.Designer.cs index 2543fd9e..c44d4610 100644 --- a/FModel/Forms/Settings.Designer.cs +++ b/FModel/Forms/Settings.Designer.cs @@ -33,6 +33,7 @@ namespace FModel.Forms this.textBox2 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox_tryToOpen = new System.Windows.Forms.CheckBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.OKButton = new System.Windows.Forms.Button(); @@ -65,7 +66,6 @@ namespace FModel.Forms this.checkBox2 = new System.Windows.Forms.CheckBox(); this.textBox6 = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); - this.checkBox_tryToOpen = new System.Windows.Forms.CheckBox(); this.groupBox3.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox4.SuspendLayout(); @@ -119,11 +119,21 @@ namespace FModel.Forms this.groupBox2.TabStop = false; this.groupBox2.Text = "Extraction"; // + // checkBox_tryToOpen + // + this.checkBox_tryToOpen.AutoSize = true; + this.checkBox_tryToOpen.Location = new System.Drawing.Point(397, 22); + this.checkBox_tryToOpen.Name = "checkBox_tryToOpen"; + this.checkBox_tryToOpen.Size = new System.Drawing.Size(157, 17); + this.checkBox_tryToOpen.TabIndex = 8; + this.checkBox_tryToOpen.Text = "Try to open Extracted Asset"; + this.checkBox_tryToOpen.UseVisualStyleBackColor = true; + // // textBox1 // this.textBox1.Location = new System.Drawing.Point(54, 19); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(329, 20); + this.textBox1.Size = new System.Drawing.Size(337, 20); this.textBox1.TabIndex = 2; // // label1 @@ -468,16 +478,6 @@ namespace FModel.Forms this.label12.TabIndex = 9; this.label12.Text = "Watermark:"; // - // checkBox_tryToOpen - // - this.checkBox_tryToOpen.AutoSize = true; - this.checkBox_tryToOpen.Location = new System.Drawing.Point(389, 22); - this.checkBox_tryToOpen.Name = "checkBox_tryToOpen"; - this.checkBox_tryToOpen.Size = new System.Drawing.Size(162, 17); - this.checkBox_tryToOpen.TabIndex = 8; - this.checkBox_tryToOpen.Text = "Try to open Extracted Assets"; - this.checkBox_tryToOpen.UseVisualStyleBackColor = true; - // // Settings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/FModel/Methods/Utilities/Utilities.cs b/FModel/Methods/Utilities/Utilities.cs index 7fe37304..2c689118 100644 --- a/FModel/Methods/Utilities/Utilities.cs +++ b/FModel/Methods/Utilities/Utilities.cs @@ -30,7 +30,7 @@ namespace FModel Directory.CreateDirectory(App.DefaultOutputPath + "\\Extracted\\"); Directory.CreateDirectory(App.DefaultOutputPath + "\\Icons\\"); Directory.CreateDirectory(App.DefaultOutputPath + "\\Sounds\\"); - Directory.CreateDirectory(App.DefaultOutputPath + "\\Saved JSON\\"); + Directory.CreateDirectory(App.DefaultOutputPath + "\\Saved_JSON\\"); } /// @@ -86,10 +86,15 @@ namespace FModel { File.Delete(App.DefaultOutputPath + "\\john-wick-parse_custom.exe"); } + //this will stay for 1 update if (Directory.Exists(App.DefaultOutputPath + "\\LocRes\\")) { Directory.Delete(App.DefaultOutputPath + "\\LocRes\\"); } + if (Directory.Exists(App.DefaultOutputPath + "\\Saved JSON\\")) + { + Directory.Delete(App.DefaultOutputPath + "\\Saved JSON\\"); + } } /// diff --git a/FModel/Properties/AssemblyInfo.cs b/FModel/Properties/AssemblyInfo.cs index fc4bcbb3..2c71adf4 100644 --- a/FModel/Properties/AssemblyInfo.cs +++ b/FModel/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // en utilisant '*', comme indiqué ci-dessous : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.0.0")] -[assembly: AssemblyFileVersion("2.4.0.0")] +[assembly: AssemblyVersion("2.4.1.0")] +[assembly: AssemblyFileVersion("2.4.1.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/README.md b/README.md index 051f8069..1595926b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ### Prerequisites [.NET Framework 4.7.1](https://dotnet.microsoft.com/download/dotnet-framework/net471) ### Download -[![](https://img.shields.io/badge/Release-Executable-orange.svg?logo=github)](https://github.com/iAmAsval/FModel/releases/tag/2.4.0) +[![](https://img.shields.io/badge/Release-Executable-orange.svg?logo=github)](https://github.com/iAmAsval/FModel/releases/tag/2.4.1) ### How does it works **1.** Once you start the executable, you'll be asked to set your path to your Fortnite .PAK files. Meanwhile a `FModel` subfolder will be created in your `Documents` folder. ![](https://i.imgur.com/O2Vg3Bx.gif)