Skip to content

Commit 5d85bfb

Browse files
IllianiBirdIllianiBird
committed
Merge branch 'master' into startingContracts
# Conflicts: # MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java
2 parents 97d736f + 0282496 commit 5d85bfb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+5782
-4673
lines changed

‎MekHQ/data/universe/academies/Local Academies.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,19 @@
119119
<ageMin>10</ageMin>
120120
<ageMax>16</ageMax>
121121
<qualification>MechTech Apprenticeship</qualification>
122-
<curriculum>Astech, Tech/Mek</curriculum>
122+
<curriculum>Astech, Tech/Mek, Administration</curriculum>
123123
<qualificationStartYear>2500</qualificationStartYear>
124124
<qualification>Mechanic Apprenticeship</qualification>
125-
<curriculum>Astech, Tech/Mechanic</curriculum>
125+
<curriculum>Astech, Tech/Mechanic, Administration</curriculum>
126126
<qualificationStartYear>2300</qualificationStartYear>
127127
<qualification>AeroTek Apprenticeship</qualification>
128-
<curriculum>Astech, Tech/Aero</curriculum>
128+
<curriculum>Astech, Tech/Aero, Administration</curriculum>
129129
<qualificationStartYear>2490</qualificationStartYear>
130130
<qualification>Battle Armor Technician Apprenticeship</qualification>
131-
<curriculum>Astech, Tech/BattleArmor</curriculum>
131+
<curriculum>Astech, Tech/BattleArmor, Administration</curriculum>
132132
<qualificationStartYear>3058</qualificationStartYear>
133133
<qualification>Black Naval Apprenticeship</qualification>
134-
<curriculum>Astech, Tech/Vessel</curriculum>
134+
<curriculum>Astech, Tech/Vessel, Administration</curriculum>
135135
<qualificationStartYear>2490</qualificationStartYear>
136136
<baseAcademicSkillLevel>1</baseAcademicSkillLevel>
137137
</academy>
@@ -218,19 +218,19 @@
218218
<educationLevelMax>College</educationLevelMax>
219219
<ageMin>16</ageMin>
220220
<qualification>Advanced BattleMek Technologies</qualification>
221-
<curriculum>Tech/Mek</curriculum>
221+
<curriculum>Tech/Mek, Administration</curriculum>
222222
<qualificationStartYear>2500</qualificationStartYear>
223223
<qualification>Advanced Technology &amp; Development</qualification>
224-
<curriculum>Tech/Mechanic</curriculum>
224+
<curriculum>Tech/Mechanic, Administration</curriculum>
225225
<qualificationStartYear>2300</qualificationStartYear>
226226
<qualification>Advanced AeroSpace Technologies</qualification>
227-
<curriculum>Tech/Aero</curriculum>
227+
<curriculum>Tech/Aero, Administration</curriculum>
228228
<qualificationStartYear>2490</qualificationStartYear>
229229
<qualification>Battle Armor Technology &amp; Development</qualification>
230-
<curriculum>Tech/BattleArmor</curriculum>
230+
<curriculum>Tech/BattleArmor, Administration</curriculum>
231231
<qualificationStartYear>3058</qualificationStartYear>
232232
<qualification>Black Naval Technologies</qualification>
233-
<curriculum>Tech/Vessel</curriculum>
233+
<curriculum>Tech/Vessel, Administration</curriculum>
234234
<qualificationStartYear>2490</qualificationStartYear>
235235
</academy>
236236
<academy>
@@ -268,19 +268,19 @@
268268
<educationLevelMax>Doctorate</educationLevelMax>
269269
<ageMin>16</ageMin>
270270
<qualification>Advanced BattleMek Technologies</qualification>
271-
<curriculum>Tech/Mek</curriculum>
271+
<curriculum>Tech/Mek, Administration</curriculum>
272272
<qualificationStartYear>2500</qualificationStartYear>
273273
<qualification>Advanced Technology &amp; Development</qualification>
274-
<curriculum>Tech/Mechanic</curriculum>
274+
<curriculum>Tech/Mechanic, Administration</curriculum>
275275
<qualificationStartYear>2300</qualificationStartYear>
276276
<qualification>Advanced AeroSpace Technologies</qualification>
277-
<curriculum>Tech/Aero</curriculum>
277+
<curriculum>Tech/Aero, Administration</curriculum>
278278
<qualificationStartYear>2490</qualificationStartYear>
279279
<qualification>Battle Armor Technology &amp; Development</qualification>
280-
<curriculum>Tech/BattleArmor</curriculum>
280+
<curriculum>Tech/BattleArmor, Administration</curriculum>
281281
<qualificationStartYear>3058</qualificationStartYear>
282282
<qualification>Black Naval Technologies</qualification>
283-
<curriculum>Tech/Vessel</curriculum>
283+
<curriculum>Tech/Vessel, Administration</curriculum>
284284
<qualificationStartYear>2490</qualificationStartYear>
285285
<qualification>Advanced Systems &amp; Technology</qualification>
286286
<curriculum>Administration, Negotiation</curriculum>

