Version bump to 2.0. Minor tweaks to WPF UI.

kabili207 · Dec 7, 2014 · 5df74d2 · 5df74d2
1 parent 8155057
commit 5df74d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/OracleHack.csproj b/OracleHack.csproj
@@ -45,7 +45,7 @@
     <Compile Include="GameInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="libs\Newtonsoft.Json.dll" />
+    <None Include="libs\Newtonsoft.Json.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
@@ -9,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("OracleHack")]
-[assembly: AssemblyCopyright("Copyright © Andrew \"Kabili\" Nagle 2013")]
+[assembly: AssemblyCopyright("Copyright © Andrew \"Kabili\" Nagle 2013 - 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -19,13 +20,13 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.0.0.*")]
+[assembly: AssemblyVersion("2.0.0.*")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
 
 //[assembly: AssemblyDelaySign(false)]
 //[assembly: AssemblyKeyFile("")]
 
-[assembly: AssemblyInformationalVersion("1.0")]
+[assembly: AssemblyInformationalVersion("2.0")]
 
diff --git 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

diff --git a/VbaGameInfo.cs b/VbaGameInfo.cs
@@ -14,7 +14,7 @@ public VbaGameInfo()
 
 		}
 
-		public static VbaGameInfo Load(Stream fsSource)
+		public static new VbaGameInfo Load(Stream fsSource)
 		{
 			VbaGameInfo info = new VbaGameInfo();
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ public VbaGameInfo() @@
     		}
-    		public static VbaGameInfo Load(Stream fsSource)
+    		public static new VbaGameInfo Load(Stream fsSource)
     		{
     			VbaGameInfo info = new VbaGameInfo();
@@ Expand Down @@