Skip to content

Commit

Permalink
Merge branch '1.20.1' into 1.20.2
Browse files Browse the repository at this point in the history
  • Loading branch information
rfresh2 committed Apr 21, 2024
2 parents 72d1038 + 67cc895 commit 8645aea
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/1.20.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v4

- name: Gradle Wrapper Verification
uses: gradle/wrapper-validation-action@v2
uses: gradle/wrapper-validation-action@v3

- name: Set up JDK 17
uses: actions/setup-java@v4
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions/checkout@v4

- name: Gradle Wrapper Verification
uses: gradle/wrapper-validation-action@v2
uses: gradle/wrapper-validation-action@v3

- name: Set up JDK 17
uses: actions/setup-java@v4
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:

files: |
artifacts/${{ needs.build.outputs.xp_fabric }}.jar
name: ${{ needs.build.outputs.xp_version }} (Fabric)
name: ${{ needs.build.outputs.xp_version }} (Fabric) (WM${{ needs.build.outputs.worldmap_version_fabric }} MM${{ needs.build.outputs.minimap_version_fabric }})
version: ${{ needs.build.outputs.xp_version }}+fabric-${{ env.MINECRAFT_VERSION }}
loaders: |
fabric
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:

files: |
artifacts/${{ needs.build.outputs.xp_forge }}.jar
name: ${{ needs.build.outputs.xp_version }} (Forge)
name: ${{ needs.build.outputs.xp_version }} (Forge) (WM${{ needs.build.outputs.worldmap_version_forge }} MM${{ needs.build.outputs.minimap_version_forge }})
version: ${{ needs.build.outputs.xp_version }}+forge-${{ env.MINECRAFT_VERSION }}
loaders: |
forge
Expand All @@ -218,7 +218,7 @@ jobs:

files: |
artifacts/${{ needs.build.outputs.xp_neo }}.jar
name: ${{ needs.build.outputs.xp_version }} (NeoForge)
name: ${{ needs.build.outputs.xp_version }} (NeoForge) (WM${{ needs.build.outputs.worldmap_version_neo }} MM${{ needs.build.outputs.minimap_version_neo }})
version: ${{ needs.build.outputs.xp_version }}+neoforge-${{ env.MINECRAFT_VERSION }}
loaders: |
neoforge
Expand All @@ -239,5 +239,11 @@ jobs:
artifacts: "artifacts/*.jar"
allowUpdates: true
makeLatest: true
body: ${{ needs.build.outputs.changelog }}
body: |
For WorldMap and Minimap Versions:
* Fabric: WM${{ needs.build.outputs.worldmap_version_fabric }} MM${{ needs.build.outputs.minimap_version_fabric }}
* Forge: WM${{ needs.build.outputs.worldmap_version_forge }} MM${{ needs.build.outputs.minimap_version_forge }}
* NeoForge: WM${{ needs.build.outputs.worldmap_version_neo }} MM${{ needs.build.outputs.minimap_version_neo }}
${{ needs.build.outputs.changelog }}
omitBodyDuringUpdate: true

0 comments on commit 8645aea

Please sign in to comment.