Merge pull request #1056 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/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>

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/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/Firespitter/Firespitter.version

@@ -3,13 +3,13 @@
   "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
   "VERSION": {
     "MAJOR": 7,
-    "MINOR": 4,
-    "PATCH": 2
+    "MINOR": 5,
+    "PATCH": 0
   },
  "KSP_VERSION":{
 	 "MAJOR":1,
 	 "MINOR":2,
-	 "PATCH":1
+	 "PATCH":2
  },
  "KSP_VERSION_MIN":{
 	 "MAJOR":1,
@@ -19,6 +19,6 @@
  "KSP_VERSION_MAX":{
 	 "MAJOR":1,
 	 "MINOR":2,
-	 "PATCH":1
+	 "PATCH":2
  }
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.3.5 - (KSP 1.2.2)
+-------------------
+Updates for KSP 1.2.2
+
 0.3.4 - (KSP 1.2.1)
 -------------------
 Changed Nukes category to Electrical (Thanks SirCharizard17/SixDasher!)

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Karibou_CTT.cfg

@@ -0,0 +1,69 @@
+//by SirCharizard17
+@PART[KER_RoverCab]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = shortTermHabitation
+}
+@PART[KER_Shelter]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = shortTermHabitation
+}
+@PART[KER_CrewCab]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = shortTermHabitation
+}
+@PART[KER_PassengerCab]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = shortTermHabitation
+}
+@PART[KER_CargoBay]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = shortTermHabitation
+}
+@PART[KER_Adapter]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = shortTermHabitation
+}
+@PART[KER_FlatBed]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = shortTermHabitation
+}
+@PART[KER_Hub]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = shortTermHabitation
+}
+@PART[KER_KISCrate]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[KER_Crate]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[KER_Tank]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[KER_WheelBay]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[KER_WheelBay_Short]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[KER_RCSBlock]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = specializedControl
+}
+@PART[KER_VTOL]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = specializedControl
+}
+@PART[KER_Wheel_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLanding
+}
+@PART[KER_RadialProbe]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = unmannedTech
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Karobou_CLS.cfg

@@ -0,0 +1,10 @@
+@PART[KER_Adapter,KER_CargoBay,KER_CrewCab,KER_FlatBed,KER_Hub,KER_RCSBlock,KER_RoverCab,KER_Shelter,KER_VTOL,KER_WheelBay,KER_WheelBay_Short]:HAS[!MODULE[ModuleConnectedLivingSpace]]:FOR[Karibou]:NEEDS[ConnectedLivingSpace]
+{
+	MODULE
+	{
+		name = ModuleConnectedLivingSpace
+		passable = true
+		passableWhenSurfaceAttached = true
+		surfaceAttachmentsPassable = true
+	}
+} 

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Adapter.cfg

@@ -0,0 +1,76 @@
+PART
+{
+	name = KER_Adapter
+	module = Part
+	author = RoverDude 
+	MODEL
+	{
+		model = UmbraSpaceIndustries/Karibou/Assets/KER_Adapter
+	}
+	rescaleFactor = 1
+
+	node_stack_topHatch = 0.0, .25, 0.4, 0.0, 1.0, 0.0,1
+	node_stack_bottomHatch = 0.0, -.25, 0.4, 0.0, -1.0, 0.0,1
+	node_stack_top = 0.0, .25, 0.0, 0.0, 1.0, 0.0,2
+	node_stack_bottom = 0.0, -.25, 0.0, 0.0, -1.0, 0.0,2
+
+	entryCost = 8000
+	cost = 2000
+	category = none
+	subcategory = 0
+	title = Karibou Adapter Plate
+	manufacturer = USI - Rover Division
+	description = A 2.5m adapter plate for the Karibou Expedition Rover featuring integrated landing struts and a small amount of storage space.
+	attachRules =1,0,1,1,0
+	mass = 0.5
+	dragModelType = default
+	maximum_drag = 0.25
+	minimum_drag = 0.25
+	angularDrag = .5
+	crashTolerance = 45
+	breakingForce = 2800
+	breakingTorque = 2800
+	maxTemp = 1700
+	bulkheadProfiles = size2
+	PhysicsSignificance = 0
+	TechRequired = advConstruction
+	MODULE
+	{
+		name = USIAnimation
+		animationName = Deploy
+	}
+
+	MODULE
+	{
+		name = FStextureSwitch2
+		textureNames = UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers;UmbraSpaceIndustries/Karibou/Assets/RoverKontainers
+		objectNames = PistonCap_001
+		textureDisplayNames = LFO;Water;Chemicals;Mulch;LH2;LiqudFuel;MonoPropellant;MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;MaterialKits;Metals;NuclearFuels;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt
+		useFuelSwitchModule = true
+		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23;24;25
+	}
+
+	MODULE
+	{
+		name = FSfuelSwitch
+		resourceNames =LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant;MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;EnrichedUranium,DepletedUranium;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt
+		resourceAmounts = 225,275;2500;2500;2500;2500;500;500;2500;2500;2500;2500;2500;1250,1250;2500;2500;1250,1250;2500;2500;500;2500;2500;2500;2500;2500;2500;2500
+		initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0;0;0;0;0,0;0;0;0,0;0;0;0;0;0;0;0;0;0
+		tankCost = 1000;1000;40000;1000;1000;1000;1500;7000;5000;4000;5000;4000;327000;5000;38000;1083000;22000;39000;600;50000;25000;100000;14000;1250;25;750
+		basePartMass = 0.5
+		tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
+		hasGUI = false
+	}
+
+
+
+	MODULE
+	{
+		name = USI_ModuleResourceWarehouse
+	}	
+
+	MODULE
+	{
+		name = USI_ModuleRecycleBin
+	}		
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_CargoBay.cfg

@@ -0,0 +1,48 @@
+PART
+{
+	name = KER_CargoBay
+	module = Part
+	author = RoverDude 
+	MODEL
+	{
+		model = UmbraSpaceIndustries/Karibou/Assets/KER_CargoBay
+	}
+	rescaleFactor = 1
+
+	node_stack_innerT = 0.0, 0.0, 0.86, 0.0, 0.0, -1.0,1
+	node_stack_innerB = 0.0, 0.0, -.86, 0.0, 0.0, 1.0,1
+	node_stack_innerL = 0.0, 1.2, 0.0, 0.0, -1.0, 0.0,1
+	node_stack_inner_R  = 0.0, -1.2, 0.0, 0.0, 1.0, 0.0,1
+
+	node_stack_topHatch = 0.0, 1.5, 0.4, 0.0, 1.0, 0.0,1
+	node_stack_bottomHatch = 0.0, -1.5, 0.4, 0.0, -1.0, 0.0,1
+	node_stack_top = 0.0, 1.5, 0.0, 0.0, 1.0, 0.0,2
+	node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0,2
+
+	entryCost = 8000
+	cost = 4000
+	category = none
+	subcategory = 0
+	title = Karibou Cargo Bay
+	manufacturer = USI - Rover Division
+	description = A large cargo bay designed for use with the Karibou Expedition Rover.  Features fold-out ramps and ample attachment points.
+	attachRules =1,0,1,1,0
+	mass = 2.5
+	dragModelType = default
+	maximum_drag = 0.25
+	minimum_drag = 0.25
+	angularDrag = .5
+	crashTolerance = 45
+	breakingForce = 28000
+	breakingTorque = 28000
+	maxTemp = 1700
+	bulkheadProfiles = size2
+	PhysicsSignificance = 0
+	TechRequired = advConstruction
+	MODULE
+	{
+		name = USIAnimation
+		animationName = Deploy
+	}
+
+}