search

cc-tweaked / cc-restitched

Other
80 stars 31 forks source link

Merge in upstream #80

Closed SquidDev closed 2 years ago

SquidDev commented 2 years ago

I've just realised that CC:R never picked up the datapack driven changes to turtle upgrades, which is sad. But it's also an API break, so didn't feel worth doing in this commit.

This is mostly a precursor for merging https://github.com/cc-tweaked/CC-Tweaked/pull/1057, but wanted to leave that for @Toad-Dev (or whoever is comfortable in not breaking #78).

Merith-TK commented 2 years ago

so, upstream is the 1.18.2 branch, stable is gonna be used for releases,

mc-<mc-MajorVersion>/ are the branches for that major version

mc-<mc-MajorVersion>/<specific MC Version> is for development,

mc-<mc-MajorVersion>/stable is for the main focus, releases are going to be derived from here unless another version is being dumb and requires a bug fix release,

basically we are gonna be using the individual branches for development, and occasionally bugfix releases, the latest version will be the stable branch for that majorMC Version, as that will have our primary focus

SquidDev commented 2 years ago

Fair enough - will rebase this. You might want to mention this in the readme or CONTRIBUTING.md.

Merith-TK commented 2 years ago

weill do