diff options
author | msg-programs <msgdoesstuff@gmail.com> | 2023-09-08 09:54:47 +0200 |
---|---|---|
committer | msg-programs <msgdoesstuff@gmail.com> | 2023-09-08 09:54:47 +0200 |
commit | 7df2a590d4b0079f65ef639315d04f63c2f754a7 (patch) | |
tree | fb2b0594a7e0b397b8f5afccdfa8ae7409edb9f8 /src/main/resources/assets | |
parent | b153e75818b5058df9334953d5924c2c82598719 (diff) | |
parent | 9c7bf54123f366ad90bfafe81e973b731fd6b5b3 (diff) | |
download | Skyblocker-7df2a590d4b0079f65ef639315d04f63c2f754a7.tar.gz Skyblocker-7df2a590d4b0079f65ef639315d04f63c2f754a7.tar.bz2 Skyblocker-7df2a590d4b0079f65ef639315d04f63c2f754a7.zip |
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into readme-fixes
Pull upstream updates into branch
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r-- | src/main/resources/assets/skyblocker/lang/en_us.json | 4 | ||||
-rw-r--r-- | src/main/resources/assets/skyblocker/tabhud/readme.md | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 33f6ff9c..b2c7fe9e 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -349,5 +349,7 @@ "skyblocker.quiverWarning.50Left": "You only have 50 Arrows left in your Quiver!", "skyblocker.quiverWarning.10Left": "You only have 10 Arrows left in your Quiver!", - "skyblocker.quiverWarning.empty": "You don't have any more Arrows left in your Quiver!" + "skyblocker.quiverWarning.empty": "You don't have any more Arrows left in your Quiver!", + + "emi.category.skyblocker.skyblock": "Skyblock" } diff --git a/src/main/resources/assets/skyblocker/tabhud/readme.md b/src/main/resources/assets/skyblocker/tabhud/readme.md index 70702d9c..7a52ddc0 100644 --- a/src/main/resources/assets/skyblocker/tabhud/readme.md +++ b/src/main/resources/assets/skyblocker/tabhud/readme.md @@ -178,10 +178,12 @@ Example: Stack A, B, C vertically/center-aligned, then align with leftOfCenter - Places a widget at some position, moving it in any direction as needed. Only makes sense to use on one widget at a time, as applying the same Place op to multiple widgtes causes them to be on top of each other. Example: Place A at "center" +``` +-----------+ +-----------+ | | | | | A | | -> v | | | --> | A | | | | | | | | | -+-----------+ +-----------+
\ No newline at end of file ++-----------+ +-----------+ +```
\ No newline at end of file |