Skip to content

Commit 7ddf816

Browse files
authored
Merge pull request #110 from aternosorg/forge-1-20-1-duplicate-mod
2 parents 55d0e7b + 140c2c8 commit 7ddf816

File tree

4 files changed

+552
-2
lines changed

4 files changed

+552
-2
lines changed

src/Analysis/Problem/Forge/ModDuplicateProblem.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ public function getMessage(): string
3939
*/
4040
public static function getPatterns(): array
4141
{
42-
return ['/Found a duplicate mod (.+) at \[([^,\n]+), ([^,\n]+)\]/'];
42+
return [
43+
'/Found a duplicate mod (.+) at \[([^,\n]+), ([^,\n]+)[,\]]/',
44+
'/^\s+Mod ID:(.+) from mod files: ([^,\n]+), ([^,\n]+)/m',
45+
];
4346
}
4447

4548
/**
@@ -82,4 +85,4 @@ public function getSecondModPath(): ?string
8285
{
8386
return $this->secondModPath;
8487
}
85-
}
88+
}

0 commit comments

Comments
 (0)