FModel 2.1.1

4sval · Apr 30, 2019 · 84256b6 · 84256b6
1 parent a684ee1
commit 84256b6
Show file tree

Hide file tree

Showing 12 changed files with 294 additions and 42 deletions.
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -144,6 +144,10 @@
   <ItemGroup>
     <Content Include="DLLs\ScintillaNET FindReplaceDialog.dll" />
     <Content Include="FModel.ico" />
+    <None Include="Resources\Challenges_Slider.png" />
+    <None Include="Resources\T-Items-MTX-L.png" />
+    <None Include="Resources\T-FNBR-SeasonalXP-L.png" />
+    <None Include="Resources\T-FNBR-BattlePoints-L.png" />
     <None Include="Resources\BurbankBigCondensed-Black.ttf" />
     <None Include="Resources\BurbankBigCondensed-Bold.ttf" />
     <None Include="Resources\Marvel512.png" />

diff --git a/FModel/Forms/SearchFiles.cs b/FModel/Forms/SearchFiles.cs
@@ -110,7 +110,6 @@ private async void SearchFiles_Load(object sender, EventArgs e)
 
                 await Task.Run(() =>
                 {
-                    Console.WriteLine(MainWindow.PAKasTXT[0]);
                     ShowItemsVirtual(myInfos);
                 });
             }

diff --git a/FModel/MainWindow.Designer.cs b/FModel/MainWindow.Designer.cs
diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs
diff --git a/FModel/MainWindow.resx b/FModel/MainWindow.resx
@@ -131,7 +131,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa
-        CAAAAk1TRnQBSQFMAgEBAgEAAZABAAGQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -176,7 +176,7 @@
     <value>522, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>97</value>
+    <value>63</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs
diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx
@@ -202,4 +202,16 @@
   <data name="BurbankBigCondensed_Bold" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\BurbankBigCondensed-Bold.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="T_FNBR_BattlePoints_L" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\T-FNBR-BattlePoints-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="T_FNBR_SeasonalXP_L" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\T-FNBR-SeasonalXP-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="T_Items_MTX_L" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\T-Items-MTX-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Challenges_Slider" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Challenges_Slider.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/FModel/Resources/Challenges_Slider.png b/FModel/Resources/Challenges_Slider.png
diff --git a/FModel/Resources/T-FNBR-BattlePoints-L.png b/FModel/Resources/T-FNBR-BattlePoints-L.png
diff --git a/FModel/Resources/T-FNBR-SeasonalXP-L.png b/FModel/Resources/T-FNBR-SeasonalXP-L.png
diff --git a/FModel/Resources/T-Items-MTX-L.png b/FModel/Resources/T-Items-MTX-L.png
diff --git 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.1)
+[![](https://img.shields.io/badge/Release-Executable-orange.svg?logo=github)](https://github.com/iAmAsval/FModel/releases/tag/2.1.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/yvHjata.png) with all **Challenges' Description**, **Count** and the **Reward**
+    - Try to create an [Icon](https://i.imgur.com/1Uzrlb0.png) with all **Challenges' Description**, **Count** and the **Reward**
   - Asset is a **_Font_**:
     - Try to convert the Asset to OTF
 
@@ -81,7 +81,6 @@ I'd highly suggest you to use [UModel](https://github.com/gildor2/UModel) instea
 
 ## TODO
 - [ ] Auto update
-- [ ] FModel status message
 - [ ] Support for meshes
 - [ ] Support for animations
 - [ ] Display support for .locres files
-Original file line number
+Diff line change
@@ Expand Up @@
                     await Task.Run(() =>
                     {
-                        Console.WriteLine(MainWindow.PAKasTXT[0]);
                         ShowItemsVirtual(myInfos);
                     });
                 }
@@ Expand Down @@