Merge branch 'dev/feature' into dev/EntityBlockStorage

SkriptLang · Jan 9, 2025 · 37d58c4 · 37d58c4
2 parents ac2048f + 960dd89
commit 37d58c4
Show file tree

Hide file tree

Showing 463 changed files with 8,994 additions and 4,828 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "skript-aliases"]
 	path = skript-aliases
 	url = https://github.com/SkriptLang/skript-aliases
+	branch = minimized-aliases
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.9.5
+version=2.10.0-pre1
 jarName=Skript.jar
 testEnv=java21/paper-1.21.4
 testEnvJavaVersion=21
diff --git a/skript-aliases b/skript-aliases
+0 −356		+global-variations.sk
+5 −3		README.md
+0 −389		armor-trims.sk
+0 −52		brewing.sk
+0 −686		building.sk
+1 −142		combat.sk
+2 −826		decoration.sk
+0 −19		doors.sk
+5 −119		foodstuffs.sk
+0 −196		misc-eggs.sk
+0 −378		misc.sk
+0 −277		other.sk
+0 −297		redstone.sk
+0 −82		slabs.sk
+0 −70		stairs.sk
+0 −65		tools.sk
+7 −134		transportation.sk
+0 −6		z-block-placement.sk
+0 −2		z-categories.sk
+0 −8		z-click-events.sk