From d58491ae80821507e559d9ad4fbbfc0e5a31e2e7 Mon Sep 17 00:00:00 2001 From: Asval Date: Sat, 20 Apr 2019 18:44:15 +0200 Subject: [PATCH] FModel 2.0.1 --- FModel/MainWindow.Designer.cs | 8 ++++---- FModel/MainWindow.cs | 2 +- FModel/MainWindow.resx | 2 +- README.md | 6 ++++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/FModel/MainWindow.Designer.cs b/FModel/MainWindow.Designer.cs index 3c9b47d9..9a2f91ff 100644 --- a/FModel/MainWindow.Designer.cs +++ b/FModel/MainWindow.Designer.cs @@ -211,7 +211,7 @@ // saveImageToolStripMenuItem // this.saveImageToolStripMenuItem.Name = "saveImageToolStripMenuItem"; - this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.saveImageToolStripMenuItem.Text = "Save Image"; this.saveImageToolStripMenuItem.Click += new System.EventHandler(this.saveImageToolStripMenuItem_Click); // @@ -219,18 +219,18 @@ // this.autoSaveImagesToolStripMenuItem.CheckOnClick = true; this.autoSaveImagesToolStripMenuItem.Name = "autoSaveImagesToolStripMenuItem"; - this.autoSaveImagesToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.autoSaveImagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.autoSaveImagesToolStripMenuItem.Text = "Auto Save Images"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(165, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6); // // mergeImagesToolStripMenuItem // this.mergeImagesToolStripMenuItem.Name = "mergeImagesToolStripMenuItem"; - this.mergeImagesToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.mergeImagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.mergeImagesToolStripMenuItem.Text = "Merge Images"; this.mergeImagesToolStripMenuItem.Click += new System.EventHandler(this.mergeImagesToolStripMenuItem_Click); // diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index 826cb8f9..0c03ee90 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -27,7 +27,7 @@ namespace FModel FindReplace MyFindReplace; Stopwatch stopWatch; private static string[] PAKsArray; - private static string[] PAKasTXT; + public static string[] PAKasTXT; private static Dictionary AllPAKsDictionary; private static Dictionary questStageDict; private static Dictionary diffToExtract; diff --git a/FModel/MainWindow.resx b/FModel/MainWindow.resx index 3bd56eab..9f8f9909 100644 --- a/FModel/MainWindow.resx +++ b/FModel/MainWindow.resx @@ -131,7 +131,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa - CAAAAk1TRnQBSQFMAgEBAgEAAWgBAAFoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAXgBAAF4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/README.md b/README.md index b80c8ed7..6ecdae4c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,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.0) +[![](https://img.shields.io/badge/Release-Executable-orange.svg?logo=github)](https://github.com/iAmAsval/FModel/releases/tag/2.0.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 and it'll automatically download the latest version of the custom [Fortnite Asset Parser](https://github.com/SirWaddles/JohnWickParse) in this subfolder. @@ -31,7 +31,7 @@ - Asset is a **_Sound_**: - Try to convert the Asset to OGG and play the sound - Asset is a **_Bundle Of Challenges_**: - - Try to create an [Icon](https://i.imgur.com/J3Ah28b.png) with all **Challenges' Description**, **Count** and the **Reward** + - Try to create an [Icon](https://i.imgur.com/BP5zRFf.png) with all **Challenges' Description**, **Count** and the **Reward** - Asset is a **_Font_**: - Try to convert the Asset to OTF @@ -58,6 +58,7 @@ ## DOCUMENTATION ### Important If you find this repository useful, feel free to give it a :star: thank you :kissing_heart: +If somehow FModel crash because of permissions (on an administrator account for example) please either disable Windows Defender or add and exception for FModel.exe ### Features 1. Extract 2. Serialize (CTRL+F/G/I support) @@ -78,6 +79,7 @@ This project is mainly based on what [UModel](https://github.com/gildor2/UModel) I'd highly suggest you to use [UModel](https://github.com/gildor2/UModel) instead if you wanna use something made professionnaly. ## TODO +- [ ] Search through PAKs - [ ] Support for meshes - [ ] Support for animations - [ ] Display support for .locres files