Fix Hold->HoldTerrain, also use a proper fix for Attack
Merge remote-tracking branch 'quietust/develop' into develop
Update xml.