diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-03-14 20:51:21 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-03-14 20:51:21 +0000 |
| commit | 4b3da0d3c95218a8ee40f1db0e74e573f1290bf2 (patch) | |
| tree | 677fc543523b026557985b0d3693722046783798 | |
| parent | 7e34f0b6c50ada4e297b7847b804926e017222d9 (diff) | |
| download | GT5-Unofficial-4b3da0d3c95218a8ee40f1db0e74e573f1290bf2.tar.gz GT5-Unofficial-4b3da0d3c95218a8ee40f1db0e74e573f1290bf2.tar.bz2 GT5-Unofficial-4b3da0d3c95218a8ee40f1db0e74e573f1290bf2.zip | |
+ Added Teflon.
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java | 2 | ||||
| -rw-r--r-- | src/resources/assets/miscutils/lang/en_US.lang | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java index 1c66b5cac2..02afada849 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -20,6 +20,7 @@ public class GenericChem extends ItemPackage { public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, "", 0);//Not a GT Inherited Material public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material + public static final Material TEFLON = new Material("Teflon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{75, 45, 75}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material //public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material //public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material @@ -55,6 +56,7 @@ public class GenericChem extends ItemPackage { PhenolicResins = ItemUtils.generateSpecialUseDusts("phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0]; MaterialGenerator.generate(BAKELITE, false); MaterialGenerator.generate(NYLON, false); + MaterialGenerator.generate(TEFLON, false); } @Override diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index e1079c90de..e1102d708e 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -2761,4 +2761,13 @@ item.itemNuggetNylon.name=Nylon Nugget item.itemPlateNylon.name=Nylon Plate item.itemPlateDoubleNylon.name=Double Nylon Plate item.itemCellNylon.name=Nylon Cell -tile.Block of Nylon.name=Block of Nylon
\ No newline at end of file +tile.Block of Nylon.name=Block of Nylon +item.itemIngotTeflon.name=Teflon Ingot +item.itemDustTeflon.name=Teflon Dust +item.itemDustTinyTeflon.name=Tiny Pile of Teflon Dust +item.itemDustSmallTeflon.name=Small Pile of Teflon Dust +item.itemNuggetTeflon.name=Teflon Nugget +item.itemPlateTeflon.name=Teflon Plate +item.itemPlateDoubleTeflon.name=Double Teflon Plate +item.itemCellTeflon.name=Teflon Cell +tile.Block of Teflon.name=Block of Teflon
\ No newline at end of file |