Merge pull request #185 from BobPalmer/DEVELOP

Develop

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.8.7 - (KSP 1.2.2)
+-------------------
+Updates for KSP 1.2.2
+
 0.8.6 - 2016.11.23
 ------------------
 Fixed conversion nullrefs

FOR_RELEASE/GameData/000_USITools/USITools.version

@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":6,
+         "PATCH":7,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":1
+         "PATCH":2
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -26,6 +26,6 @@
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":1
+         "PATCH":2
      }
  } 

FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version

@@ -1,31 +1,31 @@
 {
-     "NAME":"Community Category Kit",
-     "URL":"https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version",
-     "DOWNLOAD":"https://github.com/BobPalmer/CommunityCategoryKit/releases",
-     "GITHUB":{
-         "USERNAME":"BobPalmer",
-         "REPOSITORY":"CommunityCategoryKit",
-         "ALLOW_PRE_RELEASE":false
-     },
-     "VERSION":{
-         "MAJOR":0,
-         "MINOR":1,
-         "PATCH":2,
-         "BUILD":0
-     },
-     "KSP_VERSION":{
-         "MAJOR":1,
-         "MINOR":2,
-         "PATCH":1
-     },
-     "KSP_VERSION_MIN":{
-         "MAJOR":1,
-         "MINOR":2,
-         "PATCH":0
-     },
-     "KSP_VERSION_MAX":{
-         "MAJOR":1,
-         "MINOR":2,
-         "PATCH":1
-     }
- } 
+    "DOWNLOAD": "https://github.com/BobPalmer/CommunityCategoryKit/releases", 
+    "GITHUB": {
+        "ALLOW_PRE_RELEASE": false, 
+        "REPOSITORY": "CommunityCategoryKit", 
+        "USERNAME": "BobPalmer"
+    }, 
+    "KSP_VERSION": {
+        "MAJOR": 1, 
+        "MINOR": 2, 
+        "PATCH": 2
+    }, 
+    "KSP_VERSION_MAX": {
+        "MAJOR": 1, 
+        "MINOR": 2, 
+        "PATCH": 2
+    }, 
+    "KSP_VERSION_MIN": {
+        "MAJOR": 1, 
+        "MINOR": 2, 
+        "PATCH": 0
+    }, 
+    "NAME": "Community Category Kit", 
+    "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", 
+    "VERSION": {
+        "BUILD": 0, 
+        "MAJOR": 1, 
+        "MINOR": 2, 
+        "PATCH": 1
+    }
+}

FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt

@@ -1,3 +1,14 @@
+1.2.1 - 2016.12.12
+- [Change] Recompile for KSP 1.2.2
+
+1.2.0 - 2016.12.2
+- [Enhancement] Define common filters via a config file.
+- [Enhancement] Allow defining custom filters by updating via ModuleManager (read Wiki!).
+
+1.1.0 - 2016.11.29
+- [Fix #7] Add images for Containers category.
+- [Fix #9] Sync up DLL's and mod's versions.
+
 0.1.2 - (KSP 1.2.1)
 -------------------
 Recompile for KSP 1.2.1

FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg

@@ -0,0 +1,23 @@
+// This file contains filters approved by CCK owners.
+// Do not change this file via ModuleManager! If you need a new filter in
+// the editor you should add it into "extra-filters.cfg".
+// See more info here: https://github.com/BobPalmer/CommunityCategoryKit/wiki
+CCKCommonFilterConfig
+{
+  Item
+  {
+    name = Containers
+    tag = cck-containers
+    normalIcon = CommunityCategoryKit/icons/Containers
+    usedByMod = Kerbal Inventory System (KIS)
+    usedByMod = Kerbal Attachment System (KAS)
+  }
+  Item
+  {
+    name = Life Support
+    tag = cck-lifesupport
+    normalIcon = CommunityCategoryKit/icons/LifeSupport_N
+    selectedIcon = CommunityCategoryKit/icons/LifeSupport_S
+    usedByMod = USI Life Support
+  }
+}

FOR_RELEASE/GameData/CommunityCategoryKit/extra-filters.cfg

@@ -0,0 +1,43 @@
+// This file is always empty in CCK but third-party mods are allowed (and
+// encouraged) to extend it with own custom filters. There will be a
+// filter entry created in the editor for every Item record in this file if
+// it has at least one matching part.
+//
+// In order to create a custom filter create a ModuleManager patch file and
+// put it anywhere in your mod's folder structure:
+//
+// @CCKExtraFilterConfig
+// {
+//	Item
+//	{
+//		name = Cool Mod Things
+//		tag = cck-cool-mod
+//		normalIcon = CoolMod/Textures/FilterIcon
+//		usedByMod = Cool Mod
+//	}
+// }
+// NOTE. If you want a special icon to be displayed when the filter is active
+// use `selectedIcon` field to define one.
+//
+// See more info here: https://github.com/BobPalmer/CommunityCategoryKit/wiki
+//
+// NOTE. Avoid creating a brand new filter only because you feel you need
+// one. You may improve players experience by re-using filters used by the
+// other mods. To figure out if there are right candidates try the following:
+// 1. Check CCK common filters (common-filters.cfg).
+// 2. Try searching KSP add-ons forum for keyword "CCK" or
+//    "CommunityCategoryKit". When mod uses CCK it's usually stated in the
+//    description.
+// 3. Ask community by posting a question on the CCK forum.
+// 4. Find another mod (other than yours) which may benefit of the new
+//    filter, and suggest a new common filter on the CCK forum!
+//
+// Once you've found the right mod just use its tag and some icon texture
+// (communicate with the author if they use own icon). CCK will automatically
+// de-dupe filters so what there will be only one filter created with all the
+// matching parts.
+
+CCKExtraFilterConfig
+{
+	// Add Item entires for custom filters via ModuleManager.
+}

FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.6.4 - (KSP 1.2.2)
+-------------------
+Added Decaborane as a resource
+
 0.6.3 - (KSP 1.2.1)
 -------------------
 Adjusted cost Fluorine  (KSPI-E) to cost LqdFluorine (Realfuels)

FOR_RELEASE/GameData/CommunityResourcePack/CRP.version

@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":6,
-         "PATCH":3,
+         "PATCH":4,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":1
+         "PATCH":2
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -26,6 +26,6 @@
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":1
+         "PATCH":2
      }
  } 

FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg

@@ -693,6 +693,18 @@ RESOURCE_DEFINITION
     	ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ChargedParticles
 }
 
+RESOURCE_DEFINITION
+{
+	abbreviation = DeBo
+	name = Decaborane
+	density = 0.00094
+	flowMode = STAGE_PRIORITY_FLOW
+	transfer = PUMP
+	isTweakable = true
+	isVisible = true
+	unitCost = 3.252
+}
+
 RESOURCE_DEFINITION
 {
 	abbreviation = D

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt

@@ -1,4 +1,11 @@
-0.5.12 - 2016.12.01
+0.5.14 - (KSP 1.2.2)
+-------------------
+Updates for KSP 1.2.2
+LS screen now properly shows in TC
+Recyclers no longer allow negative values (nor are they affected by efficiency from MKS)
+Removed some old legacy parts
+
+0.5.13 - 2016.12.01
 -------------------
 Habitation Bug is finally killed (I think!)  Thanks everyone, and extra kudos to Wyzard256 for the save, and SirBriguy for the troubleshooting!