User: joe
Date: 24 Jan 24 19:27
Revision: 01146d90f185e7922501db82f9e486cd38e47cc0
Summary:
Merge branch '2023.2' into 2023.3


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

Index: gradle.properties
===================================================================
--- gradle.properties	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ gradle.properties	(revision 01146d90f185e7922501db82f9e486cd38e47cc0)
@@ -24,7 +24,7 @@
 ideaVersion = 2023.3
 ideaVersionName = 2023.3
 
-coreVersion = 1.6.12
+coreVersion = 1.7.0
 downloadIdeaSources = true
 
 pluginTomlVersion = 233.11799.172
Index: src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt	(revision 01146d90f185e7922501db82f9e486cd38e47cc0)
@@ -49,6 +49,7 @@
     val paper = platformState(PlatformType.PAPER)
     val sponge = platformState(PlatformType.SPONGE)
     val forge = platformState(PlatformType.FORGE)
+    val neoforge = platformState(PlatformType.NEOFORGE)
     val fabric = platformState(PlatformType.FABRIC)
     val architectury = platformState(PlatformType.ARCHITECTURY)
     val mcp = platformState(PlatformType.MCP)
@@ -103,6 +104,8 @@
                 },
             )
 
+            createRow(neoforge, "NeoForge", PlatformAssets.NEOFORGE_ICON_2X)
+
             createRow(
                 fabric, "Fabric", PlatformAssets.FABRIC_ICON_2X,
                 {