Merge branch 'refs/heads/dev' into feat/kts

# Conflicts:
#	core/build.gradle.kts
#	core/src/main/java/com/volmit/iris/Iris.java
#	core/src/main/java/com/volmit/iris/core/link/data/MythicMobsDataProvider.java
#	core/src/main/java/com/volmit/iris/util/misc/SlimJar.java
#	gradle/libs.versions.toml
This commit is contained in:
Julian Krings committed 2025-07-29 13:34:25 +02:00
commit 12c2c71739
57 files changed
+1756 -1455

No files matched your search

+1 -1
View File
@@ -37,7 +37,7 @@ plugins {
}
group = "com.volmit"
version = "3.6.11-1.20.1-1.21.5"
version = "3.7.0-1.20.1-1.21.7"
apply<ApiGenerator>()