Cole's XButton Indicator for Cannon Reloading merge
fixed merge