‎MekHQ/data/universe/academies/Prestigious Academies.xml‎

Lines changed: 321 additions & 321 deletions
Large diffs are not rendered by default.

‎MekHQ/data/universe/academies/Unit Education.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@
6565
<curriculum>Small Arms, Anti-Mek</curriculum>
6666
<qualificationStartYear>2300</qualificationStartYear>
6767
<qualification>MekTech Apprenticeship</qualification>
68-
<curriculum>Astech, Tech/Mek</curriculum>
68+
<curriculum>Astech, Tech/Mek, Administration</curriculum>
6969
<qualificationStartYear>2439</qualificationStartYear>
7070
<qualification>Mechanic Apprenticeship</qualification>
71-
<curriculum>Astech, Tech/Mechanic</curriculum>
71+
<curriculum>Astech, Tech/Mechanic, Administration</curriculum>
7272
<qualificationStartYear>2300</qualificationStartYear>
7373
<qualification>AeroTek Apprenticeship</qualification>
74-
<curriculum>Astech, Tech/Aero</curriculum>
74+
<curriculum>Astech, Tech/Aero, Administration</curriculum>
7575
<qualificationStartYear>2314</qualificationStartYear>
7676
<qualification>Battle Armor Technician Apprenticeship</qualification>
77-
<curriculum>Astech, Tech/BattleArmor</curriculum>
77+
<curriculum>Astech, Tech/BattleArmor, Administration</curriculum>
7878
<qualificationStartYear>3050</qualificationStartYear>
7979
<qualification>Black Naval Tech Apprenticeship</qualification>
80-
<curriculum>Astech, Tech/Vessel</curriculum>
80+
<curriculum>Astech, Tech/Vessel, Administration</curriculum>
8181
<qualificationStartYear>2470</qualificationStartYear>
8282
<qualification>Administrative Apprenticeship</qualification>
8383
<curriculum>Administration</curriculum>
@@ -100,19 +100,19 @@
100100
<facultySkill>9</facultySkill>
101101
<ageMin>16</ageMin>
102102
<qualification>MekTech Apprenticeship</qualification>
103-
<curriculum>Astech, Tech/Mek</curriculum>
103+
<curriculum>Astech, Tech/Mek, Administration</curriculum>
104104
<qualificationStartYear>2439</qualificationStartYear>
105105
<qualification>Mechanic Apprenticeship</qualification>
106-
<curriculum>Astech, Tech/Mechanic</curriculum>
106+
<curriculum>Astech, Tech/Mechanic, Administration</curriculum>
107107
<qualificationStartYear>2300</qualificationStartYear>
108108
<qualification>AeroTek Apprenticeship</qualification>
109-
<curriculum>Astech, Tech/Aero</curriculum>
109+
<curriculum>Astech, Tech/Aero, Administration</curriculum>
110110
<qualificationStartYear>2314</qualificationStartYear>
111111
<qualification>Battle Armor Technician Apprenticeship</qualification>
112-
<curriculum>Astech, Tech/BattleArmor</curriculum>
112+
<curriculum>Astech, Tech/BattleArmor, Administration</curriculum>
113113
<qualificationStartYear>3050</qualificationStartYear>
114114
<qualification>Black Naval Tech Apprenticeship</qualification>
115-
<curriculum>Astech, Tech/Vessel</curriculum>
115+
<curriculum>Astech, Tech/Vessel, Administration</curriculum>
116116
<qualificationStartYear>2470</qualificationStartYear>
117117
<qualification>Administrative Apprenticeship</qualification>
118118
<curriculum>Administration</curriculum>

‎MekHQ/docs/StratCon/Combat Teams, Roles, Training & Reinforcements.pdf‎

6.09 KB
Binary file not shown.

‎MekHQ/docs/history.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ MEKHQ VERSION HISTORY:
6060
+ PR #6431: Replaced Scrounge With Negotiation or Removed It Across Academy Curricula
6161
+ Fix #6434: Corrected Briefing Room Combat Team Counter
6262
+ PR #6442: Added Additional Error Tracking to Scenario Resolution in Attempt to Identify Bug Root Cause
63+
+ Fix #6399: Load Entity in Specific Transporter when Recalculating Free Space
6364

6465
0.50.04 (2025-03-22 1600 UTC)
6566
+ PR #5852: RAW CamOps Delivery Times

0 commit comments

Comments
 (0)