Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/gradle/com.diffplug.spotless-7.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander01998 authored Jan 8, 2025
2 parents 2378f6c + fdde74d commit e472634
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

- name: Create and push tag
run: |
MOD_VERSION=$(grep "mod_version" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
MOD_VERSION=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
git config --global user.name "Wurst-Bot"
git config --global user.email "[email protected]"
git tag "$MOD_VERSION"
Expand All @@ -91,10 +91,10 @@ jobs:
id: website_inputs
if: ${{ inputs.update_website }}
run: |
MOD_VERSION=$(grep "mod_version" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
MOD_VERSION=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
WURST_VERSION=$(echo "$MOD_VERSION" | sed 's/^v//' | sed 's/-MC.*$//')
MC_VERSION=$(grep "minecraft_version" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
FAPI_VERSION=$(grep "fabric_version" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
MC_VERSION=$(grep "^minecraft_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
FAPI_VERSION=$(grep "^fabric_version=" gradle.properties | cut -d'=' -f2 | tr -d ' \r')
JSON_STRING=$(cat << EOF
{
"wurst_version": "$WURST_VERSION",
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ loader_version=0.16.9
fabric_version=0.113.0+1.21.4

# Mod Properties
mod_version = v7.46.6-MC1.21.4
maven_group = net.wurstclient
archives_base_name = Wurst-Client
mod_version=v7.46.6-MC1.21.4
maven_group=net.wurstclient
archives_base_name=Wurst-Client

# Dependencies

0 comments on commit e472634

Please sign in to comment.