Skip to content

fix 1.21 ctm and bloom - #5129

Open
screret wants to merge 28 commits into
GregTechCEu:1.21from
screret:sc/fix-1.21-ctm-and-bloom
Open

fix 1.21 ctm and bloom#5129
screret wants to merge 28 commits into
GregTechCEu:1.21from
screret:sc/fix-1.21-ctm-and-bloom

Conversation

@screret

@screret screret commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

What

Fix bloom on 1.21

Implementation Details

Read commits for the "why"s of each change. thanks in advance!

AI Usage

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

Outcome

Bloom looks good again

How Was This Tested

Ran game, compared with 1.20. looks the same.

Additional Information

Some changes (like the ones in FluidBuilder and Predicates) were done to make the CTM test multiblock work. The commits that add those describe why they were done.
This PR also includes #5118 because I was told to split it out, but I still want/need it here.

screret added 23 commits June 30, 2026 15:30
Also: send "reloading resources" message before starting the gradlew processResources process
@screret
screret requested a review from a team as a code owner July 17, 2026 17:19
@screret screret changed the title Sc/fix 1.21 ctm and bloom fix 1.21 ctm and bloom Jul 17, 2026
@github-actions github-actions Bot added the 1.21 label Jul 17, 2026
@htmlcsjs htmlcsjs added Don't Cherrypick DO NOT CHERRYPICK THIS PR TO OTHER VERSIONS ignore changelog PR should not be added to the changelog. Release: Major - 0.X.0 Releases focused on Content, changes to gameplay; While maintaining mostly API stability. and removed Don't Cherrypick DO NOT CHERRYPICK THIS PR TO OTHER VERSIONS labels Jul 17, 2026
@htmlcsjs htmlcsjs added the Ignore Version Sync Do not append this issue to the version sync issue tracker. label Jul 17, 2026
screret added 2 commits July 17, 2026 20:58
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/machine/trait/customlogic/SteamBoilerLogic.java
#	src/main/java/com/gregtechceu/gtceu/client/renderer/GTRenderTypes.java
…ole ScopedValue being thread local

(cherrypick of GregTechCEu#5118 so I can use it here)
@screret
screret force-pushed the sc/fix-1.21-ctm-and-bloom branch from 3642c87 to 6f01ace Compare July 17, 2026 18:00
@screret
screret force-pushed the sc/fix-1.21-ctm-and-bloom branch from 6f01ace to b5bc129 Compare July 18, 2026 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.21 ignore changelog PR should not be added to the changelog. Ignore Version Sync Do not append this issue to the version sync issue tracker. Release: Major - 0.X.0 Releases focused on Content, changes to gameplay; While maintaining mostly API stability.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants