Merge pull request #130 from ChrisAdderley/dev

Release 1.3.0
post-kerbin-mining-corporation · Nov 6, 2019 · dd89588 · dd89588
2 parents 3be9ad5 + 4629f48
commit dd89588
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 71 deletions.
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -8,13 +8,13 @@ package:
     - changelog.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.0.2
+    version: 4.1.0
     location: s3
   B9PartSwitch:
-    version: 2.7.0
+    version: 2.12.1
     location: s3
   NearFutureProps:
-    tag: 0.5.1
+    tag: 0.6.1
     location: github
     repository: ChrisAdderley/NearFutureProps
 deploy:

diff --git a/Extras/OrbitalLFOEngines/OrbitalEnginesLFO.cfg b/Extras/OrbitalLFOEngines/OrbitalEnginesLFO.cfg
@@ -1,6 +1,6 @@
 // Sets mono engines to use LFO
 
-@PART[orbital-engine-0625]
+@PART[orbital-engine-0625]:FOR[NearFutureSpacecraft]
 {
 	@MODULE[ModuleEnginesFX]
     {
@@ -16,7 +16,7 @@
 
 	}
 }
-@PART[orbital-engine-125]
+@PART[orbital-engine-125]:FOR[NearFutureSpacecraft]
 {
 	@MODULE[ModuleEnginesFX]
     {
@@ -32,7 +32,7 @@
 
 	}
 }
-@PART[orbital-engine-25]
+@PART[orbital-engine-25]:FOR[NearFutureSpacecraft]
 {
 	@MODULE[ModuleB9PartSwitch]
 	{
@@ -55,7 +55,7 @@
 
 	}
 }
-@PART[orbital-engine-375]
+@PART[orbital-engine-375]:FOR[NearFutureSpacecraft]
 {
 	@MODULE[ModuleB9PartSwitch]:HAS[#switcherDescription[Fuel?Tanks]]
 	{

diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpaceCraftLandertron.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpaceCraftLandertron.cfg
@@ -1,4 +1,4 @@
-@PART[command-25-landing-1]:NEEDS[Landertron]
+@PART[command-25-landing-1]:NEEDS[Landertron]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
@@ -8,7 +8,7 @@
 	}
 }
 
-@PART[command-125-landing-1]:NEEDS[Landertron]
+@PART[command-125-landing-1]:NEEDS[Landertron]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
@@ -19,7 +19,7 @@
 }
 
 
-@PART[command-mk4-1]:NEEDS[Landertron]
+@PART[command-mk4-1]:NEEDS[Landertron]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{

diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftASET.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftASET.cfg
@@ -1,6 +1,6 @@
 // Replaces IVAs
 // Maintained by Dragon01
-@PART[utility-pod-25]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]
+@PART[utility-pod-25]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]:FOR[NearFutureSpacecraft]
 {
   @INTERNAL[crewUtilityPodInternals]
 	{
@@ -11,7 +11,7 @@
 		name = RasterPropMonitorComputer
 	}
 }
-@PART[command-ppd-1]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]
+@PART[command-ppd-1]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]:FOR[NearFutureSpacecraft]
 {
   MODULE
   {
@@ -415,7 +415,7 @@
   }
 }
 
-@PART[command-mk4-1]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]
+@PART[command-mk4-1]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]:FOR[NearFutureSpacecraft]
 {
 MODULE
 {
@@ -819,7 +819,7 @@ MODULE
 }
 }
 
