Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Update README.md

Updated to 1.4.7 official, fixed derps.  Deleted useless step.
Update README.md

wut
Merge pull request #184 from 50Wliu/Localization

Localization update (zh_CN)
Update README.md

PSA:  UPDATE TO JAVA 7u11!  THIS FIXES A MAJOR EXPLOIT!
Minor additions/changes, added latest version link.
Merge pull request #186 from 50Wliu/README

Update README.md
Traditional Chinese localization update

Alright, alright, 50Wliu, you win. No 的. :P
Just mirroring the changes he made to the simplified localization- spaces and removed periods for consistency, and that little 的 issue. 
Merge pull request #187 from anonymouspineapple/patch-29

Traditional Chinese localization update
Removal of unused commands in pt_BR localization