Merge pull request #243 from LifeIsAParadox/update-mod-to-1.12.0

Update mod to 1.12.0
SkyblockerMod · Aug 15, 2023 · f0ff975 · f0ff975
2 parents fcff994 + aabe1d8
commit f0ff975
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 26 deletions.
diff --git 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 }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# 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
+* 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
+___
 # Release 1.11.1
 
 ## Highlight

diff --git a/FEATURES.md b/FEATURES.md
@@ -31,4 +31,8 @@
 * Custom Tab HUD
 * Roughly enough items (REI) Support
 * Fishing Helper + sound notification
-* Mirrorverse Waypoints
+* Mirrorverse Waypoints
+* Item and Armour customisation:
+    * Item Renaming
+    * Custom Armour Dye Colours
+    * Custom Armour Trims
diff --git a/README.md b/README.md
@@ -7,11 +7,11 @@
 [![Build Beta](https://img.shields.io/github/actions/workflow/status/SkyblockerMod/Skyblocker/beta.yml?labelColor=cecece&label=beta&logo=github&logoColor=black)](https://github.com/SkyblockerMod/Skyblocker/actions/workflows/beta.yml)
 [![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)
+[![Translated](https://translate.hysky.de/widgets/Skyblocker/-/skyblocker/svg-badge.svg)](https://translate.hysky.de/projects/Skyblocker/skyblocker/)
 
 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>
@@ -51,19 +51,24 @@ 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>
 
 ___
 
 ## 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 +85,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
@@ -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