Update Server Config

My favorite job ^_^
Merge pull request #154 from Skaronator/patch-3

Update Server Config
Merge remote-tracking branch 'upstream/1.7.6' into 1.7.6
lots of coding