e031042af5
Add in locking changes from folia, plus fix some diffs. I'm sure it'll be error-free.
Add in locking changes from folia, plus fix some diffs. I'm sure it'll be error-free.