Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#159 enhancement fix that the text of the tooltip cannot be changed through the lang file #167

Merged
merged 3 commits into from
Mar 4, 2024
Merged

#159 enhancement fix that the text of the tooltip cannot be changed through the lang file #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
347b6a5
fix hold tooltip not translating
maggi373 Mar 4, 2024
c601d68
bump version
maggi373 Mar 4, 2024
f22906f
Update README.md
maggi373 Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading