diff options
| author | Technus <daniel112092@gmail.com> | 2017-06-16 08:35:46 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-06-16 08:35:46 +0200 |
| commit | 3d67f6b93f134345ef251e88684e2358e0c769fc (patch) | |
| tree | ee94cc6e96b2c53ab493ac4f6d037b9814180453 /src/main/java/gregtech/loaders/misc/GT_Achievements.java | |
| parent | 8863fa1f57a69269f595c9608b7917afa4705d55 (diff) | |
| parent | b588e82ef749c1f047182a7b230c157a3965c42e (diff) | |
| download | GT5-Unofficial-3d67f6b93f134345ef251e88684e2358e0c769fc.tar.gz GT5-Unofficial-3d67f6b93f134345ef251e88684e2358e0c769fc.tar.bz2 GT5-Unofficial-3d67f6b93f134345ef251e88684e2358e0c769fc.zip | |
Merge branch 'unstable_BLOOD' into reMerge
# Conflicts:
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'src/main/java/gregtech/loaders/misc/GT_Achievements.java')
| -rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_Achievements.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index bb4d700ff7..e71ae6ddc2 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -213,13 +213,13 @@ public class GT_Achievements { registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false); registerAchievement("whatnow", 4, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false); - if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ - for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { - if ((GregTech_API.sGeneratedMaterials[i] != null) && !oreList.contains(GregTech_API.sGeneratedMaterials[i])) { - codechicken.nei.api.API.hideItem(GT_OreDictUnificator.get(OrePrefixes.ore, GregTech_API.sGeneratedMaterials[i], 1)); - } - } - } +// if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ +// for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { +// if ((GregTech_API.sGeneratedMaterials[i] != null) && !oreList.contains(GregTech_API.sGeneratedMaterials[i])) { +// codechicken.nei.api.API.hideItem(GT_OreDictUnificator.get(OrePrefixes.ore, GregTech_API.sGeneratedMaterials[i], 1)); +// } +// } +// } if (GT_Mod.gregtechproxy.mAchievements) { AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) this.achievementList.values().toArray( new Achievement[this.achievementList.size()]))); |