From ada364f64b84065b1de8d6ce87972df66987e541 Mon Sep 17 00:00:00 2001
From: Yasin <a.piri@hotmail.de>
Date: Tue, 15 Aug 2023 20:56:54 +0200
Subject: [PATCH 1/4] Update buildrelease.yml
use flag 4 instead of adding <> on every link
---
.github/workflows/buildrelease.yml | 32 +++++++++++++++---------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
index 2428e2b547..fde5785bca 100644
--- a/.github/workflows/buildrelease.yml
+++ b/.github/workflows/buildrelease.yml
@@ -82,7 +82,7 @@ jobs:
' 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')
+ # 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")
@@ -124,18 +124,18 @@ jobs:
echo "::set-output name=value::${GITHUB_REF#refs/tags/}"
- name: Discord notification
- env:
- DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
- uses: Ilshidur/action-discord@master
- with:
- args: |
- "<@&1134565945482948638>"
- "## Skyblocker ${{ steps.version_tag.outputs.value }}"
- ""
- "${{ steps.read_changelog.outputs.changelog_discord }}"
- ""
- ":inbox_tray: Download latest version on Modrinth or Github:"
- "<:modrinth:900697862206287882> <${{ steps.modrinth.outputs.url }}>"
- "<:github:900697885706952725> <${{ steps.uploadrelease.outputs.url }}>"
- ""
- "<https://hysky.de/>"
+ shell: bash
+ run: |
+ OUTPUT="
+ <@&1134565945482948638>
+ ## Skyblocker ${{ steps.version_tag.outputs.value }}
+
+ ${{ steps.read_changelog.outputs.changelog_discord }}
+
+ :inbox_tray: Download latest version on Modrinth or Github:
+ <:modrinth:900697862206287882> ${{ steps.modrinth.outputs.url }}
+ <:github:900697885706952725> ${{ steps.uploadrelease.outputs.url }}
+
+ https://hysky.de/"
+
+ curl -H "Content-Type: application/json" -d '{"content":"'"${OUTPUT//$'\n'/\\n}"'", "flags": 4}' "${{ secrets.DISCORD_WEBHOOK }}"
\ No newline at end of file
From a0deb9dd255eb456fc36e91707740f3f8b2fcb52 Mon Sep 17 00:00:00 2001
From: Yasin <a.piri@hotmail.de>
Date: Tue, 15 Aug 2023 20:57:05 +0200
Subject: [PATCH 2/4] update mod
---
CHANGELOG.md | 14 ++++++++++++++
FEATURES.md | 6 +++++-
README.md | 18 ++++++++++++------
gradle.properties | 2 +-
4 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25b1d12ef5..5390e89d96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# Release 1.12.0
+
+## Highlight
+* Item and Armour customisation, see [#commands](https://github.com/SkyblockerMod/Skyblocker#commands) for more details by @AzureAaron
+
+## What's Changed
+* Add Item Renaming & Custom Armour Dye Colours by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/234
+* Separate commands sent by skyblocker from the chat history by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/235
+* Make IF a conflict by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/237
+* Custom Armour Trims by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/238
+
+
+**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.11.1...v1.12.0
+___
# Release 1.11.1
## Highlight
diff --git a/FEATURES.md b/FEATURES.md
index b80da7fac5..44525a4f90 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -31,4 +31,8 @@
* Custom Tab HUD
* Roughly enough items (REI) Support
* Fishing Helper + sound notification
-* Mirrorverse Waypoints
\ No newline at end of file
+* Mirrorverse Waypoints
+* Item and Armour customisation:
+ * Item Renaming
+ * Custom Armour Dye Colours
+ * Custom Armour Trims
\ No newline at end of file
diff --git a/README.md b/README.md
index bf792cbe63..239a06e311 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
[](https://github.com/SkyblockerMod/Skyblocker/actions/workflows/beta.yml)
[](https://discord.com/invite/aNNJHQykck)
[](https://ko-fi.com/wohlhabend)
+[](https://translate.hysky.de/projects/Skyblocker/skyblocker/)
Hypixel Skyblock Mod for Minecraft 1.17.x + 1.18.x + 1.19.x + 1.20.x
@@ -51,6 +52,10 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
* Roughly enough items (REI) Support
* Fishing Helper + sound notification
* Mirrorverse Waypoints
+* Item and Armour customisation:
+ * Item Renaming
+ * Custom Armour Dye Colours
+ * Custom Armour Trims
</details>
@@ -58,12 +63,13 @@ ___
## Commands
-| command | option | comment |
-|:---------------------:|:-----------------------:|:-------------------------------------------|
-| /skyblocker config | | open config menu (modMenu not needed) |
-| /skyblocker options | | open config menu (modMenu not needed) |
+| command | option | comment |
+|:---------------------:|:-------------------------------------:|:-------------------------------------------|
+| /skyblocker config | | open config menu (modMenu not needed) |
+| /skyblocker options | | open config menu (modMenu not needed) |
| /skyblocker hud | dwarven / dungeonmap / titleContainer | move dwarven, dungeonmap or titleContainer |
-| /skyblocker shortcuts | | add/edit shortcuts |
+| /skyblocker shortcuts | | add/edit shortcuts |
+| /skyblocker custom | renameItem / armorTrim / dyeColor | Item and Armour customisation |
---
@@ -80,7 +86,7 @@ ___
<img padding="10px,0px" height="150" src="https://hysky.de/richpresencesmall.png" />
<img padding="10px,0px" height="150" src="https://hysky.de/recipe.png" />
<img padding="10px,0px" height="150" src="https://hysky.de/backpack-preview.png" />
-
+<img padding="10px,0px" height="150" src="https://hysky.de/armour_trim.png" />
</details>
## Contribute
diff --git a/gradle.properties b/gradle.properties
index a84834ec8b..8db62203a5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@ betterinject_version=0.1.3
occlusionculling_version = 0.0.7-SNAPSHOT
# Mod Properties
-mod_version = 1.11.1
+mod_version = 1.12.0
maven_group = me.xmrvizzy
archives_base_name = skyblocker
modrinth_id=y6DuFGwJ
\ No newline at end of file
From e338e4a872ac665cac5f7522fa742d8ab5b1d885 Mon Sep 17 00:00:00 2001
From: Yasin <a.piri@hotmail.de>
Date: Tue, 15 Aug 2023 21:24:44 +0200
Subject: [PATCH 3/4] Update README.md
Added link to our modpack
---
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 239a06e311..38d1e12941 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,7 @@
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)
-
+Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/installation) or use our [Modpack](https://modrinth.com/modpack/skyblocker-modpack)
## Features
<details open>
From aabe1d8cdc5b7afe9cc67ea31be13a415c228d7f Mon Sep 17 00:00:00 2001
From: Yasin <a.piri@hotmail.de>
Date: Tue, 15 Aug 2023 23:21:21 +0200
Subject: [PATCH 4/4] Update CHANGELOG.md
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5390e89d96..876a18e0b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
* Separate commands sent by skyblocker from the chat history by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/235
* Make IF a conflict by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/237
* Custom Armour Trims by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/238
+* Lowercased server ip by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/244
**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.11.1...v1.12.0