Merge pull request #1550 from tjdeckard/main

tjdeckard · web-flow · commit 8e1434827f34 · 2021-10-23T21:40:12.000-04:00
Bug fixes
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/MKS_CTT.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/MKS_CTT.cfg
@@ -280,7 +280,7 @@
 	@TechRequired = colonization
 }
 
-@PART[ATLAS_Harvester_sm*]:NEEDS[CommunityTechTree]
+@PART[ATLAS_Harvester_Sm*]:NEEDS[CommunityTechTree]
 {
 	@TechRequired = colonization
 }
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/Patches/WOLF_CTT.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/Patches/WOLF_CTT.cfg
@@ -129,7 +129,7 @@
 
 @PART[WOLF_Transporter]:NEEDS[CommunityTechTree]
 {
-	@TechRequired = advlogistics
+	@TechRequired = advLogistics
 }
 
 @PART[WOLF_TransportModule375]:NEEDS[CommunityTechTree]
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/WOLF.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/WOLF.cfg
@@ -3,6 +3,6 @@ WOLF_CONFIGURATION
 	AllowedHarvestableResources = Dirt,ExoticMinerals,Gypsum,Hydrates,MetallicOre,Minerals,Ore,Oxygen,RareMetals,Silicates,Substrate,Water,XenonGas
 	BlacklistedHomeworldResources = ExoticMinerals,RareMetals
 	RefinedResourcesFilter = Chemicals,Fertilizer,Fuel,Metals,Polymers,Power,RefinedExotics,Silicon
-	AssembledResourcesFilter = Machinery,Maintenance,MaterialKits,Power,SpecializedParts,TransportCredits
+	AssembledResourcesFilter = Alloys,Electronics,Machinery,Maintenance,MaterialKits,Power,Prototypes,Robotics,SpecializedParts,Synthetics,TransportCredits
 	LifeSupportResourcesFilter = CarbonDioxide,ColonySupplies,Food,Habitation,Lab,LifeSupport,Mulch,Oxygen,Power,WasteWater,Water
 }
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,12 @@ pipeline {
     }
     // Determine build & publish flags for branch
     stage("Setup bleeding edge environment") {
-      when { branch "main" }
+      when { 
+        anyOf {
+          branch "main"
+          tag "*-bleeding-edge-*"
+        }
+      }
       steps {
         script {
           env.ARTIFACT_CACHES = "bleeding-edge"
diff --git a/Source/WOLF/WOLF/Configuration.cs b/Source/WOLF/WOLF/Configuration.cs
@@ -30,7 +30,8 @@ public class Configuration
 
         public static readonly List<string> DefaultAssembledResources = new List<string>
         {
-            "Machinery", "Maintenance", "MaterialKits", "SpecializedParts", "TransportCredits"
+            "Alloys", "Electronics", "Machinery", "Maintenance", "MaterialKits",
+            "Prototypes", "Robotics", "SpecializedParts", "Synthetics", "TransportCredits"
         };
 
         public static readonly List<string> DefaultLifeSupportResources = new List<string>

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@`
`280`	`280`	`@TechRequired = colonization`
`281`	`281`	`}`
`282`	`282`
`283`		`-@PART[ATLAS_Harvester_sm*]:NEEDS[CommunityTechTree]`
	`283`	`+@PART[ATLAS_Harvester_Sm*]:NEEDS[CommunityTechTree]`
`284`	`284`	`{`
`285`	`285`	`@TechRequired = colonization`
`286`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@`
`129`	`129`
`130`	`130`	`@PART[WOLF_Transporter]:NEEDS[CommunityTechTree]`
`131`	`131`	`{`
`132`		`- @TechRequired = advlogistics`
	`132`	`+ @TechRequired = advLogistics`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`@PART[WOLF_TransportModule375]:NEEDS[CommunityTechTree]`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ WOLF_CONFIGURATION`
`3`	`3`	`AllowedHarvestableResources = Dirt,ExoticMinerals,Gypsum,Hydrates,MetallicOre,Minerals,Ore,Oxygen,RareMetals,Silicates,Substrate,Water,XenonGas`
`4`	`4`	`BlacklistedHomeworldResources = ExoticMinerals,RareMetals`
`5`	`5`	`RefinedResourcesFilter = Chemicals,Fertilizer,Fuel,Metals,Polymers,Power,RefinedExotics,Silicon`
`6`		`- AssembledResourcesFilter = Machinery,Maintenance,MaterialKits,Power,SpecializedParts,TransportCredits`
	`6`	`+ AssembledResourcesFilter = Alloys,Electronics,Machinery,Maintenance,MaterialKits,Power,Prototypes,Robotics,SpecializedParts,Synthetics,TransportCredits`
`7`	`7`	`LifeSupportResourcesFilter = CarbonDioxide,ColonySupplies,Food,Habitation,Lab,LifeSupport,Mulch,Oxygen,Power,WasteWater,Water`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ public class Configuration`
`30`	`30`
`31`	`31`	`public static readonly List<string> DefaultAssembledResources = new List<string>`
`32`	`32`	`{`
`33`		`- "Machinery", "Maintenance", "MaterialKits", "SpecializedParts", "TransportCredits"`
	`33`	`+ "Alloys", "Electronics", "Machinery", "Maintenance", "MaterialKits",`
	`34`	`+ "Prototypes", "Robotics", "SpecializedParts", "Synthetics", "TransportCredits"`
`34`	`35`	`};`
`35`	`36`
`36`	`37`	`public static readonly List<string> DefaultLifeSupportResources = new List<string>`