Ignore intellij files
Merge remote-tracking branch 'origin/master'
Change max RF input to 24RF/t
Only nom power if a player has been defined