Merge remote-tracking branch 'origin/main' into ipc_new

# Conflicts:
#	CustomizePlus/Core/ServiceManagerBuilder.cs
#	CustomizePlus/Game/Services/GameObjectService.cs
#	CustomizePlus/Profiles/ProfileManager.cs
This commit is contained in:
RisaDev
2024-03-21 23:18:58 +03:00
21 changed files with 69 additions and 397 deletions

View File

@@ -1,11 +1,11 @@
using Dalamud.Plugin.Services;
using Penumbra.GameData.Actors;
using System.Collections.Generic;
using System.Collections.Generic;
using CustomizePlus.Core.Data;
using CustomizePlus.GameData.Data;
using CustomizePlus.GameData.Services;
using CustomizePlus.GameData.Extensions;
using Dalamud.Plugin.Services;
using Penumbra.GameData.Actors;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Interop;
using ObjectManager = CustomizePlus.GameData.Services.ObjectManager;
using DalamudGameObject = Dalamud.Game.ClientState.Objects.Types.GameObject;
namespace CustomizePlus.Game.Services;