Merge pull request #108 from ChrisAdderley/dev

Release 1.2.0
post-kerbin-mining-corporation · Nov 6, 2019 · 7ca602c · 7ca602c
2 parents e109d87 + 182b86f
commit 7ca602c
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 47 deletions.
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -8,10 +8,10 @@ package:
     - changelog.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.0.2
+    version: 4.1.0
     location: s3
   B9PartSwitch:
-    version: 2.9.0
+    version: 2.12.1
     location: s3
 deploy:
   SpaceDock:

diff --git a/GameData/NearFutureConstruction/Patches/NFConstructionCRPTrusses.cfg b/GameData/NearFutureConstruction/Patches/NFConstructionCRPTrusses.cfg
@@ -1,7 +1,7 @@
 // Activates the CRP trusses and the CryoTanks boiloff when the appropriate mods are installed
 
 // Octo-truss XL
-@PART[truss-octo-01]:NEEDS[CommunityResourcePack]
+@PART[truss-octo-01]:NEEDS[CommunityResourcePack]:FOR[NearFutureConstruction]
 {
   !MODULE[ModuleB9DisableTransform] {}
 
@@ -75,7 +75,7 @@
 }
 
 // Octo-truss
-@PART[truss-octo-02]:NEEDS[CommunityResourcePack]
+@PART[truss-octo-02]:NEEDS[CommunityResourcePack]:FOR[NearFutureConstruction]
 {
   !MODULE[ModuleB9DisableTransform] {}
   @MODULE[ModuleB9PartSwitch]
@@ -148,7 +148,7 @@
 }
 
 // Hex Truss XL
-@PART[truss-hex-01]:NEEDS[CommunityResourcePack]
+@PART[truss-hex-01]:NEEDS[CommunityResourcePack]:FOR[NearFutureConstruction]
 {
   !MODULE[ModuleB9DisableTransform] {}
   @MODULE[ModuleB9PartSwitch]
@@ -222,7 +222,7 @@
 }
 
 // Hex Truss
-@PART[truss-hex-02]:NEEDS[CommunityResourcePack]
+@PART[truss-hex-02]:NEEDS[CommunityResourcePack]:FOR[NearFutureConstruction]
 {
   !MODULE[ModuleB9DisableTransform] {}
   @MODULE[ModuleB9PartSwitch]

diff --git a/GameData/NearFutureConstruction/Patches/NFConstructionCommunityTechTree.cfg b/GameData/NearFutureConstruction/Patches/NFConstructionCommunityTechTree.cfg
@@ -3,71 +3,71 @@
 // Adapters
 
 // Hubs and fancy connectors in exoticAlloys
-@PART[truss-octo-hub-01]:NEEDS[CommunityTechTree]
+@PART[truss-octo-hub-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-octo-hub-crew-01]:NEEDS[CommunityTechTree]
+@PART[truss-octo-hub-crew-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-octo-attach-01]:NEEDS[CommunityTechTree]
+@PART[truss-octo-attach-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-octo-angled-01]:NEEDS[CommunityTechTree]
+@PART[truss-octo-angled-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-octo-angled-crew-01]:NEEDS[CommunityTechTree]
+@PART[truss-octo-angled-crew-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
 
 // Big trusses in exoticAlloys (not the standard size)
-@PART[truss-circular-01]:NEEDS[CommunityTechTree]
+@PART[truss-circular-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-circular-03]:NEEDS[CommunityTechTree]
+@PART[truss-circular-03]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-circular-04]:NEEDS[CommunityTechTree]
+@PART[truss-circular-04]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-spinal-01]:NEEDS[CommunityTechTree]
+@PART[truss-spinal-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-spinal-03]:NEEDS[CommunityTechTree]
+@PART[truss-spinal-03]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
-@PART[truss-spinal-04]:NEEDS[CommunityTechTree]
+@PART[truss-spinal-04]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = exoticAlloys
 }
 
 // Heavy docking ports in Orbital Assembly
-@PART[truss-octo-docking-125]:NEEDS[CommunityTechTree]
+@PART[truss-octo-docking-125]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = orbitalAssembly
 }
-@PART[truss-octo-docking-25]:NEEDS[CommunityTechTree]
+@PART[truss-octo-docking-25]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = orbitalAssembly
 }
-@PART[truss-octo-docking-octo]:NEEDS[CommunityTechTree]
+@PART[truss-octo-docking-octo]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = orbitalAssembly
 }
-@PART[truss-spinal-docking-01]:NEEDS[CommunityTechTree]
+@PART[truss-spinal-docking-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = orbitalMegastructures
 }
-@PART[truss-circular-docking-01]:NEEDS[CommunityTechTree]
+@PART[truss-circular-docking-01]:NEEDS[CommunityTechTree]:FOR[NearFutureConstruction]
 {
 	@TechRequired = orbitalMegastructures
 }
diff --git a/GameData/NearFutureConstruction/Patches/NFConstructionConnectedLivingSpaces.cfg b/GameData/NearFutureConstruction/Patches/NFConstructionConnectedLivingSpaces.cfg
@@ -1,6 +1,6 @@
 // CLS Compatability for Near Future Construction v0.6.0
 
