Skip to content

Main to next - #1159

Merged
Robotgiggle merged 5 commits into
FallingColors:1.21from
s5bug:main-to-next
Jul 27, 2026
Merged

Main to next#1159
Robotgiggle merged 5 commits into
FallingColors:1.21from
s5bug:main-to-next

Conversation

@s5bug

@s5bug s5bug commented Jun 14, 2026

Copy link
Copy Markdown
Contributor

IridescentVoid and others added 4 commits June 12, 2026 02:36
…#1115)

Fixes FallingColors#505

The behavior of Assessor's Purification:
- Item frame with focus - True (correct. before and after PR)
- Wall scroll entity - False (correct. before and after PR, though for
different reasons)
- Item frame with scroll - False (incorrect. before) and True (correct.
after PR)
…lingColors#1080)

Fixes FallingColors#964.

Also moves the `cannot_modify_cost` tag jsons from `src/generated/data`
to `src/main/data` to stop them from being deleted by the datagen
process. If there's some way to tell the datagen system to create an
action tag with no entries, that would be a much better solution -
please let me know if that's possible.

@Robotgiggle Robotgiggle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM! #1080 was indeed done correctly. The rename in the original PR was because the original version of the file would get deleted whenever datagen ran. At some point, somebody must have run datagen on the 1.21 branch and committed the result, removing the original file.

@Robotgiggle

Copy link
Copy Markdown
Member

(Also, sorry for taking so long to get to this)

@Robotgiggle
Robotgiggle added this pull request to the merge queue Jul 27, 2026
Merged via the queue into FallingColors:1.21 with commit 2b336a7 Jul 27, 2026
13 of 16 checks passed
@github-project-automation github-project-automation Bot moved this from 📋 Backlog to ✅ Done in Hex Casting Jul 27, 2026
@s5bug
s5bug deleted the main-to-next branch July 28, 2026 16:45
Robotgiggle added a commit to s5bug/HexMod that referenced this pull request Jul 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

3 participants