diff options
| author | DoKM <mcazzyman@gmail.com> | 2021-07-22 09:57:31 +0200 |
|---|---|---|
| committer | DoKM <mcazzyman@gmail.com> | 2021-07-22 09:57:31 +0200 |
| commit | befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0 (patch) | |
| tree | 4ef5014cf74f57ef52fa2650703de7b8f1153f6c /src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java | |
| parent | aebc16a2a5ca9c20affc27eb5a45cd9a95085168 (diff) | |
| parent | c1c4562b42d53ec2e8885c48f97249d7768fe1c7 (diff) | |
| download | notenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.tar.gz notenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.tar.bz2 notenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.zip | |
Fix merge conflicts for moulberry
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java index 64b27351..357815b7 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java @@ -2,7 +2,6 @@ package io.github.moulberry.notenoughupdates.overlays; import com.google.common.collect.Lists; import io.github.moulberry.notenoughupdates.NotEnoughUpdates; -import io.github.moulberry.notenoughupdates.core.config.Position; import io.github.moulberry.notenoughupdates.miscfeatures.PetInfoOverlay; import java.util.ArrayList; @@ -36,7 +35,7 @@ public class OverlayManager { "\u00a73Experiments: \u00a7e3h38m"); textOverlays.add(timersOverlay = new TimersOverlay(NotEnoughUpdates.INSTANCE.config.miscOverlays.todoPosition, () -> { List<String> strings = new ArrayList<>(); - for(int i : NotEnoughUpdates.INSTANCE.config.miscOverlays.todoText) { + for(int i : NotEnoughUpdates.INSTANCE.config.miscOverlays.todoText2) { if(i >= 0 && i < todoDummy.size()) strings.add(todoDummy.get(i)); } return strings; |
