User: joe
Date: 10 Sep 23 16:28
Revision: 3d5b92de53a5b4311db008b04d256fdf1d1c060c
Summary:
Merge branch '2023.1' into 2023.2

# Conflicts:
#	src/main/kotlin/insight/ColorLineMarkerProvider.kt


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

Index: src/main/kotlin/creator/buildsystem/maven-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision faa7e14831513ed610e84252e4b5b05223fd6c14)
+++ src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c)
@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.creator.buildsystem
 
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.creator.findStep
 import com.demonwav.mcdev.creator.getVersionJson
 import com.demonwav.mcdev.creator.notifyCreatedProjectNotOpened
@@ -63,7 +64,8 @@
 }
 
 abstract class AbstractPatchPomStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
-    override val description = "Patching pom.xml"
+    override val description
+        get() = MCDevBundle("creator.step.maven.patch_pom.description")
 
     open fun patchPom(model: MavenDomProjectModel, root: XmlTag) {
         setupCore(model)
@@ -169,7 +171,8 @@
 }
 
 class MavenImportStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
-    override val description = "Importing Maven project"
+    override val description
+        get() = MCDevBundle("creator.step.maven.import_maven.description")
 
     override fun perform(project: Project) {
         val pomFile = VfsUtil.findFile(Path.of(context.projectFileDirectory).resolve("pom.xml"), true)
Index: src/main/kotlin/insight/ColorLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/insight/ColorLineMarkerProvider.kt	(revision faa7e14831513ed610e84252e4b5b05223fd6c14)
+++ src/main/kotlin/insight/ColorLineMarkerProvider.kt	(revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c)
@@ -21,6 +21,7 @@
 package com.demonwav.mcdev.insight
 
 import com.demonwav.mcdev.MinecraftSettings
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.util.runCatchingKtIdeaExceptions
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
 import com.intellij.codeInsight.daemon.LineMarkerInfo
@@ -57,7 +58,7 @@
             identifier.findColor { map, chosen -> ColorInfo(element, chosen.value, map, chosen.key, identifier) }
         }
         if (info != null) {
-            NavigateAction.setNavigateAction(info, "Change Color", null)
+            NavigateAction.setNavigateAction(info, MCDevBundle("generate.color.change_action"), null)
         }
 
         return info
@@ -143,11 +144,12 @@
                 // implement it yet. It is better to not display the color chooser at all than deceiving users after
                 // after they chose a color
                 HintManager.getInstance()
-                    .showErrorHint(editor, "Can't change colors in " + psiElement.language.displayName)
+                    .showErrorHint(editor, MCDevBundle("generate.color.change_error", psiElement.language.displayName))
                 return@handler
             }
 
-            val c = ColorChooserService.instance.showDialog(psiElement.project, editor.component, "Choose Color", color)
+            val actionText = MCDevBundle("generate.color.choose_action")
+            val c = ColorChooserService.instance.showDialog(psiElement.project, editor.component, actionText, color)
                 ?: return@handler
             when (workElement) {
                 is ULiteralExpression -> {
@@ -185,7 +187,7 @@
             val pair = findColor(element) ?: return null
 
             val info = CommonColorInfo(element, pair.first, pair.second)
-            NavigateAction.setNavigateAction(info, "Change color", null)
+            NavigateAction.setNavigateAction(info, MCDevBundle("generate.color.change_action"), null)
 
             return info
         }
Index: src/main/resources/fileTemplates/j2ee/bukkit/Bukkit pom.xml.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/bukkit/Bukkit pom.xml.ft	(revision faa7e14831513ed610e84252e4b5b05223fd6c14)
+++ src/main/resources/fileTemplates/j2ee/bukkit/Bukkit pom.xml.ft	(revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c)
@@ -37,9 +37,6 @@
             <goals>
               <goal>shade</goal>
             </goals>
-            <configuration>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
-            </configuration>
           </execution>
         </executions>
       </plugin>
Index: src/main/resources/fileTemplates/j2ee/bungeecord/BungeeCord pom.xml.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/bungeecord/BungeeCord pom.xml.ft	(revision faa7e14831513ed610e84252e4b5b05223fd6c14)
+++ src/main/resources/fileTemplates/j2ee/bungeecord/BungeeCord pom.xml.ft	(revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c)
@@ -38,9 +38,6 @@
             <goals>
               <goal>shade</goal>
             </goals>
-            <configuration>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
-            </configuration>
           </execution>
         </executions>
       </plugin>