Merge remote-tracking branch 'origin/whenOAPAttack' into whenOAPAttack

IllianiBird · IllianiBird · commit c167d4d5f7a2 · 2025-04-04T14:56:30.000-05:00
# Conflicts:
#	MekHQ/src/mekhq/campaign/io/CampaignXmlParser.java
#	MekHQ/src/mekhq/gui/CommandCenterTab.java
diff --git a/MekHQ/src/mekhq/campaign/io/CampaignXmlParser.java b/MekHQ/src/mekhq/campaign/io/CampaignXmlParser.java
@@ -29,7 +29,6 @@
 
 import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
 import static mekhq.campaign.force.Force.FORCE_NONE;
-import static mekhq.campaign.personnel.skills.SkillDeprecationTool.DEPRECATED_SKILLS;
 import static mekhq.campaign.personnel.enums.PersonnelStatus.statusValidator;
 import static mekhq.campaign.personnel.skills.SkillDeprecationTool.DEPRECATED_SKILLS;
 import static org.apache.commons.lang3.ObjectUtils.firstNonNull;
diff --git a/MekHQ/src/mekhq/gui/CommandCenterTab.java b/MekHQ/src/mekhq/gui/CommandCenterTab.java
@@ -261,8 +261,8 @@ private void initInfoPanel() {
             // This seems to be overwritten completely and immediately by refresh
             StringBuilder experienceString = new StringBuilder(64);
             experienceString.append("<html><b>")
-                .append(SkillType.getColoredExperienceLevelName(getCampaign().getReputation().getAverageSkillLevel()))
-                .append("</b></html>");
+                  .append(SkillType.getColoredExperienceLevelName(getCampaign().getReputation().getAverageSkillLevel()))
+                  .append("</b></html>");
             lblExperience.setText(experienceString.toString());
         }
 
@@ -627,8 +627,8 @@ private void refreshBasicInfo() {
 
             StringBuilder experienceString = new StringBuilder(64);
             experienceString.append("<html><b>")
-                .append(SkillType.getColoredExperienceLevelName(campaign.getReputation().getAverageSkillLevel()))
-                .append("</b></html>");
+                  .append(SkillType.getColoredExperienceLevelName(campaign.getReputation().getAverageSkillLevel()))
+                  .append("</b></html>");
             lblExperience.setText(experienceString.toString());
         }
 
