Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.19.4 into 1.20.2 #4172

Merged
merged 5 commits into from
Oct 31, 2023
Merged

Merge 1.19.4 into 1.20.2 #4172

merged 5 commits into from
Oct 31, 2023

Conversation

ZacSharp
Copy link
Collaborator

@ZacSharp ZacSharp commented Oct 29, 2023

#4112 is the sole reason for this pr. Otherwise I'd wait until there's more things to merge.
EDIT: totally forgot about 91588ca even though I looked at it's diff 30 seconds ago...

@ZacSharp
Copy link
Collaborator Author

Wtf GitHub. I created this pr 3 minutes ago and never added commits, why do you think there's changes I haven't seen yet?
image

@end-user
Copy link

image

@ZacSharp
Copy link
Collaborator Author

Not a problem. Codacy being happy is nice but not required.

@nicobuzeta
Copy link

nicobuzeta commented Oct 31, 2023

@ZacSharp Not sure if it's related to this, but i'm using the build from the CI and i'm getting crash reports from FasterWorldScanner but it appears to be a different location than the original bug.

Happens when mining below y = 0, but only on a vanilla server with some datapacks. Tested on singleplayer and issue doesn't occur.

I'll attach the relevant log section (no other mods):
crash.log

Not sure if I should submit a bug report since I'm using this build, and it hasn't been merged yet.

@leijurv
Copy link
Member

leijurv commented Oct 31, 2023

Hmmm, I'm not sure, maybe we want to merge into 1.20.1 then 1.20.2? But I guess this is okay.

@leijurv leijurv merged commit a945cfa into cabaletta:1.20.2 Oct 31, 2023
3 of 4 checks passed
@ZacSharp
Copy link
Collaborator Author

I can still make a merge into 1.20.1 if you want to provide more updates for it. Just let me know.
(Also I'd personally like to port new features to 1.12.2 so if you'd like to have them here let me know how I should do it. Like, cherry-pick everything, try merging backwards, or whatever branching strategy)

@leijurv
Copy link
Member

leijurv commented Nov 2, 2023

I personally don't want to deal with 1.12.2 anymore but I'm willing to merge stuff. Make PRs to master, cherry-pick would be good. 👍

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.

5 participants