diff options
| author | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-01-10 17:32:02 +0000 |
|---|---|---|
| committer | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-01-10 17:32:02 +0000 |
| commit | 722f3466f87e877f291ae3cf53fea4ca58709452 (patch) | |
| tree | c0e6ac196ad0c2ad7208bc4a00913631435548b2 /src/main | |
| parent | 27fc91679b1243db298109a57e55557fe9b1e914 (diff) | |
| parent | a20dc50f1fca420784e76487f2ac96fd768e847b (diff) | |
| download | GT5-Unofficial-722f3466f87e877f291ae3cf53fea4ca58709452.tar.gz GT5-Unofficial-722f3466f87e877f291ae3cf53fea4ca58709452.tar.bz2 GT5-Unofficial-722f3466f87e877f291ae3cf53fea4ca58709452.zip | |
Merge remote-tracking branch 'origin/CelestialThingy' into CelestialThingy
# Conflicts:
# src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/nei/IMCForNEI.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java index b36b15b619..9d2659075e 100644 --- a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java +++ b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java @@ -1,12 +1,11 @@ package com.github.technus.tectech.nei; -import com.github.technus.tectech.TecTech; +import static com.github.technus.tectech.Reference.MODID; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.nbt.NBTTagCompound; -import static com.github.technus.tectech.Reference.MODID; - public class IMCForNEI { public static void IMCSender() { diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index 807663c9bb..65f5a0d4a8 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -229,7 +229,7 @@ public class EyeOfHarmonyRecipe { private static final double QUATERNARY_MULTIPLIER = (0.7); // Mercury/chem bath processing chance. private static final double[] ORE_MULTIPLIER = { - PRIMARY_MULTIPLIER, SECONDARY_MULTIPLIER, TERTIARY_MULTIPLIER, QUATERNARY_MULTIPLIER + PRIMARY_MULTIPLIER, SECONDARY_MULTIPLIER, TERTIARY_MULTIPLIER, QUATERNARY_MULTIPLIER }; public static class HashMapHelper extends HashMap<Materials, Double> { |