Merge pull request #1384 from UmbraSpaceIndustries/DEVELOP

2016.03.06 Update
UmbraSpaceIndustries · Mar 7, 2018 · 4660304 · 4660304
2 parents 318d2ed + 2297914
commit 4660304
Show file tree

Hide file tree

Showing 106 changed files with 1,162 additions and 680 deletions.
diff --git a/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version b/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version
@@ -6,20 +6,20 @@
     "VERSION":
      {
          "MAJOR":1,
-         "MINOR":4,
-         "PATCH":4,
+         "MINOR":5,
+         "PATCH":0,
          "BUILD":0
      },
     "KSP_VERSION_MIN":
      {
          "MAJOR":1,
          "MINOR":3,
-         "PATCH":0
+         "PATCH":1
      },
     "KSP_VERSION_MAX":
      {
          "MAJOR":1,
          "MINOR":3,
-         "PATCH":0
+         "PATCH":1
      }
 }
diff --git a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,11 @@
+0.10.2 - 2017.03.06
+------------------
+Logistics Updates
+
+0.10.1 - 2017.10.09
+------------------
+Fixed issue preventing categories from showing
+
 0.10.0 - 2017.10.09
 ------------------
 KSP 1.3.1

diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb b/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.pdb b/FOR_RELEASE/GameData/000_USITools/USITools.pdb
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":10,
-         "PATCH":0,
+         "PATCH":2,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version
@@ -26,6 +26,6 @@
         "BUILD": 0, 
         "MAJOR": 2, 
         "MINOR": 0, 
-        "PATCH": 1
+        "PATCH": 2
     }
 }
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt
@@ -1,3 +1,7 @@
+2.0.2 - KSP 1.3
+------------------
+- [Enhancement] Added a new standard category: Lights.
+
 2.0.1 - KSP 1.3
 ------------------
 - [Fix #20] CCK categories don't show up in the editor.

diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg b/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg
@@ -29,4 +29,13 @@ CCKCommonFilterConfig
     usedByMod = Malemute
     usedByMod = Feline Utility Rovers
   }
+  Item
+  {
+    name = Lights
+    tag = cck-lights
+    normalIcon = CommunityCategoryKit/icons/Lights_N
+    selectedIcon = CommunityCategoryKit/icons/Lights_S
+    usedByMod = Kerbal Electric
+    usedByMod = Surface Mounted Stock-Alike Lights for Self-Illumination
+  }
 }
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_N.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_N.png
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_S.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_S.png
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,9 @@
+0.8.1 - 2017.03.06
+------------------
+Fixed an issue with Chinese localization that was causing the game to hang during load.  Thanks to everyone that helped with this!
+Added Russian translations (Thanks doktorjet)
+Corrected density of Silicates/Silicon (Note that while cost/volume are the same, the resources are now ten times heavier)
+
 0.8.0 - 2017.10.09
 ------------------
 KSP 1.3.1

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
@@ -1426,7 +1426,7 @@ RESOURCE_DEFINITION
 	name = Silicates
 	abbreviation = #LOC_CRP_Silicates_Abbreviation
 	displayName = #LOC_CRP_Silicates_DisplayName
-	density = 0.00025
+	density = 0.0025
 	flowMode = ALL_VESSEL
 	transfer = PUMP
 	isTweakable = true
@@ -1440,7 +1440,7 @@ RESOURCE_DEFINITION
 	name = Silicon
 	abbreviation = #LOC_CRP_Silicon_Abbreviation
 	displayName = #LOC_CRP_Silicon_DisplayName
-	density = 0.0002329
+	density = 0.002329
 	flowMode = ALL_VESSEL
 	transfer = PUMP
 	isTweakable = true