diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml index f0505d0..0ebdb93 100644 --- a/.github/workflows/Publish.yml +++ b/.github/workflows/Publish.yml @@ -114,7 +114,7 @@ jobs: artifact_name: Bannerlord.Diplomacy secrets: NEXUSMODS_APIKEY: ${{ secrets.NEXUSMODS_APIKEY }} - NEXUSMODS_COOKIES: ${{ secrets.NEXUSMODS_COOKIES }} + NEXUSMODS_SESSION_COOKIE: ${{ secrets.NEXUSMODS_SESSION_COOKIE }} ########################### # STEAM # diff --git a/.github/workflows/verify-nexusmods-credentials.yml b/.github/workflows/verify-nexusmods-credentials.yml new file mode 100644 index 0000000..c672413 --- /dev/null +++ b/.github/workflows/verify-nexusmods-credentials.yml @@ -0,0 +1,21 @@ +name: Verify NexusMods Credentials + +on: + schedule: + - cron: "0 */24 * * *" + workflow_dispatch: + +env: + # Disable the .NET logo in the console output. + DOTNET_NOLOGO: true + # Disable the .NET first time experience to skip caching NuGet packages and speed up the build. + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + # Disable sending .NET CLI telemetry to Microsoft. + DOTNET_CLI_TELEMETRY_OPTOUT: true + +jobs: + unex-verify-nexusmods: + uses: BUTR/workflows/.github/workflows/verify-unex-nexusmods.yml@master + secrets: + NEXUSMODS_API_KEY: ${{ secrets.NEXUSMODS_APIKEY }} + NEXUSMODS_SESSION_COOKIE: ${{ secrets.NEXUSMODS_SESSION_COOKIE }} diff --git a/build/common.props b/build/common.props index 984c7ed..39ab809 100644 --- a/build/common.props +++ b/build/common.props @@ -2,7 +2,7 @@ - 1.2.12 + 1.2.13 1.0.0 @@ -13,13 +13,13 @@ 2.3.3 - 2.9.7 + 2.9.9 - 5.9.2 + 5.10.1 2.11.0 - 3.0.0.139 + 3.0.0.142 5.0.222 diff --git a/changelog.txt b/changelog.txt index beba732..9727173 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,13 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.13 +Game Versions: v1.0.x, v1.1.x, v1.2.x +* Adapted for v1.2.10. +* Updated translations from Ccrowdin. +--------------------------------------------------------------------------------------------------- Version: 1.2.12 Game Versions: v1.0.x, v1.1.x, v1.2.x -* Added Xbox support -* Restored version support +* Added Xbox support. +* Restored version support. --------------------------------------------------------------------------------------------------- Version: 1.2.11 Game Versions: v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3,v1.2.4,v1.2.5,v1.2.6,v1.2.7,v1.2.8,1.2.9 @@ -19,15 +24,15 @@ Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1 --------------------------------------------------------------------------------------------------- Version: 1.2.9 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3,v1.2.4,v1.2.5 -* Add support for v1.2.5 +* Add support for v1.2.5. --------------------------------------------------------------------------------------------------- Version: 1.2.8 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3,v1.2.4 -* Add support for v1.2.4 +* Add support for v1.2.4. --------------------------------------------------------------------------------------------------- Version: 1.2.7 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3 -* Add support for v1.1.6 +* Add support for v1.1.6. --------------------------------------------------------------------------------------------------- Version: 1.2.6 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1,v1.2.2,v1.2.3 diff --git a/src/Bannerlord.Diplomacy.sln b/src/Bannerlord.Diplomacy.sln index fbcded3..1610a5d 100644 --- a/src/Bannerlord.Diplomacy.sln +++ b/src/Bannerlord.Diplomacy.sln @@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{ ..\.github\workflows\dotnet-format-daily.yml = ..\.github\workflows\dotnet-format-daily.yml ..\.github\workflows\Publish.yml = ..\.github\workflows\Publish.yml ..\.github\workflows\TestBuild.yml = ..\.github\workflows\TestBuild.yml + ..\.github\workflows\verify-nexusmods-credentials.yml = ..\.github\workflows\verify-nexusmods-credentials.yml EndProjectSection EndProject Global diff --git a/src/Bannerlord.Diplomacy/CampaignBehaviors/CivilWarBehavior.cs b/src/Bannerlord.Diplomacy/CampaignBehaviors/CivilWarBehavior.cs index 2d98267..0380a1c 100644 --- a/src/Bannerlord.Diplomacy/CampaignBehaviors/CivilWarBehavior.cs +++ b/src/Bannerlord.Diplomacy/CampaignBehaviors/CivilWarBehavior.cs @@ -25,7 +25,7 @@ internal sealed class CivilWarBehavior : CampaignBehaviorBase public override void RegisterEvents() { CampaignEvents.DailyTickClanEvent.AddNonSerializedListener(this, DailyTickClan); -#if v124 || v125 || v126 || v127 || v128 || v129 +#if v124 || v125 || v126 || v127 || v128 || v129 || v1210 CampaignEvents.OnClanChangedKingdomEvent.AddNonSerializedListener(this, (x, y, z, _, _) => RemoveClanFromRebelFaction(x, y, z)); #elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123 CampaignEvents.ClanChangedKingdom.AddNonSerializedListener(this, (x, y, z, _, _) => RemoveClanFromRebelFaction(x, y, z)); diff --git a/src/Bannerlord.Diplomacy/ViewModel/RebelFactionsVM.cs b/src/Bannerlord.Diplomacy/ViewModel/RebelFactionsVM.cs index 57eaa11..c7391af 100644 --- a/src/Bannerlord.Diplomacy/ViewModel/RebelFactionsVM.cs +++ b/src/Bannerlord.Diplomacy/ViewModel/RebelFactionsVM.cs @@ -139,7 +139,7 @@ public void OnCreateFaction() inquiryElements, true, 1, -#if v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129 +#if v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129 || v1210 1, #endif GameTexts.FindText("str_ok").ToString(), diff --git a/src/Bannerlord.Diplomacy/ViewModel/WarExhaustionMapIndicatorVM.cs b/src/Bannerlord.Diplomacy/ViewModel/WarExhaustionMapIndicatorVM.cs index 7b6f848..3b93b45 100644 --- a/src/Bannerlord.Diplomacy/ViewModel/WarExhaustionMapIndicatorVM.cs +++ b/src/Bannerlord.Diplomacy/ViewModel/WarExhaustionMapIndicatorVM.cs @@ -19,7 +19,7 @@ public WarExhaustionMapIndicatorVM() _kingdomsAtWar = new MBBindingList(); RefreshValues(); DiplomacyEvents.WarExhaustionInitialized.AddNonSerializedListener(this, HandleStanceChange); -#if v124 || v125 || v126 || v127 || v128 || v129 +#if v124 || v125 || v126 || v127 || v128 || v129 || v1210 CampaignEvents.OnClanChangedKingdomEvent.AddNonSerializedListener(this, (x, _, _, _, _) => HandleClanChangedKingdom(x)); #elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123 CampaignEvents.ClanChangedKingdom.AddNonSerializedListener(this, (x, _, _, _, _) => HandleClanChangedKingdom(x)); @@ -51,7 +51,7 @@ public override void OnFinalize() { base.OnFinalize(); -#if v124 || v125 || v126 || v127 || v128 || v129 +#if v124 || v125 || v126 || v127 || v128 || v129 || v1210 CampaignEvents.OnClanChangedKingdomEvent.ClearListeners(this); #elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123 CampaignEvents.ClanChangedKingdom.ClearListeners(this); diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/BR/BR_faction_names_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/BR/BR_faction_names_xml.xml new file mode 100644 index 0000000..2a8fb41 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/BR/BR_faction_names_xml.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/BR/BR_help_strings_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/BR/BR_help_strings_xml.xml new file mode 100644 index 0000000..e087c65 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/BR/BR_help_strings_xml.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_civil_war_strings_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_civil_war_strings_xml.xml new file mode 100644 index 0000000..169c402 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_civil_war_strings_xml.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_faction_names_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_faction_names_xml.xml new file mode 100644 index 0000000..f30fb02 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_faction_names_xml.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_help_strings_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_help_strings_xml.xml new file mode 100644 index 0000000..718c0f4 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_help_strings_xml.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_language_data.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_language_data.xml new file mode 100644 index 0000000..1061c63 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_language_data.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_std_module_strings_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_std_module_strings_xml.xml new file mode 100644 index 0000000..b957b67 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_std_module_strings_xml.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_war_exhaustion_strings.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_war_exhaustion_strings.xml new file mode 100644 index 0000000..ca0022c --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/JP/JP_war_exhaustion_strings.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_civil_war_strings_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_civil_war_strings_xml.xml new file mode 100644 index 0000000..a2e6965 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_civil_war_strings_xml.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_faction_names_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_faction_names_xml.xml new file mode 100644 index 0000000..a05aee1 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_faction_names_xml.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_help_strings_xml.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_help_strings_xml.xml new file mode 100644 index 0000000..6a6a709 --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_help_strings_xml.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_language_data.xml b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_language_data.xml new file mode 100644 index 0000000..2c91c3e --- /dev/null +++ b/src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/PL/PL_language_data.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/supported-game-versions.txt b/supported-game-versions.txt index 1224bbc..9f5a801 100644 --- a/supported-game-versions.txt +++ b/supported-game-versions.txt @@ -1,3 +1,4 @@ +v1.2.10 v1.2.9 v1.2.8 v1.2.7