aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasin <LifeIsAParadox@users.noreply.github.com>2023-06-10 22:17:59 +0200
committerGitHub <noreply@github.com>2023-06-10 22:17:59 +0200
commitb75a2c66ead760bd2471fec16f6abd6303271269 (patch)
tree5f337f9b7489cf36633f701642a8bc4e76adc1da
parent900b60a62e421e38cf69cc075b2b05a56e2160d2 (diff)
parent4a69272abbffddc5c03ac35b23971bfff3d4556b (diff)
downloadSkyblocker-b75a2c66ead760bd2471fec16f6abd6303271269.tar.gz
Skyblocker-b75a2c66ead760bd2471fec16f6abd6303271269.tar.bz2
Skyblocker-b75a2c66ead760bd2471fec16f6abd6303271269.zip
Merge pull request #173 from LifeIsAParadox/update-mod-to-1.10.0
Update mod to 1.10.0
-rw-r--r--.github/workflows/buildrelease.yml2
-rw-r--r--CHANGELOG.md43
-rw-r--r--FEATURES.md19
-rw-r--r--README.md54
-rw-r--r--gradle.properties2
-rw-r--r--src/main/resources/assets/skyblocker/lang/es_es.json (renamed from src/main/resources/assets/skyblocker/lang/es_ES.json)0
-rw-r--r--src/main/resources/assets/skyblocker/lang/ja_jp.json (renamed from src/main/resources/assets/skyblocker/lang/ja_JP.json)0
-rw-r--r--src/main/resources/assets/skyblocker/lang/ko_kr.json (renamed from src/main/resources/assets/skyblocker/lang/ko_KR.json)0
-rw-r--r--src/main/resources/assets/skyblocker/lang/nb_no.json (renamed from src/main/resources/assets/skyblocker/lang/nb_NO.json)0
-rw-r--r--src/main/resources/assets/skyblocker/lang/nn_no.json (renamed from src/main/resources/assets/skyblocker/lang/nn_NO.json)0
-rw-r--r--src/main/resources/assets/skyblocker/lang/tr_tr.json (renamed from src/main/resources/assets/skyblocker/lang/tr_TR.json)0
-rw-r--r--src/main/resources/fabric.mod.json2
12 files changed, 100 insertions, 22 deletions
diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
index c9e3584b..4361f363 100644
--- a/.github/workflows/buildrelease.yml
+++ b/.github/workflows/buildrelease.yml
@@ -53,11 +53,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..00a172d5 100644
--- a/README.md
+++ b/README.md
@@ -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) |
-|:--------------------------------------------------------------------------------------------------:|-------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|
-| [ADON15c](https://github.com/ADON15c) | [TheColdPot](https://github.com/TheColdPot) | [Julienraptor01](https://github.com/Julienraptor01) | [ADON15c](https://github.com/MiraculixxT) |
+|:--------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------:|
+| [ADON15c](https://github.com/ADON15c) | [TheColdPot](https://github.com/TheColdPot) | [Julienraptor01](https://github.com/Julienraptor01) | [MiraculixxT](https://github.com/MiraculixxT) |
+
+| [<img alt="catandA" src="https://github.com/catandA.png" width="100">](https://github.com/catandA) | [<img alt="kevinthegreat1" src="https://github.com/kevinthegreat1.png" width="100">](https://github.com/kevinthegreat1) | [<img alt="AzureAaron" src="https://github.com/AzureAaron.png" width="100">](https://github.com/AzureAaron) | [<img alt="msg-programs" src="https://github.com/msg-programs.png" width="100">](https://github.com/msg-programs) |
+|:--------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:|
+| [catandA](https://github.com/catandA) | [kevinthegreat1](https://github.com/kevinthegreat1) | [AzureAaron](https://github.com/AzureAaron) | [msg-programs](https://github.com/msg-programs) |
-| [<img alt="catandA" src="https://github.com/catandA.png" width="100">](https://github.com/catandA) | [<img alt="kevinthegreat1" src="https://github.com/kevinthegreat1.png" width="100">](https://github.com/kevinthegreat1) | [<img alt="AzureAaron" src="https://github.com/AzureAaron.png" width="100">](https://github.com/AzureAaron) |
-|:--------------------------------------------------------------------------------------------------:|-------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------|
-| [catandA](https://github.com/catandA) | [kevinthegreat1](https://github.com/kevinthegreat1) | [AzureAaron](https://github.com/AzureAaron) |
+| [<img alt="lantice3720" src="https://github.com/lantice3720.png" width="100">](https://github.com/lantice3720) |
+|:-----------------------------------------------------------------------------------------------------|
+| [lantice3720](https://github.com/lantice3720) |
### Translators
-German ([LifeIsAParadox](https://github.com/LifeIsAParadox)) \
+German ([LifeIsAParadox](https://github.com/LifeIsAParadox) & [msg-programs](https://github.com/msg-programs)) \
Indonesian ([null2264](https://github.com/null2264)) \
-Russian ([HyperSoop](https://github.com/HyperSoop)) \
+Russian ([HyperSoop](https://github.com/HyperSoop) & [Azuremane](https://github.com/Azuremane)) \
French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01)) \
-Japanese ([hirochisan](https://github.com/@irochisan)) \
-Chinese ([catandA](https://github.com/catandA))
+Japanese ([hirochisan](https://github.com/hirochisan)) \
+Chinese ([catandA](https://github.com/catandA)) \
+Korean ([lantice3720](https://github.com/lantice3720)) \
+Spanish ([IngeSebastian](https://github.com/IngeSebastian)) \
+Norwegian Bokmål ([KdGaming0](https://github.com/KdGaming0)) \
+Norwegian Nynorsk ([KdGaming0](https://github.com/KdGaming0)) \
+Turkish ([Fix3dll](https://github.com/Fix3dll)) \
+Chinese (Simplified) ([catandA](https://github.com/catandA) & [PumpkinXD](https://github.com/PumpkinXD)) \
+Canadian English ([AzureAaron](https://github.com/AzureAaron)) \ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 752907cf..64c5e5cd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ mod_menu_version=6.1.0-rc.4
rei_version=11.0.597
# Mod Properties
-mod_version = 1.9.0
+mod_version = 1.10.0
maven_group = me.xmrvizzy
archives_base_name = skyblocker
modrinth_id=y6DuFGwJ \ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_es.json
index 7c5ea062..7c5ea062 100644
--- a/src/main/resources/assets/skyblocker/lang/es_ES.json
+++ b/src/main/resources/assets/skyblocker/lang/es_es.json
diff --git a/src/main/resources/assets/skyblocker/lang/ja_JP.json b/src/main/resources/assets/skyblocker/lang/ja_jp.json
index 954647c7..954647c7 100644
--- a/src/main/resources/assets/skyblocker/lang/ja_JP.json
+++ b/src/main/resources/assets/skyblocker/lang/ja_jp.json
diff --git a/src/main/resources/assets/skyblocker/lang/ko_KR.json b/src/main/resources/assets/skyblocker/lang/ko_kr.json
index 93930cc1..93930cc1 100644
--- a/src/main/resources/assets/skyblocker/lang/ko_KR.json
+++ b/src/main/resources/assets/skyblocker/lang/ko_kr.json
diff --git a/src/main/resources/assets/skyblocker/lang/nb_NO.json b/src/main/resources/assets/skyblocker/lang/nb_no.json
index 0f96ebb6..0f96ebb6 100644
--- a/src/main/resources/assets/skyblocker/lang/nb_NO.json
+++ b/src/main/resources/assets/skyblocker/lang/nb_no.json
diff --git a/src/main/resources/assets/skyblocker/lang/nn_NO.json b/src/main/resources/assets/skyblocker/lang/nn_no.json
index cd7ed912..cd7ed912 100644
--- a/src/main/resources/assets/skyblocker/lang/nn_NO.json
+++ b/src/main/resources/assets/skyblocker/lang/nn_no.json
diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_tr.json
index 1b07aff8..1b07aff8 100644
--- a/src/main/resources/assets/skyblocker/lang/tr_TR.json
+++ b/src/main/resources/assets/skyblocker/lang/tr_tr.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2044b170..14c1e6f1 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -5,7 +5,7 @@
"name": "Skyblocker",
"description": "Hypixel Skyblock Mod",
"authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"],
- "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "kevinthegreat1", "AzureAaron"],
+ "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "kevinthegreat1", "AzureAaron", "msg-programs", "lantice3720"],
"contact": {
"homepage": "https://hysky.de",
"sources": "https://github.com/SkyblockerMod/Skyblocker",