TMC/modded7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Fix Duplicate Prospector Tooltip + Cleanup (#837)

Browse Source 
[EXPAND]
[[messages]]
messageTitle = "Fix Duplicate Prospector Tooltip (#837)"
messageBody = '''
[BUG]
[IGNORE]
checks = { compareBefore = "1.7-beta-5" }
[IGNORE]
'''
[EXPAND]
This commit is contained in:
Integer Limit 2024-07-31 22:03:37 +10:00 committed by GitHub
parent f6adf269fa
commit 0b403347a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy
View File

@ -46,11 +46,11 @@ for (ItemStack stack : items) {
]) ])
addRecipeOutputTooltip(recipeStack, resource(recipeName), addRecipeOutputTooltip(recipeStack, resource(recipeName),
ItemMeta.compare(tool, recipeStack) ? ItemMeta.compare(tool, recipeStack) ?
translatable("tooltip.hand_framing.tool") : translatable("nomiceu.tooltip.labs.hand_framing.tool") :
translatable("tooltip.hand_framing.drawer"), translatable("nomiceu.tooltip.labs.hand_framing.drawer"),
translatable("tooltip.hand_framing.top_left"), translatable("nomiceu.tooltip.labs.hand_framing.top_left"),
translatable("tooltip.hand_framing.top_right"), translatable("nomiceu.tooltip.labs.hand_framing.top_right"),
translatable("tooltip.hand_framing.bottom_left")) translatable("nomiceu.tooltip.labs.hand_framing.bottom_left"))
} }
} }
} }

9
overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy
View File

@ -242,15 +242,6 @@ addTooltip(metaitem('cover.facade'), [
translatable('nomiceu.tooltip.gregtech.facade.2'), translatable('nomiceu.tooltip.gregtech.facade.2'),
]) ])
/* Extended Crafting */
// Omnium Trimmed Black Steel
clearTooltip(item('extendedcrafting:trimmed', 5))
addTooltip(item('extendedcrafting:trimmed', 5), [
translatable('nomiceu.tooltip.extendedcrafting.black_steel.omnium.1'),
translatable('nomiceu.tooltip.extendedcrafting.black_steel.omnium.2'),
])
/* Ender IO */ /* Ender IO */
// Glasses // Glasses

5
overrides/resources/extendedcrafting/lang/en_us.lang
View File

@ -32,4 +32,7 @@ tile.ec.storage_ender_star.name=Block of Endest Stars
# line 75-76 # line 75-76
item.ec.material_ender_star.name=Endest Star item.ec.material_ender_star.name=Endest Star
item.ec.material_ender_star_nugget.name=Endest Star Nugget item.ec.material_ender_star_nugget.name=Endest Star Nugget
# Ultimate Trimmed -> Omnium Trimmed
tooltip.ec.trimmed_ultimate=Omnium Trimmed

12
overrides/resources/modpack/lang/en_us.lang
View File

@ -1,3 +1,4 @@
# No Nether Portals
nomifactory.nonetherportals=Nether portals are disabled in §5Nomi-CEu§r. Follow the quest book to unlock §6Nether Cakes§r! nomifactory.nonetherportals=Nether portals are disabled in §5Nomi-CEu§r. Follow the quest book to unlock §6Nether Cakes§r!
# Tooltips # Tooltips
@ -77,10 +78,6 @@ nomiceu.tooltip.gregtech.prospector.4=Use JEI to check the potential vein depth.
nomiceu.tooltip.gregtech.facade.1=§3GTCEu facades can be made from most non-tile-entities.§r nomiceu.tooltip.gregtech.facade.1=§3GTCEu facades can be made from most non-tile-entities.§r
nomiceu.tooltip.gregtech.facade.2=§3They craft into different amounts based on the metal used!§r nomiceu.tooltip.gregtech.facade.2=§3They craft into different amounts based on the metal used!§r
# Extended Crafting
nomiceu.tooltip.extendedcrafting.black_steel.omnium.1=Block of Black Steel
nomiceu.tooltip.extendedcrafting.black_steel.omnium.2=§7Omnium Trimmed§r
# Ender IO # Ender IO
tooltip.fused_glass.make=Made with §6Tempered Glass§r and §7White Dye§r tooltip.fused_glass.make=Made with §6Tempered Glass§r and §7White Dye§r
tooltip.eio_glass.dye=Can be §bDyed§r! tooltip.eio_glass.dye=Can be §bDyed§r!
@ -88,5 +85,12 @@ tooltip.eio_glass.dye=Can be §bDyed§r!
# Project Red # Project Red
nomiceu.tooltip.projectred.wire=§eFor use with ProjectRed.§r nomiceu.tooltip.projectred.wire=§eFor use with ProjectRed.§r
# Nomi Labs
nomiceu.tooltip.labs.hand_framing.tool=§5Frame your Hand Framing Tool by Hand!§r
nomiceu.tooltip.labs.hand_framing.drawer=§5Frame your Drawers by Hand!§r
nomiceu.tooltip.labs.hand_framing.top_left=§5Top Left: §oSide§r
nomiceu.tooltip.labs.hand_framing.top_right=§5Top Right: §oTrim§r
nomiceu.tooltip.labs.hand_framing.bottom_left=§5Bottom Left: §oFront§r
# XTones # XTones
nomiceu.tooltip.xtones.lamp=§eRequires a redstone signal to light.§r nomiceu.tooltip.xtones.lamp=§eRequires a redstone signal to light.§r

5
overrides/resources/nomiceu/lang/en_us.lang
View File

@ -1,5 +0,0 @@
tooltip.hand_framing.tool=§5Frame your Hand Framing Tool by Hand!§r
tooltip.hand_framing.drawer=§5Frame your Drawers by Hand!§r
tooltip.hand_framing.top_left=§5Top Left: §oSide§r
tooltip.hand_framing.top_right=§5Top Right: §oTrim§r
tooltip.hand_framing.bottom_left=§5Bottom Left: §oFront§r

4
overrides/scripts/Earlygame.zs
View File

@ -395,7 +395,3 @@ macerator.recipeBuilder()
.duration(236) .duration(236)
.EUt(8) .EUt(8)
.buildAndRegister();*/ .buildAndRegister();*/
<gregtech:meta_item_1:466>.addTooltip(format.yellow("Grid squares correspond to 1 chunk, up is north\nClick a resource name in sidebar to highlight only it\nUse JEI to check potential vein depth"));
<gregtech:meta_item_1:467>.addTooltip(format.yellow("Grid squares correspond to 1 chunk, up is north\nClick a resource name in sidebar to highlight only it\nUse JEI to check potential vein depth"));
<gregtech:meta_item_1:468>.addTooltip(format.yellow("Grid squares correspond to 1 chunk, up is north\nClick a resource name in sidebar to highlight only it\nUse JEI to check potential vein depth"));