Skip to content

Merge 1.20.1, 1.21.1 and 1.21.4 into a single branch#67

Merged
Ale32bit merged 8 commits intoAle32bit:stonecutterfrom
nelsongraca:stonecutter
Apr 30, 2026
Merged

Merge 1.20.1, 1.21.1 and 1.21.4 into a single branch#67
Ale32bit merged 8 commits intoAle32bit:stonecutterfrom
nelsongraca:stonecutter

Conversation

@nelsongraca
Copy link
Copy Markdown
Contributor

@nelsongraca nelsongraca commented Mar 25, 2026

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.

@nelsongraca nelsongraca marked this pull request as ready for review March 25, 2026 19:10
@nelsongraca
Copy link
Copy Markdown
Contributor Author

Ran 1.21.4 and tested a bit, not a thorough test but everything seems to be running fine.

@Ale32bit Ale32bit changed the base branch from 1.21.1 to stonecutter April 30, 2026 18:01
Comment thread build.gradle.kts Outdated
@Ale32bit Ale32bit merged commit 69d1c55 into Ale32bit:stonecutter Apr 30, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants