User: rednesto
Date: 08 Feb 24 18:04
Revision: 0549e5a327c962fd3d0f45855764d13c0f49f8d2
Summary:
Merge branch '2023.1' into 2023.2
TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9129&personal=false
Index: build.gradle.kts
===================================================================
--- build.gradle.kts (revision f8030a1c702ef6b2951ab677443fddab4132d734)
+++ build.gradle.kts (revision 0549e5a327c962fd3d0f45855764d13c0f49f8d2)
@@ -285,6 +285,7 @@
style["bnf"] = HeaderStyle.BLOCK_COMMENT.format
val endings = listOf("java", "kt", "kts", "groovy", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
+ exclude("META-INF/plugin.xml") // https://youtrack.jetbrains.com/issue/IDEA-345026
include(endings.map { "**/*.$it" })
exclude("com/demonwav/mcdev/platform/mixin/invalidInjectorMethodSignature/*.java")
Index: gradle.properties
===================================================================
--- gradle.properties (revision f8030a1c702ef6b2951ab677443fddab4132d734)
+++ gradle.properties (revision 0549e5a327c962fd3d0f45855764d13c0f49f8d2)
@@ -24,7 +24,7 @@
ideaVersion = 2023.2.2
ideaVersionName = 2023.2.2
-coreVersion = 1.7.1
+coreVersion = 1.7.2
downloadIdeaSources = true
pluginTomlVersion = 232.8660.88
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml (revision f8030a1c702ef6b2951ab677443fddab4132d734)
+++ src/main/resources/META-INF/plugin.xml (revision 0549e5a327c962fd3d0f45855764d13c0f49f8d2)
@@ -15,7 +15,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see .
+ along with this program. If not, see https://www.gnu.org/licenses/.
-->
@@ -81,7 +81,7 @@
-
+
@@ -181,11 +181,11 @@
-
+
@@ -266,6 +266,7 @@
+ JAVA
com.demonwav.mcdev.translations.intentions.ConvertToTranslationIntention
Minecraft
convertToTranslation
@@ -354,7 +355,7 @@
-
+