ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-17 13:27:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'refs/heads/master' into apiX

Browse source 
# Conflicts:
#	Dalamud/Game/Libc/LibcFunction.cs
#	Dalamud/Game/Libc/LibcFunctionAddressResolver.cs
#	Dalamud/Game/Libc/OwnedStdString.cs
#	Dalamud/Game/Libc/StdString.cs
#	Dalamud/Interface/UiBuilder.cs
This commit is contained in:
Kaz Wolfe 2024-04-28 11:54:54 -07:00
commit b32ed39826
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
297 changed files with 768 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dalamud/Game/Text/Sanitizer/Sanitizer.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;

2
Dalamud/Game/Text/SeStringHandling/Payload.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
@ -6,6 +5,7 @@ using System.IO;
using Dalamud.Data;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Plugin.Services;
using Newtonsoft.Json;
using Serilog;

1
Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

1
Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;

1
Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;

1
Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs
View file

@ -1,4 +1,3 @@
using System;
using System.IO;
namespace Dalamud.Game.Text.SeStringHandling.Payloads;

1
Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

1
Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;

1
Dalamud/Game/Text/SeStringHandling/SeString.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

1
Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs
View file

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using Dalamud.Game.Text.SeStringHandling.Payloads;

2
Dalamud/Game/Text/XivChatTypeInfoAttribute.cs
View file

@ -1,5 +1,3 @@
using System;
namespace Dalamud.Game.Text;
/// <summary>