Merge pull request #1024 from sb023612/master

Update zh_CN.lang
#1026 Machine dupe
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git