User: joe
Date: 14 Nov 26 23:39
Revision: 06588b32ecf3aef71d154d97407e0df4021e842b
Summary:
Merge branch 'dev' into annotater
# Conflicts:
# src/main/resources/META-INF/plugin.xml
TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10785&personal=false
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml (revision 7d956b3a97d0db5859a5f4ab77c44b2f76e2baa3)
+++ src/main/resources/META-INF/plugin.xml (revision 06588b32ecf3aef71d154d97407e0df4021e842b)
@@ -59,7 +59,7 @@
includes a text-based NBT editor.
]]>
- messages.MinecraftDevelopment
+ messages.MinecraftDevelopmentBundle
the issue tracker!
@@ -67,32 +67,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -368,13 +285,12 @@
-
-
-
+
+
-
+
@@ -402,7 +318,7 @@
-
@@ -410,11 +326,11 @@
id="Settings.Minecraft.Annotater"
parentId="Settings.Minecraft"
instance="com.demonwav.mcdev.platform.fabric.annotater.AnnotaterConfigurable"/>
-
-
@@ -425,8 +341,8 @@
-
-
+
+
-
-
+
+
@@ -498,7 +414,7 @@
UAST
com.demonwav.mcdev.translations.intentions.ConvertToTranslationIntention
- Minecraft
+ intention.category.minecraft
convertToTranslation
@@ -609,9 +525,6 @@
-
-
@@ -624,9 +537,6 @@
-
-
@@ -900,183 +810,160 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1095,611 +982,553 @@
level="ERROR"
hasStaticDescription="true"
implementationClass="com.demonwav.mcdev.platform.fabric.annotater.javadoc.AnnotaterJavadocCommentInspection"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
@@ -1738,83 +1567,55 @@
-
+
-
+
-
+
-
+
-
+
+ id="GenerateSoftImplementsAction">
+ id="CopyMixinTargetReferenceAction">
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+