diff options
| author | Daniel <daniel112092@gmail.com> | 2017-06-18 11:30:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 11:30:32 +0200 |
| commit | 80a56026b16d49a18fd3d42a2d3dfa06de167c82 (patch) | |
| tree | 8112db284de8e9240865e05577bd19c14ecc71f1 /src/main/java/gregtech/api/objects | |
| parent | d7f24f3e68826adb1a15369628ded0744c123fca (diff) | |
| parent | 6f7e5063c0552c01dcc412ca01f0a243776dd9a1 (diff) | |
| download | GT5-Unofficial-80a56026b16d49a18fd3d42a2d3dfa06de167c82.tar.gz GT5-Unofficial-80a56026b16d49a18fd3d42a2d3dfa06de167c82.tar.bz2 GT5-Unofficial-80a56026b16d49a18fd3d42a2d3dfa06de167c82.zip | |
Merge pull request #26 from GTNewHorizons/reMerge
Re merge
Diffstat (limited to 'src/main/java/gregtech/api/objects')
| -rw-r--r-- | src/main/java/gregtech/api/objects/GT_Cover_Default.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/objects/GT_UO_DimensionList.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_Cover_Default.java b/src/main/java/gregtech/api/objects/GT_Cover_Default.java index bf3bc84497..fa6d3bcc26 100644 --- a/src/main/java/gregtech/api/objects/GT_Cover_Default.java +++ b/src/main/java/gregtech/api/objects/GT_Cover_Default.java @@ -22,7 +22,7 @@ public class GT_Cover_Default extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = ((aCoverVariable + 1) & 15); - GT_Utility.sendChatToPlayer(aPlayer, ((aCoverVariable & 1) != 0 ? "Redstone " : "") + ((aCoverVariable & 2) != 0 ? "Energy " : "") + ((aCoverVariable & 4) != 0 ? "Fluids " : "") + ((aCoverVariable & 8) != 0 ? "Items " : "")); + GT_Utility.sendChatToPlayer(aPlayer, ((aCoverVariable & 1) != 0 ? trans("128", "Redstone ") : "") + ((aCoverVariable & 2) != 0 ? trans("129", "Energy ") : "") + ((aCoverVariable & 4) != 0 ? trans("130", "Fluids ") : "") + ((aCoverVariable & 8) != 0 ? trans("131", "Items ") : "")); return aCoverVariable; } diff --git a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java index 36aad9a557..1e4f54eb12 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java +++ b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java @@ -2,7 +2,6 @@ package gregtech.api.objects; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import gregtech.api.util.GT_Log; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; @@ -55,7 +54,7 @@ public class GT_UO_DimensionList { SetConfigValues("Overworld", "0", "liquid_medium_oil", "liquid_medium_oil", 0, 600, 20, 5); SetConfigValues("Overworld", "0", "liquid_heavy_oil", "liquid_heavy_oil", 0, 550, 20, 4); SetConfigValues("Overworld", "0", "oil", "oil", 0, 600, 20, 5); - SetConfigValues("Moon", "Moon", "helium-3", "helium-3", 25, 150, 100, 1); + SetConfigValues("Moon", "Moon", "helium-3", "helium-3", 24, 128, 100, 1); } public void getConfig(Configuration aConfig, String aCategory) { |