From 303e97ff4f29174182be22fe5c874f84c159b4e7 Mon Sep 17 00:00:00 2001
From: Crzyrndm <joshcrawfy@gmail.com>
Date: Sun, 8 Feb 2015 16:49:49 +1300
Subject: [PATCH] update multi coupler check

---
 FilterExtension/ConfigNodes/customCategory.cs |   1 +
 FilterExtension/Core.cs                       |  25 +++++---
 FilterExtension/FilterExtensions.csproj       |   5 +-
 FilterExtension/Utility/PartType.cs           |   7 ++-
 ...Procesing.cfg => 02_Mining_Processing.cfg} |   2 +-
 .../000_Category_Main/07_Electrical.cfg       |   2 +-
 .../S02_01_LFO_Storage.cfg                    |  55 -----------------
 .../S02_02_Mono_Storage.cfg                   |  50 ---------------
 .../S02_03_JetFuel_Storage.cfg                |  57 ------------------
 .../S02_04_Karbonite_Storage.cfg              |  51 ----------------
 .../S02_05_Xenon_Storage.cfg                  |  51 ----------------
 .../S02_06_LiqHydrogen_Storage.cfg            |  51 ----------------
 .../S02_07_Karbondorum_Storage.cfg            |  51 ----------------
 .../S02_50_LifeSupport_Storage.cfg            |  56 -----------------
 .../S03_01_EngineRocket.cfg                   |  19 ------
 .../S03_02_EngineJet.cfg                      |  19 ------
 .../S03_03_EnginesSolid.cfg                   |  14 -----
 .../S03_04_EngineIon.cfg                      |  14 -----
 .../S03_05_EnginesMono.cfg                    |  14 -----
 .../S03_06_EnginesKarbonite.cfg               |  19 ------
 .../S03_07_EnginesMultiMode.cfg               |  14 -----
 .../S03_08_NuclearEngines.cfg                 |  33 ----------
 .../S03_09_PlasmaEngines.cfg                  |  19 ------
 .../S03_10_ArgonEngines.cfg                   |  14 -----
 .../S03_11_KarbondorumEngines.cfg             |  14 -----
 .../S03_12_RocksEngines.cfg                   |  14 -----
 .../S03_13_FanEngines.cfg                     |  19 ------
 .../S03_14_ThermalEngines.cfg                 |  14 -----
 .../S03_15_EnginesAluminium.cfg               |  14 -----
 .../S04_02_Coupler.cfg                        |   6 --
 .../S06_04_WheelsAndTracks.cfg                |   2 +-
 .../Configs/Subcategory_Patches/Fuel_EC.cfg   |  28 +++++++++
 .../000_FilterExtensions/FilterCreator.dll    | Bin 13824 -> 13824 bytes
 .../000_FilterExtensions/FilterExtensions.dll | Bin 34304 -> 34816 bytes
 .../FilterExtensions.version                  |   2 +-
 ...ElectricalParts.png => ElectricCharge.png} | Bin
 ...lected.png => ElectricCharge_selected.png} | Bin
 .../{StorageKarbonite.png => Karbonite.png}   | Bin
 ...te_selected.png => Karbonite_selected.png} | Bin
 ...StorageKarborundum.png => Karborundum.png} | Bin
 ..._selected.png => Karborundum_selected.png} | Bin
 .../{StorageJetFuel.png => LiquidFuel.png}    | Bin
 ...l_selected.png => LiquidFuel_selected.png} | Bin
 .../{StorageLiquidHyd.png => LiquidHyd.png}   | Bin
 ...yd_selected.png => LiquidHyd_selected.png} | Bin
 .../{StorageMono.png => MonoPropellant.png}   | Bin
 ...lected.png => MonoPropellant_selected.png} | Bin
 .../{StorageXenon.png => XenonGas.png}        | Bin
 ...non_selected.png => XenonGas_selected.png} | Bin
 49 files changed, 56 insertions(+), 700 deletions(-)
 rename GameData/000_FilterExtensions/Configs/000_Category_Main/{02_Storage_Mining_Procesing.cfg => 02_Mining_Processing.cfg} (61%)
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_01_LFO_Storage.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_02_Mono_Storage.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_03_JetFuel_Storage.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_04_Karbonite_Storage.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_05_Xenon_Storage.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_06_LiqHydrogen_Storage.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_07_Karbondorum_Storage.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_50_LifeSupport_Storage.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_01_EngineRocket.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_02_EngineJet.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_03_EnginesSolid.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_04_EngineIon.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_05_EnginesMono.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_06_EnginesKarbonite.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_07_EnginesMultiMode.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_08_NuclearEngines.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_09_PlasmaEngines.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_10_ArgonEngines.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_11_KarbondorumEngines.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_12_RocksEngines.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_13_FanEngines.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_14_ThermalEngines.cfg
 delete mode 100644 GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_15_EnginesAluminium.cfg
 create mode 100644 GameData/000_FilterExtensions/Configs/Subcategory_Patches/Fuel_EC.cfg
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{ElectricalParts.png => ElectricCharge.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{ElectricalParts_selected.png => ElectricCharge_selected.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageKarbonite.png => Karbonite.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageKarbonite_selected.png => Karbonite_selected.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageKarborundum.png => Karborundum.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageKarborundum_selected.png => Karborundum_selected.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageJetFuel.png => LiquidFuel.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageJetFuel_selected.png => LiquidFuel_selected.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageLiquidHyd.png => LiquidHyd.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageLiquidHyd_selected.png => LiquidHyd_selected.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageMono.png => MonoPropellant.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageMono_selected.png => MonoPropellant_selected.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageXenon.png => XenonGas.png} (100%)
 rename GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/{StorageXenon_selected.png => XenonGas_selected.png} (100%)

diff --git a/FilterExtension/ConfigNodes/customCategory.cs b/FilterExtension/ConfigNodes/customCategory.cs
index 9be385ce..aaefd378 100644
--- a/FilterExtension/ConfigNodes/customCategory.cs
+++ b/FilterExtension/ConfigNodes/customCategory.cs
@@ -124,6 +124,7 @@ private void generateEngineTypes()
                     checks.Add(new Check("propellant", s));
                     props += s;
                 }
+                checks.Add(new Check("propellant", props, true, false)); // exact match to propellant list. Nothing extra, nothing less
 
                 customSubCategory sC = new customSubCategory(props, this.categoryName, "stock_Engines");
 
diff --git a/FilterExtension/Core.cs b/FilterExtension/Core.cs
index 45ca182b..b5042f87 100644
--- a/FilterExtension/Core.cs
+++ b/FilterExtension/Core.cs
@@ -146,7 +146,7 @@ private void associateParts()
             foreach (AvailablePart p in PartLoader.Instance.parts)
             {
                 // don't want dummy parts
-                if (p.category == PartCategories.none)
+                if (p == null || p.category == PartCategories.none)
                     continue;
                 
                 if (string.IsNullOrEmpty(p.partUrl))
@@ -168,7 +168,7 @@ private void associateParts()
                 else
                     Log(p.name + " duplicated part key in part-mod dictionary");
 
-                if (p != null && PartType.isEngine(p))
+                if (PartType.isEngine(p))
                 {
                     foreach (ModuleEngines e in p.partPrefab.GetModuleEngines())
                     {
@@ -222,7 +222,7 @@ private bool stringListComparer(List<string> propellants)
         internal void editor()
         {
             // set state == 1, we have started processing
-            state = 1;
+            // state = 1;
 
             // clear manufacturers from Filter by Manufacturer
             // Don't rename incase other mods depend on finding it (and the name isn't half bad either...)
@@ -261,14 +261,12 @@ internal void editor()
 
             // Remove any category with no subCategories (causes major breakages). Removal doesn't actually prevent icon showing, just breakages
             PartCategorizer.Instance.filters.RemoveAll(c => c.subcategories.Count == 0);
-            // refresh icons - doesn't work >.<
-            // PartCategorizer.Instance.UpdateCategoryNameLabel();
 
             // reveal categories
             PartCategorizer.Instance.SetAdvancedMode();
 
             // set state == -1, we have finished processing with no critical errors
-            state = -1;
+            // state = -1;
         }
 
         public void refreshList()
@@ -371,7 +369,7 @@ private static void loadIcons()
                         i++;
                     if (i != 1000)
                         name = name + i.ToString();
-                    Log("Duplicated texture name by texture " + t.name + ". New reference is: " + name);
+                    Log("Duplicated texture name \"" + t.name.Split(new char[] { '/', '\\' }).Last() + "\" at:\r\n" + t.name + "\r\n New reference is: " + name);
                 }
 
                 PartCategorizer.Icon icon = new PartCategorizer.Icon(name, t.texture, selectedTex, false);
@@ -394,9 +392,14 @@ public static PartCategorizer.Icon getIcon(string name)
             }
             else if (name.StartsWith("stock_"))
             {
-                PartCategorizer.Category fbf = PartCategorizer.Instance.filters.Find(c => c.button.categoryName == "Filter by Function");
-                name = name.Substring(6);
-                return fbf.subcategories.FirstOrDefault(sC => sC.button.categoryName == name).button.icon;
+                foreach (PartCategorizer.Category C in PartCategorizer.Instance.filters)
+                {
+                    foreach (PartCategorizer.Category sC in C.subcategories)
+                    {
+                        if (name.Substring(6) == sC.button.categoryName)
+                            return sC.button.icon;
+                    }
+                }
             }
             return null;
         }
