Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/type-filter-tico-ores' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master committed Dec 26, 2024
2 parents 12e59c9 + 3e47790 commit e640d3a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/main/java/gregtech/common/GTProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -1626,8 +1626,9 @@ public void registerOre(OreDictionary.OreRegisterEvent aEvent) {
try {
aEvent.Ore.stackSize = 1;

// skipping TinkerConstruct ore registration
if (this.mIgnoreTcon && aOriginalMod.equals(TinkerConstruct.ID)) {
// skipping TinkerConstruct ore registration except for blocks
if (this.mIgnoreTcon && aOriginalMod.equals(TinkerConstruct.ID)
&& !(aEvent.Ore.getItem() instanceof ItemBlock)) {
return;
}
String tModToName = aMod + " -> " + aEvent.Name;
Expand Down

0 comments on commit e640d3a

Please sign in to comment.