Merge pull request #1550 from tjdeckard/main

Bug fixes
UmbraSpaceIndustries · Oct 24, 2021 · 8e14348 · 8e14348
2 parents f3fa1ab + 5d7a8dd
commit 8e14348
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
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>