Merge pull request #33 from BobPalmer/DEVELOP

2016.12.17 Update
UmbraSpaceIndustries · Dec 17, 2016 · d1d9312 · d1d9312
2 parents bc46aa1 + d865abb
commit d1d9312
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 9 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,15 @@
+0.8.7 - (KSP 1.2.2)
+-------------------
+Updates for KSP 1.2.2
+
+0.8.6 - 2016.11.23
+------------------
+Fixed conversion nullrefs
+
+0.8.5 - 2016.11.19
+------------------
+Supporting fixes for the efficiency system
+
 0.8.4 - (KSP 1.2.1)
 -------------------
 Dependency Updates

diff --git a/FOR_RELEASE/GameData/000_USITools/MiniAVC.dll b/FOR_RELEASE/GameData/000_USITools/MiniAVC.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/MiniAVC.xml b/FOR_RELEASE/GameData/000_USITools/MiniAVC.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AddonSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <AllowCheck>true</AllowCheck>
+  <FirstRun>false</FirstRun>
+</AddonSettings>
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,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":4,
+         "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
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/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)

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/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
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/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

diff --git a/FOR_RELEASE/GameData/ModuleManager.2.7.3.dll → FOR_RELEASE/GameData/ModuleManager.2.7.5.dll b/FOR_RELEASE/GameData/ModuleManager.2.7.3.dll → FOR_RELEASE/GameData/ModuleManager.2.7.5.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.1.8 - (KSP 1.2.2)
+-------------------
+Updates for KSP 1.2.2
+
 0.1.7 - (KSP 1.2.1)
 -------------------
 Add support for parts being KIS-helpers (enabling them to carry weight for KIS actions) - Thanks DStaal and Boiler1!

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll.mdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll.mdb
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.pdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.pdb
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version
@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":1,
-         "PATCH":7,
+         "PATCH":8,
          "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
      }
  } 
diff --git a/Source/Konstruction/.vs/Konstruction/v14/.suo b/Source/Konstruction/.vs/Konstruction/v14/.suo
diff --git a/Source/Konstruction/Konstruction/obj/Debug/Konstruction.csprojResolveAssemblyReference.cache b/Source/Konstruction/Konstruction/obj/Debug/Konstruction.csprojResolveAssemblyReference.cache
diff --git a/Source/Konstruction/Konstruction/obj/Debug/Konstruction.dll b/Source/Konstruction/Konstruction/obj/Debug/Konstruction.dll
diff --git a/Source/Konstruction/Konstruction/obj/Debug/Konstruction.pdb b/Source/Konstruction/Konstruction/obj/Debug/Konstruction.pdb