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

Browse Source

# 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

parent 589d1075b4 7195d5a0c5

commit 4c94667989

21 changed files with 69 additions and 397 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

submodules/OtterGui

Submodule submodules/OtterGui updated: f8f3e0b9bd...2bbb9b2a8a

2

submodules/Penumbra.Api

Submodule submodules/Penumbra.Api updated: cfc51714f7...d2a1406bc3

2

submodules/Penumbra.GameData

Submodule submodules/Penumbra.GameData updated: 260ac69cd6...529e181150

2

submodules/Penumbra.String

Submodule submodules/Penumbra.String updated: 620a7edf00...14e00f77d4