creature text fix merge trinitycore & more fixes