diff options
| author | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-13 23:39:55 +0100 |
|---|---|---|
| committer | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-13 23:39:55 +0100 |
| commit | a2a9ad400f23726885020f1a77627f9561487948 (patch) | |
| tree | 9116c76f46d49d951ac63442af335a0bd6016052 /src/main/java/gtPlusPlus/core/item | |
| parent | 20b5d2932ef44e1c96104d6ec0528012f5c83d21 (diff) | |
| parent | 868ddab78797403d58dbc84d357f792926e94f42 (diff) | |
| download | GT5-Unofficial-a2a9ad400f23726885020f1a77627f9561487948.tar.gz GT5-Unofficial-a2a9ad400f23726885020f1a77627f9561487948.tar.bz2 GT5-Unofficial-a2a9ad400f23726885020f1a77627f9561487948.zip | |
Merge tag '1.7.20' into unified-build-script2
# Conflicts:
# build.properties
# src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/ModItems.java | 7 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 4c6f0dc712..47278c559d 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -523,6 +523,9 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false); + if (!CORE.GTNH) { + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.getInstance().TRINIUM); + } //Custom Materials that will have standalone refinery processes MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); @@ -534,8 +537,8 @@ public final class ModItems { //Custom Materials that are from Runescape MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL); MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL); - MaterialGenerator.generate(ELEMENT.STANDALONE.GRANITE, false, false); - MaterialGenerator.generate(ELEMENT.STANDALONE.RUNITE, false); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.GRANITE); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.RUNITE); MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL, false); MISC_MATERIALS.run(); diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index dfc85c533b..8dd2cd1187 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -243,10 +243,10 @@ public class MilledOreProcessing extends ItemPackage { //milledMonazite TODO registerOreDataForMilledType( MonaziteFlotationFroth, - ELEMENT.getInstance().ERBIUM, 96, - ELEMENT.getInstance().LANTHANUM, 96, - ELEMENT.getInstance().PRASEODYMIUM, 96, - ELEMENT.getInstance().EUROPIUM, 32 + ELEMENT.getInstance().ERBIUM, 64, + ELEMENT.getInstance().LANTHANUM, 32, + ELEMENT.getInstance().LUTETIUM, 16, + ELEMENT.getInstance().EUROPIUM, 8 ); |