Added Check for OP
Made funnel respect labels
couple changes
Create Korean translation file
Update ko_KR.lang
Added Ore gen change and removed bedrock
Merge pull request #323 from jinwoo829/patch-1

Create Korean translation file
Fixed crash caused in creative
Register ko_KR
Merge pull request #337 from jinwoo829/patch-2

Register ko_KR
Added IMC for kami research, and auto ignores research ending in KAMI
Merge branch 'hotfix' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into hotfix
Merge branch 'hotfix'
Added temp blacklist of aliquo
Update zh_CN.lang

It will take me some time to complete, but at least I can add the missing entries first.
Merge pull request #341 from crafteverywhere/patch-4

Update zh_CN.lang
Update KamiResearchItem.java

Added Skymatrix to blacklist, removed miniliths as fixed
Modular goodness!

- Allow the Osmotic Enchanter pillar list to be modular
Merge pull request #342 from T145/master

Modular goodness!
Update zh_CN.lang

To be continued!