fix merge conflict

2026-01-05 20:46:51 +01:00
parent 3205e6e0c3 17dd8a307b
commit 55d62ff52a
7 changed files with 991 additions and 166 deletions
--- a/LightlessSync/LightlessConfiguration/Configurations/ChatConfig.cs
+++ b/LightlessSync/LightlessConfiguration/Configurations/ChatConfig.cs
@@ -11,6 +11,7 @@ public sealed class ChatConfig : ILightlessConfiguration
    public bool ShowRulesOverlayOnOpen { get; set; } = true;
    public bool ShowMessageTimestamps { get; set; } = true;
    public bool ShowNotesInSyncshellChat { get; set; } = true;
+    public bool EnableAnimatedEmotes { get; set; } = true;
    public float ChatWindowOpacity { get; set; } = .97f;
    public bool FadeWhenUnfocused { get; set; } = false;
    public float UnfocusedWindowOpacity { get; set; } = 0.6f;