Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitry Khudyakov committed Jan 22, 2024
1 parent e5823e3 commit 620be80
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CHREADME.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LTC: MNtz8Zz1cPD1CZadoc38jT5qeqeFBS6Aif\

### [提交Bug报告 \ 功能要求](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/issues/new/choose)

### [版本 2.8.5 适配服务器 SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.5)
### [版本 2.8.6 适配服务器 SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.6)
### [版本 2.7 适配服务器 SPT-AKI 3.4.0 - 3.6.1](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.7)
### [版本 2.4.2 适配服务器 SPT-AKI 3.2.0 - 3.3.0](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.4.2)
### [版本 2.3.1 适配服务器 SPT-AKI 3.0.0 - 3.1.1](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.3.1)
Expand Down
2 changes: 1 addition & 1 deletion ENGREADME.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LTC: MNtz8Zz1cPD1CZadoc38jT5qeqeFBS6Aif\

### [Submit a bug report \ Feature request](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/issues/new/choose)

### [Version 2.8.5 for server SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.5)
### [Version 2.8.6 for server SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.6)
### [Version 2.7 for server SPT-AKI 3.4.0 - 3.6.1](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.7)
### [Version 2.4.2 for server SPT-AKI 3.2.0 - 3.3.0](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.4.2)
### [Version 2.3.1 for server SPT-AKI 3.0.0 - 3.1.1](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.3.1)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LTC: MNtz8Zz1cPD1CZadoc38jT5qeqeFBS6Aif\

### [Отправить баг репорт \ Предложить новую функцию](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/issues/new/choose)

### [Версия 2.8.5 для сервера SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.5)
### [Версия 2.8.6 для сервера SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.6)
### [Версия 2.7 для сервера SPT-AKI 3.4.0 - 3.6.1](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.7)
### [Версия 2.4.2 для сервера SPT-AKI 3.2.0 - 3.3.0](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.4.2)
### [Версия 2.3.1 для сервера SPT-AKI 3.0.0 - 3.1.1](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.3.1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:SPT-AKI Profile Editor"
"ProductCode" = "8:{10C705DA-70D2-4DBD-B26C-261FE27A88CE}"
"PackageCode" = "8:{CA0D07ED-949B-4167-918D-E207D27338F5}"
"ProductCode" = "8:{F61EE9B8-31D6-4F99-B135-A7184B00A43F}"
"PackageCode" = "8:{C11BFFAE-F589-4091-83DE-4631E1202D43}"
"UpgradeCode" = "8:{1F669B59-9085-4108-BADB-9359D4FBA0D0}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:2.8.5"
"ProductVersion" = "8:2.8.6"
"Manufacturer" = "8:SkiTles"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://github.com/SkiTles55/SPT-AKI-Profile-Editor"
Expand Down
2 changes: 1 addition & 1 deletion SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace SPT_AKI_Profile_Editor.Tests.Hepers
internal class TestHelpers
{
public static readonly JsonSerializerSettings seriSettings = new() { Formatting = Formatting.Indented, Converters = new List<JsonConverter>() { new StringEnumConverterExt() } };
public static readonly string profileFile = @"D:\SPT-AKI\user\profiles\ef459984b6c044ab3cc52347.json";
public static readonly string profileFile = @"D:\SPT-AKI\user\profiles\2878d563f46da2789a35326f.json";
public static readonly string serverPath = @"D:\SPT-AKI\";
public static readonly string wrongServerPath = @"D:\WinSetupFromUSB";
public static readonly string profileWithDuplicatedItems = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "testFiles", "profileWithDuplicatedItems.json");
Expand Down
6 changes: 4 additions & 2 deletions SPT-AKI Profile Editor/Core/ProfileClasses/CharacterQuest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ public QuestStatus Status
public Dictionary<QuestStatus, double> StatusTimers { get; set; }

[JsonIgnore]
public string LocalizedTraderName => AppData.ServerDatabase.LocalesGlobal.ContainsKey(QuestTrader.Nickname()) ? AppData.ServerDatabase.LocalesGlobal[QuestTrader.Nickname()] : QuestTrader;
public string LocalizedTraderName
=> AppData.ServerDatabase.LocalesGlobal.ContainsKey(QuestTrader.Nickname()) ? AppData.ServerDatabase.LocalesGlobal[QuestTrader.Nickname()] : QuestTrader;

[JsonIgnore]
public string LocalizedQuestName => AppData.ServerDatabase.LocalesGlobal.ContainsKey(QuestQid.QuestName()) ? AppData.ServerDatabase.LocalesGlobal[QuestQid.QuestName()] : QuestQid;
public string LocalizedQuestName
=> AppData.ServerDatabase.LocalesGlobal.ContainsKey(QuestQid.QuestName()) ? AppData.ServerDatabase.LocalesGlobal[QuestQid.QuestName()] : QuestQid;

[JsonIgnore]
public QuestType Type
Expand Down
2 changes: 1 addition & 1 deletion SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>SPT_AKI_Profile_Editor</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<Version>2.8.5</Version>
<Version>2.8.6</Version>
<ApplicationIcon>Resources\killa_ico_k3r_icon.ico</ApplicationIcon>
<PackageId>SPT-AKI Profile Editor</PackageId>
<Authors>SkiTles55</Authors>
Expand Down

0 comments on commit 620be80

Please sign in to comment.