User: joe
Date: 10 Nov 26 02:24
Revision: f51646c87e0a09ecc1034c19feb9e4829439b724
Summary:
Merge branch '2025.3' into 2026.1

# Conflicts:
#	src/main/kotlin/platform/minecraft/vanillagradle/VanillaGradleProjectResolverExtension.kt


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10699&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 230c82ede23edc532b296869c271f8d738f59b6b)
+++ build.gradle.kts	(revision f51646c87e0a09ecc1034c19feb9e4829439b724)
@@ -299,11 +299,11 @@
     }
 }
 
-val generateAtLexer by lexer("AtLexer", "com/demonwav/mcdev/platform/mcp/at/gen")
-val generateAtParser by parser("AtParser", "com/demonwav/mcdev/platform/mcp/at/gen")
+val generateAtLexer by lexer("AtLexer", "com/demonwav/mcdev/platform/minecraft/at/gen")
+val generateAtParser by parser("AtParser", "com/demonwav/mcdev/platform/minecraft/at/gen")
 
-val generateCtLexer by lexer("CtLexer", "com/demonwav/mcdev/platform/mcp/ct/gen")
-val generateCtParser by parser("CtParser", "com/demonwav/mcdev/platform/mcp/ct/gen")
+val generateCtLexer by lexer("CtLexer", "com/demonwav/mcdev/platform/minecraft/ct/gen")
+val generateCtParser by parser("CtParser", "com/demonwav/mcdev/platform/minecraft/ct/gen")
 
 val generateNbttLexer by lexer("NbttLexer", "com/demonwav/mcdev/nbt/lang/gen")
 val generateNbttParser by parser("NbttParser", "com/demonwav/mcdev/nbt/lang/gen")
Index: gradle.properties
===================================================================
--- gradle.properties	(revision 230c82ede23edc532b296869c271f8d738f59b6b)
+++ gradle.properties	(revision f51646c87e0a09ecc1034c19feb9e4829439b724)
@@ -23,7 +23,7 @@
 
 ideaVersionName = 2026.1
 
-coreVersion = 1.9.0
+coreVersion = 1.9.1
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false