unlock
Merge pull request #34 from MoeBoy76/master

OCD and other fixes
Fixed some text errors，and Update
Fix name PokemonThai
Merge pull request #33 from Yyiyun/patch-13

unlock
Merge pull request #35 from Yyiyun/patch-14

Fixed some text errors，and Update
Merge pull request #36 from saiber4u/patch-6

Fix name PokemonThai
th_TH.lang

fix pixelmon name
Update zh_TW.lang

added some berry, some hallowed of gem, isi's golden hourglass and silver hourglass, some fine adjustment, added key names from options menu.
Merge pull request #37 from saiber4u/patch-7

th_TH.lang
Accurate translation
Merge pull request #38 from eva08maicy02/patch-4

Update zh_TW.lang
Merge pull request #39 from Yyiyun/patch-15

Accurate translation
added halloween event lang tags
Merge branch 'master' of https://github.com/Pixelmon/Pixelmon-Language

Conflicts:
	en_US.lang
halloween
Merge pull request #40 from Yyiyun/patch-16

halloween
Update zh_TW.lang

Added halloween message, fix some mistransplant name.
Fix All Simplified Chinese Translaton

Fixed Layout

Made With New Pixelmon English Language File
fix nbt.speed2