Git conflicts

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -7,6 +7,8 @@ body:
         ## Guidelines
         Please make sure you are running the latest version of Skript on a supported server platform and version.
         Try to make sure there are no issues of this same problem currently open either.
+        As of the release of Skript 2.10, the oldest supported version has been raised to 1.19.4.
+        Any issues created for versions older than 1.19.4 will not be looked into or fixed unless the issue persists on supported versions.
   - type: textarea
     attributes:
       label: Skript/Server Version

.github/dependabot.yml

@@ -1,5 +1,12 @@
 version: 2
 updates:
+  - package-ecosystem: "gitsubmodule"
+    target-branch: "dev/patch"
+    directory: "/"
+    schedule:
+        interval: "weekly"
+    labels:
+      - "dependencies"
   - package-ecosystem: "github-actions"
     target-branch: "dev/patch"
     directory: "/"

build.gradle

@@ -30,11 +30,19 @@ dependencies {
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.0.2'
 	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.2'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21-R0.1-SNAPSHOT'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.4-R0.1-SNAPSHOT'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
-	implementation group: 'com.sk89q.worldguard', name: 'worldguard-legacy', version: '7.0.0-SNAPSHOT'
+
+	// bundled with Minecraft 1.19.4+ for display entity transforms
+	implementation group: 'org.joml', name: 'joml', version: '1.10.5'
+
+	// Plugin hook libraries
+	implementation group: 'com.sk89q.worldguard', name: 'worldguard-legacy', version: '7.0.0-SNAPSHOT', {
+		exclude group: 'org.bukkit', module: 'bukkit'
+	}
 	implementation group: 'net.milkbowl.vault', name: 'Vault', version: '1.7.3', {
 		exclude group: 'org.bstats', module: 'bstats-bukkit'
+		exclude group: 'org.bukkit', module: 'bukkit'
 	}
 
 	implementation fileTree(dir: 'lib', include: '*.jar')
@@ -239,7 +247,7 @@ void createTestTask(String name, String desc, String environments, int javaVersi
 def java21 = 21
 def java17 = 17
 
-def latestEnv = 'java21/paper-1.21.0.json'
+def latestEnv = 'java21/paper-1.21.4.json'
 def latestJava = java21
 def oldestJava = java17
 

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.9.3
+version=2.10.0-pre1
 jarName=Skript.jar
-testEnv=java21/paper-1.21.0
+testEnv=java21/paper-1.21.4
 testEnvJavaVersion=21

src/main/java/ch/njol/skript/PatcherTool.java

@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 import java.io.IOException;