diff options
| author | Tec <daniel112092@gmail.com> | 2018-12-16 21:11:34 +0100 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2018-12-16 21:11:34 +0100 |
| commit | f6581ad4edf8fee1cee16066ecdfcb7250eb98e1 (patch) | |
| tree | a380a3a5cfbcee7f33c57356904b1bb90846fc8b | |
| parent | 47afbb41189baab2ad181a1017cb7b9829fc3a52 (diff) | |
| parent | 44164e592dbfaecbdd65b6573c791d4480e8d9d0 (diff) | |
| download | GT5-Unofficial-f6581ad4edf8fee1cee16066ecdfcb7250eb98e1.tar.gz GT5-Unofficial-f6581ad4edf8fee1cee16066ecdfcb7250eb98e1.tar.bz2 GT5-Unofficial-f6581ad4edf8fee1cee16066ecdfcb7250eb98e1.zip | |
Merge branch 'master' of https://github.com/Technus/TecTech
| -rw-r--r-- | build.properties | 6 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build.properties b/build.properties index 7cdca650d8..d753ae5835 100644 --- a/build.properties +++ b/build.properties @@ -1,13 +1,13 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -tectech.version=3.6.7 +tectech.version=3.6.8 ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=192 -gregtech.version=5.09.33.03 +gregtech.jenkinsbuild=196 +gregtech.version=5.09.33.04 cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.version=[1.7.10]1.0.3-175-dev diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java index 3d9cd58083..23f566075a 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java @@ -1469,7 +1469,7 @@ public final class dAtomDefinition extends cElementalDefinition { transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(12), 144), dust, Materials.Magnesium,1); transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(13), 144), dust, Materials.Aluminium,1); transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(14), 144), dust, Materials.Silicon,1); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(15), 144), dust, Materials.Phosphor,1); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(15), 144), dust, Materials.Phosphorus,1); transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(16), 144), dust, Materials.Sulfur,1); transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(17), 144),Materials.Chlorine.mGas.getID(), 144); transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(18), 144),Materials.Argon.mGas.getID(), 144); |