Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't ignore Tinker's Construct blocks in ore registration. #3709

Merged
merged 8 commits into from
Jan 3, 2025
Merged

Don't ignore Tinker's Construct blocks in ore registration. #3709

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b058b82
Don't ignore Tinker's Construct blocks in ore registration.
YannickMG Dec 25, 2024
96829df
Merge branch 'master' into type-filter-tico-ores
Dream-Master Dec 26, 2024
3e47790
Merge branch 'master' into type-filter-tico-ores
Dream-Master Dec 26, 2024
265897d
Merge branch 'master' into type-filter-tico-ores
Dream-Master Dec 27, 2024
8aa8874
Merge branch 'master' into type-filter-tico-ores
Dream-Master Dec 27, 2024
c97e7ff
Merge branch 'master' into type-filter-tico-ores
Dream-Master Dec 31, 2024
47c2aaf
Merge branch 'master' into type-filter-tico-ores
YannickMG Jan 3, 2025
50b7587
Merge branch 'master' into type-filter-tico-ores
YannickMG Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/gregtech/common/GTProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,8 +1627,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
Loading