Revert "Fix

This reverts commit ebad8c1e6f2e274825c476d72f6c134e2f25569e.

Conflicts:
	.classpath
	bin/icbm/core/ClientProxy.class
	bin/icbm/core/CommonProxy.class
	bin/icbm/core/ICBMCore.class
	bin/icbm/core/blocks/BlockProximityDetector.class
	bin/icbm/core/blocks/OreGeneratorICBM.class
	bin/icbm/core/blocks/TileProximityDetector.class
	bin/icbm/core/entity/EntityFlyingBlock.class
	bin/icbm/core/gui/GuiFrequency.class
	bin/icbm/core/gui/GuiProximityDetector.class
	bin/icbm/core/items/ItemTracker.class
	bin/icbm/core/prefab/TileFrequency.class
	bin/icbm/core/prefab/TileICBM.class
	bin/icbm/core/prefab/item/ItemICBMElectrical.class
	bin/icbm/core/tiles/ContainerBox.class
	bin/icbm/core/tiles/GuiBox.class
	eclipse/.metadata/.log
	eclipse/.metadata/.mylyn/.tasks.xml.zip
	eclipse/.metadata/.mylyn/tasks.xml.zip
	jars/resonant-engine-2.0.0.48-dev.jar
	jars/universal-electricity-4.0.0.28-dev.jar
Moving things around