diff options
| author | Kiwi <42833050+Kiwi233@users.noreply.github.com> | 2021-08-11 21:49:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 21:49:14 +0800 |
| commit | c753e4a5602e1ae17d1acd5d7f2eed0991b6a15a (patch) | |
| tree | f6d2302e588853ed12c5153099b1ec1c2f1e3645 | |
| parent | 475c314c7aebfec6e6a605f88f8fd1e4bb5cbae2 (diff) | |
| parent | 2828e91f560ea0fb7a853394c200f06aff6d7909 (diff) | |
| download | GT5-Unofficial-c753e4a5602e1ae17d1acd5d7f2eed0991b6a15a.tar.gz GT5-Unofficial-c753e4a5602e1ae17d1acd5d7f2eed0991b6a15a.tar.bz2 GT5-Unofficial-c753e4a5602e1ae17d1acd5d7f2eed0991b6a15a.zip | |
Merge branch 'GTNewHorizons:main' into main
| -rw-r--r-- | src/main/java/GoodGenerator/Items/MyMaterial.java | 8 | ||||
| -rw-r--r-- | src/main/java/GoodGenerator/Loader/RecipeLoader.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java index 0b18deca8b..47ed7df2b7 100644 --- a/src/main/java/GoodGenerator/Items/MyMaterial.java +++ b/src/main/java/GoodGenerator/Items/MyMaterial.java @@ -225,7 +225,7 @@ public class MyMaterial implements Runnable { public static final Werkstoff thoriumTetrachloride = new Werkstoff( new short[]{0x13,0x7c,0x16}, - "thorium Tetrachloride", + "Thorium Tetrachloride", subscriptNumbers("ThCl4"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, @@ -257,10 +257,10 @@ public class MyMaterial implements Runnable { new Pair<> (Fluorine,4) ); - //Atomic Separation Catalyst + //Naquadria Catalyst public static final Werkstoff atomicSeparationCatalyst = new Werkstoff( new short[]{0xe8,0x5e,0x0c}, - "Atomic Separation Catalyst", + "Naquadria Catalyst", "the melting core...", new Werkstoff.Stats().setMeltingPoint(5000).setBlastFurnace(true), Werkstoff.Types.COMPOUND, @@ -338,7 +338,7 @@ public class MyMaterial implements Runnable { public static final Werkstoff ether = new Werkstoff( new short[]{0xeb,0xbc,0x2f}, - "Ether", + "Diethyl Ether", subscriptNumbers("CH3CH2OCH2CH3"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index 8d86690478..c68624d244 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -782,8 +782,8 @@ public class RecipeLoader { MyMaterial.naquadahEmulsion.getFluidOrGas(1000), }, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.AntimonyTrioxide,1), - WerkstoffLoader.Fluorspar.get(OrePrefixes.dust,6) + GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.AntimonyTrioxide,1), + WerkstoffLoader.Fluorspar.get(OrePrefixes.dust,4) }, 240, 30 |