Broke Git...
Merge branch 'MC1_6_2' of https://github.com/pacas00/PacasMods into MC1_6_2

Conflicts:
	.gitignore
	README.md
	src/minecraft/pacas00/pacasArmour/PacasArmourBase.java
	src/minecraft/pacas00/pacasArmour/PacasArmourClientProxy.java
	src/minecraft/pacas00/pacasArmour/PacasArmourCommonProxy.java
	src/minecraft/pacas00/pacasArmour/mod_PacasArmourMain.java
	src/minecraft/pacas00/pacasCircuit/PacasCircuitBlockPressurePlate.java
	src/minecraft/pacas00/pacasCircuit/PacasCircuitClientProxy.java
	src/minecraft/pacas00/pacasCircuit/mod_PacasCircuitMain.java
	src/minecraft/pacas00/pacasDimension/PacasDimensionClientProxy.java
	src/minecraft/pacas00/pacasOre/PacasOreArmor.java
	src/minecraft/pacas00/pacasOre/PacasOreClientProxy.java
	src/minecraft/pacas00/pacasRecords/PacasRecordsClientProxy.java
	src/minecraft/pacas00/pacasRecords/mod_PacasRecordsMain.java

should have run git pull first before trying to add everything back...