TEMP FIX for Wylker, will be rolled back for matured changes in v6
Update zh_CN.lang
Merge pull request #765 from crafteverywhere/patch-2

Update zh_CN.lang
Backport CableUtils optimisations to master branch
Bump version to 5.7.0 due to Vaygrim's request, closes #808
Fix typo
Merge pull request #913 from Mierzen/patch-1

Fix Copper ore tooltip typo
Touch up on Free Runners positioning
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Conflicts:
	common/mekanism/client/render/ModelCustomArmor.java
no message
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
Fix a few bugs
Fix GUI
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
Should be fixed
Update build.xml
Update build.properties
Update build.properties
Armored Jetpack…done. Also made Charcoal Blocks fuel sources
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development