Skip to content

Commit

Permalink
Merge pull request #167 from Thorfusion/159-enhancement-fix-that-the-…
Browse files Browse the repository at this point in the history
…text-of-the-tooltip-cannot-be-changed-through-the-lang-file

#159 enhancement fix that the text of the tooltip cannot be changed through the lang file
  • Loading branch information
maggi373 authored Mar 4, 2024
2 parents 461e268 + f22906f commit 54f20d6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ Note that changes not by the mekanism ce team has been added by us from their re
+ Plat Compat Shenanigans in https://github.com/Thorfusion/Mekanism-Community-Edition/pull/142
+ Patch Personal Chest dupe in https://github.com/Thorfusion/Mekanism-Community-Edition/pull/143
+ Fixed lag with in heat transferring devices https://github.com/Thorfusion/Mekanism-Community-Edition/pull/158
+ Fix hold in tooltip not being translated https://github.com/Thorfusion/Mekanism-Community-Edition/pull/167

#### leytilera
+ universal cable connection to IC2
Expand All @@ -162,6 +163,14 @@ Note that changes not by the mekanism ce team has been added by us from their re
+ Additional checks for IC2 api and cofhcore in ChargeUtils before using them fixes mekanism#4785 Thorfusion#118
+ Fix Gas Registry Lookup Performance in https://github.com/Thorfusion/Mekanism-Community-Edition/pull/138

#### Omgise
* Update zh_CN.lang in https://github.com/Thorfusion/Mekanism-Community-Edition/pull/162

#### Bedrockbreaker
* Add missing Gas API methods in https://github.com/Thorfusion/Mekanism-Community-Edition/pull/166



## All contributors get capes

# License
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ FMP_version=1.2.0.345
CCLIB_version=1.1.3.141
NEI_version=1.0.5.120
CCC_version=1.0.7.48
mod_version=9.10.35
alt_version=9, 10, 35
mod_version=9.10.36
alt_version=9, 10, 36
2 changes: 1 addition & 1 deletion src/main/java/mekanism/common/item/ItemBlockOre.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List
{
if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey))
{
list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + LangUtils.localize("tooltip.forDetails") + ".");
list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + LangUtils.localize("tooltip.forDetails") + ".");
}
else {
list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")), itemstack));
Expand Down

0 comments on commit 54f20d6

Please sign in to comment.