Skip to content

Merge 1.20.1 into mui2-refactor#4672

Merged
gustovafing merged 19 commits intomui2-refactorfrom
gus/update-mui2-branch
Feb 23, 2026
Merged

Merge 1.20.1 into mui2-refactor#4672
gustovafing merged 19 commits intomui2-refactorfrom
gus/update-mui2-branch

Conversation

@gustovafing
Copy link
Member

What

Merge 1.20.1 into mui2-refactor

gustovafing and others added 4 commits February 17, 2026 00:18
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMufflerMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/MufflerPartMachine.java
@gustovafing gustovafing requested a review from a team as a code owner February 20, 2026 23:35
@gustovafing gustovafing added 1.20.1 Release: Major - 0.X.0 Releases focused on Content, changes to gameplay; While maintaining mostly API stability. labels Feb 20, 2026
@github-actions github-actions bot added the Tests: Passed Game Tests have passed on this PR label Feb 20, 2026
@jurrejelle jurrejelle added the type: refactor Suggestion to refactor a section of code label Feb 21, 2026
Copy link
Contributor

@jurrejelle jurrejelle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs non-squash merge

@github-actions github-actions bot added Tests: Failed Game Tests have failed on this PR and removed Tests: Passed Game Tests have passed on this PR labels Feb 23, 2026
@gustovafing gustovafing merged commit 97f6164 into mui2-refactor Feb 23, 2026
1 of 4 checks passed
@gustovafing gustovafing deleted the gus/update-mui2-branch branch February 23, 2026 08:22
@gustovafing gustovafing restored the gus/update-mui2-branch branch February 23, 2026 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.20.1 Release: Major - 0.X.0 Releases focused on Content, changes to gameplay; While maintaining mostly API stability. Tests: Failed Game Tests have failed on this PR type: refactor Suggestion to refactor a section of code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants