Skip to content

26.1#8823

Merged
shartte merged 54 commits into1.21.11from
26.1
May 1, 2026
Merged

26.1#8823
shartte merged 54 commits into1.21.11from
26.1

Conversation

@shartte
Copy link
Copy Markdown
Member

@shartte shartte commented Apr 17, 2026 •
edited
Loading

This is just for easier comparison against the 1.21.11 base, but will not be merged

shartte added 26 commits December 19, 2025 13:58
@shartte
First port to 26.1
13c0575
@shartte
Bump to final versions.
8029479
@shartte
Update to newer versions
e6ba346
@shartte
Formatting.
2d2df1c
@shartte
Fix tests
db81817
@shartte
Allow releases from tags without neoforge/ prefix.
9b189bc 
Update release versions and Jade.
@shartte
Allow releases for snapshots.
654f65c
@shartte
Fix PaintSplotch Crash when the Block has no Data
a980fea
@shartte
Fix Compass Data Storage
d5d35db 
Fix Compass Rotation
@shartte
Fix item models of quartz buds
ab0121d 
Fix memory card item model
@shartte
Add back JEI integration.
b947197
@shartte
Fix broken advancement background.
f452266
@shartte
Update to NeoForge 26.1.0.0-alpha.3
7dbc64a
@shartte
Address Gradle 9 deprecations
6b4575c
@shartte
Address deprecations
2629bac
@shartte
Updated JEI, slight cleanup.
2ca60c8
@shartte
Work on warnings and deprecations
077d374
@shartte
Add API description of parts.
6ffd061
@shartte
Use the right render type for translucent blocks
b6e28c1
@shartte
Fix recipe exports for guideme
d57db7d 
Update guideme
@shartte
Update GuideME and publish the guides per major-version and not per i…
748bf23 
…ndividual version.
@shartte
Port to 26.1-snapshot-4
c4d72a9
@shartte
Disable runtime JEI to fix datagen.
3208bb8
@shartte
Fix JEI version
07a9fba
@shartte
Fix cable datagen.
ea421d9
@shartte
WIP
8dad027
@shartte shartte changed the base branch from main to 1.21.11 April 17, 2026 18:53
@shartte shartte marked this pull request as draft April 17, 2026 18:53
Mithi83 and others added 23 commits April 17, 2026 23:38
@Mithi83
[26.1] WIP - mostly GUI and accesstransformer (#8824)
713ca0b
@shartte
WIP
7dc91f9
@Mithi83
more 26.1 WIP (#8825)
fb94afc
@shartte
Compiles
6c3bccf
@shartte
Formatting
998b52a
@Mithi83
WIP (#8826)
082b365
@shartte
Datagen
a8f4304
@shartte
Fix unbaked cable bus model.
ce397b5
@Mithi83
[26.1] fix GUI - needs to be double-checked (#8827)
69ccf20
@shartte
Fix sprite blitting
7fc06db
@shartte
Fix Drive LED depth
0e5a697
@shartte
Fix block colors.
d007417
@shartte
Fix tests
1c4585a
@shartte
Fix facade item render type
e013683
@shartte
Remove static site building for now
f773e8a
@Mithi83
adapt wthit and jade versions to 26.1 (#8830)
fc93b1c 
I've chosen Jade as the default in this PR, adapt if you prefer another
setting.
@Mithi83
picking colors with a color applicator works - remove related TODO (#…
02f175a 
…8832)
@Mithi83
reenable jade and wthit code (#8835)
607a681
@Mithi83
fix spatial anchor overlay (#8831)
44b6cf5
@Mithi83
fix curios integration (#8838)
c2bc624
@Mithi83
reactivate pattern access terminal searching (#8840)
d506333
@Mithi83
remove TODOs (#8842)
c321ff1
@Mithi83
render red background for invalid patterns again (#8843)
d8085bb
@Mithi83
Copy link
Copy Markdown
Collaborator

Mithi83 commented Apr 30, 2026 •
edited
Loading

External dependencies that were not yet ported to 26.1 and have open TODOs:

  • REI
  • EMI
  • TheOneProbe

Places marked with TODOs:

  • CableBusModel: Need to fix detection if attachments require cable connections to render straight lines differently.
  • Check rendering order in GUI in AEBaseScreen.extractContents: In particular the place for graphics.nextStratum() was just a guess
  • Athena version needs update, also the datagen for CTM is currently commented out.
  • ... many more TODOs in the code

Pending PRs:

Mithi83 and others added 3 commits April 30, 2026 14:14
@Mithi83
Add quick move of ghost items from JEI (#8814)
9d9989d 
I've recently added a quick move option to JEI for 26.1
(mezz/JustEnoughItems#4232) with the intention
to use it with AE2 to more easily move larger numbers of ghost items
quickly with a shift-click semantic.
@Mithi83
fix area overlay lineWidth (#8839)
76b30e7
@shartte
Fix straight cable rendering
7b17735
@shartte shartte marked this pull request as ready for review May 1, 2026 21:09
@shartte shartte merged commit adf39bc into 1.21.11 May 1, 2026
9 of 10 checks passed
@shartte shartte deleted the 26.1 branch May 1, 2026 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@shartte @Mithi83