aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/registration
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-26 17:18:48 +0100
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-26 17:18:48 +0100
commitbe3bdb8df41e3f05c9b48b5323c4d4dbd4bdbf7b (patch)
tree06e6ef11658a519146806fc0764e133232a5e0a1 /src/Java/gtPlusPlus/xmod/gregtech/registration
parent2cf05c4deaf3a26626853431f725d0ca375ffec3 (diff)
downloadGT5-Unofficial-be3bdb8df41e3f05c9b48b5323c4d4dbd4bdbf7b.tar.gz
GT5-Unofficial-be3bdb8df41e3f05c9b48b5323c4d4dbd4bdbf7b.tar.bz2
GT5-Unofficial-be3bdb8df41e3f05c9b48b5323c4d4dbd4bdbf7b.zip
+ Added a roasting recipe for obtaining small quantities of Germanium.
- Disabled obfuscated method names in ASM. % More adjustments to EBF and ABS recipes. $ Fixed names of Tungsten Steel & Stainless Steel Hexadecuple Pipes. $ Fixed recipe collision of Rose Gold and Tumbaga in the mixer.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/registration')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 5558d7551f..c611dda53e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -76,9 +76,9 @@ public class GregtechConduits {
generateFluidMultiPipes(constructor, Materials.Copper, MaterialUtils.getMaterialName(Materials.Copper), "Copper", BasePipeHexadecupleID++, 60, 1000, true);
generateFluidMultiPipes(constructor, Materials.Bronze, MaterialUtils.getMaterialName(Materials.Bronze), "Bronze", BasePipeHexadecupleID++, 120, 2000, true);
generateFluidMultiPipes(constructor, Materials.Steel, MaterialUtils.getMaterialName(Materials.Steel), "Steel", BasePipeHexadecupleID++, 240, 2500, true);
- generateFluidMultiPipes(constructor, Materials.StainlessSteel, MaterialUtils.getMaterialName(Materials.StainlessSteel), "StainlessSteel", BasePipeHexadecupleID++, 360, 3000, true);
+ generateFluidMultiPipes(constructor, Materials.StainlessSteel, MaterialUtils.getMaterialName(Materials.StainlessSteel), "Stainless Steel", BasePipeHexadecupleID++, 360, 3000, true);
generateFluidMultiPipes(constructor, Materials.Titanium, MaterialUtils.getMaterialName(Materials.Titanium), "Titanium", BasePipeHexadecupleID++, 480, 5000, true);
- generateFluidMultiPipes(constructor, Materials.TungstenSteel, MaterialUtils.getMaterialName(Materials.TungstenSteel), "Bronze", BasePipeHexadecupleID++, 600, 7500, true);
+ generateFluidMultiPipes(constructor, Materials.TungstenSteel, MaterialUtils.getMaterialName(Materials.TungstenSteel), "Tungsten Steel", BasePipeHexadecupleID++, 600, 7500, true);
generateFluidMultiPipes(constructor, Materials.Plastic, MaterialUtils.getMaterialName(Materials.Plastic), "Plastic", BasePipeHexadecupleID++, 360, 350, true);
Materials aPTFE = Materials.get("Polytetrafluoroethylene");