diff options
author | Yasin <LifeIsAParadox@users.noreply.github.com> | 2024-04-24 22:17:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-24 22:17:37 +0200 |
commit | 532c55d495864f6f72abfa776a065984cec7688e (patch) | |
tree | bda268f1fc2c9830116795c49e4ab141e3dba073 | |
parent | cca9c9a13c3c92f06f567cb8467b525a32cdfd2a (diff) | |
parent | 9587ddf665f080984dd6fa1fd640f4587c432a6c (diff) | |
download | Skyblocker-532c55d495864f6f72abfa776a065984cec7688e.tar.gz Skyblocker-532c55d495864f6f72abfa776a065984cec7688e.tar.bz2 Skyblocker-532c55d495864f6f72abfa776a065984cec7688e.zip |
Merge pull request #672 from LifeIsAParadox/update-mod-to-1.20.1
Update mod to 1.20.1
-rw-r--r-- | .github/workflows/beta.yml | 7 | ||||
-rw-r--r-- | .github/workflows/webhook_translate.yml | 5 | ||||
-rw-r--r-- | CHANGELOG.md | 16 | ||||
-rw-r--r-- | gradle.properties | 2 | ||||
-rw-r--r-- | src/main/resources/fabric.mod.json | 2 |
5 files changed, 25 insertions, 7 deletions
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 71d23311..7100e2e2 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -7,10 +7,15 @@ on: - master paths-ignore: - 'src/main/resources/assets/skyblocker/lang/**' + - 'CHANGELOG.md' + - 'FEATURES.md' + - 'README.md' pull_request: paths-ignore: - 'src/main/resources/assets/skyblocker/lang/**' - + - 'CHANGELOG.md' + - 'FEATURES.md' + - 'README.md' jobs: # This workflow contains a single job called "build" diff --git a/.github/workflows/webhook_translate.yml b/.github/workflows/webhook_translate.yml index 1998ee73..85ed7c3c 100644 --- a/.github/workflows/webhook_translate.yml +++ b/.github/workflows/webhook_translate.yml @@ -34,19 +34,16 @@ jobs: shell: bash run: | OUTPUT=$(go run github.com/josephburnett/jd@latest <(git show HEAD^:src/main/resources/assets/skyblocker/lang/en_us.json) <(git show HEAD:src/main/resources/assets/skyblocker/lang/en_us.json) || true) - OUTPUT=$(echo "$OUTPUT" | sed 's/"/\\"/g') - OUTPUT=$(echo "$OUTPUT" | sed 's/\\n/\\\\n/g') OUTPUT="\`\`\`diff $OUTPUT \`\`\`" - OUTPUT=$(jq -Rn --arg str "$OUTPUT" '$str' | sed -E "s|^(['\"])(.*)\1$|\2|g") JSON_PAYLOAD='{ "content": "<@&1134566053138145330>", "embeds": [ { "title": "Something Changed (Click me)", - "description": "'"${OUTPUT}"'", + "description": '"$(echo "$OUTPUT" | jq -Rsa .)"', "url": "https://translate.hysky.de/projects/Skyblocker/skyblocker", "color": 5808639, "image": { diff --git a/CHANGELOG.md b/CHANGELOG.md index e81a2e4e..aec2df21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +# Release 1.20.1 + +## Highlight +* vic (the cat) made two fixes + * fix end hud + * added missing farming tool for detection in garden hud + +## What's Changed +* Translations update from hysky translate by @Weblate-LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/666 +* fix garden icons and clamp the progress bar by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/668 +* fix and things for end hud by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/667 + + +**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.20.0...v1.20.1 + +___ # Release 1.20.0 ## Highlight diff --git a/gradle.properties b/gradle.properties index a7d4c0c3..d7e879d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ jgit_version = 6.8.0.202311291450-r commons_math_version = 3.6.1 # Mod Properties -mod_version = 1.20.0 +mod_version = 1.20.1 maven_group = de.hysky archives_base_name = skyblocker modrinth_id=y6DuFGwJ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a18707da..dd6c2cd4 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": ["LifeIsAParadox/wohlhabend", "kevinthegreat1", "AzureAaron"], - "contributors": ["xMrVizzy", "d3dx9", "ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "msg-programs", "lantice3720", "Futuremappermydud", "koloiyolo", "viciscat", "Grayray75", "alexiayaa", "KhafraDev", "btwonion", "Kaluub", "Emirlol", "LegendaryLilac", "olim88", "Ghost-3", "esteban4567890", "Fluboxer"], + "contributors": ["xMrVizzy", "d3dx9", "ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "msg-programs", "lantice3720", "Futuremappermydud", "koloiyolo", "viciscat", "Grayray75", "alexiayaa", "KhafraDev", "btwonion", "Kaluub", "Emirlol", "LegendaryLilac", "olim88", "Ghost-3", "esteban4567890", "Fluboxer", "VeritasDL", "TheDearbear"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/SkyblockerMod/Skyblocker", |