User: kyle wood
Date: 19 Jul 26 21:49
Revision: e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c
Summary:
Merge branch '2026.1' into 2026.2


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 74ee1622bebb32b0363628eb7dbe47ea58ded453)
+++ build.gradle.kts	(revision e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c)
@@ -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 74ee1622bebb32b0363628eb7dbe47ea58ded453)
+++ gradle.properties	(revision e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c)
@@ -23,7 +23,7 @@
 
 ideaVersionName = 2026.2
 
-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
Index: readme.md
===================================================================
--- readme.md	(revision 74ee1622bebb32b0363628eb7dbe47ea58ded453)
+++ readme.md	(revision e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c)
@@ -12,10 +12,6 @@
         <td colspan="2"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Build"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Build)/statusIcon.svg" alt="Teamcity Build Status" /></a></td>
     </tr>
     <tr>
-        <td align="left">2025.2</td>
-        <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20252"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20252)/statusIcon.svg" alt="2025.2 Nightly Status" /></a></td>
-    </tr>
-    <tr>
         <td align="left">2025.3</td>
         <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20253"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20253)/statusIcon.svg" alt="2025.3 Nightly Status" /></a></td>
     </tr>