diff --git a/AddonExample/AddonExample.csproj b/AddonExample/AddonExample.csproj
index b25d75967..a98b66b14 100644
--- a/AddonExample/AddonExample.csproj
+++ b/AddonExample/AddonExample.csproj
@@ -9,7 +9,7 @@
Properties
AddonExample
AddonExample
- v4.6.1
+ v4.8
512
diff --git a/DEPS.py b/DEPS.py
index f69ba6177..d395a955b 100644
--- a/DEPS.py
+++ b/DEPS.py
@@ -4,16 +4,16 @@
deps = {
'ACT': {
- 'url': 'https://github.com/EQAditu/AdvancedCombatTracker/releases/download/3.4.7.268/ACTv3.zip',
+ 'url': 'https://github.com/EQAditu/AdvancedCombatTracker/releases/download/3.5.0.273/ACTv3.zip',
'dest': 'Thirdparty/ACT',
'strip': 0,
'hash': ['sha256', 'adf13a38d0938ce90f8e674f8365b227d933b91636ddf72b26c85702f6e3b808'],
},
'FFXIV_ACT_Plugin': {
- 'url': 'https://github.com/ravahn/FFXIV_ACT_Plugin/raw/master/Releases/FFXIV_ACT_Plugin_SDK_2.0.6.1.zip',
+ 'url': 'https://github.com/ravahn/FFXIV_ACT_Plugin/raw/master/Releases/FFXIV_ACT_Plugin_SDK_2.6.2.8.zip',
'dest': 'Thirdparty/FFXIV_ACT_Plugin',
'strip': 0,
- 'hash': ['sha256', '55eed8660848273b285e2f128a65e6822f086c885942be69691baf5c530a7cd6'],
+ 'hash': ['sha256', '437579fba7e9d848ffb7bae9cedc59a61749429de488e6df0dcd3885f5b6e93d'],
},
'curl': {
'url': 'https://curl.haxx.se/download/curl-7.70.0.tar.xz',
diff --git a/OverlayPlugin.Core/Integration/FFXIVRepository.cs b/OverlayPlugin.Core/Integration/FFXIVRepository.cs
index 40a970e55..62537d97c 100644
--- a/OverlayPlugin.Core/Integration/FFXIVRepository.cs
+++ b/OverlayPlugin.Core/Integration/FFXIVRepository.cs
@@ -246,7 +246,10 @@ public Language GetLanguage()
{
var repo = GetRepository();
if (repo == null)
- return Language.Unknown;
+ {
+ // Defaults to English
+ return Language.English;
+ }
return repo.GetSelectedLanguageID();
}
diff --git a/OverlayPlugin.Core/MemoryProcessors/FFXIVProcess.cs b/OverlayPlugin.Core/MemoryProcessors/FFXIVProcess.cs
index 3f1bc8cd2..37b478b4e 100644
--- a/OverlayPlugin.Core/MemoryProcessors/FFXIVProcess.cs
+++ b/OverlayPlugin.Core/MemoryProcessors/FFXIVProcess.cs
@@ -132,6 +132,13 @@ static internal bool IsCrafter(EntityJob job)
job == EntityJob.ALC ||
job == EntityJob.CUL;
}
+
+ static internal string ToProperCase(string name)
+ {
+ System.Globalization.CultureInfo cultureInfo = System.Threading.Thread.CurrentThread.CurrentCulture;
+ System.Globalization.TextInfo textInfo = cultureInfo.TextInfo;
+ return textInfo.ToTitleCase(name);
+ }
[Serializable]
public class EntityData
diff --git a/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessCn.cs b/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessCn.cs
index 97cea5235..683eecad3 100644
--- a/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessCn.cs
+++ b/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessCn.cs
@@ -180,7 +180,7 @@ public unsafe override EntityData GetEntityDataFromByteArray(byte[] source) {
// dump '\0' string terminators
var memoryName = System.Text.Encoding.UTF8.GetString(mem.Name, EntityMemory.nameBytes).Split(new[] { '\0' }, 2)[0];
- var capitalizedName = FFXIV_ACT_Plugin.Common.StringHelper.ToProperCase(memoryName);
+ var capitalizedName = ToProperCase(memoryName);
EntityData entity = new EntityData() {
name = capitalizedName,
diff --git a/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessIntl.cs b/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessIntl.cs
index 12168625d..24167a020 100644
--- a/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessIntl.cs
+++ b/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessIntl.cs
@@ -178,7 +178,7 @@ public unsafe override EntityData GetEntityDataFromByteArray(byte[] source) {
// dump '\0' string terminators
var memoryName = System.Text.Encoding.UTF8.GetString(mem.Name, EntityMemory.nameBytes).Split(new[] { '\0' }, 2)[0];
- var capitalizedName = FFXIV_ACT_Plugin.Common.StringHelper.ToProperCase(memoryName);
+ var capitalizedName = ToProperCase(memoryName);
EntityData entity = new EntityData() {
name = capitalizedName,
diff --git a/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessKo.cs b/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessKo.cs
index d5a00a1fd..5dcd72ab1 100644
--- a/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessKo.cs
+++ b/OverlayPlugin.Core/MemoryProcessors/FFXIVProcessKo.cs
@@ -167,7 +167,7 @@ public unsafe override EntityData GetEntityDataFromByteArray(byte[] source) {
// dump '\0' string terminators
var memoryName = System.Text.Encoding.UTF8.GetString(mem.Name, EntityMemory.nameBytes).Split(new[] { '\0' }, 2)[0];
- var capitalizedName = FFXIV_ACT_Plugin.Common.StringHelper.ToProperCase(memoryName);
+ var capitalizedName = ToProperCase(memoryName);
EntityData entity = new EntityData() {
name = capitalizedName,