1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00

Merge branch 'Slimefun:master' into feature/hercules-pickaxe-update

This commit is contained in:
GuizhanCraft 2021-09-14 23:33:01 +08:00 committed by GitHub
commit 270e3f4dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -27,7 +27,7 @@ jobs:
api: '🔧 API'
compatibility: '🤝 Compatibility'
- uses: thollander/actions-comment-pull-request@1.0.3
- uses: thollander/actions-comment-pull-request@v1.0.4
name: Leave a comment about the applied label
if: ${{ steps.labeller.outputs.applied != 0 }}
with:
@ -36,7 +36,7 @@ jobs:
Your Pull Request was automatically labelled as: "${{ steps.labeller.outputs.applied }}"
Thank you for contributing to this project! ❤️
- uses: thollander/actions-comment-pull-request@1.0.3
- uses: thollander/actions-comment-pull-request@v1.0.4
name: Leave a comment about our branch naming convention
if: ${{ steps.labeller.outputs.applied == 0 }}
with:

View File

@ -360,7 +360,7 @@
<dependency>
<groupId>com.konghq</groupId>
<artifactId>unirest-java</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
<scope>compile</scope>
<exclusions>
@ -376,7 +376,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.2</version>
<version>5.8.0</version>
<scope>test</scope>
</dependency>
<dependency>