Skip to content

Commit cc15c0a

Browse files
committed
Merge branch 'dev/feature' into feature/pdc_round_2
2 parents 5e20972 + 94d9924 commit cc15c0a

953 files changed

Lines changed: 18627 additions & 9293 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,6 @@
7070

7171
# EntityData
7272
/src/main/java/ch/njol/skript/entity @Absolutionism @skriptlang/core-developers
73+
74+
# Particles/Effects
75+
/src/main/java/org/skriptlang/skript/bukkit/particles @sovdeeth @skriptlang/core-developers

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ body:
77
## Guidelines
88
Please make sure you are running the latest version of Skript on a supported server platform and version.
99
Try to make sure there are no issues of this same problem currently open either.
10-
As of the release of Skript 2.13, the oldest supported version has been raised to Paper 1.20.4.
11-
Any issues created for versions older than 1.20.4, or for Spigot, will not be looked into or fixed unless the issue persists on supported versions.
10+
As of the release of Skript 2.14, the oldest supported version has been raised to Paper 1.21.0.
11+
Any issues created for versions older than 1.21.0, or for Spigot, will not be looked into or fixed unless the issue persists on supported versions.
1212
- type: textarea
1313
attributes:
1414
label: Skript/Server Version

.github/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ We welcome contributions from everyone. To get started, please fork the reposito
8080
and clone it to your local machine. If you are unfamiliar with Git, please refer to the
8181
[Git documentation](https://git-scm.com/learn).
8282
```
83-
git clone https://github.com/SkriptLang/Skript
83+
git clone https://github.com/SkriptLang/Skript --recurse-submodules
8484
```
8585

8686
Create a new branch for your changes. Use a descriptive name for the branch,

.github/workflows/archive-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
1919
echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
2020
- name: Checkout Skript
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
submodules: recursive
2424
path: skript

.github/workflows/checkstyle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
19-
uses: gradle/actions/wrapper-validation@v4
19+
uses: gradle/actions/wrapper-validation@v5
2020
- name: Set up JDK 21
2121
uses: actions/setup-java@v5
2222
with:
@@ -28,7 +28,7 @@ jobs:
2828
- name: Run checkstyle
2929
run: ./gradlew clean checkstyleMain
3030
- name: Upload checkstyle report
31-
uses: actions/upload-artifact@v4
31+
uses: actions/upload-artifact@v6
3232
if: success()
3333
with:
3434
name: checkstyle-report

.github/workflows/cleanup-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/nightly/${BRANCH_NAME}" >> $GITHUB_OUTPUT
1616
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
1717
- name: Checkout Skript
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919
with:
2020
ref: ${{ github.event.repository.default_branch }}
2121
submodules: recursive

.github/workflows/java-21-builds.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1414
uses: ./.github/workflows/parallelize-tests.yml
1515
with:
16-
environments: 1.21,1.21.1,1.21.3,1.21.4,1.21.5,1.21.8,1.21.10
16+
environments: 1.21,1.21.1,1.21.3,1.21.4,1.21.5,1.21.8,1.21.10,1.21.11
1717
java_version: 21
1818
parallel_jobs: 3
1919

@@ -24,11 +24,11 @@ jobs:
2424
strategy:
2525
matrix: ${{ fromJSON(needs.prepare.outputs.matrix) }}
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
submodules: recursive
3030
- name: validate gradle wrapper
31-
uses: gradle/actions/wrapper-validation@v4
31+
uses: gradle/actions/wrapper-validation@v5
3232
- name: Set up JDK 21
3333
uses: actions/setup-java@v5
3434
with:
@@ -40,7 +40,7 @@ jobs:
4040
- name: Build Skript and run test scripts
4141
run: ./gradlew clean customTest -PtestEnvs="${{ matrix.envs }}" -PtestEnvJavaVersion=21
4242
- name: Upload Nightly Build
43-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v6
4444
if: success() && matrix.id == 1
4545
with:
4646
name: skript-nightly

.github/workflows/junit-21-builds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1414
uses: ./.github/workflows/parallelize-tests.yml
1515
with:
16-
environments: 1.21,1.21.1,1.21.3,1.21.4,1.21.5,1.21.8,1.21.10
16+
environments: 1.21,1.21.1,1.21.3,1.21.4,1.21.5,1.21.8,1.21.10,1.21.11
1717
java_version: 21
1818
parallel_jobs: 3
1919

@@ -24,11 +24,11 @@ jobs:
2424
strategy:
2525
matrix: ${{ fromJSON(needs.prepare.outputs.matrix) }}
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
submodules: recursive
3030
- name: validate gradle wrapper
31-
uses: gradle/actions/wrapper-validation@v4
31+
uses: gradle/actions/wrapper-validation@v5
3232
- name: Set up JDK 21
3333
uses: actions/setup-java@v5
3434
with:

.github/workflows/nightly-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
3434
echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
3535
- name: Checkout Skript
36-
uses: actions/checkout@v5
36+
uses: actions/checkout@v6
3737
with:
3838
submodules: recursive
3939
path: skript

.github/workflows/release-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
1919
echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
2020
- name: Checkout Skript
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
submodules: recursive
2424
path: skript

0 commit comments

Comments
 (0)