mirror of
https://github.com/4sval/FModel.git
synced 2026-08-28 04:14:30 -05:00
fixed fonts crash on old windows version + fmodel can now be used even if paks are used by something else
This commit is contained in:
@@ -144,6 +144,8 @@
|
||||
<ItemGroup>
|
||||
<Content Include="DLLs\ScintillaNET FindReplaceDialog.dll" />
|
||||
<Content Include="FModel.ico" />
|
||||
<None Include="Resources\BurbankBigCondensed-Black.ttf" />
|
||||
<None Include="Resources\BurbankBigCondensed-Bold.ttf" />
|
||||
<None Include="Resources\Marvel512.png" />
|
||||
<None Include="Resources\T-Icon-Pets-64.png" />
|
||||
<None Include="Resources\T-Icon-Quests-64.png" />
|
||||
@@ -165,8 +167,6 @@
|
||||
<None Include="Resources\E512.png" />
|
||||
<None Include="Resources\C512.png" />
|
||||
<None Include="Resources\BG512.png" />
|
||||
<None Include="Resources\BurbankBigCondensed-Black.otf" />
|
||||
<None Include="Resources\BurbankBigCondensed-Bold.otf" />
|
||||
<None Include="Resources\properties_16xLG.png" />
|
||||
<None Include="Resources\StatusAnnotations_Information_16xLG_color.png" />
|
||||
<None Include="Resources\folder_Closed_16xLG.png" />
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -130,12 +130,6 @@
|
||||
<data name="properties_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\properties_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="BurbankBigCondensed_Black" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\BurbankBigCondensed-Black.otf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="BurbankBigCondensed_Bold" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\BurbankBigCondensed-Bold.otf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="BG512" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\BG512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -202,4 +196,10 @@
|
||||
<data name="Marvel512" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Marvel512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="BurbankBigCondensed_Black" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\BurbankBigCondensed-Black.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<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>
|
||||
</root>
|
||||
Binary file not shown.
BIN
FModel/Resources/BurbankBigCondensed-Black.ttf
Normal file
BIN
FModel/Resources/BurbankBigCondensed-Black.ttf
Normal file
Binary file not shown.
Binary file not shown.
BIN
FModel/Resources/BurbankBigCondensed-Bold.ttf
Normal file
BIN
FModel/Resources/BurbankBigCondensed-Bold.ttf
Normal file
Binary file not shown.
Reference in New Issue
Block a user