Merge branch 'master' into classified

.gitattributes

@@ -1 +0,0 @@
-*.dat text

.gitignore

@@ -301,8 +301,9 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-# ignore /lib/save
+# ignore /lib
 lib/save/
+lib/build/
 
 # ignore binaries in p3d project
 p3d/**/*.exe
@@ -315,6 +316,3 @@ p3d/GameModes/
 p3d/save/
 p3d/screenshots/
 p3d/log.dat
-
-# include lib/build
-!lib/build

P3D/P3D.vbproj

@@ -15,7 +15,7 @@
     <MonoGamePlatform>Windows</MonoGamePlatform>
     <MonoGameContentBuilderExe>
     </MonoGameContentBuilderExe>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <ApplicationIcon>Pokemon3D.ico</ApplicationIcon>

README.md

@@ -42,7 +42,7 @@ The first build of the game will take a little longer due to the MonoGame Conten
 The game was configured to connect to several servers and internet APIs using private keys.
 To keep the private keys private, they have been redacted from the source code, along with a few URLs.
 
-If you want to you can add your own private keys/URLs back into the game to enable certain online features. To find these places search for these comments in the source code; `' CLASSIFIED` or you can open __Core/Classified.vb__.
+If you want to you can add your own private keys/URLs back into the game to enable certain online features. To find these places search for these comments in the source code: `' CLASSIFIED`
 
 Every line that has the "CLASSIFIED" comment at the end of it had some kind of string removed from it.