Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into v1.3.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	SpaceWarp/Patching/ColorsPatch.cs
#	SpaceWarp/SpaceWarp.csproj
#	SpaceWarpPatcher/SpaceWarpPatcher.csproj
  • Loading branch information
cheese3660 committed Jun 22, 2023
2 parents 68a51e9 + aa04c41 commit d1fa207
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions SpaceWarp/Patching/ColorsPatch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ internal static void Prefix()
nameof(Module_Color.OnInitialize))]
internal static void Postfix(Module_Color __instance)
{

var partName = __instance.OABPart is not null ? __instance.OABPart.PartName : __instance.part.Name;
var trimmedPartName = TrimPartName(partName);
if (DeclaredParts.Count > 0 && _allParts.Contains(trimmedPartName))
Expand Down

0 comments on commit d1fa207

Please sign in to comment.