diff --git a/src/main/java/ellpeck/actuallyadditions/event/TooltipEvent.java b/src/main/java/ellpeck/actuallyadditions/event/TooltipEvent.java index f7f978918..90299a778 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/TooltipEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/TooltipEvent.java @@ -17,8 +17,8 @@ public class TooltipEvent{ @SubscribeEvent public void onTooltipEvent(ItemTooltipEvent event){ if(event.itemStack.getItem() != null){ - if(KeyUtil.isControlPressed()){ - if(ConfigBoolValues.CTRL_EXTRA_INFO.isEnabled()){ + if(ConfigBoolValues.CTRL_EXTRA_INFO.isEnabled()){ + if(KeyUtil.isControlPressed()){ event.toolTip.add(StringUtil.GRAY+StringUtil.ITALIC+StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".extraInfo.desc")+":"); //OreDict Names @@ -51,10 +51,10 @@ public class TooltipEvent{ event.toolTip.add(TEXT_PRE+metaName); } } - } - else{ - if(ConfigBoolValues.CTRL_INFO_FOR_EXTRA_INFO.isEnabled()){ - event.toolTip.add(StringUtil.GRAY+StringUtil.ITALIC+StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".ctrlForMoreInfo.desc")); + else{ + if(ConfigBoolValues.CTRL_INFO_FOR_EXTRA_INFO.isEnabled()){ + event.toolTip.add(StringUtil.GRAY+StringUtil.ITALIC+StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".ctrlForMoreInfo.desc")); + } } } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 08771bc51..5587fcf72 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -407,7 +407,7 @@ item.actuallyadditions.itemDustCoal.name=Crushed Coal item.actuallyadditions.itemDustQuartzBlack.name=Crushed Black Quartz tooltip.actuallyadditions.shiftForInfo.desc=Press Shift for Info -tooltip.actuallyadditions.ctrlForMoreInfo.desc= +tooltip.actuallyadditions.ctrlForMoreInfo.desc=Press CTRL for Advanced Info tooltip.actuallyadditions.extraInfo.desc=Advanced Info tooltip.actuallyadditions.hunger.desc=Hunger Points tooltip.actuallyadditions.saturation.desc=Saturation @@ -634,6 +634,7 @@ container.actuallyadditions.drill.name=Drill container.actuallyadditions.energizer.name=Energizer container.actuallyadditions.enervator.name=Enervator container.actuallyadditions.xpSolidifier.name=Experience Solidifier +container.actuallyadditions.oreMagnet.name=Magnetic Miner container.nei.actuallyadditions.crushing.name=Crusher container.nei.actuallyadditions.crushingDouble.name=Double Crusher diff --git a/update/changelog.txt b/update/changelog.txt index 149dbaca8..2f200fb97 100644 --- a/update/changelog.txt +++ b/update/changelog.txt @@ -1 +1 @@ -Made Tools work on Hardened Clay again >.> \ No newline at end of file +Added a bunch of awesome Rings & Magnetic Miner \ No newline at end of file diff --git a/update/newestVersion.txt b/update/newestVersion.txt index f78a21d21..c3e5d8c7c 100644 --- a/update/newestVersion.txt +++ b/update/newestVersion.txt @@ -1 +1 @@ -1.7.10-0.0.7.6 \ No newline at end of file +1.7.10-0.0.8.0 \ No newline at end of file