From 20874386b5318661633339ea836fe3cdf7fa53cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 04:11:48 +0100 Subject: [PATCH 1/4] Bump coverlet.msbuild from 6.0.3 to 6.0.4 in /ImperatorToCK3.UnitTests (#2449) Bumps [coverlet.msbuild](https://github.com/coverlet-coverage/coverlet) from 6.0.3 to 6.0.4.
Release notes

Sourced from coverlet.msbuild's releases.

v6.0.4

Fixed

Diff between 6.0.3 and 6.0.4

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=coverlet.msbuild&package-manager=nuget&previous-version=6.0.3&new-version=6.0.4)](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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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.UnitTests/ImperatorToCK3.UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj index afbdfd406..8f55ba3d2 100644 --- a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj +++ b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj @@ -12,7 +12,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From d3d55e48f9c08f5d0b73dc7b77d3f06e7858e95c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 04:12:14 +0100 Subject: [PATCH 2/4] Bump coverlet.collector from 6.0.3 to 6.0.4 in /ImperatorToCK3.UnitTests (#2448) Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.3 to 6.0.4.
Release notes

Sourced from coverlet.collector's releases.

v6.0.4

Fixed

  • Fix empty coverage report when using include and exclude filters #1726

Diff between 6.0.3 and 6.0.4

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=coverlet.collector&package-manager=nuget&previous-version=6.0.3&new-version=6.0.4)](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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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.UnitTests/ImperatorToCK3.UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj index 8f55ba3d2..243248ca0 100644 --- a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj +++ b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj @@ -23,7 +23,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From de625e45f294cdf39ef8add93b961ee625f81ba2 Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Mon, 20 Jan 2025 04:12:25 +0100 Subject: [PATCH 3/4] Rename Ancient Egyptian to Kemetic and Egyptian to Misri (#2451) #2442 --- .../english/zzz_IRToCK3_vanilla_override_l_english.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ImperatorToCK3/Data_Files/blankMod/output/localization/replace/english/zzz_IRToCK3_vanilla_override_l_english.yml b/ImperatorToCK3/Data_Files/blankMod/output/localization/replace/english/zzz_IRToCK3_vanilla_override_l_english.yml index b1687e428..bbd819e93 100644 --- a/ImperatorToCK3/Data_Files/blankMod/output/localization/replace/english/zzz_IRToCK3_vanilla_override_l_english.yml +++ b/ImperatorToCK3/Data_Files/blankMod/output/localization/replace/english/zzz_IRToCK3_vanilla_override_l_english.yml @@ -24,3 +24,13 @@ unlock_final_hasan_decisions_1_tt: "" unlock_final_hasan_decisions_2_tt: "" unlock_final_hasan_decisions_3_tt: "" + + # "Ancient Egyptian" is weird as a name for a culture that exists in the megacampaign timeline. + ancient_egyptian: "Kemetic" + ancient_egyptian_collective_noun: "Kemetics" + ancient_egyptian_prefix: "Egypto" + # "Egyptian" should not be used for the later Arabic-speaking population of Egypt. + # Instead, base the name on "Misr", the Arabic name for Egypt. + egyptian: "Misri" + egyptian_collective_noun: "Misris" + egyptian_prefix: "Egypto" From f63d29c79acce86ea29f8e6992404973c39ff012 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 04:12:40 +0100 Subject: [PATCH 4/4] Bump Fronter.NET from `b8fe36f` to `3613c99` (#2447) Bumps [Fronter.NET](https://github.com/ParadoxGameConverters/Fronter.NET) from `b8fe36f` to `3613c99`.
Commits
  • 3613c99 Bump AWSSDK.S3 from 3.7.412 to 3.7.412.2 in /Fronter.NET.Tests (#755)
  • 447b791 Bump PGCG.commonItems from 15.1.3 to 15.1.4 in /Fronter.NET.Tests (#756)
  • ec14ad8 Update copyright year (#754)
  • See full diff in compare view

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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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 b8fe36f97..3613c99e2 160000 --- a/Fronter.NET +++ b/Fronter.NET @@ -1 +1 @@ -Subproject commit b8fe36f97b52d49f8cb5de8c9ccb6b4631037883 +Subproject commit 3613c99e2060cb803d7452b5541c819035a0997d