diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 1b469306..47c20bda 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -144,6 +144,8 @@ + + @@ -165,8 +167,6 @@ - - diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index 216e0fcc..984d47ed 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -500,7 +500,7 @@ namespace FModel //METHODS private string readPAKGuid(string pakPath) { - using (BinaryReader reader = new BinaryReader(File.Open(pakPath, FileMode.Open))) + using (BinaryReader reader = new BinaryReader(File.Open(pakPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))) { reader.BaseStream.Seek(reader.BaseStream.Length - 61 - 160, SeekOrigin.Begin); uint g1 = reader.ReadUInt32(); @@ -877,6 +877,7 @@ namespace FModel if (Properties.Settings.Default.UMConsumablesWeapons == true) { searchResults.Add("Athena/Items/Consumables/"); + searchResults.Add("Athena/Items/Gameplay/"); searchResults.Add("Athena/Items/Weapons/"); } if (Properties.Settings.Default.UMTraps == true) diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index b529df72..c9a9a524 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -130,12 +130,6 @@ ..\Resources\properties_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\BurbankBigCondensed-Black.otf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\BurbankBigCondensed-Bold.otf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\BG512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,4 +196,10 @@ ..\Resources\Marvel512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\BurbankBigCondensed-Black.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\BurbankBigCondensed-Bold.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/FModel/Resources/BurbankBigCondensed-Black.otf b/FModel/Resources/BurbankBigCondensed-Black.otf deleted file mode 100644 index 0960123f..00000000 Binary files a/FModel/Resources/BurbankBigCondensed-Black.otf and /dev/null differ diff --git a/FModel/Resources/BurbankBigCondensed-Black.ttf b/FModel/Resources/BurbankBigCondensed-Black.ttf new file mode 100644 index 00000000..5b97841f Binary files /dev/null and b/FModel/Resources/BurbankBigCondensed-Black.ttf differ diff --git a/FModel/Resources/BurbankBigCondensed-Bold.otf b/FModel/Resources/BurbankBigCondensed-Bold.otf deleted file mode 100644 index 86eb241d..00000000 Binary files a/FModel/Resources/BurbankBigCondensed-Bold.otf and /dev/null differ diff --git a/FModel/Resources/BurbankBigCondensed-Bold.ttf b/FModel/Resources/BurbankBigCondensed-Bold.ttf new file mode 100644 index 00000000..f2bac4d3 Binary files /dev/null and b/FModel/Resources/BurbankBigCondensed-Bold.ttf differ