Merge remote-tracking branch 'refs/remotes/origin/master' into res-settings

ArcFormats/KiriKiri/WidgetXP3.xaml.cs

@@ -15,11 +15,14 @@ namespace GameRes.Formats.GUI
     {
         public WidgetXP3 ()
         {
+            var last_selected = Properties.Settings.Default.XP3Scheme;
             InitializeComponent();
             var keys = new[] { new KeyValuePair<string, ICrypt> (arcStrings.ArcNoEncryption, Xp3Opener.NoCryptAlgorithm) };
             this.DataContext = keys.Concat (Xp3Opener.KnownSchemes.OrderBy (x => x.Key));
             this.Loaded += (s, e) => {
-                if (-1 == this.Scheme.SelectedIndex)
+                if (!string.IsNullOrEmpty (last_selected))
+                    this.Scheme.SelectedValue = last_selected;
+                else
                     this.Scheme.SelectedIndex = 0;
             };
         }

ArcFormats/Malie/ArcLIB.cs

@@ -134,7 +134,7 @@ namespace GameRes.Formats.Malie
         public DatOpener ()
         {
             Extensions = new string[] { "lib", "dat" };
-            Signatures = new uint[] { 0, 0x3F503FB1, 0xC237434E };
+            Signatures = new uint[] { 0, 0x3F503FB1, 0xC237434E, 0x8CD11522 };
         }
 
         public override ArcFile TryOpen (ArcView file)

GameRes/ArchiveFormat.cs

@@ -127,7 +127,7 @@ namespace GameRes
         /// </summary>
         public static bool IsSaneCount (int count)
         {
-            return count > 0 && count < 0x20000;
+            return count > 0 && count < 0x40000;
         }
 
         /// <summary>

docs/version.xml

@@ -21,7 +21,7 @@
 </Notes>
     </Release>
     <FormatsData>
-        <FileVersion>96</FileVersion>
+        <FileVersion>98</FileVersion>
         <Url>https://github.com/morkt/GARbro/raw/master/ArcFormats/Resources/Formats.dat</Url>
         <Requires>
             <Assembly Name="ArcFormats" Version="1.2.36.1546"/>