-@PART[truss-octo-drone-01]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-drone-01]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{
@@ -10,63 +10,63 @@
 }
 
 // Girders
-@PART[truss-octo-crew-01]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-crew-01]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[truss-octo-crew-02]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-crew-02]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[truss-octo-crew-03]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-crew-03]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[truss-octo-hub-crew-01]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-hub-crew-01]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[truss-octo-adapter-crew-01]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-adapter-crew-01]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[truss-octo-docking-125]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-docking-125]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[truss-octo-docking-octo]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-docking-octo]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[truss-octo-angled-crew-01]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
+@PART[truss-octo-angled-crew-01]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureConstruction]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{

diff --git a/GameData/NearFutureConstruction/Patches/NFConstructionFuelTankTypes.cfg b/GameData/NearFutureConstruction/Patches/NFConstructionFuelTankTypes.cfg
@@ -1,5 +1,5 @@
 // Adds support for CRP fuels when CRP is installed
-B9_TANK_TYPE:NEEDS[CommunityResourcePack&!CryoTanks]
+B9_TANK_TYPE:NEEDS[CommunityResourcePack&!CryoTanks]:FOR[NearFutureConstruction]
 {
 	name = LH2OCryo
 	tankMass = 0.000278904
@@ -16,7 +16,7 @@ B9_TANK_TYPE:NEEDS[CommunityResourcePack&!CryoTanks]
 		unitsPerVolume = 0.333
 	}
 }
-B9_TANK_TYPE:NEEDS[CommunityResourcePack&!CryoTanks]
+B9_TANK_TYPE:NEEDS[CommunityResourcePack&!CryoTanks]:FOR[NearFutureConstruction]
 {
 	name = LH2Cryo
 	tankMass =  0.00010627500
@@ -28,7 +28,7 @@ B9_TANK_TYPE:NEEDS[CommunityResourcePack&!CryoTanks]
 		unitsPerVolume = 7.5
 	}
 }
-B9_TANK_TYPE:NEEDS[CommunityResourcePack]
+B9_TANK_TYPE:NEEDS[CommunityResourcePack]:FOR[NearFutureConstruction]
 {
 	name = Lithium
 	tankMass = 0.00089
@@ -40,7 +40,7 @@ B9_TANK_TYPE:NEEDS[CommunityResourcePack]
 		unitsPerVolume = 5
 	}
 }
-B9_TANK_TYPE:NEEDS[CommunityResourcePack]
+B9_TANK_TYPE:NEEDS[CommunityResourcePack]:FOR[NearFutureConstruction]
 {
 	name = Argon
 	tankMass =  0.000594667
@@ -103,7 +103,7 @@ B9_TANK_TYPE
 	}
 }
 
-@B9_TANK_TYPE[Xenon]:NEEDS[NearFuturePropulsion]
+@B9_TANK_TYPE[Xenon]:NEEDS[NearFuturePropulsion]:FOR[NearFutureConstruction]
 {
 	@tankMass = 0.000525
 }

diff --git a/GameData/NearFutureConstruction/Versioning/NearFutureConstruction.version b/GameData/NearFutureConstruction/Versioning/NearFutureConstruction.version
@@ -5,24 +5,24 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":1,
-        "PATCH":4,
+        "MINOR":2,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":7,
-        "PATCH":3
+        "MINOR":8,
+        "PATCH":1
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
-        "MINOR":7,
-        "PATCH":3
+        "MINOR":8,
+        "PATCH":0
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":7,
+        "MINOR":8,
         "PATCH":99
     }
 }
diff --git a/README.md b/README.md
@@ -25,8 +25,8 @@ A number of parts designed to help build cooler spacecraft with girders and trus
 
 ### Required
 These components are required for the mod to function and are bundled as part of any download:
-* [ModuleManager (4.0.2)](https://github.com/sarbian/ModuleManager)
-* [B9PartSwitch (2.9.0)](https://github.com/blowfishpro/B9PartSwitch)
+* [ModuleManager (4.1.0)](https://github.com/sarbian/ModuleManager)
+* [B9PartSwitch (2.12.1)](https://github.com/blowfishpro/B9PartSwitch)
 
 ## Installation
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,10 @@
+v1.2.0
+------
+- KSP 1.8.x
+- Updated MM to 4.1.0
+- Updated B9PartSwitch to 2.12.1
+- Updated MM patch pass specifiers where needed
+
 v1.1.4
 ------
 - Fixed colliders on angled octo-truss 30 and 45 degree variants

diff --git a/readme.txt b/readme.txt
@@ -9,8 +9,8 @@ DEPENDENCIES
 ============
 
 Required
-- B9PartSwitch (v2.9.0)
-- ModuleManager (v4.0.2)
+- B9PartSwitch (v2.12.1)
+- ModuleManager (v4.1.0)
 
 Optional
 - Community Tech Tree (v2.0+)