Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into json-tabhud

# Conflicts:
#	src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java

Pull upstream changes

1 files changed, 51 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59b3fd68..2957090f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,54 @@
+# Release 1.11.0
+
+## Highlight
+* Crimson Isle, Rift, Garden visitor Tab Hud Improvements by @AzureAaron
+* Fairy Souls Helper by @kevinthegreat1
+* Experiments Solvers by @kevinthegreat1
+* Mirrorverse Waypoints by @AzureAaron
+* Implement Vampire Slayer Features by @Futuremappermydud
+
+## What's Changed
+* Rename zh_Hant.json to zh_tw.json by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/178
+* Add sound notification to fishing helper by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/179
+* 1.20 Port by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/150
+* Crimson Isle Tab Hud Improvements by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/183
+* DiscordRPC bug fixes and improvements by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/184
+* Fairy Souls Helper by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/167
+* Added Rift Tab Hud + 1 Rift related fix by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/185
+* Fix recipe book search field not being selectable by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/187
+* Fix chat ad filter by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/188
+* Workflow fix discord character limit by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/180
+* Experiments Solvers by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/186
+* Add Mirrorverse Waypoints + Rift Fixes by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/189
+* Implement Vampire Slayer Features by @Futuremappermydud in https://github.com/SkyblockerMod/Skyblocker/pull/191
+* Add Reparty Auto Rejoin by @koloiyolo in https://github.com/SkyblockerMod/Skyblocker/pull/176
+* Add Motes Price Tooltip by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/192
+* Fix dragged items not rendering by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/193
+* Add Vampire Minion by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/194
+* Title container by @Futuremappermydud in https://github.com/SkyblockerMod/Skyblocker/pull/196
+* Loom 1.3 by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/197
+* Clean up by @TacoMonkey11 in https://github.com/SkyblockerMod/Skyblocker/pull/151
+* Truncate text in the recipe book by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/198
+* Sort + Colourize Blessings by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/200
+* Skyblock Levels fixes + Tab Hud improvements by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/201
+* Rendering Improvements, Fixes + Occlusion Culling by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/204
+* Item fixer upper rewrite by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/203
+* Shortcuts by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/195
+* Add Dark Auction Tab Hud by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/205
+* Fix ads filter triggering when it shouldn't by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/206
+* Add show off message filter by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/207
+* Garden Tab Hud Improvements by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/208
+* Hide spammed warnings by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/209
+* Fix hotbar lock rendering mixin by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/211
+* Add new trophy fishing emblem by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/212
+
+## New Contributors
+* @Futuremappermydud made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/191
+* @koloiyolo made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/176
+
+**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.10.0...v1.11.0
+
+___
 # Release 1.10.0
 
 ## Highlight