James, I started working on a merge from standard (May 2013...)

[neroden]

My merge-from-standard branch contains the current work.  So far I've managed to pull the code relating to the edge of the world, and that seems to compile and run correctly.

(The next bit is going to take a bit longer as it has more merge conflicts.)

[jamespetts]

Thank you - that is most helpful. The world edge stuff is quite separate, I think, from the things that are different about Experimental. Is it worth, I wonder, merging in this part before the next major release, which I am hoping will be soon?

[neroden]

The "world edge" work is at commit 69ea30ef8f10f67a17b049cb5613028b486cb52b.

I think it is worth merging.  It's quite independent of the work in Experimental, but I think it improves things quite nicely.  I believe there's a subtle update to saving and loading involved in standard, so you'll want to recheck all the version numbers before proceeding.

I've gotten a lot further in the merge since then.  None of the stuff so far should cause any conflicts or trouble.

I have now successfully merged the fixes to the loading bar.  It runs and compiles.  There is one small bug where the max_progress is not set correctly (so the loading bar goes running off the right edge), but I can't find it because the progress bar is going by so fast that I can't figure out which progress bar it is.  :-)

So I think it's worth merging this and fixing that later.  This was a pain to merge even though there's nothing substantive to it.

This merge is at 24f73e198e5ae2dfe37cea39c124250fae74a6d0, still on the "merge-from-standard" branch.

Then I did a bunch more easy merging, which is at 24f73e198e5ae2dfe37cea39c124250fae74a6d0, still on the 'merge-from-standard' branch.

---
The next commit after that is conflict hell and will probably take a while.

[jamespetts]

Just merged and pushed - that seems to work well: thank you!