Skip to content

Re/merge 1.20.1 into 1.21 #4437

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.

Sign up for GitHub

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

Jump to bottom
Merged
jurrejelle merged 31 commits into from
Jan 7, 2026
Merged

Re/merge 1.20.1 into 1.21 #4437

jurrejelle merged 31 commits into from
Jan 7, 2026

Conversation

@Reabstraction
Copy link
Contributor

@Reabstraction Reabstraction commented Jan 7, 2026

What

Merge 1.20.1 into 1.21

Phoenixvine32908 and others added 30 commits December 22, 2025 15:45
@Phoenixvine32908
Fix the recipe modifier list for example turbine. (#4361)
f122a60
@zetrock1
сorrecting EnderCoversTest (#4340)
42b91cf
@zetrock1
itemLinkCoverTest (#4333)
ce51110
@jurrejelle
Rework element creation docs (#4367)
7c23a95
@carbonatek
(Docs) Fix GTValues.VA being used as a function in material property …
d0a6d11 
…modification, add reference to coil temps in Material Properties (#4338)
@Reabstraction
Update spotless to 8.1.0 (#4323)
539757c
@zetrock1
PumpBiomeModifier - change priority of tags (#4369)
69bb85a
@jurrejelle
Change out LDLib client side check to GTCEu one (#4365)
9b15449
@Mqrius
Make fuel jetpacks work on servers (#4341)
1edfb73
@Petr211071
Cyclohexanone oxime ru_ru name correction (#4394)
c1673c9
@Siber0 @screret @jurrejelle
Changes and additions to documentation (#3050)
2dd99cb 
Co-authored-by: screret <[email protected]>
Co-authored-by: Jurre Groenendijk <[email protected]>
@HazeVista
Retextured mk3 ctms (#4355)
8e2549c
@jurrejelle
Fix facade cover json (#4418)
3c8ff11
@remakefactory
Correct Data Stick interaction handling (#4409)
5b16a10
@StarmanMine142
Update uk_ua.json (#4411)
e82d853
@Conity723
Fixes to overlay textures on some machines. (#4403)
5f364ad
@TarLaboratories
Test coverage (#4410)
781f171
@TarLaboratories
Fix {fromAscii} placeholder (#4392)
1071c00
@JuiceyBeans
Fix blackstone and tuff ores not dropping dusts (#4376)
e3394a9
@zetrock1
Fix rotor holder Z-fighting (#4335)
7de5cb7
@JuiceyBeans
Make netherite tools and items fire resistant (#4378)
698cf02
@jonasGajdosikas
Refactor naquadah reactor overlays to a workableMultiblockMachineCasi…
59a51b9 
…ng compatible format (#4353)
@JuiceyBeans
Jade support for Long Distance Pipeline Endpoints (#4420)
eb160f6
@DilithiumThoride
Fix ranged output items voiding if there wasn't enough output space (#…
53b6d92 
…4290)
@esmenard @jurrejelle
Add recipe for Copper Ingot disassembling (#4399)
ef00786 
Co-authored-by: Jurre Groenendijk <[email protected]>
@jkieberking @gustovafing
@screret @jurrejelle
Fix multiblock controller rotation overlay logic (#4199)
bf67107 
Co-authored-by: Gustavo <[email protected]>
Co-authored-by: screret <[email protected]>
Co-authored-by: jurrejelle <[email protected]>
@Pyritie
Add missing rock types to initializeCobbleReplacements() (#4329)
d7a411b
@TechLord22
Port existing keybinds to new system (#4069)
c0401e2
@github-actions @jurrejelle
RELEASE for 1.20.1 [no-snapshot] (#4426)
29a43dd 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jurre Groenendijk <[email protected]>
@Reabstraction
Merge remote-tracking branch 'origin/1.20.1' into re/merge-1.20.1-int…
4f02fa8 
…o-1.21
@Reabstraction Reabstraction requested a review from a team as a code owner January 7, 2026 11:12
@github-actions github-actions bot added the 1.21 label Jan 7, 2026
@Reabstraction Reabstraction added ignore changelog PR should not be added to the changelog. type: bugfix General bug fixes Release: Patch - 0.0.X Smaller changes that either are bug fixes or very minor tweaks. labels Jan 7, 2026
@github-actions github-actions bot added the Tests: Failed Game Tests have failed on this PR label Jan 7, 2026
@github-actions github-actions bot added Tests: Passed Game Tests have passed on this PR and removed Tests: Failed Game Tests have failed on this PR labels Jan 7, 2026
@jurrejelle jurrejelle merged commit c97d019 into 1.21 Jan 7, 2026
4 of 5 checks passed
@jurrejelle jurrejelle deleted the re/merge-1.20.1-into-1.21 branch January 7, 2026 11:24
@Reabstraction Reabstraction restored the re/merge-1.20.1-into-1.21 branch January 7, 2026 12:35
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: Patch - 0.0.X Smaller changes that either are bug fixes or very minor tweaks. Tests: Passed Game Tests have passed on this PR type: bugfix General bug fixes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.