Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Ability to Manually Edit Education Level to Edit Person View & Fixed Minor Bugs #4126

Merged
merged 6 commits into from
Jun 8, 2024

Conversation

IllianiCBT
Copy link
Collaborator

Added Education Level to CustomizePersonDialog and CreateCharacterDialog. Users can now set the education level of characters through the edit person dialog.

I also applied a couple of minor corrections to the prestigious academies xml, and added a condition to a academy tooltip method call that should result in more robust tooltip creation for the education module.

- Added Education Level to CustomizePersonDialog and CreateCharacterDialog
- Modified PrestigiousAcademies.xml: changed constructionYears and locationSystems, renamed Combat College of New Earth
@IllianiCBT IllianiCBT self-assigned this May 31, 2024
@IllianiCBT IllianiCBT added Bug Personnel Personnel-related Issues labels May 31, 2024
# Conflicts:
#	MekHQ/resources/mekhq/resources/CreateCharacterDialog.properties
#	MekHQ/resources/mekhq/resources/CustomizePersonDialog.properties
#	MekHQ/src/mekhq/gui/dialog/CustomizePersonDialog.java
@IllianiCBT
Copy link
Collaborator Author

Resolved conflicts

@IllianiCBT IllianiCBT changed the title Added Ability to Manually Edit Education Level to Edit Person View Added Ability to Manually Edit Education Level to Edit Person View & Fixed Minor Bugs Jun 7, 2024
@SJuliez SJuliez merged commit 7a70b47 into MegaMek:master Jun 8, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Personnel Personnel-related Issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants