Merge pull request #267 from way2muchnoise/1.7-update

no more ore synthesis and fixes inconsistencies with decomposer