User: joe
Date: 28 Apr 25 15:47
Revision: eebb7105bd705d744d82652f3d396c2f0d9addf5
Summary:
Merge branch '2024.2' into 2024.3

# Conflicts:
#	gradle.properties
#	gradle/libs.versions.toml


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

Index: gradle.properties
===================================================================
--- gradle.properties	(revision def63cd8d8346f0f58c63435195fe329317e93b5)
+++ gradle.properties	(revision eebb7105bd705d744d82652f3d396c2f0d9addf5)
@@ -19,6 +19,8 @@
 #
 
 # suppress inspection "UnusedProperty" for whole file
+org.gradle.jvmargs=-Xmx1g
+
 ideaVersionName = 2024.3
 
 coreVersion = 1.8.4
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision def63cd8d8346f0f58c63435195fe329317e93b5)
+++ gradle/libs.versions.toml	(revision eebb7105bd705d744d82652f3d396c2f0d9addf5)
@@ -7,9 +7,10 @@
 fuel = "2.3.1"
 licenser = "0.6.1"
 changelog = "2.2.0"
-intellij-plugin = "2.4.0"
+intellij-plugin = "2.5.0"
+intellij-plugin-repository-rest-client = "2.0.46"
 intellij-ide = "2024.3.5"
-idea-ext = "1.1.8"
+idea-ext = "1.1.10"
 psiPlugin = "243.7768"
 
 [plugins]
@@ -20,6 +21,8 @@
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
 
 [libraries]
+intellij-plugin-repository-rest-client = { module = "org.jetbrains.intellij:plugin-repository-rest-client", version.ref = "intellij-plugin-repository-rest-client" }
+
 kotlin-plugin = { module = "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision def63cd8d8346f0f58c63435195fe329317e93b5)
+++ src/main/resources/META-INF/plugin.xml	(revision eebb7105bd705d744d82652f3d396c2f0d9addf5)
@@ -632,7 +632,7 @@
         <!-- access widener file type -->
         <fileType name="Access Widener" language="Access Widener"
                   implementationClass="com.demonwav.mcdev.platform.mcp.aw.AwFileType" fieldName="INSTANCE"
-                  patterns="*.accesswidener"/>
+                  patterns="*.accesswidener;*.aw"/>
         <lang.parserDefinition language="Access Widener"
                                implementationClass="com.demonwav.mcdev.platform.mcp.aw.AwParserDefinition"/>
         <lang.syntaxHighlighterFactory language="Access Widener"
@@ -1038,7 +1038,7 @@
                          groupName="Mixin"
                          language="JAVA"
                          enabledByDefault="true"
-                         level="ERROR"
+                         level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.MixinAnnotationsInspection"/>
         <localInspection displayName="Missing or unused cancellable @Inject"
@@ -1070,7 +1070,7 @@
                          groupName="Mixin"
                          language="JAVA"
                          enabledByDefault="true"
-                         level="ERROR"
+                         level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.StaticMemberInspection"/>
         <localInspection displayName="Inner classes in Mixins"