Skip to content

Commit

Permalink
Merge branch 'main' into net8
Browse files Browse the repository at this point in the history
  • Loading branch information
JustArchi committed Nov 14, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 3387354 + 98e85f8 commit 89453eb
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/bump-asf-reference.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.1
with:
show-progress: false
token: ${{ env.PUSH_GITHUB_TOKEN }}
@@ -36,7 +36,7 @@ jobs:
type: ${{ env.RELEASE_TYPE }}

- name: Import GPG key for signing
uses: crazy-max/ghaction-import-gpg@d6f3f49f3345e29369fe57596a3ca8f94c4d2ca7 # v5.4.0
uses: crazy-max/ghaction-import-gpg@v6.0.0
if: ${{ env.GPG_PRIVATE_KEY != null }}
with:
gpg_private_key: ${{ env.GPG_PRIVATE_KEY }}
@@ -67,7 +67,7 @@ jobs:
fi
- name: Push changes to the repo
uses: ad-m/github-push-action@v0.6.0
uses: ad-m/github-push-action@v0.8.0
with:
github_token: ${{ env.PUSH_GITHUB_TOKEN }}
branch: ${{ github.ref }}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.1
with:
show-progress: false
submodules: recursive
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.1
with:
show-progress: false
submodules: recursive
@@ -147,14 +147,14 @@ jobs:
Get-Job | Receive-Job -Wait
- name: Upload generic
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v3.1.3
with:
name: ${{ matrix.os }}_${{ env.PLUGIN_NAME }}-generic
path: out/${{ env.PLUGIN_NAME }}-generic.zip

- name: Upload generic-netf
if: startsWith(matrix.os, 'windows-')
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v3.1.3
with:
name: ${{ matrix.os }}_${{ env.PLUGIN_NAME }}-generic-netf
path: out/${{ env.PLUGIN_NAME }}-generic-netf.zip
@@ -166,7 +166,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.1
with:
show-progress: false

2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "ArchiSteamFarm"]
path = ArchiSteamFarm
url = https://github.com/JustArchiNET/ArchiSteamFarm.git
branch = 5.4.9.3
branch = 5.4.12.5
2 changes: 1 addition & 1 deletion ArchiSteamFarm
Submodule ArchiSteamFarm updated 52 files
+3 −2 .github/workflows/ci.yml
+20 −3 .github/workflows/code-quality.yml
+4 −3 .github/workflows/docker-ci.yml
+6 −5 .github/workflows/docker-publish-latest.yml
+6 −5 .github/workflows/docker-publish-main.yml
+6 −5 .github/workflows/docker-publish-released.yml
+15 −10 .github/workflows/publish.yml
+6 −5 .github/workflows/translations.yml
+1 −1 ASF-ui
+6 −4 ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatAPI.cs
+2 −0 ArchiSteamFarm.CustomPlugins.ExamplePlugin/ExamplePlugin.cs
+1 −1 ArchiSteamFarm.CustomPlugins.ExamplePlugin/MeowResponse.cs
+65 −0 ArchiSteamFarm.OfficialPlugins.ItemsMatcher/Localization/Strings.bs-BA.resx
+3 −3 ArchiSteamFarm.OfficialPlugins.ItemsMatcher/Localization/Strings.de-DE.resx
+1 −1 ArchiSteamFarm.OfficialPlugins.ItemsMatcher/Localization/Strings.zh-Hant.resx
+65 −0 ArchiSteamFarm.OfficialPlugins.MobileAuthenticator/Localization/Strings.bs-BA.resx
+2 −0 ArchiSteamFarm.OfficialPlugins.MobileAuthenticator/MobileAuthenticatorPlugin.cs
+94 −0 ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.bs-BA.resx
+2 −2 ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.de-DE.resx
+4 −1 ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.it-IT.resx
+4 −1 ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/Localization/Strings.uk-UA.resx
+5 −0 ArchiSteamFarm.sln.DotSettings
+1 −0 ArchiSteamFarm/ArchiSteamFarm.csproj
+3 −0 ArchiSteamFarm/Collections/ObservableConcurrentDictionary.cs
+23 −2 ArchiSteamFarm/Core/ASF.cs
+19 −1 ArchiSteamFarm/Core/Utilities.cs
+1 −2 ArchiSteamFarm/IPC/Controllers/Api/CommandController.cs
+357 −0 ArchiSteamFarm/Localization/Strings.bs-BA.resx
+13 −13 ArchiSteamFarm/Localization/Strings.de-DE.resx
+16 −4 ArchiSteamFarm/Localization/Strings.it-IT.resx
+1 −1 ArchiSteamFarm/Localization/Strings.pt-BR.resx
+56 −15 ArchiSteamFarm/Localization/Strings.sv-SE.resx
+4 −1 ArchiSteamFarm/Localization/Strings.uk-UA.resx
+46 −45 ArchiSteamFarm/Localization/Strings.zh-Hant.resx
+1 −1 ArchiSteamFarm/NLog/Logging.cs
+2 −2 ArchiSteamFarm/Program.cs
+264 −64 ArchiSteamFarm/Steam/Bot.cs
+276 −57 ArchiSteamFarm/Steam/Cards/CardsFarmer.cs
+1 −1 ArchiSteamFarm/Steam/Cards/Game.cs
+34 −0 ArchiSteamFarm/Steam/Data/BoosterCreatorEntry.cs
+35 −2 ArchiSteamFarm/Steam/Integration/ArchiHandler.cs
+113 −86 ArchiSteamFarm/Steam/Integration/ArchiWebHandler.cs
+9 −0 ArchiSteamFarm/Steam/Storage/BotConfig.cs
+43 −0 ArchiSteamFarm/Steam/Storage/BotDatabase.cs
+9 −0 ArchiSteamFarm/Storage/GlobalConfig.cs
+1 −1 ArchiSteamFarm/Web/GitHub.cs
+1 −1 ArchiSteamFarm/overlay/variant-base/linux/ArchiSteamFarm@.service
+1 −1 ArchiSteamFarm/overlay/variant-specific/generic-netf/ArchiSteamFarm@.service
+1 −1 ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm@.service
+1 −1 Directory.Build.props
+5 −4 Directory.Packages.props
+1 −1 wiki

0 comments on commit 89453eb

Please sign in to comment.