everything in the correct place now
Merge pull request #12 from matheusxaviersi/dev

everything in the correct place now so its inside the code base now
everything in the correct place now
Merged Portuguese translation from dev
Create zh_CN.lang
Update README.md

Add zh_CN
Merge branch 'performance' into dev
Merge branch 'master' into dev
Fixed exosuit armor protection
Fixed 5reals
Merge branch 'performance' into perfdev
Merge branch 'dev' of https://github.com/Flaxbeard/SteamCraft_1.7 into dev
License for asie
Fixed potential for 'useless' smashed ores
Fixed useless smashed ores
Tweaked for testing
Merge branch 'performance' into dev

Conflicts:
	src/main/java/flaxbeard/steamcraft/api/steamnet/SteamNetwork.java
Thumper does not mine bedrock
Thumper no longer mines bedrock
Fixed Boiler Pickblock