@@ -418,6 +421,8 @@ private void checkForEmptySubCategories()
 
             foreach (customSubCategory sC in subCategories)
             {
+                Debug.Log(sC.subCategoryTitle);
+                Debug.Log(sC.oldTitle);
                 if (!sC.hasFilters)
                 {
                     notEmpty.Add(sC);
diff --git a/FilterExtension/FilterExtensions.csproj b/FilterExtension/FilterExtensions.csproj
index 07e7593a..f68462a2 100644
--- a/FilterExtension/FilterExtensions.csproj
+++ b/FilterExtension/FilterExtensions.csproj
@@ -61,8 +61,9 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>set SOURCE="D:\Users\Joshua\GitHub\Filter-Extensions\FilterExtension\GameData"
+set DESTINATION="D:\Users\Joshua\Desktop\Kerbal Space Program Dev\GameData"
+xcopy %25SOURCE%25 %25DESTINATION%25 /e /c /r /i /u /y</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/FilterExtension/Utility/PartType.cs b/FilterExtension/Utility/PartType.cs
index 9b4a7f26..a1d2ba7d 100644
--- a/FilterExtension/Utility/PartType.cs
+++ b/FilterExtension/Utility/PartType.cs
@@ -176,7 +176,6 @@ internal static bool checkPropellant(AvailablePart part, string value, bool cont
                 {
                     foreach (Propellant p in Lp)
                     {
-                        Core.Log(p.name);
                         if (!value.Split(',').Contains(p.name))
                             return true;
                     }
@@ -301,8 +300,12 @@ public static bool isFuselage(AvailablePart part)
 
         public static bool isMultiCoupler(AvailablePart part)
         {
-            if (part.partPrefab.attachNodes.Count > 2)
+            if (part.partPrefab.attachNodes.Count <= 2 || part.title.Contains("Cargo Bay"))
+                return false;
+            float pos = part.partPrefab.attachNodes.Last().position.y;
+            if (part.partPrefab.attachNodes.FindAll(n => n.position.y == pos).Count > 1 && part.partPrefab.attachNodes.FindAll(n => n.position.y == pos).Count < part.partPrefab.attachNodes.Count)
                 return true;
+            
             return false;
         }
 
diff --git a/GameData/000_FilterExtensions/Configs/000_Category_Main/02_Storage_Mining_Procesing.cfg b/GameData/000_FilterExtensions/Configs/000_Category_Main/02_Mining_Processing.cfg
similarity index 61%
rename from GameData/000_FilterExtensions/Configs/000_Category_Main/02_Storage_Mining_Procesing.cfg
rename to GameData/000_FilterExtensions/Configs/000_Category_Main/02_Mining_Processing.cfg
index 41501650..b5583d7c 100644
--- a/GameData/000_FilterExtensions/Configs/000_Category_Main/02_Storage_Mining_Procesing.cfg
+++ b/GameData/000_FilterExtensions/Configs/000_Category_Main/02_Mining_Processing.cfg
@@ -1,6 +1,6 @@
 CATEGORY
 {
-	name = Resource Storage and Processing
+	name = Resource Mining and Processing
 	icon = Resources
 	colour = #FF90F090
 	all = true
diff --git a/GameData/000_FilterExtensions/Configs/000_Category_Main/07_Electrical.cfg b/GameData/000_FilterExtensions/Configs/000_Category_Main/07_Electrical.cfg
index 11a28ba6..7227c5b2 100644
--- a/GameData/000_FilterExtensions/Configs/000_Category_Main/07_Electrical.cfg
+++ b/GameData/000_FilterExtensions/Configs/000_Category_Main/07_Electrical.cfg
@@ -1,7 +1,7 @@
 CATEGORY
 {
 	name = Electrical
-	icon = ElectricalParts
+	icon = ElectricCharge
 	colour = #FF90F090
 	all = true
 }
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_01_LFO_Storage.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_01_LFO_Storage.cfg
deleted file mode 100644
index f35e38dc..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_01_LFO_Storage.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-SUBCATEGORY
-{
-	category = B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Resource Storage and Processing
-	name = LFO Tanks
-	icon = StorageLFO
-	FILTER
-	{
-		CHECK
-		{
-			type = resource
-			value = LiquidFuel
-		}
-		CHECK
-		{
-			type = resource
-			value = Oxidizer
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleCommand
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEngines
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEnginesFX
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = REGO_ModuleResourceConverter
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleGenerator
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = FNGenerator
-			invert = true
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_02_Mono_Storage.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_02_Mono_Storage.cfg
deleted file mode 100644
index f78bd1c8..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_02_Mono_Storage.cfg
+++ /dev/null
@@ -1,50 +0,0 @@
-SUBCATEGORY
-{
-	category = B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Resource Storage and Processing
-	name = MonoPropellant Tanks
-	icon = StorageMono
-	FILTER
-	{
-		CHECK
-		{
-			type = resource
-			value = MonoPropellant
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleCommand
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEngines
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEnginesFX
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = REGO_ModuleResourceConverter
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleGenerator
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = FNGenerator
-			invert = true
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_03_JetFuel_Storage.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_03_JetFuel_Storage.cfg
deleted file mode 100644
index f59addcb..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_03_JetFuel_Storage.cfg
+++ /dev/null
@@ -1,57 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Resource Storage and Processing
-	name = Jet Fuel Tanks
-	icon = StorageJetFuel
-	FILTER
-	{
-		CHECK
-		{
-			type = resource
-			value = LiquidFuel
-		}
-		CHECK
-		{
-			type = resource
-			value = LiquidFuel
-			invert = true
-			contains = false
-		}
-		CHECK		
-		{		
-			type = moduleName		
-			value = ModuleCommand		
-			invert = true		
-		}
-		CHECK		
-		{		
-			type = moduleName		
-			value = ModuleEngines		
-			invert = true		
-		}		
-		CHECK		
-		{		
-			type = moduleName		
-			value = ModuleEnginesFX		
-			invert = true		
-		}		
-		CHECK		
-		{		
-			type = moduleName		
-			value = REGO_ModuleResourceConverter		
-			invert = true		
-		}		
-		CHECK		
-		{		
-			type = moduleName		
-			value = ModuleGenerator		
-			invert = true		
-		}		
-		CHECK		
-		{		
-			type = moduleName		
-			value = FNGenerator
-			invert = true
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_04_Karbonite_Storage.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_04_Karbonite_Storage.cfg
deleted file mode 100644
index 76755032..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_04_Karbonite_Storage.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Resource Storage and Processing
-	name = Karbonite Tanks
-	icon = StorageKarbonite
-	FILTER
-	{
-		CHECK
-		{
-			type = resource
-			value = Karbonite
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleCommand
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEngines
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEnginesFX
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = REGO_ModuleResourceConverter
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleGenerator
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = FNGenerator
-			invert = true
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_05_Xenon_Storage.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_05_Xenon_Storage.cfg
deleted file mode 100644
index 233e53e1..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_05_Xenon_Storage.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Resource Storage and Processing
-	name = Xenon Tanks
-	icon = StorageXenon
-	FILTER
-	{
-		CHECK
-		{
-			type = resource
-			value = XenonGas
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleCommand
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEngines
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEnginesFX
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = REGO_ModuleResourceConverter
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleGenerator
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = FNGenerator
-			invert = true
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_06_LiqHydrogen_Storage.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_06_LiqHydrogen_Storage.cfg
deleted file mode 100644
index 697b0fd3..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_06_LiqHydrogen_Storage.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Resource Storage and Processing
-	name = Liquid Hydrogen Tanks
-	icon = StorageLiquidHyd
-	FILTER
-	{
-		CHECK
-		{
-			type = resource
-			value = LiquidHydrogen
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleCommand
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEngines
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEnginesFX
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = REGO_ModuleResourceConverter
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleGenerator
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = FNGenerator
-			invert = true
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_07_Karbondorum_Storage.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_07_Karbondorum_Storage.cfg
deleted file mode 100644
index fb834659..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_07_Karbondorum_Storage.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Resource Storage and Processing
-	name = KarborundumTanks
-	icon = StorageKarborundum
-	FILTER
-	{
-		CHECK
-		{
-			type = resource
-			value = Karborundum
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleCommand
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEngines
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEnginesFX
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = REGO_ModuleResourceConverter
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleGenerator
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = FNGenerator
-			invert = true
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_50_LifeSupport_Storage.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_50_LifeSupport_Storage.cfg
deleted file mode 100644
index d1569ae2..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S02_50_LifeSupport_Storage.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Resource Storage and Processing
-	name = Life Support Tank
-	icon = StorageLS
-	FILTER
-	{
-		CHECK
-		{
-			type = resource
-			value = Food, Oxygen, Water, CarbonDioxide, WasteWater, Waste
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleCommand
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEngines
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEnginesFX
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = REGO_ModuleResourceConverter
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = ModuleGenerator
-			invert = true
-		}
-		CHECK
-		{
-			type = moduleName
-			value = FNGenerator
-			invert = true
-		}
-		CHECK
-		{
-			type = crew
-			value = 0
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_01_EngineRocket.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_01_EngineRocket.cfg
deleted file mode 100644
index 10017be8..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_01_EngineRocket.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBCATEGORY
-{
-	category = Filter by Function, B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - LFO
-	icon = EngineLFO
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = LiquidFuel
-		}
-		CHECK
-		{
-			type = propellant
-			value = Oxidizer
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_02_EngineJet.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_02_EngineJet.cfg
deleted file mode 100644
index a45afe2c..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_02_EngineJet.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBCATEGORY
-{
-	category = Filter by Function, B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Jet
-	icon = EngineJet
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = LiquidFuel
-		}
-		CHECK
-		{
-			type = propellant
-			value = IntakeAir
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_03_EnginesSolid.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_03_EnginesSolid.cfg
deleted file mode 100644
index 9e651ac2..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_03_EnginesSolid.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-	category = Filter by Function, B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - SRB
-	icon = EngineSolid
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = SolidFuel
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_04_EngineIon.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_04_EngineIon.cfg
deleted file mode 100644
index fb04f83f..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_04_EngineIon.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-	category = Filter by Function, B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Ion
-	icon = EngineIon
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = XenonGas
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_05_EnginesMono.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_05_EnginesMono.cfg
deleted file mode 100644
index e0541436..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_05_EnginesMono.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engines Mono
-	icon = EngineMono
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = MonoPropellant
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_06_EnginesKarbonite.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_06_EnginesKarbonite.cfg
deleted file mode 100644
index 7f77c2b5..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_06_EnginesKarbonite.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBCATEGORY:NEEDS[Karbonite]
-{
-	category = Filter by Function, B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engines - Karbonite
-	icon = EngineKarbonite
-	FILTER
-	{
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEngines
-		}
-		CHECK
-		{
-			type = propellant
-			value = Karbonite
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_07_EnginesMultiMode.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_07_EnginesMultiMode.cfg
deleted file mode 100644
index 9b344f58..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_07_EnginesMultiMode.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-	category = Filter by Function, B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar, Engines
-	name = Engines - MultiMode
-	icon = EngineMulti
-	FILTER
-	{
-		CHECK
-		{
-			type = moduleName
-			value = MultiModeEngine
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_08_NuclearEngines.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_08_NuclearEngines.cfg
deleted file mode 100644
index 8dbf56ea..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_08_NuclearEngines.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Nuclear
-	icon = NuclearRocket
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = LiquidHydrogen
-		}
-		CHECK
-		{
-			type = propellant
-			value = ElectricCharge
-			invert = true
-		}
-	}
-	FILTER
-	{
-		CHECK
-		{
-			type = moduleName
-			value = ModuleEnginesFX, ModuleEngines
-		}
-		CHECK
-		{
-			type = title
-			value = Nuclear, Atomic
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_09_PlasmaEngines.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_09_PlasmaEngines.cfg
deleted file mode 100644
index c9e50c2c..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_09_PlasmaEngines.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Plasma
-	icon = EnginePlasma
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = LiquidHydrogen
-		}
-		CHECK
-		{
-			type = propellant
-			value = ElectricCharge
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_10_ArgonEngines.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_10_ArgonEngines.cfg
deleted file mode 100644
index 8feb7f6c..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_10_ArgonEngines.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Argon
-	icon = EngineArgon
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = ArgonGas
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_11_KarbondorumEngines.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_11_KarbondorumEngines.cfg
deleted file mode 100644
index dd9cbda0..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_11_KarbondorumEngines.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Karborundum
-	icon = EngineKarborundum
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = Karborundum
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_12_RocksEngines.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_12_RocksEngines.cfg
deleted file mode 100644
index c05121e8..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_12_RocksEngines.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Rock
-	icon = EngineRock
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = Rock
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_13_FanEngines.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_13_FanEngines.cfg
deleted file mode 100644
index d1ef1016..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_13_FanEngines.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Electric Fan
-	icon = FanEngine
-	FILTER
-	{
-		CHECK
-		{
-			type = propellant
-			value = ElectricCharge
-		}
-		CHECK
-		{
-			type = propellant
-			value = IntakeAtm
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_14_ThermalEngines.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_14_ThermalEngines.cfg
deleted file mode 100644
index 5225dafa..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_14_ThermalEngines.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-	category =  B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-	name = Engine - Thermal
-	icon = EngineThermal
-	FILTER
-	{
-		CHECK
-		{
-			type = title
-			value = Thermal Turbojet
-		}
-	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_15_EnginesAluminium.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_15_EnginesAluminium.cfg
deleted file mode 100644
index fe825b76..00000000
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S03_15_EnginesAluminium.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-SUBCATEGORY
-{
-  	category = B9 Aerospace, KW Rocketry, Modular Rocket Systems, Squad, Near Future Technologies, Novapunch, RLA Stockalike, Umbra Space Industries, KSP Interstellar
-  	name = Engines - Aluminium
-	icon = EngineAluminium
-  	FILTER
-  	{
-		CHECK
-		{
-			type = propellant
-			value = Aluminium
-		}
-  	}
-}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S04_02_Coupler.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S04_02_Coupler.cfg
index f87461aa..b0fdff35 100644
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S04_02_Coupler.cfg
+++ b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S04_02_Coupler.cfg
@@ -10,11 +10,5 @@ SUBCATEGORY
 			type = custom
 			value = multicoupler
 		}
-		CHECK
-        {
-            type = title
-            value = Cargo Bay
-			invert = true
-        }
 	}	
 }
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S06_04_WheelsAndTracks.cfg b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S06_04_WheelsAndTracks.cfg
index fc71e6bf..e87a63ab 100644
--- a/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S06_04_WheelsAndTracks.cfg
+++ b/GameData/000_FilterExtensions/Configs/006_Subcategory_Filters/S06_04_WheelsAndTracks.cfg
@@ -1,6 +1,6 @@
 SUBCATEGORY
 {
-	category = Filter by Function, Landing Parts
+	category = Landing Parts
 	name = Rover Wheels and Tracks
 	icon = Wheels
 	FILTER
diff --git a/GameData/000_FilterExtensions/Configs/Subcategory_Patches/Fuel_EC.cfg b/GameData/000_FilterExtensions/Configs/Subcategory_Patches/Fuel_EC.cfg
new file mode 100644
index 00000000..6a1d825e
--- /dev/null
+++ b/GameData/000_FilterExtensions/Configs/Subcategory_Patches/Fuel_EC.cfg
@@ -0,0 +1,28 @@
+SUBCATEGORY
+{
+	category = Filter by Resource
+	oldTitle = Electric Charge
+	title =
+}
+
+SUBCATEGORY
+{
+	category = Filter by Resource
+	name = Electric Charge
+	icon = R&D_node_icon_advelectrics
+	
+	FILTER
+	{
+		CHECK
+		{
+			type = resource
+			value = ElectricCharge
+		}
+		CHECK
+		{
+			type = moduleName
+			value = ModuleCommand,ModuleEngines,ModuleEnginesFX
+			invert = true
+		}
+	}
+}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/FilterCreator.dll b/GameData/000_FilterExtensions/FilterCreator.dll
index a1bfb8dcfef391b9dfe0ab34a247fbc5d563cbc6..e6321803ecd46bd77925394251daaa2b27fdbfe1 100644
GIT binary patch
delta 36
ucmV+<0Nek7Y=CT#hy&or)v=3lDG-w-jrTrR*g~PT^@!)orBbsDD)b9iz!Iha

delta 36
scmZq3X~>z-!TdS&^v3Q&O@S!$?D}TrX<q9mmkF9*?@`*!qxFRw04G%sI{*Lx

diff --git a/GameData/000_FilterExtensions/FilterExtensions.dll b/GameData/000_FilterExtensions/FilterExtensions.dll
index 75e98ced036d9f7c3ad86d7d91807a8a1420bf1f..0ccc2b1fc0e95527a6e523e2c9c062b9038c5f78 100644
GIT binary patch
delta 10869
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

delta 10497
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
IoweHk0(IGOssI20

diff --git a/GameData/000_FilterExtensions/FilterExtensions.version b/GameData/000_FilterExtensions/FilterExtensions.version
index 564292e1..96372e73 100644
--- a/GameData/000_FilterExtensions/FilterExtensions.version
+++ b/GameData/000_FilterExtensions/FilterExtensions.version
@@ -1 +1 @@
-{"NAME":"Filter Extensions","URL":"http://ksp-avc.cybutek.net/version.php?id=97","DOWNLOAD":"https://github.com/Crzyrndm/FilterExtension/releases","VERSION":{"MAJOR":1,"MINOR":16,"PATCH":0,"BUILD":0},"KSP_VERSION":{"MAJOR":0,"MINOR":90,"PATCH":0}}
\ No newline at end of file
+{"NAME":"Filter Extensions","URL":"http://ksp-avc.cybutek.net/version.php?id=97","DOWNLOAD":"https://github.com/Crzyrndm/FilterExtension/releases","VERSION":{"MAJOR":1,"MINOR":17,"PATCH":0,"BUILD":0},"KSP_VERSION":{"MAJOR":0,"MINOR":90,"PATCH":0}}
\ No newline at end of file
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/ElectricalParts.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/ElectricCharge.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/ElectricalParts.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/ElectricCharge.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/ElectricalParts_selected.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/ElectricCharge_selected.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/ElectricalParts_selected.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/ElectricCharge_selected.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageKarbonite.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/Karbonite.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageKarbonite.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/Karbonite.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageKarbonite_selected.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/Karbonite_selected.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageKarbonite_selected.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/Karbonite_selected.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageKarborundum.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/Karborundum.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageKarborundum.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/Karborundum.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageKarborundum_selected.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/Karborundum_selected.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageKarborundum_selected.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/Karborundum_selected.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageJetFuel.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/LiquidFuel.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageJetFuel.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/LiquidFuel.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageJetFuel_selected.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/LiquidFuel_selected.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageJetFuel_selected.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/LiquidFuel_selected.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageLiquidHyd.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/LiquidHyd.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageLiquidHyd.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/LiquidHyd.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageLiquidHyd_selected.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/LiquidHyd_selected.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageLiquidHyd_selected.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/LiquidHyd_selected.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageMono.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/MonoPropellant.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageMono.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/MonoPropellant.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageMono_selected.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/MonoPropellant_selected.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageMono_selected.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/MonoPropellant_selected.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageXenon.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/XenonGas.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageXenon.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/XenonGas.png
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageXenon_selected.png b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/XenonGas_selected.png
similarity index 100%
rename from GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/StorageXenon_selected.png
rename to GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/XenonGas_selected.png