-@PART[command-mk3-9]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]
+@PART[command-mk3-9]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]:FOR[NearFutureSpacecraft]
 {
   MODULE
   {

diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftCommunityTechTree.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftCommunityTechTree.cfg
@@ -1,39 +1,39 @@
 // Near Future Spacecraft CTT Support
 // CTT 2.0+
 
-@PART[command-25-1]:NEEDS[CommunityTechTree]
+@PART[command-25-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
   @TechRequired = heavyCommandModules
 }
-@PART[command-25-landing-1]:NEEDS[CommunityTechTree]
+@PART[command-25-landing-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
   @TechRequired = specializedCommandModules
 }
-@PART[command-125-1]:NEEDS[CommunityTechTree]
+@PART[command-125-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
   @TechRequired = commandModules
 }
-@PART[command-125-landing-1]:NEEDS[CommunityTechTree]
+@PART[command-125-landing-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
   @TechRequired = commandModules
 }
-@PART[command-125-orbit-1]:NEEDS[CommunityTechTree]
+@PART[command-125-orbit-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
   @TechRequired = specializedCommandModules
 }
-@PART[command-375-biconic-1]:NEEDS[CommunityTechTree]
+@PART[command-375-biconic-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
   @TechRequired = heavyCommandCenters
 }
-@PART[command-mk3-9]:NEEDS[CommunityTechTree]
+@PART[command-mk3-9]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
 	@TechRequired = heavyCommandModules
 }
-@PART[command-ppd-1]:NEEDS[CommunityTechTree]
+@PART[command-ppd-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
 	@TechRequired = heavyCommandCenters
 }
-@PART[command-mk4-1]:NEEDS[CommunityTechTree]
+@PART[command-mk4-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft]
 {
 	@TechRequired = heavyLanders
 }
diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftConnectedLivingSpaces.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftConnectedLivingSpaces.cfg
@@ -1,45 +1,45 @@
 // CLS Compatability for Near Future Spacecraft v1.0.0
-@PART[command-25-1]:NEEDS[ConnectedLivingSpace]
+@PART[command-25-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
   MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[command-25-landing-1]:NEEDS[ConnectedLivingSpace]
+@PART[command-25-landing-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
   MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[command-125-1]:NEEDS[ConnectedLivingSpace]
+@PART[command-125-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
   MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[command-125-landing-1]:NEEDS[ConnectedLivingSpace]
+@PART[command-125-landing-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
   MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[command-125-orbit-1]:NEEDS[ConnectedLivingSpace]
+@PART[command-125-orbit-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
   MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[command-375-biconic-1]:NEEDS[ConnectedLivingSpace]
+@PART[command-375-biconic-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
   MODULE
 	{
@@ -48,15 +48,15 @@
     impassablenodes = top
 	}
 }
-@PART[command-ppd-1]:NEEDS[ConnectedLivingSpace]
+@PART[command-ppd-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
     MODULE
 	{
 		name = ModuleConnectedLivingSpace
 		passable = true
 	}
 }
-@PART[command-mk3-9]:NEEDS[ConnectedLivingSpace]
+@PART[command-mk3-9]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
     MODULE
 	{
@@ -65,7 +65,7 @@
 
 	}
 }
-@PART[utility-pod-25]:NEEDS[ConnectedLivingSpace]
+@PART[utility-pod-25]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
     MODULE
 	{
@@ -74,7 +74,7 @@
 	}
 }
 // Not an error, this guy has a passable tube!
-@PART[orbital-engine-25]:NEEDS[ConnectedLivingSpace]
+@PART[orbital-engine-25]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
     MODULE
 	{
@@ -84,7 +84,7 @@
 	}
 }
 
-@PART[command-mk4-1]:NEEDS[ConnectedLivingSpace]
+@PART[command-mk4-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
     MODULE
 	{
@@ -93,7 +93,7 @@
 
 	}
 }
-@PART[docking-nose-0625-1]:NEEDS[ConnectedLivingSpace]
+@PART[docking-nose-0625-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft]
 {
   MODULE
 	{

diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftFAR.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftFAR.cfg
@@ -1,38 +1,38 @@
 // Near Future Spacecraft FAR Support
 
-@PART[command-25-1]:NEEDS[FerramAerospaceResearch]
+@PART[command-25-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
   !MODULE[ModuleLiftingSurface] {}
 }
-@PART[command-25-landing-1]:NEEDS[FerramAerospaceResearch]
+@PART[command-25-landing-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
 !MODULE[ModuleLiftingSurface] {}
 }
-@PART[command-125-1]:NEEDS[FerramAerospaceResearch]
+@PART[command-125-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
   !MODULE[ModuleLiftingSurface] {}
 }
-@PART[command-125-landing-1]:NEEDS[FerramAerospaceResearch]
+@PART[command-125-landing-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
   !MODULE[ModuleLiftingSurface] {}
 }
-@PART[command-125-orbit-1]:NEEDS[FerramAerospaceResearch]
+@PART[command-125-orbit-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
   !MODULE[ModuleLiftingSurface] {}
 }
-@PART[command-375-biconic-1]:NEEDS[FerramAerospaceResearch]
+@PART[command-375-biconic-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
   !MODULE[ModuleLiftingSurface] {}
 }
-@PART[command-mk3-9]:NEEDS[FerramAerospaceResearch]
+@PART[command-mk3-9]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
 	!MODULE[ModuleLiftingSurface] {}
 }
-@PART[command-ppd-1]:NEEDS[FerramAerospaceResearch]
+@PART[command-ppd-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
 	!MODULE[ModuleLiftingSurface] {}
 }
-@PART[command-mk4-1]:NEEDS[FerramAerospaceResearch]
+@PART[command-mk4-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft]
 {
 	!MODULE[ModuleLiftingSurface] {}
 }
diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftKerbalHealth.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftKerbalHealth.cfg
@@ -1,61 +1,61 @@
 // KerbalHealth support (fraz86)
-@PART[command-mk3-9]:NEEDS[KerbalHealth,!USILifeSupport]
+@PART[command-mk3-9]:NEEDS[KerbalHealth,!USILifeSupport]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
 		name = ModuleKerbalHealth
 		space = 2.5
 	}
 }
-@PART[command-mk3-9]:NEEDS[KerbalHealth,USILifeSupport]
+@PART[command-mk3-9]:NEEDS[KerbalHealth,USILifeSupport]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
 		name = ModuleKerbalHealth
 		space = 1.2
 	}
 }
