Updated Calclavia mods

Universal-Electriciy is now part of resonant engine
Updated CoFH mods