aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/gregtech/lang/en_US.lang
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-07-19 12:27:40 -0400
committerGitHub <noreply@github.com>2024-07-19 23:27:40 +0700
commit1842f59eeb837edecfc31dae8a2b35fcda471b38 (patch)
tree826ae5a141706145ed48ec415c57b3bf93a3fc88 /src/main/resources/assets/gregtech/lang/en_US.lang
parente4b0d5d1e0f6080d4896c6ceec649d16fe68369f (diff)
downloadGT5-Unofficial-1842f59eeb837edecfc31dae8a2b35fcda471b38.tar.gz
GT5-Unofficial-1842f59eeb837edecfc31dae8a2b35fcda471b38.tar.bz2
GT5-Unofficial-1842f59eeb837edecfc31dae8a2b35fcda471b38.zip
Mode switch button (#2730)
* Button textures. Once again I am manually pulling changes from a different branch... sorry. If you want to read the full commit history, the modeswitchgui branch has it. * Texture enums * Implementation in ControllerWithOptionalFeatures * Implementation in GT_MetaTileEntity_MultiBlockBase * Implemented into all multi-machines * Lang changes * Added documentation * Added missing clear * Quick polish changes - button base texture is standard instead of pressed, and the click noise works. * MFE compatibility * TurboCan compatibility * Fix misordered icons in canner * Removed redundant code in button * Attempted to refactor with MachineMode enum. Also moved loadNBT and saveNBT logic to base class * sa * fix (cherry picked from commit 1f14a7abf460ad114f10e8ba58b6be44b7b18d48) * Rework machineMode into enum of IMachineMode completely * Fixed breaking typo * Made it stop crashing on normal multis that don't support mode switch * Revert * Finished revert and re-addressed changes from original review * spotless * Load nbt tags in correct order. Fixes backwards compat * Check nbt key on load instead * Run super last and make all MACHINEMODE static --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/resources/assets/gregtech/lang/en_US.lang')
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index e529750871..9c62c6be6a 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -320,13 +320,13 @@ GT5U.machines.stalled_vent.tooltip.2=§7point this machine's steam
GT5U.machines.stalled_vent.tooltip.3=§7vent towards an empty space.
GT5U.GTPP_MULTI_ARC_FURNACE.mode.0=Electric
GT5U.GTPP_MULTI_ARC_FURNACE.mode.1=Plasma
-GT5U.GTPP_MULTI_CUTTING_MACHINE.mode.0=Slicing
-GT5U.GTPP_MULTI_CUTTING_MACHINE.mode.1=Cutting
+GT5U.GTPP_MULTI_CUTTING_MACHINE.mode.0=Cutting
+GT5U.GTPP_MULTI_CUTTING_MACHINE.mode.1=Slicing
GT5U.GTPP_MULTI_WASH_PLANT.mode.0=Ore Washer
GT5U.GTPP_MULTI_WASH_PLANT.mode.1=Simple Washer
GT5U.GTPP_MULTI_WASH_PLANT.mode.2=Chemical Bath
-GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.0=Forming Press
-GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.1=Bending
+GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.0=Bending
+GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.1=Forming Press
GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.0=Electromagnetic Separator
GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.1=Electromagnetic Polarizer
GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.0=Metal
@@ -342,8 +342,8 @@ GT5U.GTPP_MULTI_ADV_DISTILLATION_TOWER.mode.0=Distillation Tower
GT5U.GTPP_MULTI_ADV_DISTILLATION_TOWER.mode.1=Distillery
GT5U.GTPP_MULTI_PRECISE_ASSEMBLER.mode.0=Precise
GT5U.GTPP_MULTI_PRECISE_ASSEMBLER.mode.1=Normal
-GT5U.GTPP_MULTI_PACKAGER.mode.0=Unpackager
-GT5U.GTPP_MULTI_PACKAGER.mode.1=Packager
+GT5U.GTPP_MULTI_PACKAGER.mode.0=Packager
+GT5U.GTPP_MULTI_PACKAGER.mode.1=Unpackager
GT5U.machines.oreprocessor1=§eRunning Mode:
GT5U.machines.oreprocessor2=§cTime: %s s
GT5U.machines.oreprocessor.void=§eVoid Stone Dust: %s
@@ -448,6 +448,7 @@ GT5U.gui.button.voiding_mode_item=§7Void Excess §6Items
GT5U.gui.button.voiding_mode_fluid=§7Void Excess §9Fluids
GT5U.gui.button.voiding_mode_all=§7Void Excess §6Items §7and §9Fluids
GT5U.gui.button.input_separation=Input Separation
+GT5U.gui.button.mode_switch=Mode Switch
GT5U.gui.button.batch_mode=Batch Mode
GT5U.gui.button.lock_recipe=Lock Recipe
GT5U.gui.button.down_tier=Down Tier