Merge remote-tracking branch 'upstream/master' into feat/folia

# Conflicts:
#	.github/workflows/main.yml
This commit is contained in:
Allink 2023-04-01 23:21:32 +01:00
commit e4e11a2354
No known key found for this signature in database

View file

@ -11,8 +11,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
@ -23,7 +23,7 @@ jobs:
- name: Build with Gradle
run: ./gradlew --no-daemon build
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
name: Extras
path: build/libs/Extras-master-all.jar