Merges in the major changes made in the upstream-pr branch, as well as the upr-addcomponents, upr-recallsetpoint, and upr-installerfunctions branches.
This should, in theory, bring dev back into line with the work being done on the PR.
Why wasn't it done this way in the first place?
Well, at the time it seemed like the PR was going to require a lot of rapid changes, but then when it was done the changes could be merged/overwritten into dev. However since the PR is taking ages, I'd like to be able to continue development without things forking too far apart, so this is an attempt to get it all back in sync.
Will this break my config?
I don't think so (based on my limited testing). There were a lot of internal code changes, but the config should be the same.
Merges in the major changes made in the
upstream-prbranch, as well as theupr-addcomponents,upr-recallsetpoint, andupr-installerfunctionsbranches.This should, in theory, bring
devback into line with the work being done on the PR.Why wasn't it done this way in the first place?
Well, at the time it seemed like the PR was going to require a lot of rapid changes, but then when it was done the changes could be merged/overwritten into
dev. However since the PR is taking ages, I'd like to be able to continue development without things forking too far apart, so this is an attempt to get it all back in sync.Will this break my config?
I don't think so (based on my limited testing). There were a lot of internal code changes, but the config should be the same.