Merge branch 'master' of C:\Users\Nick\Desktop\Mod Stuff\MysticEnergies with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
T3cs fail