Made MekGen recipes more OreDict friendly
Merge branch 'master' into development
Merge branch 'master' into development
Fixed strange glow panel issue
Fixed a Portable Tank crash
Merge branch 'master' into development
Merge branch 'master' into development
Minor cleanup
Merge branch 'master' into development
Merge branch 'master' into development
Merge branch 'master' into development

Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
Merge branch 'master' into development
Merge branch 'master' into development
Merge branch 'master' into development
Merge branch 'master' into development
Merge branch 'master' into development
Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975
Reorganise trait registration
Merge branch 'master' into development
Merge branch 'master' into development