Most command cards in Conflict_Check. PLM WarpPrism conflict fixed.
Merge branch 'master' of https://github.com/SixtusTheFifth/TheCoreConverter into SixtusTheFifth-master
Merge branch 'master' of https://github.com/jonnyhweiss/TheCoreConverter