Implement #4397, Internal Bomb Bay quirk, plus various fixes and improvements

megamek/build.gradle

@@ -46,7 +46,7 @@ dependencies {
 mainClassName = 'megamek.MegaMek'
 
 ext {
-    mmJvmOptions = ['-Xmx2048m', '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED']
+    mmJvmOptions = ['-Xmx4096m', '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '-Dsun.awt.disablegrab=true']
     data = 'data'
     unitFiles = "${data}/mechfiles"
     rats = "${data}/rat"
@@ -101,12 +101,12 @@ task equipmentList(type: JavaExec, dependsOn: jar) {
 
 task copyFiles(type: Copy) {
     description = 'Stages files that are to be copied into the distribution.'
-    
+
     dependsOn officialUnitList
     dependsOn equipmentList
-    
+
     from projectDir
-    
+
     include "${data}/**"
     include "${docs}/**"
     include "${mmconf}/**"
@@ -116,9 +116,9 @@ task copyFiles(type: Copy) {
     exclude { it.file.isDirectory() && (it.file in file(unitFiles).listFiles()) }
     exclude "${rats}/**"
     include "${userdata}/"
-    
+
     into fileStagingDir
-    
+
     inputs.dir "${data}"
     inputs.dir "${docs}"
     inputs.dir "${mmconf}"
@@ -176,7 +176,7 @@ task stageFiles {
     dependsOn unitFilesZip
     dependsOn ratZip
     dependsOn deleteAtlasedImages
-    
+
     doLast {
         mkdir "${fileStagingDir}/${log}"
     }
@@ -249,7 +249,7 @@ createExe {
         new File("${buildDir}/${outputDir}/${iniFile}").text = """# Launch4j runtime config
 # you can add arguments here that will be processed by the JVM at runtime
 ${project.ext.mmJvmOptions.join('\n')}
-"""        
+"""
     }
 }
 
@@ -320,7 +320,7 @@ task buildFromRepo (type: GradleBuild) {
     description = 'Assembles the distribution packages in the clean repository copy'
     group = 'distribution'
     dependsOn cloneMMRepo
-    
+
     dir = "${mmRepoDir}"
     tasks = [ ':megamek:assembleDist' ]
 }
@@ -329,7 +329,7 @@ task release (type: Copy) {
     description = 'Builds the release packages from the repository and copies them into the project build directory'
     group = 'distribution'
     dependsOn buildFromRepo
-    
+
     from (buildFromRepo)
     into "${distributionDir}"
 }

megamek/data/mechfiles/infantry/3085/Comstar/Surveillance Specialist Com Guards Battlefield Data Miners.blk

@@ -0,0 +1,86 @@
+#building block data file
+<BlockVersion>
+1
+</BlockVersion>
+
+##Write the version number just in case...
+<Version>
+MAM0
+</Version>
+
+<UnitType>
+Infantry
+</UnitType>
+
+<Name>
+Surveillance Specialist
+</Name>
+
+<Model>
+Com Guards Battlefield Data Miners
+</Model>
+
+<mul id:>
+3136
+</mul id:>
+
+<year>
+3064
+</year>
+
+<originalBuildYear>
+3064
+</originalBuildYear>
+
+<type>
+IS Level 3
+</type>
+
+<motion_type>
+Hover
+</motion_type>
+
+<Field Guns Equipment>
+</Field Guns Equipment>
+
+<capabilities>
+<p>Equipped with advanced remote sensors and mechanized carriers, the Data Miners excel in capturing enemy transmissions and conducting signal measurements. While real-time decryption of encrypted communications is rare, their ability to identify enemy commanders and key positions through signal analysis greatly aids in targeting and strategic planning.</p>
+<p>Their technical expertise is not just limited to signal interception; they also play a key role in the processing and analysis of the gathered data, making them indispensable in the Com Guards' information warfare strategies.</p>
+</capabilities>
+
+<overview>
+<p>The Surveillance Specialists of the Com Guards Battlefield Data Miners are a crucial component of ComStar's intelligence apparatus. With ComStar's foundational business in communications, these units specialize in intercepting and analyzing battlefield transmissions. Their role is pivotal in providing up-to-date intelligence, a vital element in the strategic planning and execution of ComStar's military operations.</p>
+</overview>
+
+<deployment>
+<p>Deployed primarily in scenarios where intelligence gathering is crucial, the Surveillance Specialists operate behind the front lines. Their actions are often decisive in identifying enemy movements and command structures, thereby shaping the Com Guards' tactical responses and operations on the battlefield.</p>
+</deployment>
+
+<history>
+<p>The inception and evolution of the Battlefield Data Miners are deeply intertwined with ComStar's ethos of prioritizing communication and intelligence in warfare. Over the years, they have proved their worth in various conflicts, notably during the Jihad, where their intelligence gathering capabilities significantly contributed to the strategic successes of the Com Guards.</p>
+</history>
+
+<source>
+Technical Readout: 3085
+</source>
+
+<squad_size>
+5
+</squad_size>
+
+<squadn>
+2
+</squadn>
+
+<Primary>
+InfantryFederatedBarrettM42B
+</Primary>
+
+<armorKit>
+ComStar Infantry Kit
+</armorKit>
+
+<specialization>
+16
+</specialization>
+

megamek/docs/UserDirHelp.html

@@ -0,0 +1,53 @@
+<HTML><H2>How to Use the User Data Directory</H2>
+
+<P>Use this directory for resources you want to share between different installs or versions of MegaMek, MegaMekLab and MekHQ. The files listed below will also be loaded from this directory (in addition to what is loaded from MegaMek's own data). The directory should be an absolute path such as D:/MyBTStuff (in other words, not relative to your MegaMek directory).</P>
+
+<P>Generally, all content from the user directory is added to the pre-defined content. In some cases, added content may replace pre-defined content when it has the same name or file path.</P>
+
+<P>How to place files within the user data directory:
+<UL>
+    <LI><B>Fonts</B> can be placed anywhere in the user data directory (i.e., in the directory itself or in any subfolder)
+
+    <LI><B>Units</B> (.mtf and .blk files) can be placed anywhere in the user data directory
+
+    <LI><B>Camo</B> images must be placed in &lt;user data directory&gt;/data/images/camo/. In this subfolder, further subfolders can be used (optional).
+
+    <LI><B>Portrait</B> images must be placed in &lt;user data directory&gt;/data/images/portraits/. In this subfolder, further subfolders can be used (optional).
+
+    <LI><B>Unit fluff</B> images must be placed in &lt;user data directory&gt;/data/images/fluff/&lt;unit type&gt;/. To find the exact subfolders to use, go to your megamek folder and open /data/images/fluff/.
+
+    <LI><B>Skin</B> definition files (.xml) can be placed anywhere in the user data directory
+
+    <LI><B>Rank Systems</B> may be defined in &lt;user data directory&gt;/data/universe/ranks.xml
+
+    <LI><B>Award</B> definition files (.xml) can be placed in &lt;user data directory&gt;/data/universe/awards
+</UL>
+
+<P>This is an example of a suitable directory structure with a few example files:
+<BR><BR>
+D:/myBTStuff<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;Oxanium.ttf<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;Exo.ttf<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;campaign_units/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Atlas AS8-XT.mtf<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;data/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Jura.ttf<BR>
+        MyMMSkin.xml<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;images/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;camo/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;myForceCamo.png<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;oldcamo/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;camo1.png<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;camo2.png<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;portraits/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;minscandboo.png<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;fluff/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Mech/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Atlas.png<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;DropShip/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Colossus.png<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;universe/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ranks.xml<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;awards/<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;MyAwards.xml<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;AuriganAwards.xml<BR>

megamek/docs/history.txt

@@ -48,6 +48,12 @@ VERSION HISTORY:
 + PR #4956: Use foot/jump type modifier for beast-mounted infantry
 + PR #4963: In the heat report, heat effects are now shown after the affected unit (instead of before)
 + PR #4966: The mtf file format for Meks now uses chassis: and model: qualifiers and no longer includes the mtf version
++ Issue #4949: return impossible instead of raising an error
++ PR #4957: More tooltips colors (set FG color and BG color for more tooltips, add highlight, weapon, quirk client settings, consolidate some colors into existing client setting colors)
++ PR #4922: Add deployment options (There is a lot in this one see note from PR link for specifics)
++ PR #4981: Add unit readout button (Warbook) that displays the unit summary, TRO entry, and AS card in Game
++ PR #4961: User file directory
++ PR #4977: add a split pane lobby between player and unit panels
 
 0.49.15 (2023-10-21 1530 UTC)
 + PR #4688: Round reports should no longer take increasingly long to load

megamek/i18n/megamek/client/messages.properties

@@ -63,6 +63,8 @@ BotReadmeNagDialog.title=Please Read The Bot Documentation First
 BotReadmeNagDialog.text=Please read the Princess Notes.txt file in the docs/Bot Stuff folder before using the bot. \nNote: The bot does not support all game options. \nWould you like to read the AI documentation now?
 
 ### Unspecified Dialogs
+UserDirHelpDialog.title=How to Use the User Data Directory
+
 ## AlphaStrikeStatsDialog Class
 AlphaStrikeStatsDialog.title=Alpha Strike Conversion Results
 
@@ -285,6 +287,7 @@ BoardSelectionDialog.UpdateSize=Update Size
 BoardSelectionDialog.Updating=Updating...
 BoardSelectionDialog.ViewGameBoard=Preview Game Map... *
 BoardSelectionDialog.ViewGameBoardTooltip=Shows a preview of the game's map.<br> * Note: For generated maps and surprise maps the preview is only a sample<br> and will not be the same as the actual map used.
+BoardSelectionDialog.ViewGameBoardButton=Refresh Preview
 
 #Game board tooltips
 BoardView1.ACTIVATING=ACTIVATING
@@ -772,6 +775,8 @@ ChatLounge.notDone=Not Done
 ChatLounge.PartialRepairs=Partial Repairs
 ChatLounge.Player=Player
 ChatLounge.Players=Players
+ChatLounge.Player0=Player0
+ChatLounge.Blind=Blind
 ChatLounge.quickView=Unit Quick View
 ChatLounge.OverlapDeploy.title=Must choose exclusive deployment zone
 ChatLounge.OverlapDeploy.msg=When using double blind, each player needs to have an exclusive deployment zone.
@@ -896,6 +901,7 @@ ClientGUI.targetMenuItem=Target
 ClientGUI.title=MegaMek Client
 ClientGUI.TransmittingData=Transmitting game data...
 ClientGUI.viewMenuItem=View 
+ClientGUI.viewReadoutMenuItem=View Readout 
 ClientGUI.doneMenuItem=Done
 ClientGUI.waitingOnTheServer=Waiting on the server...
 ClientGUI.PointBlankShot.Message={0} has moved adjacent to the hidden {1}. Take pointblank shot?
@@ -1188,6 +1194,9 @@ CommonSettingsDialog.colors.UnitTooltipBuildingBGColor=Building BG Color
 CommonSettingsDialog.colors.UnitTooltipAltBGColor=Alt BG Color
 CommonSettingsDialog.colors.UnitTooltipBlockBGColor=Block BG Color
 CommonSettingsDialog.colors.UnitTooltipTerrainBGColor=Terrain BG Color
+CommonSettingsDialog.colors.UnitTooltipHighlightColor=Highlight Color
+CommonSettingsDialog.colors.UnitTooltipWeaponColor=Weapon Color
+CommonSettingsDialog.colors.UnitTooltipQuirkColor=Quirk Color
 CommonSettingsDialog.colors.VisualRangeColor=Visual Range Color
 CommonSettingsDialog.colors.warningColor=Warning Color
 CommonSettingsDialog.darkenMapAtNight=Darken Map At Night
@@ -1226,6 +1235,9 @@ CommonSettingsDialog.locale.Russian=\u0420\u0443\u0441\u0441\u043a\u0438\u0439
 CommonSettingsDialog.locale.Spanish=Español
 CommonSettingsDialog.locale=Language/Sprache/\u042f\u0437\u044b\u043a:
 CommonSettingsDialog.logFileName=Game log filename:
+CommonSettingsDialog.userDir=User Files Directory:
+CommonSettingsDialog.userDir.tooltip=<html>Use this directory for resources you want to share between different installs or versions of MegaMek, MegaMekLab and MekHQ. Fonts, units, camos, portraits and fluff images will also be loaded from this directory.<BR>Note: Inside the user directory, use the directory structure of MM/MML/MHQ for camos, portraits and fluff images, i.e. data/images/camo, data/images/portraits and data/images/fluff/. <BR>Fonts and units can be placed anywhere in the user directory.
+CommonSettingsDialog.userDir.chooser.title=Choose User Data Folder
 CommonSettingsDialog.main=Main
 CommonSettingsDialog.audio=Audio
 CommonSettingsDialog.miniMap=Mini Map
@@ -1444,6 +1456,12 @@ CustomMechDialog.labDeploymentOffset=Deployment Zone Offset:
 CustomMechDialog.labDeploymentOffsetTip=Deployment Zone Offset, in hexes from corresponding map edge
 CustomMechDialog.labDeploymentWidth=Deployment Zone Width:
 CustomMechDialog.labDeploymentWidthTip=Deployment Zone width, in hexes
+CustomMechDialog.labDeploymentAnyNW=Deployment Any NW corner:
+CustomMechDialog.labDeploymentAnySE=Deployment Any SE corner:
+CustomMechDialog.BtnDeploymentUseRuler=Use ruler coords
+CustomMechDialog.BtnDeploymentUseRulerTip=Set the Any NW and SE corners based on the corners of the NW and SE corners the square defined by the map preview ruler  
+CustomMechDialog.BtnDeploymentApply=Apply
+CustomMechDialog.BtnDeploymentApplyTip=Apply player setting
 CustomMechDialog.labDeployShutdown=Shutdown 
 CustomMechDialog.labDeployProne=Prone 
 CustomMechDialog.labDeployHullDown=Hull Down 
@@ -1971,6 +1989,7 @@ MechDisplay.Target=Target:
 MechDisplay.ToHit=To Hit:
 MechDisplay.Turretlocked=Turret locked
 MechDisplay.Unit=Unit
+MechDisplay.UnitReadout=Unit Readout
 MechDisplay.UnusedSpace=Unused Space:
 MechDisplay.Weapon=Weapon
 MechDisplay.Variable=Variable
@@ -3929,6 +3948,7 @@ WeaponAttackAction.AttackerNotReady=Attacker is in no condition to fire weapons.
 WeaponAttackAction.AttackerTooHigh=attacker is too high.
 WeaponAttackAction.BusyAltBombing=Already altitude bombing.
 WeaponAttackAction.BusyDiveBombing=Already dive bombing.
+WeaponAttackAction.AlreadyUsedMaxInternalBombs=Already used maximum internal bombs (6).
 WeaponAttackAction.BusyLayingMines=Can't fire weapons when laying mines.
 WeaponAttackAction.BusySpaceBombing=Already space bombing.
 WeaponAttackAction.CantShootAndFastMove=Infantry fast moved this turn and so can not shoot.

megamek/i18n/megamek/common/messages.properties

@@ -311,7 +311,8 @@ PlanetaryConditions.Indicator.Gravity.Normal=\u23AF
 PlanetaryConditions.Indicator.Gravity.High=\u2B73
 PlanetaryConditions.Indicator.EMI.true=\u2301
 PlanetaryConditions.Indicator.EMI.false=\u2312
-UnitType.Aero=Aerospace Fighter
+UnitType.Aero=Aerospace
+UnitType.AeroSpaceFighter=Aerospace Fighter
 UnitType.BattleArmor=Battle Armor
 UnitType.Conventional\ Fighter=Conventional Fighter
 UnitType.Dropship=Dropship

megamek/i18n/megamek/common/options/messages.properties

@@ -33,6 +33,10 @@ GameOptionsInfo.option.dumping_from_round.displayableName=first round for ammo d
 GameOptionsInfo.option.dumping_from_round.description=Number of the round that has to be at least reached before allowing ammo dumps.
 GameOptionsInfo.option.set_arty_player_homeedge.displayableName=Automatically set artillery home edge
 GameOptionsInfo.option.set_arty_player_homeedge.description=If checked, all of the players' artillery units will have their home edge set to the deployment edge of the player, NW and NE are North, SW and SE are South. \nUnchecked by default.
+GameOptionsInfo.option.set_default_team_1.displayableName=Default non-bot players to team 1, useful in coop games
+GameOptionsInfo.option.set_default_team_1.description=When this option is unchecked each player is assigned new team
+GameOptionsInfo.option.set_player_deployment_to_player0.displayableName=Non-bot player entities with \"Use Owners*\" deployment set, use Player 0\'s settings, instead of current player\'s settings
+GameOptionsInfo.option.set_player_deployment_to_player0.description=When this option is unchecked use the standard player deployments settings
 GameOptionsInfo.option.restrict_game_commands.displayableName=Restrict sensitive commands to non-Observers
 GameOptionsInfo.option.restrict_game_commands.description=If checked, commands such as /reset and /kick cannot be used by Observers while others are playing. \nUnchecked by default.
 GameOptionsInfo.option.disable_local_save.displayableName=Disable local saves when using double blind
@@ -822,7 +826,7 @@ QuirksInfo.option.good_rep_2.description=Unit costs 25% more C-bills.\nincluded
 QuirksInfo.option.hyper_actuator.displayableName=Hyper-Extending Actuators
 QuirksInfo.option.hyper_actuator.description=This unit can flip arms,\neven with lower arm and hand actuators. (SO pg 194)
 QuirksInfo.option.internal_bomb.displayableName=Internal Bomb Bay
-QuirksInfo.option.internal_bomb.description=No game effect,\ncurrently. (SO pg 195)
+QuirksInfo.option.internal_bomb.description=Allows some units to utilize cargo space as bomb bays, but risk internal explosions. (SO pg 195)
 QuirksInfo.option.low_profile.displayableName=Narrow/Low Profile
 QuirksInfo.option.low_profile.description=This unit is may take less damage because of a narrow/low profile. (BMM pg 85)
 QuirksInfo.option.imp_com.displayableName=Improved Communications

megamek/i18n/megamek/common/report-messages.properties

@@ -726,6 +726,15 @@
 5543=<font color='008000'>success!</font>
 5550=External heat reduced due to intact heat-dissipating armor!
 5560=<data> takes over as <data> of <data> (<data>).
+5600=<newline>Bomb Bay Explosions<newline>-------------------
+5601=<data> (<data>) took ground fire damage while dropping internal bay bombs.
+5602=<data> (<data>) must roll under <data>+ to avoid bomb bay explosion, rolls <data>.
+5603=\ <font color='C00000'><data> (<data>) takes <data> damage when <data> remaining bombs explode!</font>
+5604=\ <font color='008000'><data> (<data>) avoids bomb bay explosion; <data> internal bombs remaining.</font>
+5605=\ <font color='C00000'><data> (<data>) suffers a critical Cargo hit; <msg:5606,5607></font>
+5606=player must choose <data> bombs to be destroyed.
+5607=bot loses <data> bombs.
+5608=<data> (<data>) Internal Bomb Bay + Cargo critical: Damage exceeds remaining bombs; all bombs destroyed.
 
 #6000's -- Damage Related
 6005=\ no effect.

megamek/src/megamek/MMConstants.java

@@ -49,6 +49,7 @@ public final class MMConstants extends SuiteConstants {
     public static final String GIVEN_NAME_MALE_FILE = "data/names/maleGivenNames.csv";
     public static final String SURNAME_FILE = "data/names/surnames.csv";
     public static final String BOT_README_FILE_PATH = "docs/Bot Stuff/Princess Notes.txt";
+    public static final String USER_DIR_README_FILE = "docs/UserDirHelp.html";
     public static final String SERIALKILLER_CONFIG_FILE = "mmconf/serialkiller.xml";
     public static final String USER_NAME_FACTIONS_DIRECTORY_PATH = "userdata/data/names/factions/";
     public static final String USER_CALLSIGN_FILE_PATH = "userdata/data/names/callsigns.csv";

megamek/src/megamek/MegaMek.java

@@ -356,4 +356,4 @@ public static void initializeSuiteGraphicalSetups(final String currentProject) {
         // Setup Button Order Preferences
         ButtonOrderPreferences.getInstance().setButtonPriorities();
     }
-}
+}