diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
index ee9ea0e7..7aaab0fa 100644
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -20,11 +20,10 @@
- x64
- true
- 1701;1702;NU1701
+ x64
+ true
+ 1701;1702;NU1701
-
x64
true
diff --git a/FModel/PakReader/Parsers/PropertyTagData/SetProperty.cs b/FModel/PakReader/Parsers/PropertyTagData/SetProperty.cs
index 043fa66e..67eae25f 100644
--- a/FModel/PakReader/Parsers/PropertyTagData/SetProperty.cs
+++ b/FModel/PakReader/Parsers/PropertyTagData/SetProperty.cs
@@ -1,4 +1,3 @@
-using System;
using PakReader.Parsers.Objects;
namespace PakReader.Parsers.PropertyTagData
@@ -10,10 +9,9 @@ namespace PakReader.Parsers.PropertyTagData
{
Position = reader.Position;
var NumKeysToRemove = reader.ReadInt32();
- if (NumKeysToRemove != 0)
+ for (int i = 0; i < NumKeysToRemove; i++)
{
- // Let me know if you find a package that has a non-zero NumKeysToRemove value
- throw new NotImplementedException("Parsing of non-zero NumKeysToRemove sets aren't supported yet.");
+ ReadAsObject(reader, tag, tag.InnerType, ReadType.ARRAY); // read in the air? uh ok
}
var NumEntries = reader.ReadInt32();
diff --git a/FModel/PakReader/Textures/TextureDecoder.cs b/FModel/PakReader/Textures/TextureDecoder.cs
index bb1bc399..d929915c 100644
--- a/FModel/PakReader/Textures/TextureDecoder.cs
+++ b/FModel/PakReader/Textures/TextureDecoder.cs
@@ -36,11 +36,11 @@ namespace PakReader.Textures
break;
case EPixelFormat.PF_BC5:
data = BCDecoder.DecodeBC5(sequence, width, height);
- colorType = SKColorType.Bgra8888;
+ colorType = SKColorType.Rgb888x;
break;
case EPixelFormat.PF_BC4:
data = BCDecoder.DecodeBC4(sequence, width, height);
- colorType = SKColorType.Bgra8888;
+ colorType = SKColorType.Rgb888x;
break;
case EPixelFormat.PF_G8:
data = sequence;
diff --git a/FModel/Properties/Settings.Designer.cs b/FModel/Properties/Settings.Designer.cs
index 00c91a47..0f7a593a 100644
--- a/FModel/Properties/Settings.Designer.cs
+++ b/FModel/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace FModel.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -59,18 +59,6 @@ namespace FModel.Properties {
}
}
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("True")]
- public bool ReloadAesKeys {
- get {
- return ((bool)(this["ReloadAesKeys"]));
- }
- set {
- this["ReloadAesKeys"] = value;
- }
- }
-
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
@@ -514,5 +502,17 @@ namespace FModel.Properties {
this["SkipVersion"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool ReloadAesKeys {
+ get {
+ return ((bool)(this["ReloadAesKeys"]));
+ }
+ set {
+ this["ReloadAesKeys"] = value;
+ }
+ }
}
}
diff --git a/FModel/Properties/Settings.settings b/FModel/Properties/Settings.settings
index 9dd4d6e9..e26d4ac2 100644
--- a/FModel/Properties/Settings.settings
+++ b/FModel/Properties/Settings.settings
@@ -11,9 +11,6 @@
True
-
- True
-
True
@@ -125,5 +122,8 @@
False
+
+ True
+
\ No newline at end of file