From d1f83f131cddc38bb2ada6d564f6217699f668af Mon Sep 17 00:00:00 2001 From: "T.J. Deckard" Date: Sun, 3 Oct 2021 22:12:25 -0400 Subject: [PATCH 1/4] Fix typo in WOLF_CTT.cfg --- .../GameData/UmbraSpaceIndustries/WOLF/Patches/WOLF_CTT.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/Patches/WOLF_CTT.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/Patches/WOLF_CTT.cfg index 997a70fe..7e8f5a20 100644 --- 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] From 55ac061d5ff696416796c11001a737c492e96690 Mon Sep 17 00:00:00 2001 From: "T.J. Deckard" Date: Sun, 3 Oct 2021 22:23:42 -0400 Subject: [PATCH 2/4] Add Konstruction resources to AssembledResourcesFilter for WOLF --- FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/WOLF.cfg | 2 +- Source/WOLF/WOLF/Configuration.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/WOLF.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/WOLF/WOLF.cfg index a35d1961..d5b77f9c 100644 --- 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/Source/WOLF/WOLF/Configuration.cs b/Source/WOLF/WOLF/Configuration.cs index edd07896..d3c6bf3f 100644 --- a/Source/WOLF/WOLF/Configuration.cs +++ b/Source/WOLF/WOLF/Configuration.cs @@ -30,7 +30,8 @@ public class Configuration public static readonly List DefaultAssembledResources = new List { - "Machinery", "Maintenance", "MaterialKits", "SpecializedParts", "TransportCredits" + "Alloys", "Electronics", "Machinery", "Maintenance", "MaterialKits", + "Prototypes", "Robotics", "SpecializedParts", "Synthetics", "TransportCredits" }; public static readonly List DefaultLifeSupportResources = new List From afd4a9484f5406f569e95351ae4d5510180c10be Mon Sep 17 00:00:00 2001 From: "T.J. Deckard" Date: Sun, 3 Oct 2021 22:38:48 -0400 Subject: [PATCH 3/4] Fix typo in MKS_CTT.cfg --- .../GameData/UmbraSpaceIndustries/MKS/Patches/MKS_CTT.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/MKS_CTT.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/MKS_CTT.cfg index 477bdb9e..a3d3e44a 100644 --- 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 } From 5d7a8ddbfc616033d1e5d049c1334dba40688be7 Mon Sep 17 00:00:00 2001 From: "T.J. Deckard" Date: Sat, 23 Oct 2021 21:39:44 -0400 Subject: [PATCH 4/4] Add bleeding-edge tag to when in jenkinsfile --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a7726f36..12852e53 100644 --- 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"