update BlockType.fromString to accept data value at the end of a machine name