diff --git a/ArcFormats/Properties/AssemblyInfo.cs b/ArcFormats/Properties/AssemblyInfo.cs index 3638f51b..8ba0364a 100644 --- a/ArcFormats/Properties/AssemblyInfo.cs +++ b/ArcFormats/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.2.16.641")] -[assembly: AssemblyFileVersion ("1.2.16.641")] +[assembly: AssemblyVersion ("1.2.17.706")] +[assembly: AssemblyFileVersion ("1.2.17.706")] diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj index 9b211d39..8f7e7f4d 100644 --- a/GUI/GARbro.GUI.csproj +++ b/GUI/GARbro.GUI.csproj @@ -77,27 +77,23 @@ - - False - packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll + + ..\packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll - - False - packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll + + ..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll packages\NAudio.1.7.3\lib\net35\NAudio.dll True - - False - packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll + + ..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll - - False - packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll + + ..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll @@ -110,9 +106,8 @@ - - False - packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll + + ..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll @@ -290,7 +285,7 @@ - perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) + perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) "$(SolutionDir)\" exit 0 @@ -303,4 +298,4 @@ exit 0 --> - + \ No newline at end of file diff --git a/GUI/Properties/AssemblyInfo.cs b/GUI/Properties/AssemblyInfo.cs index 96b87f3f..3c71e011 100644 --- a/GUI/Properties/AssemblyInfo.cs +++ b/GUI/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany ("mørkt")] [assembly: AssemblyProduct("GARbro.GUI")] -[assembly: AssemblyCopyright ("Copyright © 2014-2015 mørkt")] +[assembly: AssemblyCopyright("Copyright © 2014-2016 mørkt")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.2.12.0")] -[assembly: AssemblyFileVersion ("1.2.12.0")] +[assembly: AssemblyVersion ("1.2.13.1024")] +[assembly: AssemblyFileVersion ("1.2.13.1024")] diff --git a/GUI/Resources/Formats.dat b/GUI/Resources/Formats.dat index 797e473f..e4f4a31b 100644 Binary files a/GUI/Resources/Formats.dat and b/GUI/Resources/Formats.dat differ diff --git a/GameRes/Properties/AssemblyInfo.cs b/GameRes/Properties/AssemblyInfo.cs index e8edfd2e..de6918b4 100644 --- a/GameRes/Properties/AssemblyInfo.cs +++ b/GameRes/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.2.13.137")] -[assembly: AssemblyFileVersion ("1.2.13.137")] +[assembly: AssemblyVersion ("1.2.14.139")] +[assembly: AssemblyFileVersion ("1.2.14.139")] diff --git a/inc-revision.pl b/inc-revision.pl index 6dab523b..3f204f97 100644 --- a/inc-revision.pl +++ b/inc-revision.pl @@ -20,22 +20,22 @@ sub match_version { return $_[0] =~ /^(\d+)\.(\d+)(?:\.(\d+)\.(\d+))?/; } -unless (1 == $#ARGV) { - print "usage: inc-revision.pl PROJECT-FILE CONFIG\n"; +if ($#ARGV < 1) { + print "usage: inc-revision.pl PROJECT-FILE CONFIG [ROOT-DIR]\n"; exit 0; } -my ($project_path, $config) = @ARGV; +my ($project_path, $config, $root_dir) = @ARGV; my $project_dir = dirname ($project_path); -my $project_file = basename ($project_path); +$root_dir //= $project_dir; my $is_release = 'release' eq lc $config; -chdir $project_dir or die "$project_dir: $!\n"; +chdir $root_dir or die "$root_dir: $!\n"; my $git_exe = get_git_exe; -my $prop_dir = File::Spec->catfile ('.', 'Properties'); -my $assembly_info = File::Spec->catfile ($prop_dir, 'AssemblyInfo.cs'); my $revision = `$git_exe rev-list HEAD --count .`; die "git.exe failed\n" if $? != 0; +my $prop_dir = File::Spec->catfile ($project_dir, 'Properties'); +my $assembly_info = File::Spec->catfile ($prop_dir, 'AssemblyInfo.cs'); chomp $revision; my $version_changed = 0; diff --git a/packages/repositories.config b/packages/repositories.config new file mode 100644 index 00000000..5ec48574 --- /dev/null +++ b/packages/repositories.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/supported.html b/supported.html index bc9c523f..553d0a75 100644 --- a/supported.html +++ b/supported.html @@ -153,6 +153,7 @@ Folklore Jam
I/O
Natsuiro Kouen ~Denpatou no Shita de Ai wo Kataru~
Onegai O-Hoshi-sama
+Toriko Hime ~Hakudaku Mamire no Reijou~
Tsuma Youji
Tsuma Youji 2
Yume Miru Kusuri