diff --git a/MekHQ/data/universe/academies/Prestigious Academies.xml b/MekHQ/data/universe/academies/Prestigious Academies.xml
index b94ef7bc41..4cb0fd5eef 100644
--- a/MekHQ/data/universe/academies/Prestigious Academies.xml
+++ b/MekHQ/data/universe/academies/Prestigious Academies.xml
@@ -23,8 +23,6 @@
Addicks University
University
Located in the heart of the Inner Sphere, Addicks University is celebrated for its progressive liberal arts education, particularly in teacher training. The institution uniquely integrates its academic programs with community schools, allowing student teachers to gain invaluable hands-on experience.
- 0
- true
Addicks
2400
2777
@@ -34,6 +32,9 @@
High School
College
16
+ Teaching Graduate
+ Leadership
+ 2300
0
@@ -1795,7 +1796,6 @@
Semester One Curriculum
Small Arms
2300
- 2300
-1
@@ -2324,7 +2324,6 @@
Armored Infantry Graduate
Gunnery/Battlesuit, Anti-Mech
3058
- 3058
Aerospace Graduate
Piloting/Aerospace, Gunnery/Aerospace
2490
@@ -2422,12 +2421,15 @@
Terra
2300
2777
- #N/A
+ 7500
1200
5
High School
Doctorate
16
+ Intergalactic Diplomacy in the Modern Age
+ Negotiation, Leadership
+ 2300
0
diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt
index 187bf27459..167759b7a9 100644
--- a/MekHQ/docs/history.txt
+++ b/MekHQ/docs/history.txt
@@ -103,6 +103,7 @@ MEKHQ VERSION HISTORY:
+ Fix #4235: Fixed Invalid Parsing of Early Childhood when Loading Personnel
+ PR #4242: Added Prestigious Academies D-F
+ PR #4246: Added Prestigious Academies G-J
++ PR #4248: Fixed Missing Qualification from James McKenna University
0.49.19.1 (2024-05-14 1800 UTC)
+ Milestone Release. Backported fixes.
diff --git a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
index d965f7a44a..d1bcb0981f 100644
--- a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
+++ b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
@@ -1518,7 +1518,7 @@ protected Optional createPopupMenu() {
}
if (academySetNames.contains("Prestigious Academies")) {
- if (!campaign.getCampaignOptions().isEnableLocalAcademies()) {
+ if (!campaign.getCampaignOptions().isEnablePrestigiousAcademies()) {
academySetNames.remove("Prestigious Academies");
}
}
diff --git a/MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java b/MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java
index cfa9441365..31b42cf129 100644
--- a/MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java
+++ b/MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java
@@ -8491,7 +8491,7 @@ public void updateOptions() {
}
campaign.setLocalDate(date);
- if (campaign.getCampaignStartDate() == null) {
+ if ((campaign.getCampaignStartDate() == null) || (campaign.getCampaignStartDate().isAfter(campaign.getLocalDate()))) {
campaign.setCampaignStartDate(date);
}
// Ensure that the MegaMek year GameOption matches the campaign year