RR 2.3.1 mod update pass

Only existing mods have been updated at this stage
ID conflict correction

Whoops.
ID conflict correction attempt #2

Double-whoops. I forgot how tightly packed the Metallurgy IDs are.
Adding new mods

CompactWindmills
Damage Indicators
Small Boats
Tubes
XML update for RR 2.3.1-BETA
Debugging
brute force merge