aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2022-06-10 10:15:08 +0100
committerGitHub <noreply@github.com>2022-06-10 11:15:08 +0200
commita894c865281c0d8875600dbe6125231421424ad5 (patch)
tree7fbe19c93dbfcf12c84fd35ee5f30fb10b26092b /src/main/resources
parent6ced738344fbf1b2bfccc2b753cf52c4d720e408 (diff)
downloadGT5-Unofficial-a894c865281c0d8875600dbe6125231421424ad5.tar.gz
GT5-Unofficial-a894c865281c0d8875600dbe6125231421424ad5.tar.bz2
GT5-Unofficial-a894c865281c0d8875600dbe6125231421424ad5.zip
Adjust NEI recipe pages (#1077)
* Add config support for changes. * Change ticks config to default OFF. * Usage -> Voltage for some cases. Also fix language translations. * Remove comment. * Remove redundant null check. * Bring back null checks (crashes). Move config to client. Adjust priorities so that if OC is detected it will display usage instead of voltage. * Remove null checks again (but for realsies this time). * Add language localisation. * Update language localisation. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 8aab9fcb80..39e9feb3c5 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -127,8 +127,8 @@ GT5U.machines.stalled_stuttering.tooltip.3=§7the recipe to complete it.
GT5U.machines.stalled_stuttering.tooltip.extended=§7Progress was lost, but not
GT5U.machines.stalled_stuttering.tooltip.extended.1=§7the recipe's output.
GT5U.machines.stalled_vent.tooltip=§4Stalled: Cannot vent steam!
-GT5U.machines.stalled_vent.tooltip.1=§7Right-click with a wrench to
-GT5U.machines.stalled_vent.tooltip.2=§7point this machine's steam
+GT5U.machines.stalled_vent.tooltip.1=§7Right-click with a wrench to
+GT5U.machines.stalled_vent.tooltip.2=§7point this machine's steam
GT5U.machines.stalled_vent.tooltip.3=§7vent towards an empty space.
GT5U.machines.stalled_vent.tooltip.extended=§7Progress was lost, but not
GT5U.machines.stalled_vent.tooltip.extended.1=§7the recipe's output.
@@ -202,6 +202,7 @@ GT5U.config.render.RenderFlippedMachinesFlipped=Render flipped machines with fli
GT5U.config.render.RenderIndicatorsOnHatch=Render indicator on hatch
GT5U.config.render.RenderPollutionFog=Render pollution fog
GT5U.config.render.TileAmbientOcclusion=Enable Ambient Occlusion
+GT5U.config.feature.NEI_recipe_second_mode=Show NEI recipes using seconds (as opposed to ticks).
// Cover tabs
GT5U.interface.coverTabs.down=Bottom
@@ -807,7 +808,7 @@ gregtech.areaLethargic=Lethargic
gregtech.areaExploratory=Exploratory
gregtech.speedUnproductive=Unproductive
gregtech.speedAccelerated=Accelerated
-gregtech.lifeBlink=Blink
+gregtech.lifeBlink=Blink
gregtech.lifeEon=Eon
entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow