I don't use Mambelfish, but do have a number of custom mods to certain files.
On Mosforge.net, Gayle posted a diff which will only implement the changes from 1.0.5 to 1.0.7 (released today in place of 1.0.6). I used it glitch-free.
Basically, what it does is only modify the lines of code where specified...it does not replace any files (to the best of my knowledge).
Here's the link if you're interested.