diff options
| author | Technus <daniel112092@gmail.com> | 2017-09-18 06:23:16 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-09-18 06:23:16 +0200 |
| commit | d1bbc1bba95492a4256b98dbdaedaa178c204b04 (patch) | |
| tree | 7f3084ffd2d20c0f98292b6f1ddcbba1ecd17104 /src/main/java/openmodularturrets | |
| parent | 6fb50fabe6f7111dd6dbbe024aa1146237e90036 (diff) | |
| parent | 8334c42a5818cd279d0a2ac7105c6f18192ae64f (diff) | |
| download | GT5-Unofficial-d1bbc1bba95492a4256b98dbdaedaa178c204b04.tar.gz GT5-Unofficial-d1bbc1bba95492a4256b98dbdaedaa178c204b04.tar.bz2 GT5-Unofficial-d1bbc1bba95492a4256b98dbdaedaa178c204b04.zip | |
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/java/openmodularturrets')
| -rw-r--r-- | src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java | 2 | ||||
| -rw-r--r-- | src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java index 36437fa741..3b60922248 100644 --- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java @@ -19,7 +19,7 @@ public class TurretBaseItemEM extends ItemBlock { } public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(CommonValues.tecMark); + list.add(CommonValues.TEC_MARK); list.add(""); list.add(EnumChatFormatting.AQUA + "--" + StatCollector.translateToLocal("tooptip.energy.label") + "--"); list.add(StatCollector.translateToLocal("tooltip.rf.max") + ": " + EnumChatFormatting.WHITE + 1000000000); diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java index db2e034710..c728f30db0 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java @@ -11,7 +11,7 @@ import openmodularturrets.handler.ConfigHandler; import java.text.DecimalFormat; import java.util.List; -import static com.github.technus.tectech.CommonValues.tecMark; +import static com.github.technus.tectech.CommonValues.TEC_MARK; /** * Created by Bass on 28/07/2017. @@ -24,7 +24,7 @@ public class TurretHeadItemEM extends ItemBlock { } public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(tecMark); + list.add(TEC_MARK); list.add(""); list.add(EnumChatFormatting.GOLD + "--" + StatCollector.translateToLocal("tooltip.info") + "--"); list.add(StatCollector.translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + "5"); |