Skip to content

Main to next - #1216

Merged
object-Object merged 12 commits into
FallingColors:1.21from
s5bug:main-to-next
Jul 29, 2026
Merged

Main to next#1216
object-Object merged 12 commits into
FallingColors:1.21from
s5bug:main-to-next

Conversation

@s5bug

@s5bug s5bug commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Includes PRs:

Someone more familiar with the datagen than me needs to check why scroll_paper.json isn't being generated under the Common/ or Neoforge/ generated resources. runAllDatagen should probably completely delete the generated resources directory before running just so stuff like this can be caught at the right time.

IridescentVoid and others added 11 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.
Adds Contemplation, a variant of Consideration that has no draw-time
effect (and thus does not require double-escaping). Signature is 0.11.3
consideration but drawn in reverse.

Closes FallingColors#1092

---------

Co-authored-by: Robotgiggle <88736742+Robotgiggle@users.noreply.github.com>
This fixes the intermittent build failures caused by
https://maven.terraformersmc.com/releases sometimes returning the
following error:

```
Premature end of chunk coded message body: closing chunk expected
```

The new maven is a mirror run by a Terraformers team member.
Closes FallingColors#1200 

This is how it looks in IJ:

<img width="1037" height="335"
alt="{D55CE6B8-A345-48EE-AA61-3C0463DE6D05}"
src="https://github.com/user-attachments/assets/3063d098-9105-4a50-a9d6-cdea471f1a64"
/>

Not pretty, but not outright horrible...
Closes FallingColors#901 

All the classes removed are unused in code and have been replaced by
Arithmetic implementations.

@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.

Looks good, but I can't merge this myself since it needs to not be squashed.

@object-Object

@object-Object
object-Object merged commit 49432f3 into FallingColors:1.21 Jul 29, 2026
7 of 8 checks passed
@github-project-automation github-project-automation Bot moved this from 📋 Backlog to ✅ Done in Hex Casting Jul 29, 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.

9 participants