Closed divenal closed 5 months ago
Ah ok, so this is basically a similar attempt to mine without screwing up the whitespace & formatting. I'll merge this one then I'll see how that impacts the other one from Britkat.
Because this is directly on the prepare-for-1.0 branch, shouldn't impact Britkat's change, which was on the dev branch. Still have to see where we end up with these branches...
As promise, a sequence of changes to bring getting-ready branch up to givenergy-local. The first 5 get our tree identical to their one, except for the import statements. The last one takes some of the battery-pause support, but not all of it.
(I'm hoping the merge will keep them as separate changes.)
Don't know about you, but I was finding it almost impossible to separate the significant changes from the reformatting ones when it was all in one big lump.