Merge pull request #95 from UmbraSpaceIndustries/DEVELOP

Develop
UmbraSpaceIndustries · Aug 16, 2017 · 30ceceb · 30ceceb
2 parents 78f1177 + 772bb95
commit 30ceceb
Show file tree

Hide file tree

Showing 21 changed files with 1,622 additions and 282 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,11 @@
+0.9.3 - 2017.08.15
+---------------
+Dependency Updates
+
+0.9.2 - 2017.05.31
+------------------
+Fixed a potential cause of nullref spam
+
 0.9.1 - KSP 1.3
 -------------------
 KSP 1.3 Compatibility

diff --git a/FOR_RELEASE/GameData/000_USITools/TraitsAndEffects.cfg b/FOR_RELEASE/GameData/000_USITools/TraitsAndEffects.cfg
@@ -19,10 +19,6 @@
 	EFFECT {
 		name = GeologySkill
 	}
-	EFFECT
-	{
-		name = ConstructionSkill
-	}	
 }
 
 @EXPERIENCE_TRAIT[Scientist] {

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":9,
-         "PATCH":1,
+         "PATCH":3,
          "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
@@ -1,31 +1,31 @@
 {
-    "NAME": "Community Category Kit", 
-    "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", 
-    "VERSION": {
-        "BUILD": 0, 
-        "MAJOR": 2, 
-        "MINOR": 0, 
-        "PATCH": 0
-    },
     "DOWNLOAD": "https://github.com/BobPalmer/CommunityCategoryKit/releases", 
     "GITHUB": {
         "ALLOW_PRE_RELEASE": false, 
         "REPOSITORY": "CommunityCategoryKit", 
         "USERNAME": "BobPalmer"
     }, 
-     "KSP_VERSION":{
-         "MAJOR":1,
-         "MINOR":3,
-         "PATCH":1
-     },
-     "KSP_VERSION_MIN":{
-         "MAJOR":1,
-         "MINOR":2,
-         "PATCH":9
-     },
-     "KSP_VERSION_MAX":{
-         "MAJOR":1,
-         "MINOR":3,
-         "PATCH":9
-     }
+    "KSP_VERSION": {
+        "MAJOR": 1, 
+        "MINOR": 3, 
+        "PATCH": 0
+    }, 
+    "KSP_VERSION_MAX": {
+        "MAJOR": 1, 
+        "MINOR": 3, 
+        "PATCH": 9
+    }, 
+    "KSP_VERSION_MIN": {
+        "MAJOR": 1, 
+        "MINOR": 2, 
+        "PATCH": 9
+    }, 
+    "NAME": "Community Category Kit", 
+    "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", 
+    "VERSION": {
+        "BUILD": 0, 
+        "MAJOR": 2, 
+        "MINOR": 0, 
+        "PATCH": 1
+    }
 }
diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt
@@ -1,4 +1,8 @@
-1.3.1 - KSP 1.3
+2.0.1 - KSP 1.3
+------------------
+- [Fix #20] CCK categories don't show up in the editor.
+
+2.0.0 - KSP 1.3
 ------------------
 KSP 1.3 Compatibility
 Added Rovers as a new standard category

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/AsteroidScannerSetup.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/AsteroidScannerSetup.cfg
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,9 @@
+0.7.2 - 2017.08.15
+---------------
+Dependency Updates
+Localization Updates
+New KSPI Resources
+
 0.7.1 - KSP 1.3
 ------------------
 KSP 1.3 Compatibility

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