From 198f834592e0ed103c722c77f0a7e01d0578d779 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Mon, 19 Dec 2022 12:05:31 +0800 Subject: apparently not everyone count from 0 --- src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java | 2 +- src/main/resources/assets/ggfab/lang/en_US.lang | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java b/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java index bc29898a69..bd533b29c8 100644 --- a/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java +++ b/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java @@ -667,7 +667,7 @@ public class MTE_AdvAssLine extends GT_MetaTileEntity_EnhancedMultiBlockBase 20) { - currentTip.add(I18n.format("ggfab.waila.advassline.slice", i, progress / 20, duration / 20)); + currentTip.add(I18n.format("ggfab.waila.advassline.slice", i + 1, progress / 20, duration / 20)); } else if (progress > 0) { currentTip.add(I18n.format("ggfab.waila.advassline.slice.small", i, progress)); } else if (progress == 0) { diff --git a/src/main/resources/assets/ggfab/lang/en_US.lang b/src/main/resources/assets/ggfab/lang/en_US.lang index d4a9e1234a..e726ec787e 100644 --- a/src/main/resources/assets/ggfab/lang/en_US.lang +++ b/src/main/resources/assets/ggfab/lang/en_US.lang @@ -5,7 +5,9 @@ ggfab.info.advassline.3=You can think of an advanced assembly line as a collecti ggfab.info.advassline.4=It will start processing once the input bus contents align with any stored data stick. The first slice will consume the input in Bus #1. After (recipe time/number of inputs) time, the first slice's work is concluded and will start the second slice. At the same time, first slice will look for input in input bus #1. If there are still enough input there slice #1 will start working again. ggfab.info.advassline.5=The terminal slice (the n-th slice, where n is number of item input in recipe) will put the recipe output in output bus when it has concluded his work. Whenever a non-terminal slice finished its work, it will try to pass the work onto next slice. If the next slice cannot find the materials in its input bus, the just-finished slice will remain in §4STUCK§r state and hang the assembly line. To help locate these §4STUCK§r assembly lines, the controller's front face will have its status light turned orange. ggfab.info.advassline.6=The EU/t cost of this machine is number of slices active multiplied by the original recipe EU/t. §4STUCK§r slices do not consume power. -ggfab.waila.advassline.slice=Slice %s: %s s/%s s -ggfab.waila.advassline.slice.small=Slice %s: %s ticks remaining -ggfab.waila.advassline.slice.idle=Slice %s: Idle -ggfab.waila.advassline.slice.stuck=Slice %s: §4STUCK \ No newline at end of file +ggfab.waila.advassline.slice=Slice #%s: %s s/%s s +ggfab.waila.advassline.slice.small=Slice #%s: %s ticks remaining +ggfab.waila.advassline.slice.idle=Slice #%s: Idle +ggfab.waila.advassline.slice.stuck=Slice #%s: §4STUCK + +ggfab.info.biome=Biome: -- cgit