god dammit

jesus
Merge branch 'master' of https://github.com/TheModerGuy/Sent_Matrix_Logic

Conflicts:

src/minecraft/com/themoderguy/sml/client/renderers/tileentity/TileEntity
XpGeneratorRenderer.java