mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge branch 'Slimefun:master' into feature/hercules-pickaxe-update
This commit is contained in:
commit
270e3f4dce
4
.github/workflows/pr-labels.yml
vendored
4
.github/workflows/pr-labels.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
|||||||
api: '🔧 API'
|
api: '🔧 API'
|
||||||
compatibility: '🤝 Compatibility'
|
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
|
name: Leave a comment about the applied label
|
||||||
if: ${{ steps.labeller.outputs.applied != 0 }}
|
if: ${{ steps.labeller.outputs.applied != 0 }}
|
||||||
with:
|
with:
|
||||||
@ -36,7 +36,7 @@ jobs:
|
|||||||
Your Pull Request was automatically labelled as: "${{ steps.labeller.outputs.applied }}"
|
Your Pull Request was automatically labelled as: "${{ steps.labeller.outputs.applied }}"
|
||||||
Thank you for contributing to this project! ❤️
|
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
|
name: Leave a comment about our branch naming convention
|
||||||
if: ${{ steps.labeller.outputs.applied == 0 }}
|
if: ${{ steps.labeller.outputs.applied == 0 }}
|
||||||
with:
|
with:
|
||||||
|
4
pom.xml
4
pom.xml
@ -360,7 +360,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.konghq</groupId>
|
<groupId>com.konghq</groupId>
|
||||||
<artifactId>unirest-java</artifactId>
|
<artifactId>unirest-java</artifactId>
|
||||||
<version>3.12.0</version>
|
<version>3.13.0</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
|
|
||||||
<exclusions>
|
<exclusions>
|
||||||
@ -376,7 +376,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.jupiter</groupId>
|
<groupId>org.junit.jupiter</groupId>
|
||||||
<artifactId>junit-jupiter</artifactId>
|
<artifactId>junit-jupiter</artifactId>
|
||||||
<version>5.7.2</version>
|
<version>5.8.0</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
Loading…
Reference in New Issue
Block a user