Skip to content

Commit 7a56fc7

Browse files
TheLimeGlassTheLimeGlass
authored
Merge branch 'dev/feature' into fix/command-async-unregister
2 parents ed4126a + 0278847 commit 7a56fc7

File tree

814 files changed

+35352
-9551
lines changed

Some content is hidden

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

814 files changed

+35352
-9551
lines changed

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,11 @@
6262
/src/main/java/org/skriptlang/skript/bukkit/input/ @UnderscoreTud @skriptlang/core-developers
6363

6464
# Documentation
65-
/src/main/java/ch/njol/skript/doc/ @Pikachu920 @AyhamAl-Ali @Efnilite @skriptlang/core-developers
65+
/src/main/java/ch/njol/skript/doc/@Efnilite @skriptlang/core-developers
66+
67+
# Functions
68+
/src/main/java/ch/njol/skript/lang/function @Efnilite @skriptlang/core-developers
69+
/src/main/java/org/skriptlang/skript/lang/function @Efnilite @skriptlang/core-developers
70+
71+
# EntityData
72+
/src/main/java/ch/njol/skript/entity @Absolutionism @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.10, the oldest supported version has been raised to 1.19.4.
11-
Any issues created for versions older than 1.19.4 will not be looked into or fixed unless the issue persists on supported versions.
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.
1212
- type: textarea
1313
attributes:
1414
label: Skript/Server Version

‎.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@v4
21+
uses: actions/checkout@v5
2222
with:
2323
submodules: recursive
2424
path: skript

‎.github/workflows/checkstyle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
1919
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: '21'
2424
distribution: 'adopt'

‎.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@v4
18+
uses: actions/checkout@v5
1919
with:
2020
ref: ${{ github.event.repository.default_branch }}
2121
submodules: recursive

‎.github/workflows/docs/generate-docs/action.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ runs:
5252
find $1 -type f -exec sed -i -e "s/$2/$3/g" {} \;
5353
}
5454
55-
# this should be replaced with a more reliable jq command,
56-
# but it can't be right now because docs.json is actually not valid json.
5755
get_skript_version_of_directory() {
58-
grep skriptVersion "$1/docs.json" | cut -d\" -f 4
56+
jq ".source.version" "$1/docs.json"
5957
}
6058
6159
if [ -d "${DOCS_REPO_DIR}/docs/templates" ]

‎.github/workflows/java-17-builds.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Java 17 CI (MC 1.19.4-1.20.4)
1+
name: Java 17 CI (MC 1.20.4)
22

33
on:
44
push:
@@ -12,13 +12,13 @@ jobs:
1212
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
1919
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: '21'
2424
distribution: 'adopt'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
1919
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: '21'
2424
distribution: 'adopt'

‎.github/workflows/junit-17-builds.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: JUnit (MC 1.19.4-1.20.4)
1+
name: JUnit (MC 1.20.4)
22

33
on:
44
push:
@@ -12,13 +12,13 @@ jobs:
1212
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
1919
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: '21'
2424
distribution: 'adopt'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
1919
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: '21'
2424
distribution: 'adopt'

0 commit comments

Comments
 (0)