Skip to content

Commit

Permalink
Merge pull request #5176 from IllianiCBT/camOpsContractMarket_disable…
Browse files Browse the repository at this point in the history
…Option

Temporarily Removed CAM_OPS from Contract Market Method ComboBox
  • Loading branch information
IllianiCBT authored Nov 7, 2024
2 parents 3a92f71 + 17ce710 commit ca05673
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import mekhq.campaign.market.enums.UnitMarketMethod;
import mekhq.campaign.mission.AtBContract;
import mekhq.campaign.mission.enums.AtBLanceRole;
import mekhq.campaign.parts.Part;
import mekhq.campaign.parts.enums.PartQuality;
import mekhq.campaign.personnel.PersonnelOptions;
import mekhq.campaign.personnel.SkillType;
Expand Down Expand Up @@ -99,6 +98,7 @@
import java.util.stream.IntStream;

import static megamek.client.ui.WrapLayout.wordWrap;
import static mekhq.campaign.market.enums.ContractMarketMethod.CAM_OPS;

/**
* @author Justin 'Windchild' Bowen
Expand Down Expand Up @@ -7998,6 +7998,7 @@ private JPanel createContractMarketPanel() {

comboContractMarketMethod = new MMComboBox<>("comboContractMarketMethod",
ContractMarketMethod.values());
comboContractMarketMethod.removeItem(CAM_OPS);
comboContractMarketMethod.setToolTipText(resources.getString("lblContractMarketMethod.toolTipText"));
comboContractMarketMethod.setRenderer(new DefaultListCellRenderer() {
@Override
Expand Down

0 comments on commit ca05673

Please sign in to comment.