Merge pull request #1 from scorpianz1525/master

Update 1
Fix warnings, some formatting, and specify generics
Merge pull request #2 from scorpianz1525/master

Textures
Added new slot and fixed shift-clicking
I have no idea
Fix up shift-clicking a bit more
Merge pull request #3 from tterrag1098/master

Fix up container stuff