diff options
author | Jakub Kolodziej <jakvb.kolodziej@gmail.com> | 2023-06-25 13:02:20 +0200 |
---|---|---|
committer | Jakub Kolodziej <jakvb.kolodziej@gmail.com> | 2023-06-25 13:02:20 +0200 |
commit | f3f000a7e5a015aa7690502c8c3b74ce558decf6 (patch) | |
tree | a0c96b6a9450242feb843c3af6f7bc2210bc2de5 /src/main/resources/assets | |
parent | b21711bf9f5fcc5b28235a44d659e3ae4b5f6e7d (diff) | |
download | Skyblocker-f3f000a7e5a015aa7690502c8c3b74ce558decf6.tar.gz Skyblocker-f3f000a7e5a015aa7690502c8c3b74ce558decf6.tar.bz2 Skyblocker-f3f000a7e5a015aa7690502c8c3b74ce558decf6.zip |
Resolve conflicts with master
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r-- | src/main/resources/assets/skyblocker/lang/en_us.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 502efde3..3889777c 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -20,6 +20,10 @@ "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Mana Bar Position", "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Defence Bar Position", "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "Experience Bar Position", + "text.autoconfig.skyblocker.option.general.experiments": "Experiments Solver", + "text.autoconfig.skyblocker.option.general.experiments.enableChronomatronSolver": "Enable Chronomatron Solver", + "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Enable Superpairs Solver", + "text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver": "Enable Ultrasequencer Solver", "text.autoconfig.skyblocker.option.general.acceptReparty": "Auto accept Reparty", "text.autoconfig.skyblocker.option.general.fishing": "Fishing Helper", "text.autoconfig.skyblocker.option.general.fishing.enableFishingHelper": "Enable Fishing Helper", |