Merge branch 'master' into autorejoin2

81 files changed, 2013 insertions, 607 deletions

diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
index c9e3584b..d79c40e8 100644
--- a/.github/workflows/buildrelease.yml
+++ b/.github/workflows/buildrelease.yml
@@ -39,11 +39,51 @@ jobs:
         id: read_changelog
         shell: bash
         run: |
-          CHANGELOG=$(sed '/___/Q' CHANGELOG.md | grep -v '# ')
+          CHANGELOG=$(sed '/___/Q' CHANGELOG.md)
           echo "Changelog:\n$CHANGELOG"
+
+          changelog="${CHANGELOG}"
+
+          # Because of the 2000 char limit in Discord shorten the changelog
+
+          # Calculate the number of characters to delete
+          delete_chars=$((${#changelog} + 350 - 2000 - 15))
+          
+          # Check if delete_chars is greater than 0
+          if [ $delete_chars -gt 0 ]; then
+
+              # Extract the "What's Changed" section from the changelog
+              changed_section=$(echo "$changelog" | awk '/## What'\''s Changed/{flag=1;next}/^$/{flag=0}flag')
+
+              # Trim the changed_section based on the delete_chars value and remove the last line
+              modified_section="${changed_section::-delete_chars}"
+              modified_section=$(echo "$modified_section" | sed '$d')
+
+              # Add "[...] and more" at the end of modified_section
+              modified_section+="\n[...] and more"
+
+              # Format modified_section with printf
+              modified_section=$(printf "%s" "$modified_section")
+
+              # Generate the modified_changelog by inserting modified_section after the "What's Changed" section
+              modified_changelog=$(awk -v modified_section="$modified_section" '
+                      /^## What'\''s Changed/ { print; print modified_section; f=1; next }
+                      f && /^$/ { f=0 }
+                      !f { print }
+                      END { if (f) print "" }
+                  ' ORS='\n' <<< "$changelog")
+
+              # Format the modified_changelog by removing "@" characters and enclosing URLs in "<>"
+              modified_changelog=$(echo "$modified_changelog" | sed -e 's/@//g' -e 's|https\?://[^[:space:]]*|<\0>|g')
+          
+          # Store the modified_changelog in the CHANGELOG variable
+          CHANGELOG=$(echo -n "$modified_changelog")
+          fi
+          
           CHANGELOG="${CHANGELOG//'%'/'%25'}"
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
           CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
+          
           echo "::set-output name=changelog::$CHANGELOG"
 
       - uses: actions/github-script@v2
@@ -53,11 +93,13 @@ jobs:
           script: |
             const fs = require("fs")
             return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0]
+
       - name: Release
         id: uploadrelease
         uses: softprops/action-gh-release@v1
         with:
           body: ${{ steps.read_changelog.outputs.changelog }}
+          token: ${{ secrets.GH_RELEASE }}
           files: build/libs/${{ steps.fname.outputs.result }}
 
       - name: Publish to Modrinth
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aa8c4df..59b3fd68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,46 @@
+# Release 1.10.0
+
+## Highlight
+* Custom Tab HUD by @msg-programs in https://github.com/SkyblockerMod/Skyblocker/pull/137
+* Fishing Helper by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/157
+* REI Compatibility by @lantice3720 in https://github.com/SkyblockerMod/Skyblocker/pull/148
+* Barn solvers by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/134
+
+## What's Changed
+* Translations update from hysky translate by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/142
+* Barn solvers by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/134
+* Dungeon map scale adjustment customization  by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/127
+* Add option to hide empty tooltips in inventories. by @msg-programs in https://github.com/SkyblockerMod/Skyblocker/pull/135
+* Translations update from hysky translate by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/144
+* There is now 240 fairy souls! by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/138
+* Translations update from hysky translate by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/149
+* minor updates by @Fix3dll in https://github.com/SkyblockerMod/Skyblocker/pull/122
+* Migrated to ClientReceiveMessageEvents and some fixes by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/131
+* Renamed container package to gui and added docs by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/145
+* Translations update from hysky translate by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/153
+* REI Compatibility by @lantice3720 in https://github.com/SkyblockerMod/Skyblocker/pull/148
+* Api migration, config command, and cleanup by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/154
+* Translations update from hysky translate by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/155
+* Refactors & docs by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/156
+* return instead of assign by @Fix3dll in https://github.com/SkyblockerMod/Skyblocker/pull/158
+* Translations update from hysky translate by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/159
+* Add Fishing Helper by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/157
+* Update Loom and Gradle by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/163
+* Livid color by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/162
+* fix repository update by @Fix3dll in https://github.com/SkyblockerMod/Skyblocker/pull/165
+* remove backup LBIN server because it desn't exist anymore by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/168
+* fixing missing strings by @PumpkinXD in https://github.com/SkyblockerMod/Skyblocker/pull/170
+* Translations update from hysky translate by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/166
+* Replace tab/playerlist HUD with a more fancy version by @msg-programs in https://github.com/SkyblockerMod/Skyblocker/pull/137
+* Add Dungeon Map Placement Screen by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/169
+
+## New Contributors
+* @msg-programs made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/135
+* @lantice3720 made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/148
+* @PumpkinXD made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/170
+
+**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.9.0...v1.10.0
+___
 # Release 1.9.0
 
 Supports 1.19.4
diff --git a/FEATURES.md b/FEATURES.md
index 1cd95a1e..3db3c2a5 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -2,14 +2,18 @@
 * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages
 * Dungeon Minimap
 * Dungeon Puzzle Solver:
-    * Three Weirdos
-    * Blaze
-    * Croesus
-    * F7 Terminal: Order, Color, Name
+  * Three Weirdos
+  * Blaze
+  * Croesus
+  * Terminal: 
+    * Order
+    * Coloured Items
+    * Item Name
 * Dwarven Mines Solver: Fetchur, Puzzler
+* Barn Solver: Treasure Hunter, Hungry Hiker
 * Drill Fuel in Item Durability Bar
 * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton)
-* price tooltip: npc, bazaar (avg, lbin), ah, museum
+* Price tooltip: npc, bazaar (avg, lbin), ah, museum
 * reparty: write /rp to reparty
 * Wiki Lookup: press f4 to open the wiki page about the held item
 * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message
@@ -20,4 +24,7 @@
   hold shift to preview
 * Update notification
 * Commission HUD: Dwarven Mines quests
-* 1.8 hitbox for lever and farmland
\ No newline at end of file
+* 1.8 hitbox for lever and farmland
+* Custom Tab HUD
+* Roughly enough items (REI) Support
+* Fishing Helper
\ No newline at end of file
diff --git a/README.md b/README.md
index 59e8a7fa..9b5e323c 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 [![Discord](https://img.shields.io/discord/879732108745125969?logo=discord&labelColor=cecece&color=7289DA&label=)](https://discord.com/invite/aNNJHQykck)
 [![modrinth statistic](https://img.shields.io/badge/buy%20me%20coffee-skyblocker?color=434B57&logo=kofi)](https://ko-fi.com/wohlhabend)
 
-Hypixel Skyblock Mod for Minecraft 1.17.x + 1.18.x + 1.19.x
+Hypixel Skyblock Mod for Minecraft 1.17.x + 1.18.x + 1.19.x + 1.20.x
 
 Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/installation)
 
@@ -21,14 +21,18 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages
 * Dungeon Minimap
 * Dungeon Puzzle Solver:
-    * Three Weirdos
-    * Blaze
-    * Croesus
-    * F7 Terminal: Order, Color, Name
+  * Three Weirdos
+  * Blaze
+  * Croesus
+  * Terminal:
+    * Order
+    * Coloured Items
+    * Item Name
 * Dwarven Mines Solver: Fetchur, Puzzler
+* Barn Solver: Treasure Hunter, Hungry Hiker
 * Drill Fuel in Item Durability Bar
 * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton)
-* price tooltip: npc, bazaar (avg, lbin), ah, museum
+* Price tooltip: npc, bazaar (avg, lbin), ah, museum
 * reparty: write /rp to reparty
 * Wiki Lookup: press f4 to open the wiki page about the held item
 * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message
@@ -40,11 +44,22 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 * Update notification
 * Commission HUD: Dwarven Mines quests
 * 1.8 hitbox for lever and farmland
+* Custom Tab HUD
+* Roughly enough items (REI) Support
+* Fishing Helper
 
 </details>
 
 ___
+## Commands
 
+|           command            |        option        | comment                               |
+|:----------------------------:|:--------------------:|:--------------------------------------|
+|      /skyblocker config      |                      | open config menu (modMenu not needed) |
+|        /skyblocker options   |                      | open config menu (modMenu not needed) |
+|       /skyblocker hud        | dwarven / dungeonmap | move dwarven or dungeonmap            |
+
+---
 ## Images
 
 <details open>
@@ -81,18 +96,29 @@ information.
 |                                [Zailer43](https://github.com/Zailer43)                                |                                  [TacoMonkey11](https://github.com/TacoMonkey11)                                  |                                 [KonaeAkira](https://github.com/KonaeAkira)                                 |                               [Fix3dll](https://github.com/Fix3dll)                                |
 
 | [<img alt="ADON15c" src="https://github.com/ADON15c.png" width="100">](https://github.com/ADON15c) | [<img alt="TheColdPot" src="https://github.com/TheColdPot.png" width="100">](https://github.com/TheColdPot) | [<img alt="Julienraptor01" src="https://github.com/Julienraptor01.png" width="100">](https://github.com/Julienraptor01) | [<img alt="MiraculixxT" src="https://github.com/MiraculixxT.png" width="100">](https://github.com/MiraculixxT) |
-|:------