Merge pull request #583 from 1461748123/Beta-Build

diff --git a/PokemonGo/RocketAPI/Window/App.config b/PokemonGo/RocketAPI/Window/App.config
index e6b3fa7..3842152 100644
--- a/PokemonGo/RocketAPI/Window/App.config
+++ b/PokemonGo/RocketAPI/Window/App.config
@@ -55,5 +55,17 @@
     <!--Only visit pokestop and collect items-->
     <add key="EvolveAllGivenPokemons" value="false" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
+
+    <add key="MaxItemPokeBall" value="100"/>
+    <add key="MaxItemGreatBall" value="100"/>
+    <add key="MaxItemUltraBall" value="100"/>
+    <add key="MaxItemMasterBall" value="200"/>
+    <add key="MaxItemRazzBerry" value="100"/>
+    <add key="MaxItemRevive" value="20"/>
+    <add key="MaxItemPotion" value="0"/>
+    <add key="MaxItemSuperPotion" value="0"/>
+    <add key="MaxItemHyperPotion" value="50"/>
+    <add key="MaxItemMaxPotion" value="100"/>
+
   </appSettings>
 </configuration>
\ No newline at end of file
diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
index cf16d59..7d859a6 100644
--- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
+++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
@@ -209,7 +209,7 @@ namespace PokemonGo.RocketAPI.Window
             this.objectListView1.RowHeight = 32;
             this.objectListView1.SelectAllOnControlA = false;
             this.objectListView1.ShowGroups = false;
-            this.objectListView1.Size = new System.Drawing.Size(1012, 215);
+            this.objectListView1.Size = new System.Drawing.Size(668, 215);
             this.objectListView1.SmallImageList = this.smallPokemonImageList;
             this.objectListView1.TabIndex = 25;
             this.objectListView1.UseCompatibleStateImageBehavior = false;
@@ -292,9 +292,10 @@ namespace PokemonGo.RocketAPI.Window
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.button1.Location = new System.Drawing.Point(0, 588);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(1012, 26);
+            this.button1.Size = new System.Drawing.Size(668, 26);
             this.button1.TabIndex = 26;
             this.button1.Text = "Refresh";
             this.button1.UseVisualStyleBackColor = true;
@@ -305,20 +306,20 @@ namespace PokemonGo.RocketAPI.Window
             this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Bottom;
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.tabControl1.Location = new System.Drawing.Point(674, 368);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(338, 246);
+            this.tabControl1.Size = new System.Drawing.Size(338, 244);
             this.tabControl1.TabIndex = 27;
-            this.tabControl1.Visible = false;
             //
             // tabPage1
             //
             this.tabPage1.Location = new System.Drawing.Point(4, 4);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(330, 220);
+            this.tabPage1.Size = new System.Drawing.Size(330, 216);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "tabPage1";
             this.tabPage1.UseVisualStyleBackColor = true;
diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs
index 615b23a..2d1f167 100644
--- a/PokemonGo/RocketAPI/Window/MainForm.cs
+++ b/PokemonGo/RocketAPI/Window/MainForm.cs
@@ -1232,20 +1232,18 @@ namespace PokemonGo.RocketAPI.Window
         {
             objectListView1.ButtonClick += PokemonListButton_Click;

-            /* pkmnName.ImageGetter = delegate (object rowObject)
+             pkmnName.ImageGetter = delegate (object rowObject)
             {
                 PokemonData pokemon = (PokemonData)rowObject;

                 String key = pokemon.PokemonId.ToString();
-
                 if (!objectListView1.SmallImageList.Images.ContainsKey(key))
                 {
-                    Image largeImage = GetPokemonImage((int)pokemon.PokemonId);
-                    objectListView1.SmallImageList.Images.Add(key, largeImage);
-                    objectListView1.LargeImageList.Images.Add(key, largeImage);
+                    Image img = GetPokemonImage((int)pokemon.PokemonId);
+                    objectListView1.SmallImageList.Images.Add(key, img);
                 }
                 return key;
-            };  */
+            };

             objectListView1.CellToolTipShowing += delegate (object sender, ToolTipShowingEventArgs args)
             {
diff --git a/PokemonGo/RocketAPI/Window/MainForm.resx b/PokemonGo/RocketAPI/Window/MainForm.resx
index e8d4638..1821e28 100644
--- a/PokemonGo/RocketAPI/Window/MainForm.resx
+++ b/PokemonGo/RocketAPI/Window/MainForm.resx
@@ -129,9 +129,6 @@
   <metadata name="smallPokemonImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>247, 18</value>
   </metadata>
-  <metadata name="tabControl1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>58</value>
   </metadata>