Update type2.txt

cottonnee fairy
Merge pull request #826 from ZoroDark/patch-14

Update type2.txt
Fix usage stats test on windows
Merge branch 'master' of github.com:po-devs/pokemon-online
Merge pull request #827 from TheUnknownOne/master

po:send url
Fixed nature bug

Also more generally assured consistency in version passing for networking.
Merge branch 'master' of github.com:po-devs/pokemon-online
.
Added another test, to ensure team passing integrity

This test does client <-> server <-> battle server
Smeargle needs Mat Block
Smeargle needs Mat Block
Update level_moves.txt
Merge pull request #828 from BeastCharizard/patch-3

Mat Block for Smeargle
fix channel crash?
Bettering tb code a little