User: kyle wood
Date: 19 Jul 26 21:48
Revision: 33f8e8f1a420f57b06f46c5404beb37b4e220a26
Summary:
Merge branch '2025.3' into 2026.1


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision a53790d2745a1a86012f8999e2cdc6377ff6e0d2)
+++ build.gradle.kts	(revision 33f8e8f1a420f57b06f46c5404beb37b4e220a26)
@@ -122,6 +122,7 @@
         bundledModule("intellij.platform.langInjection")
         bundledPlugin("com.intellij.properties")
         bundledPlugin("Git4Idea")
+        bundledModule("intellij.platform.collaborationTools")
         bundledPlugin("com.intellij.modules.json")
 
         // Optional dependencies
Index: gradle.properties
===================================================================
--- gradle.properties	(revision a53790d2745a1a86012f8999e2cdc6377ff6e0d2)
+++ gradle.properties	(revision 33f8e8f1a420f57b06f46c5404beb37b4e220a26)
@@ -23,7 +23,7 @@
 
 ideaVersionName = 2026.1
 
-coreVersion = 1.8.17
+coreVersion = 1.8.18
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false