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 resources/com/pahimar/ee3/lang/pl_PL.xml

Corrected a typo, changed one translation to be more correct
Merge remote-tracking branch 'upstream/master'
Updated to reflect latest upstream changes.
Merge pull request #192 from gbibgim/master

Corrected a typo,
Merge pull request #195 from RedRoserade/master

Updated European Portuguese translation file
Updated french localization
Merge pull request #197 from Deatrathias/master

Updated French localization
Some work on getting Portable Crafting to properly damage transmutuation stones, finishing this up tomorrow