New way to calculate effects

Merging mana streams is possible now! Generators don't need to be on (1,
1)