From bece4e64a01c618d3a8be22d741fd5f9709d6d5a Mon Sep 17 00:00:00 2001 From: Cheeeh Date: Fri, 2 Jan 2026 16:55:29 +0100 Subject: [PATCH 1/3] update workflow snapshot --- .github/workflows/snapshot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index afc88037..15ad2f48 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -2,9 +2,9 @@ name: Snapshot on: push: - branches: [ develop, newbb ] + branches: [ develop, newbb, 20240626_develop ] pull_request: - branches: [ develop, newbb ] + branches: [ develop, newbb, 20240626_develop ] jobs: build: From 47f7e641a2961827e1ddd2ec7c06edd43b502348 Mon Sep 17 00:00:00 2001 From: Cheeeh Date: Fri, 2 Jan 2026 17:02:11 +0100 Subject: [PATCH 2/3] update to upload-artifact@v4 --- .github/workflows/snapshot.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 15ad2f48..14f196df 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -43,7 +43,7 @@ jobs: with: args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-win64.zip publish/win64/ - name: Upload win64 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: TBot-${{ env.SNAP_VERSION }}-win64 path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-win64.zip @@ -61,7 +61,7 @@ jobs: with: args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-win32.zip publish/win32/ - name: Upload win32 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: TBot-${{ env.SNAP_VERSION }}-win32 path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-win32.zip @@ -81,7 +81,7 @@ jobs: with: args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linux64.zip publish/linux64/ - name: Upload linux64 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: TBot-${{ env.SNAP_VERSION }}-linux64 path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linux64.zip @@ -101,7 +101,7 @@ jobs: with: args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linuxarm.zip publish/linuxarm/ - name: Upload linuxarm - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: TBot-${{ env.SNAP_VERSION }}-linuxarm path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linuxarm.zip @@ -121,7 +121,7 @@ jobs: with: args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-linuxarm64.zip publish/linuxarm64/ - name: Upload linuxarm64 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: TBot-${{ env.SNAP_VERSION }}-linuxarm64 path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-linuxarm64.zip @@ -141,7 +141,7 @@ jobs: with: args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-osx64.zip publish/osx64/ - name: Upload osx64 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: TBot-${{ env.SNAP_VERSION }}-osx64 path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-osx64.zip @@ -161,7 +161,7 @@ jobs: with: args: zip -qq -r TBot-${{ env.SNAP_VERSION }}-osx-arm64.zip publish/osx-arm64/ - name: Upload osx-arm64 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: TBot-${{ env.SNAP_VERSION }}-osx-arm64 path: ${{ github.workspace }}/TBot-${{ env.SNAP_VERSION }}-osx-arm64.zip From 289cdd226ec22aacd89bbfefa4be4d8afb2234f6 Mon Sep 17 00:00:00 2001 From: Cheeeh Date: Tue, 13 Jan 2026 15:09:36 +0100 Subject: [PATCH 3/3] fix typo --- TBot/Workers/AutoDiscoveryWorker.cs | 2 +- TBot/Workers/AutoFarmWorker.cs | 2 +- TBot/Workers/Brain/AutoMineCelestialWorker.cs | 2 +- TBot/Workers/Brain/AutoResearchWorker.cs | 2 +- TBot/Workers/Brain/LifeformsAutoMineCelestialWorker.cs | 2 +- TBot/Workers/Brain/LifeformsAutoResearchCelestialWorker.cs | 2 +- TBot/Workers/ColonizeWorker.cs | 2 +- TBot/Workers/ExpeditionsWorker.cs | 2 +- TBot/Workers/HarvestWorker.cs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/TBot/Workers/AutoDiscoveryWorker.cs b/TBot/Workers/AutoDiscoveryWorker.cs index df06f277..17ad62bc 100644 --- a/TBot/Workers/AutoDiscoveryWorker.cs +++ b/TBot/Workers/AutoDiscoveryWorker.cs @@ -61,7 +61,7 @@ protected override async Task Execute() { new RankSlotsPriority(Feature.BrainAutoMine, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.Brain, ((bool)_tbotInstance.InstanceSettings.Brain.Active && (bool)_tbotInstance.InstanceSettings.Brain.Transports.Active && ((bool)_tbotInstance.InstanceSettings.Brain.AutoMine.Active || (bool)_tbotInstance.InstanceSettings.Brain.AutoResearch.Active || (bool)_tbotInstance.InstanceSettings.Brain.LifeformAutoMine.Active || (bool)_tbotInstance.InstanceSettings.Brain.LifeformAutoResearch.Active)), (int)_tbotInstance.InstanceSettings.Brain.Transports.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Transport)), new RankSlotsPriority(Feature.Expeditions, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.Expeditions, (bool)_tbotInstance.InstanceSettings.Expeditions.Active, (int)_tbotInstance.UserData.slots.ExpTotal, (int)_tbotInstance.UserData.slots.ExpInUse), new RankSlotsPriority(Feature.AutoFarm, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoFarm, (bool)_tbotInstance.InstanceSettings.AutoFarm.Active, (int)_tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), - new RankSlotsPriority(Feature.Colonize, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, (bool)_tbotInstance.InstanceSettings.AutoColonize.Active, (bool)_tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int)_tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : 1, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Colonize)), + new RankSlotsPriority(Feature.Colonize, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool)_tbotInstance.InstanceSettings.AutoColonize.Active, (bool)_tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int)_tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : 1, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Colonize)), new RankSlotsPriority(Feature.AutoDiscovery, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoDiscovery, (bool)_tbotInstance.InstanceSettings.AutoDiscovery.Active, (int)_tbotInstance.InstanceSettings.AutoDiscovery.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Discovery)), new RankSlotsPriority(Feature.Harvest, (int)_tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoHarvest, (bool)_tbotInstance.InstanceSettings.AutoHarvest.Active, (int)_tbotInstance.InstanceSettings.AutoHarvest.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Harvest)) }; diff --git a/TBot/Workers/AutoFarmWorker.cs b/TBot/Workers/AutoFarmWorker.cs index 85393598..614bb59f 100644 --- a/TBot/Workers/AutoFarmWorker.cs +++ b/TBot/Workers/AutoFarmWorker.cs @@ -599,7 +599,7 @@ protected override async Task Execute() { (int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), new RankSlotsPriority(Feature.Colonize, - (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, + (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool) _tbotInstance.InstanceSettings.AutoColonize.Active, (bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : diff --git a/TBot/Workers/Brain/AutoMineCelestialWorker.cs b/TBot/Workers/Brain/AutoMineCelestialWorker.cs index 83401c54..35ed77a8 100644 --- a/TBot/Workers/Brain/AutoMineCelestialWorker.cs +++ b/TBot/Workers/Brain/AutoMineCelestialWorker.cs @@ -321,7 +321,7 @@ private async Task AutoMineCelestial(Celestial celestial, Buildings maxBuildings (int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), new RankSlotsPriority(Feature.Colonize, - (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, + (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool) _tbotInstance.InstanceSettings.AutoColonize.Active, (bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : diff --git a/TBot/Workers/Brain/AutoResearchWorker.cs b/TBot/Workers/Brain/AutoResearchWorker.cs index 6476d364..645ce415 100644 --- a/TBot/Workers/Brain/AutoResearchWorker.cs +++ b/TBot/Workers/Brain/AutoResearchWorker.cs @@ -196,7 +196,7 @@ protected override async Task Execute() { (int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), new RankSlotsPriority(Feature.Colonize, - (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, + (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool) _tbotInstance.InstanceSettings.AutoColonize.Active, (bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : diff --git a/TBot/Workers/Brain/LifeformsAutoMineCelestialWorker.cs b/TBot/Workers/Brain/LifeformsAutoMineCelestialWorker.cs index cc68cff9..3350b864 100644 --- a/TBot/Workers/Brain/LifeformsAutoMineCelestialWorker.cs +++ b/TBot/Workers/Brain/LifeformsAutoMineCelestialWorker.cs @@ -201,7 +201,7 @@ private async Task LifeformAutoMineCelestial(Celestial celestial) { (int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), new RankSlotsPriority(Feature.Colonize, - (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, + (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool) _tbotInstance.InstanceSettings.AutoColonize.Active, (bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : diff --git a/TBot/Workers/Brain/LifeformsAutoResearchCelestialWorker.cs b/TBot/Workers/Brain/LifeformsAutoResearchCelestialWorker.cs index 54c38f72..765937e2 100644 --- a/TBot/Workers/Brain/LifeformsAutoResearchCelestialWorker.cs +++ b/TBot/Workers/Brain/LifeformsAutoResearchCelestialWorker.cs @@ -211,7 +211,7 @@ private async Task LifeformAutoResearchCelestial(Celestial celestial) { (int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), new RankSlotsPriority(Feature.Colonize, - (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, + (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool) _tbotInstance.InstanceSettings.AutoColonize.Active, (bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : diff --git a/TBot/Workers/ColonizeWorker.cs b/TBot/Workers/ColonizeWorker.cs index 213069ee..c7fc22dc 100644 --- a/TBot/Workers/ColonizeWorker.cs +++ b/TBot/Workers/ColonizeWorker.cs @@ -116,7 +116,7 @@ protected override async Task Execute() { (int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), new RankSlotsPriority(Feature.Colonize, - (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, + (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool) _tbotInstance.InstanceSettings.AutoColonize.Active, (bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : diff --git a/TBot/Workers/ExpeditionsWorker.cs b/TBot/Workers/ExpeditionsWorker.cs index bcfa777f..1f19d26a 100644 --- a/TBot/Workers/ExpeditionsWorker.cs +++ b/TBot/Workers/ExpeditionsWorker.cs @@ -92,7 +92,7 @@ protected override async Task Execute() { (int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), new RankSlotsPriority(Feature.Colonize, - (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, + (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool) _tbotInstance.InstanceSettings.AutoColonize.Active, (bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots : diff --git a/TBot/Workers/HarvestWorker.cs b/TBot/Workers/HarvestWorker.cs index 93c0464c..cd8e34ec 100644 --- a/TBot/Workers/HarvestWorker.cs +++ b/TBot/Workers/HarvestWorker.cs @@ -160,7 +160,7 @@ protected override async Task Execute() { (int) _tbotInstance.InstanceSettings.AutoFarm.MaxSlots, (int) _tbotInstance.UserData.fleets.Count(f => f.Mission == Missions.Attack)), new RankSlotsPriority(Feature.Colonize, - (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.Colonize, + (int) _tbotInstance.InstanceSettings.General.SlotPriorityLevel.AutoColonize, (bool) _tbotInstance.InstanceSettings.AutoColonize.Active, (bool) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.Active ? (int) _tbotInstance.InstanceSettings.AutoColonize.IntensiveResearch.MaxSlots :