Merge remote-tracking branch 'upstream/Beta-Build'

Patrick Branch [2016-07-29 14:21:00]
Merge remote-tracking branch 'upstream/Beta-Build'
Filename
PokemonGo/RocketAPI/Window/SettingsForm.cs
README.md
diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.cs b/PokemonGo/RocketAPI/Window/SettingsForm.cs
index 000e498..808d322 100644
--- a/PokemonGo/RocketAPI/Window/SettingsForm.cs
+++ b/PokemonGo/RocketAPI/Window/SettingsForm.cs
@@ -64,16 +64,16 @@ namespace PokemonGo.RocketAPI.Window
             trackBar.Value = 10;

             //set zoom
-            gMapControl1.Zoom = trackBar.Value;
+            gMapControl1.Zoom = trackBar.Value;
         }

         private void saveBtn_Click(object sender, EventArgs e)
         {
             Settings.Instance.SetSetting(authTypeCb.Text, "AuthType");
-                Settings.Instance.SetSetting(EmailLoginBox.Text, "Email");
-                Settings.Instance.SetSetting(EmailPasswordBox.Text, "Password");
-                Settings.Instance.SetSetting(ptcUserText.Text, "PtcUsername");
-                Settings.Instance.SetSetting(ptcPassText.Text, "PtcPassword");
+            Settings.Instance.SetSetting(EmailLoginBox.Text, "Email");
+            Settings.Instance.SetSetting(EmailPasswordBox.Text, "Password");
+            Settings.Instance.SetSetting(ptcUserText.Text, "PtcUsername");
+            Settings.Instance.SetSetting(ptcPassText.Text, "PtcPassword");
             Settings.Instance.SetSetting(latitudeText.Text.Replace(',', '.'), "DefaultLatitude");
             Settings.Instance.SetSetting(longitudeText.Text.Replace(',', '.'), "DefaultLongitude");

@@ -131,13 +131,13 @@ namespace PokemonGo.RocketAPI.Window
             {
                 gMapControl1.Zoom += 5;
             }
-
+
             double X = Math.Round(gMapControl1.Position.Lng, 6);
             double Y = Math.Round(gMapControl1.Position.Lat, 6);
             string longitude = X.ToString();
             string latitude = Y.ToString();
             latitudeText.Text = latitude;
-            longitudeText.Text = longitude;
+            longitudeText.Text = longitude;
         }

         private void trackBar_Scroll(object sender, EventArgs e)
diff --git a/README.md b/README.md
index 54403be..f396ae3 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,6 @@
 ![alt tag](https://github.com/DetectiveSquirrel/Pokemon-Go-Rocket-API/blob/master/MainPokeUi.png)
 ![alt tag](https://github.com/DetectiveSquirrel/Pokemon-Go-Rocket-API/blob/master/MainSettings2.png)

-#Console
-![alt tag](https://github.com/DetectiveSquirrel/Pokemon-Go-Rocket-API/blob/master/screenshot.png)
-

 A Pokémon Go bot in C#

@@ -31,20 +28,17 @@ A Pokémon Go bot in C#

 ## Getting Started

-Go to PokemonGo\RocketAPI\Console\App.config -> Edit the Settings you like -> Build and Run (CTRL+F5)
+Go to PokemonGo\RocketAPI\Window\App.config -> Edit the Settings you like -> Build and Run (CTRL+F5)

 # Settings
 ## AuthType
-* *Google* - Google login via oauth2
+* *Google* - Google login
 * *Ptc* - Pokémon Trainer Club login with username/password combination

 ## PtcUsername
 * *username* for PTC account. No need for when using Google.
 * *password* for PTC account. No need for when using Google.

-## GoogleRefreshToken
-* *GoogleRefreshToken* - You get this code when you connect the application with your Google account. You do not need to enter it.
-
 ## DefaultLatitude
 * *12.345678* - Latitude of your location you want to use the bot in. Number between -90 and +90. Doesn't matter how many numbers stand after the comma.
You may download the files in Public Git.