Update plugins to match fixed field names in cage/civzone
Merge branch 'master' of https://github.com/jjyg/dfhack
Merge changes, also fix Windows build (missing header)