Closed Stelk closed 2 years ago
There are still conflicts here.
My bad. In my fork 1.18 is a branch of 1.17 while I believe upstream branched 1.18 from master. I'll rebase/test/and commit the changes. I should have asked how the branching is managed beforehand. Thanks for the feedback.
@magicus works with 1.17 version, his PRs in the 'master' branch. I've started 1.17 branch before, but did't complete it.
Just the minimum changes to get the code working on 1.18-pre5.
version.properties may need to be excluded from the changeset to keep the mod version consistent with future releases.
I'll provide another PR once MC 1.18 is officially released on the 30th.