3 Commits

Author SHA1 Message Date
f90a521bec 1.7.2.0
All checks were successful
Build and Update Repo / build-and-update-repo (push) Successful in 1m0s
Fix for sure for real
2026-05-02 19:32:40 +01:00
612cf6d3a4 1.7.1.8
Some checks failed
Build and Update Repo / build-and-update-repo (push) Failing after 1m53s
2026-05-02 19:13:00 +01:00
10a34fa3c6 Update version 2026-05-02 19:08:42 +01:00
9 changed files with 9 additions and 5 deletions

View File

@@ -2,7 +2,7 @@
<Project Sdk="Dalamud.NET.Sdk/15.0.0">
<PropertyGroup>
<AssemblyName>ClubPenguinSync</AssemblyName>
<Version>1.7.1.6</Version>
<Version>1.7.2.0</Version>
<PackageProjectUrl>https://github.com/Rawrington/ClubPenguinSync/</PackageProjectUrl>
<LangVersion>latest</LangVersion>
</PropertyGroup>

View File

@@ -267,7 +267,7 @@ public sealed partial class CharaDataManager : DisposableMediatorSubscriberBase
var obj = await _dalamudUtilService.GetGposeTargetGameObjectAsync().ConfigureAwait(false);
string targetName = string.Empty;
bool canApply = _dalamudUtilService.IsInGpose && obj != null
&& obj.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player;
&& obj.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Pc;
if (canApply)
{
targetName = obj!.Name.TextValue;

View File

@@ -3,6 +3,7 @@ using Dalamud.Interface;
using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using Dalamud.Utility;
using MareSynchronos.API.Data.Extensions;
using MareSynchronos.API.Dto.User;

View File

@@ -618,7 +618,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
string fileGroupText = fileGroup.Key + " [" + fileGroup.Count() + "]";
var requiresCompute = fileGroup.Any(k => !k.IsComputed);
using var tabcol = ImRaii.PushColor(ImGuiCol.Tab, UiSharedService.Color(ImGuiColors.DalamudYellow), requiresCompute);
ImRaii.IEndObject fileTab;
ImRaii.TabItemDisposable fileTab;
using (var textcol = ImRaii.PushColor(ImGuiCol.Text, UiSharedService.Color(new(0, 0, 0, 1)),
requiresCompute && !string.Equals(_selectedFileTypeTab, fileGroup.Key, StringComparison.Ordinal)))
{

View File

@@ -1,5 +1,6 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Colors;
using Dalamud.Interface.Windowing;
using MareSynchronos.MareConfiguration;
using MareSynchronos.PlayerData.Handlers;
using MareSynchronos.Services;

View File

@@ -2,6 +2,7 @@
using Dalamud.Interface;
using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using Dalamud.Utility;
using MareSynchronos.API.Dto.Account;
using MareSynchronos.FileCache;

View File

@@ -212,7 +212,7 @@ public class PlayerAnalysisUI : WindowMediatorSubscriberBase
string fileGroupText = fileGroup.Key + " [" + fileGroup.Count() + "]";
var requiresCompute = fileGroup.Any(k => !k.IsComputed);
using var tabcol = ImRaii.PushColor(ImGuiCol.Tab, UiSharedService.Color(ImGuiColors.DalamudYellow), requiresCompute);
ImRaii.IEndObject fileTab;
ImRaii.TabItemDisposable fileTab;
using (var textcol = ImRaii.PushColor(ImGuiCol.Text, UiSharedService.Color(new(0, 0, 0, 1)),
requiresCompute && !string.Equals(_selectedFileTypeTab, fileGroup.Key, StringComparison.Ordinal)))
{

View File

@@ -3,6 +3,7 @@ using Dalamud.Interface;
using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using MareSynchronos.API.Data.Enum;
using MareSynchronos.API.Data.Extensions;
using MareSynchronos.API.Dto.Group;

View File

@@ -113,7 +113,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
UidFont = _pluginInterface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
{
e.OnPreBuild(tk => tk.AddDalamudAssetFont(Dalamud.DalamudAsset.NotoSansJpMedium, new()
e.OnPreBuild(tk => tk.AddDalamudAssetFont(Dalamud.DalamudAsset.NotoSansCjkRegular, new()
{
SizePx = 35,
GlyphRanges = [0x20, 0x7E, 0]