Merge 1.20 back into main - #546
Merged
Merged
Conversation
…others) not being done for 1.20 yet
…, haven't yet tried to build/launch at all
…ls are gone, so block properties seem to be mostly made by copying from other blocks and changing relevant things. Data generation seems to have changed, and recipes need a recipe category.
…hich blocks can be removed by OpDestroyFluid.
…ore rendering fixes
…and fix some other datagen stuff.
…rge, committing this so I don't lose it in case I want to come back to it
Fix wood recipe data generator
…o the 1.20 branch and fixed it up to work in this version (f5a76ed)
…ntical by altering the old renderer to match the new (only bothered for slate since its the only one that will toggle back to the old renderer in normal gameplay, and the scroll renderer is a bit more complicated).
This commit also adds edified fences as well as the sign textures
Make Operators capable of returning OperationResult
… second every time someone places a scroll
Render pattern textures in a background thread
# Conflicts: # Common/src/main/java/at/petrak/hexcasting/client/render/PatternTextureManager.java
… crash when too many patterns added to render queue at once, try and fix flickering issue.
Fix forge crashes on death
Fail Jenkins pipeline if datagen needs to be run
Bring texture-based pattern rendering to 1.20
object-Object
marked this pull request as ready for review
December 24, 2023 22:17
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
1.18and1.19are the LTS release branches, so there's no reason not to do this. It also allows addon devs to resume using the actual maven instead of hacky local repo stuff.Prerequisites: