User: joe
Date: 14 Nov 26 02:04
Revision: d411ca468686825a93f9f26853f73f451cf5c237
Summary:
Merge branch '2026.2' into 2026.3

# Conflicts:
#	src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt


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

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 97be4d44d425f73d344dac06b886caca65f2b422)
+++ gradle.properties	(revision d411ca468686825a93f9f26853f73f451cf5c237)
@@ -30,3 +30,6 @@
 
 org.gradle.parallel=true
 org.gradle.caching=true
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true
Index: src/main/kotlin/asset/MCDevBundle.kt
===================================================================
--- src/main/kotlin/asset/MCDevBundle.kt	(revision 97be4d44d425f73d344dac06b886caca65f2b422)
+++ src/main/kotlin/asset/MCDevBundle.kt	(revision d411ca468686825a93f9f26853f73f451cf5c237)
@@ -26,7 +26,7 @@
 import org.jetbrains.annotations.PropertyKey
 
 @NonNls
-private const val BUNDLE = "messages.MinecraftDevelopment"
+private const val BUNDLE = "messages.MinecraftDevelopmentBundle"
 
 object MCDevBundle {
 
Index: src/main/resources/META-INF/mcdev-kotlin.xml
===================================================================
--- src/main/resources/META-INF/mcdev-kotlin.xml	(revision 97be4d44d425f73d344dac06b886caca65f2b422)
+++ src/main/resources/META-INF/mcdev-kotlin.xml	(revision d411ca468686825a93f9f26853f73f451cf5c237)
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2025 minecraft-dev
+    Copyright (C) 2026 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published
@@ -20,8 +20,6 @@
 
 <idea-plugin>
     <extensions defaultExtensionNs="com.demonwav.minecraft-dev">
-        <gradleFileType implementation="com.demonwav.mcdev.creator.buildsystem.KotlinGradleFile$Type" />
-
         <eventGenHelper language="kotlin" implementationClass="com.demonwav.mcdev.insight.generation.KotlinEventGenHelper"/>
     </extensions>