Ug.
Oh so slowly getting there.
Closer.
time to cry?
I hate you GUIs.
Item filter upgrades seem to now be working.
It is ready to test!
Changed item conduits to be a single, upgradable conduit.
Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into CrazyPants-1.7

Conflicts:
	src/main/java/crazypants/enderio/conduit/gui/ItemSettings.java
	src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java
Merge branch 'CrazyPants-1.7' into 1.7