Merge pull request #940 from BobPalmer/DEVELOP

Develop

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.8.2 - 2016.10.16
+------------------
+Made the nuclear pulse engine atmospheric nerf optional
+
 0.8.1 - 2016.10.15
 ------------------
 Fixed an issue that was causing swappable converters to shut down

FOR_RELEASE/GameData/000_USITools/USITools.version

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

FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt

@@ -1,6 +1,11 @@
+0.3.2 - 2016.10.16
+------------------
+Added Mulch to the supply pack
+CTT Update!  (Thanks theRagingIrisman!)
+
 0.3.1 - 2016.10.15
 ------------------
-Fixes texture switch missing parameters (Thanks goldenpsp!)
+Fixed texture switch missing parameters (Thanks goldenpsp!)
 
 0.3.0 - (KSP 1.2)
 ------------------

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.1.5 - 2016.10.16
+------------------
+Dependency Updates
+
 0.1.4 - 2016.10.15
 ------------------
 Fixed issue where some parts would shift on compression (Thanks DefiantZombie!)

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":1,
-         "PATCH":4,
+         "PATCH":5,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/CTT.cfg → FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainers_CTT.cfg

@@ -1,102 +1,168 @@
+//done by theRagingIrishman
+
+//Nuclear
 @PART[C3_DepletedFuelTank]:NEEDS[CommunityTechTree]
 {
     @TechRequired = nuclearFuelSystems
-
 }
 @PART[C3_NukeFuelTank]:NEEDS[CommunityTechTree]
 {
     @TechRequired = nuclearFuelSystems
+}
 
+//Fuel
+@PART[C3_FlatRnd_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = basicRocketry
 }
 
+@PART[C3_FlatRnd_02]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = fuelSystems
+}
 
-@PART[C3_RTank_00]:NEEDS[CommunityTechTree]
+@PART[C3_FlatRnd_03]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = storageTech
+    @TechRequired = advFuelSystems
+}
 
+@PART[C3_FlatRnd_04]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = largeVolumeContainment
 }
-@PART[C3_RTank_01]:NEEDS[CommunityTechTree]
+
+@PART[C3_RTank_00]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = storageTech
+    @TechRequired = basicRocketry
+}
 
+@PART[C3_RTank_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advRocketry
 }
+
 @PART[C3_RTank_02]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = logistics
+    @TechRequired = advFuelSystems
 }
+
 @PART[C3_RTank_03]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = advLogistics
+    @TechRequired = highPerformanceFuelSystems
 }
+
 @PART[C3_RTank_04]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = advLogistics
+    @TechRequired = specializedFuelStorage
 }
+
 @PART[C3_RTank_06]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = advLogistics
+    @TechRequired = exoticFuelStorage
 }
+
 @PART[C3_RTank_08]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = advLogistics
+    @TechRequired = exoticFuelStorage
 }
 
 @PART[C3_Tank_01]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = storageTech
+    @TechRequired = advRocketry
 }
+
 @PART[C3_Tank_02]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = logistics
+    @TechRequired = largeVolumeContainment
 }
+
 @PART[C3_Tank_03]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = advLogistics
+    @TechRequired = highPerformanceFuelSystems
 }
+
 @PART[C3_Tank_04]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = advLogistics
+    @TechRequired = specializedFuelStorage
+}
+
+@PART[C3_LqdTrussTank]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advFuelSystems
 }
 
+@PART[RadialLqdTank]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = fuelSystems
+}
+
+//Non-Fuel
+@PART[C3_FlatTank_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+}
 
 @PART[C3_Kontainer_01]:NEEDS[CommunityTechTree]
 {
     @TechRequired = storageTech
 }
+
+@PART[C3_Kontainer_KIS_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+}
+
+@PART[C3_FlatTank_02]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+
 @PART[C3_Kontainer_02]:NEEDS[CommunityTechTree]
 {
     @TechRequired = logistics
 }
-@PART[C3_Kontainer_03]:NEEDS[CommunityTechTree]
+
+@PART[C3_Kontainer_KIS_02]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = advLogistics
+    @TechRequired = logistics
 }
-@PART[C3_Kontainer_04]:NEEDS[CommunityTechTree]
+
+@PART[C3_FlatTank_03]:NEEDS[CommunityTechTree]
 {
     @TechRequired = advLogistics
 }
 
-
-@PART[C3_Kontainer_KIS_M]:NEEDS[CommunityTechTree]
+@PART[C3_Kontainer_03]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = storageTech
+    @TechRequired = advLogistics
 }
 
-@PART[C3_Kontainer_KIS_01]:NEEDS[CommunityTechTree]
+@PART[C3_Kontainer_KIS_03]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = storageTech
+    @TechRequired = advLogistics
 }
-@PART[C3_Kontainer_KIS_02]:NEEDS[CommunityTechTree]
+
+@PART[C3_FlatTank_04]:NEEDS[CommunityTechTree]
 {
-    @TechRequired = logistics
+    @TechRequired = advLogistics
 }
-@PART[C3_Kontainer_KIS_03]:NEEDS[CommunityTechTree]
+
+@PART[C3_Kontainer_04]:NEEDS[CommunityTechTree]
 {
     @TechRequired = advLogistics
 }
+
 @PART[C3_Kontainer_KIS_04]:NEEDS[CommunityTechTree]
 {
     @TechRequired = advLogistics
 }
 
+@PART[C3_Kontainer_KIS_M]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = generalConstruction
+}
 
+@PART[RadialSupPack]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialSupPak.cfg

@@ -79,9 +79,9 @@ PART
 	MODULE
 	{
 		name = FSfuelSwitch
-		resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics
-		resourceAmounts = 1250;1250;1250;1250;1250;625,625;1250;1250;1250;1250;250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250
-		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
+		resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies,Mulch;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics
+		resourceAmounts = 1250;1250;1250;1250;1250;625,625;1250;1250;1250;1200,50;250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250
+		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
 		tankCost = 2200;875;375;1000;400;187500;2500;17800;10000;3125;5;19750;8750;40000;2500;625;12.5;375;12.5;25;312500;18750;625
         basePartMass = 0.15625
 		tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt

@@ -1,3 +1,10 @@
+0.50.2 - 2016.10.16
+-------------------
+Added a Ranger-style 6K battery 
+Added Mulch to the supply pack
+CTT Update!  (Thanks theRagingIrisman!)
+Fixed missing ResourceDistributor configs for the Pioneer and Logistics Centers
+
 0.50.1 - 2016.10.15
 -------------------
 Corrected an issue where some modules were not auto-transferring resources