Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update
Update zh_CN.lang

Localization time!
more null checking
optimized import
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update
Re-added extra null checks

Not sure why these were removed

Should help with jakimfett/Minechem#172

And now I'm off on holiday - have a good one fellas!
fixed oreDict with giant refactor
Remove some unnecessary code.
extra null check
Merge pull request #194 from way2muchnoise/1.7-update

Null checking, Optimization and the oreDict fix
Merge pull request #193 from hilburn/1.7-update

Null checks
Merge pull request #191 from Mrkwtkr/patch-1

Update zh_CN.lang
nether ore support
Merge pull request #199 from way2muchnoise/1.7-update

nether ore support
Merge branch 'clean-up' of https://github.com/yushijinhun/Minechem into yushijinhun-clean-up

Conflicts:
	src/main/java/minechem/oredictionary/OreDictionaryDefaultHandler.java
null checking in NEIDecomp
Merge branch 'yushijinhun-clean-up' into 1.7-update
Merge branch '1.7-update' of github.com:jakimfett/MineChem into 1.7-update
Merge pull request #200 from way2muchnoise/1.7-update

null checking in NEIDecomp