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

Merge main to beta #5438

Merged
merged 6 commits into from
Feb 28, 2025
Merged

Merge main to beta #5438

merged 6 commits into from
Feb 28, 2025

Conversation

Fontbane
Copy link
Contributor

@Fontbane Fontbane commented Feb 28, 2025

Damo is considering a batch of hotfixes going to beta first before being pushed to main as 1.7.1, so main->beta needs to merge first

What are the changes the user will see?

Why am I making these changes?

What are the changes from a developer perspective?

Screenshots/Videos

How to test the changes?

Checklist

  • I'm using beta as my base branch
  • There is no overlap with another PR?
  • The PR is self-contained and cannot be split into smaller PRs?
  • Have I provided a clear explanation of the changes?
  • Have I tested the changes manually?
  • Are all unit tests still passing? (npm run test)
    • Have I created new automated tests (npm run create-test) or updated existing tests related to the PR's changes?
  • Have I provided screenshots/videos of the changes (if applicable)?
    • Have I made sure that any UI change works for both UI themes (default and legacy)?

Are there any localization additions or changes? If so:

  • Has a locales PR been created on the locales repo?
    • If so, please leave a link to it here:
  • Has the translation team been contacted for proofreading/translation?

Release 1.7.0
@damocleas
Copy link
Collaborator

damocleas commented Feb 28, 2025

will do once Mycelium Might softlock is fixed

@damocleas damocleas requested a review from a team as a code owner February 28, 2025 02:05
@damocleas damocleas enabled auto-merge February 28, 2025 21:40
@damocleas damocleas merged commit 9b2f649 into beta Feb 28, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants