Merge 1.20.1, 1.21.1 and 1.21.4 into a single branch#67
Open
nelsongraca wants to merge 6 commits intoAle32bit:1.21.1from
Open
Merge 1.20.1, 1.21.1 and 1.21.4 into a single branch#67nelsongraca wants to merge 6 commits intoAle32bit:1.21.1from
nelsongraca wants to merge 6 commits intoAle32bit:1.21.1from
Conversation
Switch to Kotlin DSL Start adding Stonecutter
nelsongraca
force-pushed
the
stonecutter
branch
from
d75788b to
7304a75
Compare
Author
|
Ran 1.21.4 and tested a bit, not a thorough test but everything seems to be running fine. |
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
1 participant
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.
This is my attempt to merge all 3 existing versions into a single branch using stonecutter.
The branch started off 1.20.1 but since it is to be merged into 1.21.1 I rebased it from there.
I also changed gradle scripts to Kotlin, I found it easier to work with.
All 3 versions build fine, I have not run any of them yet.