From 0085241d2366f266b5416488dbead174184420b0 Mon Sep 17 00:00:00 2001
From: MichaelTheShifter <michaelshiftos@gmail.com>
Date: Sun, 1 May 2016 20:23:48 -0400
Subject: Beta 2.2 Patch 1

Commit for Beta 2.2 Patch 1

- Removed unused "Linux Mint 7" and "NetSockets" files from
Resources.resx
- Added a better server startup pool, no longer hardcoded.
- Added a server blacklist for disabling servers that break the rules of
the playshiftos.ml/forum server showcase
---
 .../Properties/Resources.Designer.cs                 | 20 --------------------
 .../Properties/Resources.resx                        |  6 ------
 2 files changed, 26 deletions(-)

(limited to 'source/WindowsFormsApplication1/Properties')

diff --git a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
index 14b69ef..e8ab95a 100644
--- a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
+++ b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs
@@ -1445,16 +1445,6 @@ namespace ShiftOS.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] Linux_Mint_7 {
-            get {
-                object obj = ResourceManager.GetObject("Linux_Mint_7", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -1495,16 +1485,6 @@ namespace ShiftOS.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] NetSockets {
-            get {
-                object obj = ResourceManager.GetObject("NetSockets", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/source/WindowsFormsApplication1/Properties/Resources.resx b/source/WindowsFormsApplication1/Properties/Resources.resx
index 6b09ba4..62c4a5c 100644
--- a/source/WindowsFormsApplication1/Properties/Resources.resx
+++ b/source/WindowsFormsApplication1/Properties/Resources.resx
@@ -523,9 +523,6 @@
   <data name="upgradeshiftericon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\upgradeshiftericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Linux_Mint_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Linux Mint 7.skn;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="upgradealshifter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\upgradealshifter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -1180,7 +1177,4 @@
   <data name="NoIconFound" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NoIconFound.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="NetSockets" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\bin\Debug\NetSockets.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
 </root>
\ No newline at end of file
-- 
cgit v1.2.3