User: rednesto
Date: 01 Oct 24 09:57
Revision: 555d6d2e0a61125b492866b875070c237f868735
Summary:
Merge branch '2024.2' into 2024.3


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9759&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 9c4c07da219ad1014db8ccc5e40cd32880dd0d0f)
+++ build.gradle.kts	(revision 555d6d2e0a61125b492866b875070c237f868735)
@@ -307,12 +307,13 @@
 
 tasks.withType<PrepareSandboxTask> {
     pluginJar.set(tasks.jar.get().archiveFile)
+    val pluginDirName = intellijPlatform.projectName.get()
     from(externalAnnotationsJar) {
-        into("MinecraftDev/lib/resources")
+        into("$pluginDirName/lib/resources")
     }
     from("templates") {
         exclude(".git")
-        into("MinecraftDev/lib/resources/builtin-templates")
+        into("$pluginDirName/lib/resources/builtin-templates")
     }
 }
 
@@ -323,6 +324,12 @@
         systemProperty("idea.ProcessCanceledException", "disabled")
         systemProperty("idea.debug.mode", "true")
     }
+
+    // Kotlin K2 is enabled by default, uncomment to switch to K1
+    // jvmArgumentProviders += CommandLineArgumentProvider {
+    //     listOf("-Didea.kotlin.plugin.use.k2=false")
+    // }
+
     // Set these properties to test different languages
     // systemProperty("user.language", "fr")
     // systemProperty("user.country", "FR")
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision 9c4c07da219ad1014db8ccc5e40cd32880dd0d0f)
+++ src/main/resources/META-INF/plugin.xml	(revision 555d6d2e0a61125b492866b875070c237f868735)
@@ -1578,8 +1578,5 @@
                 description="Copy the reference to clipboard in Access Widener format">
             <add-to-group relative-to-action="CopyATAction" anchor="after" group-id="Copy.Paste.Special"/>
         </action>
-        <action id="com.demonwav.mcdev.creator.custom.expression.EvaluateTemplateConditionAction"
-                class="com.demonwav.mcdev.creator.custom.EvaluateTemplateExpressionAction"
-                text="Evaluate Template Expression"/>
     </actions>
 </idea-plugin>