Skip to content

Commit ea8ef91

Browse files
rubensworksrubensworks
committed
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
2 parents 1b15069 + 7465569 commit ea8ef91

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
gradle.properties merge=ours
22
src/main/resources/META-INF/mods.toml merge=ours
33
src/main/resources/META-INF/neoforge.mods.toml merge=ours
4+
CHANGELOG.md merge=ours

‎.github/workflows/publish-github-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v3
1111
- name: Release
12-
uses: softprops/action-gh-release@v1
13-
env:
14-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
uses: softprops/action-gh-release@v2
13+
with:
14+
body_path: CHANGELOG.md

0 commit comments

Comments
 (0)