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

Embed Fluff Images in the Unit Files (MM part) #5156

Merged
merged 12 commits into from
Feb 26, 2024
Merged

Conversation

SJuliez
Copy link
Member

@SJuliez SJuliez commented Feb 13, 2024

See MegaMek/megameklab#1423 for the description

@HammerGS HammerGS added the For New Dev Cycle This PR should be merged at the beginning of a dev cycle label Feb 14, 2024
# Conflicts:
#	megamek/src/megamek/common/Entity.java
#	megamek/src/megamek/common/HexTarget.java
#	megamek/src/megamek/common/Jumpship.java
@SJuliez SJuliez merged commit 915a5e4 into MegaMek:master Feb 26, 2024
4 checks passed
@SJuliez SJuliez deleted the fluff64 branch March 9, 2024 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
For New Dev Cycle This PR should be merged at the beginning of a dev cycle
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants