On Mon, July 12, 2021 9:14 pm, trondd wrote: > "Kirill Bychkov" <[email protected]> wrote: > >> On Thu, July 8, 2021 00:33, Stefmorino wrote: >> > And that's why I should do a better job of separating my current build >> > and stable backport. I accidentally ran cvs diff against the -stable >> > ports revision instead of -current (which is also why the tarball >> still >> > works as @kirby mentions). >> > >> > I have corrected my mistake, and have tested the patch against head; I >> > also fixed the problems @stu found ( much appreciated, I'm still a bit >> > new to this :) ) >> > >> > I've included a tarball like last time, as well as a tarball for a >> > backport to -stable. >> > >> > Hope it all goes well this time! >> > >> > >> >> Hi, >> Diff is still broken. Attached one works fine for me and I'm >> going to commit it soon if no one objects. > > Diff applied and looks ok. I ran out of time to test the actual game. > I'll do some play testing tomorrow if you want to wait. > > Tim. >
Looks good to me. I had to delete ~/.config/cataclysm-dda/fonts.json as the format of the contents seems to have changed. It got recreated. And just the usual world updates for mods that have been removed which is not unexpected. Thanks. Tim.