-@PART[command-ppd-1]:NEEDS[KerbalHealth,!USILifeSupport]
+@PART[command-ppd-1]:NEEDS[KerbalHealth,!USILifeSupport]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
 		name = ModuleKerbalHealth
 		space = 4.9
 	}
 }
-@PART[command-ppd-1]:NEEDS[KerbalHealth,USILifeSupport]
+@PART[command-ppd-1]:NEEDS[KerbalHealth,USILifeSupport]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
 		name = ModuleKerbalHealth
 		space = 2.0
 	}
 }
-@PART[command-mk4-1]:NEEDS[KerbalHealth,!USILifeSupport]
+@PART[command-mk4-1]:NEEDS[KerbalHealth,!USILifeSupport]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
 		name = ModuleKerbalHealth
 		space = 6.2
 	}
 }
-@PART[command-mk4-1]:NEEDS[KerbalHealth,USILifeSupport]
+@PART[command-mk4-1]:NEEDS[KerbalHealth,USILifeSupport]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
 		name = ModuleKerbalHealth
 		space = 2.4
 	}
 }
-@PART[utility-pod-25]:NEEDS[KerbalHealth,!USILifeSupport]
+@PART[utility-pod-25]:NEEDS[KerbalHealth,!USILifeSupport]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{
 		name = ModuleKerbalHealth
 		space = 1.8
 	}
 }
-@PART[utility-pod-25]:NEEDS[KerbalHealth,USILifeSupport]
+@PART[utility-pod-25]:NEEDS[KerbalHealth,USILifeSupport]:FOR[NearFutureSpacecraft]
 {
 	MODULE
 	{

diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftTACLifeSupport.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftTACLifeSupport.cfg
@@ -1,4 +1,4 @@
-@PART[command-mk3-9,utility-pod-25]:NEEDS[TacLifeSupport]
+@PART[command-mk3-9,utility-pod-25]:NEEDS[TacLifeSupport]:FOR[NearFutureSpacecraft]
 {
     RESOURCE
     {