diff --git a/OracleHack b/OracleHack
index cac89ae..5df74d2 160000
--- a/OracleHack
+++ b/OracleHack
@@ -1 +1 @@
-Subproject commit cac89ae56925a3518506bb8e86dbfc16cb534e0f
+Subproject commit 5df74d2e5152af094818c1cbf71aae02cb766868
diff --git a/OracleHack.sln b/OracleHack.sln
index f296b04..43aee4f 100644
--- a/OracleHack.sln
+++ b/OracleHack.sln
@@ -30,15 +30,12 @@ Global
{ED9EED55-66D8-4B76-888D-A4FF3A3670C0}.Release|x86.ActiveCfg = Release|x86
{ED9EED55-66D8-4B76-888D-A4FF3A3670C0}.Release|x86.Build.0 = Release|x86
EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
$0.TextStylePolicy = $1
$1.FileWidth = 120
- $1.TabWidth = 4
- $1.inheritsSet = Mono
+ $1.TabsToSpaces = False
+ $1.inheritsSet = VisualStudio
$1.inheritsScope = text/plain
$1.scope = text/x-csharp
$0.CSharpFormattingPolicy = $2
@@ -53,6 +50,8 @@ Global
$2.StatementBraceStyle = NextLine
$2.ElseNewLinePlacement = NewLine
$2.ElseIfNewLinePlacement = SameLine
+ $2.CatchNewLinePlacement = NewLine
+ $2.FinallyNewLinePlacement = NewLine
$2.BeforeMethodDeclarationParentheses = False
$2.BeforeMethodCallParentheses = False
$2.BeforeConstructorDeclarationParentheses = False
@@ -64,5 +63,14 @@ Global
$2.inheritsSet = Mono
$2.inheritsScope = text/x-csharp
$2.scope = text/x-csharp
+ $0.DotNetNamingPolicy = $3
+ $3.DirectoryNamespaceAssociation = Hierarchical
+ $3.ResourceNamePolicy = MSBuild
+ $0.StandardHeader = $4
+ $4.Text =
+ $4.IncludeInNewFiles = True
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
diff --git a/OracleWin/AboutWindow.xaml b/OracleWin/AboutWindow.xaml
index 86159fb..ed96d11 100644
--- a/OracleWin/AboutWindow.xaml
+++ b/OracleWin/AboutWindow.xaml
@@ -13,7 +13,7 @@
-
+
diff --git a/OracleWin/OracleWin.csproj b/OracleWin/OracleWin.csproj
index ac3cc4f..686880e 100644
--- a/OracleWin/OracleWin.csproj
+++ b/OracleWin/OracleWin.csproj
@@ -16,21 +16,20 @@
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
- true
+ false
publish\
true
- Web
- true
+ Disk
+ false
Foreground
7
Days
false
false
true
- http://zyrenth.com/oracle/
- true
publish.htm
- 1
+ true
+ 2
1.0.0.%2a
false
true
@@ -213,7 +212,7 @@
Images\Seed_Seasons.gif
-
+
diff --git a/OracleWin/Properties/AssemblyInfo.cs b/OracleWin/Properties/AssemblyInfo.cs
index 4fd9709..ccd09b2 100644
--- a/OracleWin/Properties/AssemblyInfo.cs
+++ b/OracleWin/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("OracleWin")]
-[assembly: AssemblyCopyright("Copyright © Andrew \"Kabili\" Nagle 2013")]
+[assembly: AssemblyCopyright("Copyright © Andrew \"Kabili\" Nagle 2013 - 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -51,5 +51,5 @@
// 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.0.0.*")]
-[assembly: AssemblyInformationalVersion("1.1")]
+[assembly: AssemblyVersion("2.0.0.*")]
+[assembly: AssemblyInformationalVersion("2.0")]
diff --git a/README.md b/README.md
index b3792eb..c8f5cc4 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,13 @@ A decoder for the password system used in the Legend of Zelda Oracle of Ages and
### Features
* Decodes game and ring secrets
- * Partially generates game, ring, and memory secrets
+ * Generates game, ring, and memory secrets
* Allows the user to save the decoded game information for later use
### TODO
* Include a debugging screen to get raw information about secrets
* Finish GTK interface for Linux users
- * Determine logic used for checksums
### Special Thanks
* Paulygon - Created the [original secret generator](http://home.earthlink.net/~paul3/zeldagbc.html) way back in 2001