Yield fixes
More plot effect support
First addition for Build Restrictions
Manual conflict merge

Trying to do command line conflict merge; not sure what I'm doing...