Skip to content

Merge 1.20.1 into 1.21#5089

Merged
serenibyss merged 40 commits into
1.21from
gus/update-1.21
Jul 12, 2026
Merged

Merge 1.20.1 into 1.21#5089
serenibyss merged 40 commits into
1.21from
gus/update-1.21

Conversation

@gustovafing

@gustovafing gustovafing commented Jul 12, 2026 •
edited by Reabstraction
Loading

Copy link
Copy Markdown
Member

Merge 1.20.1 into 1.21

  • No AI driven tools were used for this pull request.

jurrejelle and others added 30 commits June 25, 2026 08:09
@jurrejelle
Document modifying and removing veins (#4956)
e8eb858
@jurrejelle
Sync Handler Docs (#4997)
d5448f5
@jurrejelle
Add property modification to material modification docs (#4951)
fc71f1a
@YoungOnionMC
Fix recipe widget now showing all emi recipe categories (#4994)
b91d3e3
@jurrejelle
Replace MainAxisAlignment image (#5004)
5b7eaaa
@Phoenixvine32908
Fixed up some typos/broken/missing formatting with onion's docs. (#5010)
9fd3d1f
@jurrejelle
remove redundant preinit stencil call (#5018)
1e3d584
@YoungOnionMC @JuiceyBeans
Steam dial widget for Steam Machines (#5006)
5e93de8 
Co-authored-by: Karthi <75553966+JuiceyBeans@users.noreply.github.com>
@YoungOnionMC
Add pickaxe tag to lamps (#4981)
ac93f1e
@YoungOnionMC @Ghostipedia
Fix ordering of crystal mainframe circuit (#4979)
09f0ace 
Co-authored-by: Ghostipedia / Caitlynn <46772882+Ghostipedia@users.noreply.github.com>
@YoungOnionMC
Onion UI cleanup PT 2 (#5026)
ea30a5f
@YoungOnionMC
Fix auto output trait on load (#5025)
6a7b7c6
@YoungOnionMC
Onion Machine UI cleanup p3 (#5028)
28263fa
@DilithiumThoride
Remove Chance Boosting (#4968)
2ffc0aa
@YoungOnionMC
Large Bronze Boiler UI (#5033)
1843bb8
@gustovafing
fix fluid tooltip duplication (#5036)
cf0ed10
@YoungOnionMC
More Arc Furnace Slots (#4993)
8b93f38
@YoungOnionMC @jurrejelle
Primitive Pump UI (#5039)
cb1ef51 
Co-authored-by: jurrejelle <jurre@jilles.com>
@YoungOnionMC
Schema parts catalyst (#5050)
4531434
@Ghostipedia
G^2
a390555
@jurrejelle
Bump MUI (#5063)
374a635
@gustovafing
Final parts of machine refactor (#4925)
342f928
@Vykonn @gustovafing @jurrejelle
Fix broken Antidote behaviors (#4798)
5a64605 
Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com>
Co-authored-by: jurrejelle <jurre@jilles.com>
@jurrejelle
Add version sync log workflow (#5042)
e07ee9d
@YoungOnionMC
Fix screwdriver drum (#5067)
f4c79f0
@jurrejelle
Add TARGET_REPO to version sync workflow (#5070)
be9b437
@jurrejelle
exclude steam dial in xei (#5072)
fa49b23
@jurrejelle
fix drum/crate drops (#5073)
3f6b66c
@jurrejelle
bump emi to match mui (#5074)
0e6ceaf
@jurrejelle
Fix nullable machines crashing EMI plugin (#5075)
c2f4459
@gustovafing gustovafing requested a review from a team as a code owner July 12, 2026 11:39
@github-actions github-actions Bot added the 1.21 label Jul 12, 2026
@gustovafing gustovafing added type: feature New feature or request bundled for a 0.X.0 Update ignore changelog PR should not be added to the changelog. Release: API - X.0.0 Major Breaking Refactors that MUST be in a API-Breaking Release labels Jul 12, 2026
@github-actions github-actions Bot added the Tests: Passed Game Tests have passed on this PR label Jul 12, 2026
@serenibyss serenibyss merged commit 1f95068 into 1.21 Jul 12, 2026
5 of 7 checks passed
@serenibyss serenibyss deleted the gus/update-1.21 branch July 12, 2026 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jurrejelle jurrejelle jurrejelle approved these changes

Assignees

No one assigned

Labels

1.21 ignore changelog PR should not be added to the changelog. Release: API - X.0.0 Major Breaking Refactors that MUST be in a API-Breaking Release Tests: Passed Game Tests have passed on this PR type: feature New feature or request bundled for a 0.X.0 Update

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@gustovafing @jurrejelle @serenibyss @YoungOnionMC @Phoenixvine32908 @DilithiumThoride @Ghostipedia @Vykonn @htmlcsjs