From 0f021416c80a291976a83c4b9f4b39423ec4e87b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 21:20:22 +0200 Subject: [PATCH 1/4] Bump PGCG.commonItems from 8.1.5 to 8.1.6 (#1441) Bumps [PGCG.commonItems](https://github.com/ParadoxGameConverters/commonItems.NET) from 8.1.5 to 8.1.6.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=PGCG.commonItems&package-manager=nuget&previous-version=8.1.5&new-version=8.1.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- ImperatorToCK3/ImperatorToCK3.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImperatorToCK3/ImperatorToCK3.csproj b/ImperatorToCK3/ImperatorToCK3.csproj index 934cfec5d..2153a0bfc 100644 --- a/ImperatorToCK3/ImperatorToCK3.csproj +++ b/ImperatorToCK3/ImperatorToCK3.csproj @@ -32,7 +32,7 @@ - + From e6e80377c2d099d2d289a5cf52427efef4de4a77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 22:18:43 +0200 Subject: [PATCH 2/4] Bump Fronter.NET from `8ab1972` to `4692537` (#1446) Bumps [Fronter.NET](https://github.com/ParadoxGameConverters/Fronter.NET) from `8ab1972` to `4692537`.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Seweryn Presnal --- .github/workflows/build.yml | 2 +- .github/workflows/build_dev_version.yml | 4 ++++ .github/workflows/create_release.yml | 4 ++++ Fronter.NET | 2 +- .../fronter_configuration/fronter-configuration.txt | 2 ++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9f66d85c..ea924a523 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: build: strategy: matrix: - os: [[self-hosted, windows], [self-hosted, linux], macos-latest] + os: [[self-hosted, windows], ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build_dev_version.yml b/.github/workflows/build_dev_version.yml index 0ef85b42d..c32b6708a 100644 --- a/.github/workflows/build_dev_version.yml +++ b/.github/workflows/build_dev_version.yml @@ -43,6 +43,10 @@ jobs: uses: actions/setup-dotnet@v3 with: global-json-file: Fronter.NET/global.json + env: + BACKBLAZE_KEY_ID: '${{ secrets.BACKBLAZE_KEY_ID }}' + BACKBLAZE_APPLICATION_KEY: '${{ secrets.BACKBLAZE_APPLICATION_KEY }}' + BACKBLAZE_BUCKET_ID: '${{ secrets.BACKBLAZE_BUCKET_ID }}' - name: "Replace frontend background image" run: | rm Fronter.NET/Fronter.NET/Assets/Images/background.png diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 7fc887dfc..edaf75c19 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -79,6 +79,10 @@ jobs: with: fronter_dir: 'Fronter.NET' release_dir: 'Publish' + env: + BACKBLAZE_KEY_ID: '${{ secrets.BACKBLAZE_KEY_ID }}' + BACKBLAZE_APPLICATION_KEY: '${{ secrets.BACKBLAZE_APPLICATION_KEY }}' + BACKBLAZE_BUCKET_ID: '${{ secrets.BACKBLAZE_BUCKET_ID }}' - name: "Setup Dotnet for use with actions" uses: actions/setup-dotnet@v3 with: diff --git a/Fronter.NET b/Fronter.NET index 8ab197229..469253749 160000 --- a/Fronter.NET +++ b/Fronter.NET @@ -1 +1 @@ -Subproject commit 8ab1972290a1a24d91719bb1b816338026d11a6f +Subproject commit 469253749d1ba1cdbe3c3397e30cba68251eedec diff --git a/ImperatorToCK3/Data_Files/fronter_configuration/fronter-configuration.txt b/ImperatorToCK3/Data_Files/fronter_configuration/fronter-configuration.txt index d44225484..05f0db8b0 100644 --- a/ImperatorToCK3/Data_Files/fronter_configuration/fronter-configuration.txt +++ b/ImperatorToCK3/Data_Files/fronter_configuration/fronter-configuration.txt @@ -3,6 +3,8 @@ converterFolder = ImperatorToCK3 backendExePath = ImperatorToCK3Converter displayName = IMPDISPLAYNAME +sentryDsn = "https://9b108bcd89e348018522fc56be7ac112@o4505568167460864.ingest.sentry.io/4505568179257344" + sourceGame = IMPGAME targetGame = CK3GAME From 255f9db0280435cd95bdf84d0ea4ab4ff54ed453 Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Thu, 3 Aug 2023 00:27:38 +0200 Subject: [PATCH 3/4] Minor cleanup of unused localization (#1448) #minor --- .../from_venetic_mod/Ven_deities_l_english.yml | 3 +-- .../Ven_events_and_decisions_l_english.yml | 17 ----------------- .../Ven_events_and_decisions_l_simp_chinese.yml | 12 ------------ 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_deities_l_english.yml b/ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_deities_l_english.yml index ce7159de4..4bcff42fa 100644 --- a/ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_deities_l_english.yml +++ b/ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_deities_l_english.yml @@ -17,9 +17,8 @@ reitian_priests: "Klovetebos" reitian_priest: "Klovetes" reitian_priestess: "Klovetes" - reitian_priests: "Klovetebos" retic_evil_god: "The Unholy Darkness" venetic_eternity: "Etarnos" - venetic_hell: "Tartarnos" \ No newline at end of file + venetic_hell: "Tartarnos" diff --git a/ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_events_and_decisions_l_english.yml b/ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_events_and_decisions_l_english.yml index 52fc7e8b8..673d8742e 100644 --- a/ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_events_and_decisions_l_english.yml +++ b/ImperatorToCK3/Data_Files/blankMod/output/localization/english/from_venetic_mod/Ven_events_and_decisions_l_english.yml @@ -10,18 +10,6 @@ select_personal_deity_venetic_decision.select_vetusa: "Vetusa, keeper of nature and master of the lands!" select_personal_deity_venetic_decision_confirm: "My choise is most wise" - bhakti_germanic_reitia: "Devotee of Reitia" - bhakti_germanic_reitia_desc: "This character's favored god is Reitia, goddess of writing, education and the all-Mother." - bhakti_germanic_tumusiates: "Devotee of Tumusiates" - bhakti_germanic_tumusiates_desc: "This character's favored god is Tumusiates, a god of honor, wisdom and statesmanship." - bhakti_germanic_bouleno: "Devotee of Bouleno" - bhakti_germanic_bouleno_desc: "This character's favored god is Bouleno, a god of cunning and bravery." - bhakti_germanic_vetusa: "Devotee of Vetusa" - bhakti_germanic_vetusa_desc: "This character's favored god is Vetusa, a goddess of protection, nature and animals." - - gave_written_offering_modifier: "Inscribed Gratitude to the Gods" - - written_offering_decision: "Make a Written Offering" written_offering_decision_tooltip: "Inscribing a Prayer" written_offering_decision_tt: "Inscribing a Prayer" @@ -30,9 +18,4 @@ doctrine_parameter_ritual_writing_active: "Allows #ERitual Inscriptions as gifts in exchange for piety" - religious_decision.102.optout: "Maybe this was a bad idea" - religious_decision.102.flavour: "I shouldn't invoke the wrath of many gods by choosing one" - - gave_written_offering: "Inscribed Gratitude to the Gods" - ritual_writing_vassals: "Pleased Faithful" diff --git a/ImperatorToCK3/Data_Files/blankMod/output/localization/simp_chinese/from_venetic_mod/Ven_events_and_decisions_l_simp_chinese.yml b/ImperatorToCK3/Data_Files/blankMod/output/localization/simp_chinese/from_venetic_mod/Ven_events_and_decisions_l_simp_chinese.yml index a125e5ff8..cfb18c40e 100644 --- a/ImperatorToCK3/Data_Files/blankMod/output/localization/simp_chinese/from_venetic_mod/Ven_events_and_decisions_l_simp_chinese.yml +++ b/ImperatorToCK3/Data_Files/blankMod/output/localization/simp_chinese/from_venetic_mod/Ven_events_and_decisions_l_simp_chinese.yml @@ -8,22 +8,10 @@ select_personal_deity_venetic_decision.select_bouleno: "鲍勒诺——老奸巨猾的战士！" select_personal_deity_venetic_decision.select_vetusa: "威涂莎——自然守护者与大地之主！" select_personal_deity_venetic_decision_confirm: "我的选择是最明智的" - bhakti_germanic_reitia: "雷伊蒂亚信徒" - bhakti_germanic_reitia_desc: "该角色偏爱的神是——司掌书写与教育的女神及万物之母。" - bhakti_germanic_tumusiates: "特卢慕赛特斯信徒" - bhakti_germanic_tumusiates_desc: "该角色偏爱的神是特卢慕赛特斯——荣耀，智慧与治国之神。" - bhakti_germanic_bouleno: "鲍勒诺信徒" - bhakti_germanic_bouleno_desc: "该角色偏爱的神是鲍勒诺——勇气与诡诈之神。" - bhakti_germanic_vetusa: "威涂莎信徒" - bhakti_germanic_vetusa_desc: "该角色偏爱的神是威涂莎——司掌保护，自然与动物的女神。" - gave_written_offering_modifier: "题献对诸神的感谢" written_offering_decision: "献上文字" written_offering_decision_tooltip: "题献祷文" written_offering_decision_tt: "题献祷文" written_offering_decision_desc: "若我向诸神献上谢礼，他们必会友好看待我和我的人民。" written_offering_decision_confirm: "该提笔了！" doctrine_parameter_ritual_writing_active: "允许#ERitual 以题献献礼换取虔诚" - religious_decision.102.optout: "也许这不是个好主意" - religious_decision.102.flavour: "我不应因在诸神中选择一位而招致他们的愤怒" - gave_written_offering: "题献对诸神的感谢" ritual_writing_vassals: "满意的信徒" From d60985b891f80c5050bc3d9b3efe99072d1db989 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 00:34:26 +0200 Subject: [PATCH 4/4] Bump Fronter.NET from `4692537` to `aad3a11` (#1447) #patch Bumps [Fronter.NET](https://github.com/ParadoxGameConverters/Fronter.NET) from `4692537` to `aad3a11`.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Fronter.NET | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fronter.NET b/Fronter.NET index 469253749..aad3a11da 160000 --- a/Fronter.NET +++ b/Fronter.NET @@ -1 +1 @@ -Subproject commit 469253749d1ba1cdbe3c3397e30cba68251eedec +Subproject commit aad3a11dabd392378c991958702903e5c97e3870