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

Conflicts:

src/minecraft/com/themoderguy/sml/common/tileentity/TileEntityXpGenerato
r.java