lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
morkt
2018-01-10 17:32:19 +04:00
parent a3664adb53 a6865194c4
commit c1a6c69145
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ArcFormats/KiriKiri/WidgetXP3.xaml.cs
View File

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

2
ArcFormats/Malie/ArcLIB.cs
View File

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

BIN
ArcFormats/Resources/Formats.dat
View File

Binary file not shown.

2
GameRes/ArchiveFormat.cs
View File

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

2
docs/version.xml
View File

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