I've caught a few more things in my last testing run I'm fixing (plant, elemental, dragon, and magical beast shapes now get the benefits of all my wildshape fixes; minor shapeshift fixed (new feat in 1.32), and the phantom bear/wolf spells fixed to correctly apply their incorporeal effect).
Once I get through the list again for the last time I'll upload the single player version. From there I'll start working on the MP version but it's going to take me a few hours to be sure since I have to create new hex-based 2da numbers for all the new feats, spells, etc (roughly 200 new entries) as well as diff the two files to see what I fixed in the already existing stuff. MP usually takes me a night to do (same as the combined with Reerons).
Better than having non-functional content! I'm testing everything I added this time instead of assuming it's easy so no need to test.
Edit: I've also suggested to Loudent and other PW devs to wait a week after a release to add the stuff so that the single player folks can find any issues and I can fix them in a point release for everyone. It's harder dealing with issues in a PW than it is with single player content.
Single player is completed and being uploaded to vault. Now to work on the MP and combined.
New stuff: 2 domains, 5 spells, 2 prcs, 21 feats, 3 new vfx, new armor types, panther shape for druids/lion of talisid's, and a ton of fixes and changes. Biggest update yet, probably equal to the last 3-4 combined.
For merging text files, you might look at a program like araxis merge. I used to use it all of the time when I wrote software. Very handy and was not very expensive when I bought it years ago: