Added to the API, Some Switch Cables work...
Added a recipe for the Wire Mill...

Some things still need textures, and to do that their texture setting
code needs to be changed as well...
Merge branch 'master' of https://github.com/Mattredsox/UE-Electric-Expansion

Conflicts:
	src/common/electricexpansion/alex_hawks/misc/RecipeRegistrar.java
Fix accidental commits

MCP changed the decompiled directory structure slightly...
Work towards 1.4.0 update
MERGE Matt's stuff (master)
Merge branch 'master' of https://github.com/Mattredsox/UE-Electric-Expansion

Conflicts:
	.gitignore
	src/common/electricexpansion/EECommonProxy.java
	src/common/electricexpansion/ElectricExpansion.java
	src/common/electricexpansion/alex_hawks/cables/TileEntityRawWire.java
	src/common/electricexpansion/alex_hawks/cables/TileEntitySuperConductor.java
	src/common/electricexpansion/alex_hawks/helpers/TileEntityCableHelper.java
	src/common/electricexpansion/alex_hawks/machines/TileEntityWireMill.java
	src/common/electricexpansion/alex_hawks/misc/ContainerWireMill.java
	src/common/electricexpansion/alex_hawks/misc/RecipeRegistrar.java
	src/common/electricexpansion/alex_hawks/misc/TileEntitySuperConductor.java
	src/common/electricexpansion/mattredsox/blocks/BlockAdvBatteryBox.java
	src/common/electricexpansion/mattredsox/tileentities/TileEntityAdvBatteryBox.java
	src/minecraft/electricexpansion/client/alex_hawks/GuiWireMill.java
	src/minecraft/electricexpansion/client/mattredsox/GUIAdvBatteryBox.java
	src/minecraft/electricexpansion/client/mattredsox/GuiVoltDetector.java
Starting to implement Wireless Power Transfer
Manually merging Matt's code
	modified:   .gitignore
	new file:   buildnumber.txt
	new file:   info.txt
	modified:   src/common/electricexpansion/EECommonProxy.java
	modified:   src/common/electricexpansion/ElectricExpansion.java
	modified:   src/common/electricexpansion/alex_hawks/helpers/TileEntityCableHelper.java
	modified:   src/common/electricexpansion/alex_hawks/machines/TileEntityWPTReciever.java
	modified:   src/common/electricexpansion/alex_hawks/misc/RecipeRegistrar.java
	new file:   src/common/electricexpansion/mattredsox/blocks/BlockBCBatteryBox.java
	modified:   src/common/electricexpansion/mattredsox/blocks/BlockDOWNTransformer.java
	modified:   src/common/electricexpansion/mattredsox/blocks/BlockFuse.java
	modified:   src/common/electricexpansion/mattredsox/blocks/BlockUPTransformer.java
	new file:   src/common/electricexpansion/mattredsox/items/ItemLead.java
	modified:   src/common/electricexpansion/mattredsox/tileentities/TileEntityAdvBatteryBox.java
	new file:   src/common/electricexpansion/mattredsox/tileentities/TileEntityBCBatteryBox.java
	modified:   src/minecraft/electricexpansion/client/alex_hawks/GuiWireMill.java
	modified:   src/minecraft/electricexpansion/client/mattredsox/GUIAdvBatteryBox.java
	new file:   textures/electricexpansion/textures/mattredsox/BatBox.png
	modified:   textures/electricexpansion/textures/mattredsox/blocks.png
	deleted:    textures/electricexpansion/textures/mattredsox/blocks1.png
Started adding Quantum Batt-box
Finishing for the night...
Merge branch 'master' of https://github.com/Mattredsox/UE-Electric-Expansion

Conflicts:
	.gitignore
	buildnumber.txt
	info.txt
	src/common/electricexpansion/ElectricExpansion.java
	src/common/electricexpansion/alex_hawks/helpers/TileEntityCableHelper.java
	src/common/electricexpansion/alex_hawks/misc/RecipeRegistrar.java
	src/common/electricexpansion/mattredsox/tileentities/TileEntityAdvBatteryBox.java
	src/minecraft/electricexpansion/client/mattredsox/GUIAdvBatteryBox.java
Commiting before moving to MCP 7.19
Checkpoint, and something for @ElusiveHawk

@ElusiveHawk you want customRecipes.java
Merge pull request #18 from Alex-hawks/master

Merging stuff