User: rednesto
Date: 26 Feb 24 18:31
Revision: 57825689142402204f40745ec40c42d727a11670
Summary:
Merge branch 'refs/heads/2023.2' into 2023.3

# Conflicts:
#	src/main/kotlin/facet/MinecraftFacetDetector.kt


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision bb4143203552f7e7855ac664f336e66e91a10e2c)
+++ build.gradle.kts	(revision 57825689142402204f40745ec40c42d727a11670)
@@ -34,7 +34,7 @@
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.17.0"
+    id("org.jetbrains.intellij") version "1.17.2"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
Index: gradle.properties
===================================================================
--- gradle.properties	(revision bb4143203552f7e7855ac664f336e66e91a10e2c)
+++ gradle.properties	(revision 57825689142402204f40745ec40c42d727a11670)
@@ -24,7 +24,7 @@
 ideaVersion = 2023.3
 ideaVersionName = 2023.3
 
-coreVersion = 1.7.2
+coreVersion = 1.7.3
 downloadIdeaSources = true
 
 pluginTomlVersion = 233.11799.172