User: rednesto
Date: 29 Apr 23 19:58
Revision: 38e46fb4656083af498c4554d2b1997979c733de
Summary:
Merge branch '2022.2' into 2022.3


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

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 025f546e9992fbd3a3927a101b5e537eea5908f5)
+++ gradle.properties	(revision 38e46fb4656083af498c4554d2b1997979c733de)
@@ -14,7 +14,7 @@
 ideaVersion = 2022.3
 ideaVersionName = 2022.3
 
-coreVersion = 1.6.3
+coreVersion = 1.6.4
 downloadIdeaSources = true
 
 pluginTomlVersion = 223.7571.59
Index: src/main/kotlin/platform/architectury/creator/ui-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/ui-steps.kt	(revision 025f546e9992fbd3a3927a101b5e537eea5908f5)
+++ src/main/kotlin/platform/architectury/creator/ui-steps.kt	(revision 38e46fb4656083af498c4554d2b1997979c733de)
@@ -73,6 +73,7 @@
             .nextStep(::ArchitecturyForgeMainClassStep)
             .nextStep(::ArchitecturyFabricMainClassStep)
             .nextStep(::ArchitecturyPostBuildSystemStep)
+            .nextStep(::ArchitecturyReformatPackDescriptorStep)
     }
 
     class Factory : ModPlatformStep.Factory {
Index: src/main/kotlin/util/utils.kt
===================================================================
--- src/main/kotlin/util/utils.kt	(revision 025f546e9992fbd3a3927a101b5e537eea5908f5)
+++ src/main/kotlin/util/utils.kt	(revision 38e46fb4656083af498c4554d2b1997979c733de)
@@ -350,3 +350,13 @@
 // put the whole class name in as a string (easier to refactor, etc.)
 @Suppress("NOTHING_TO_INLINE") // In order for this to work this function must be `inline`
 inline fun loggerForTopLevel() = Logger.getInstance(MethodHandles.lookup().lookupClass())
+
+inline fun <T> runCatchingKtIdeaExceptions(action: () -> T): T? = try {
+    action()
+} catch (e: Exception) {
+    if (e.javaClass.name == "org.jetbrains.kotlin.idea.caches.resolve.KotlinIdeaResolutionException") {
+        null
+    } else {
+        throw e
+    }
+}