started refactor into own package
Added AtomicScience
Merge branch 'master' of https://github.com/MightyPirates/OpenComponents

Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
more refactoring
me so indecisive
yet more refactoring!
adjusted mcmod.info so it don't crash forge when published
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
added MassFab and Lamp
cc peripherals are now wrapped by default and can be disabled using a blacklist (in the config)
Merge branch 'master' of https://github.com/MightyPirates/OpenComponents
cleaned up after peripheral redesign
Added Railcraft, TMechworks
Merge branch 'master' of github.com:MightyPirates/OpenComponents

Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
adjustments for 1.7
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Conflicts:
	src/main/scala/li/cil/oc/common/block/Delegator.scala
added check to avoid duplicate components when a block next to the adapter already has an environment interface in addition to a peripheral interface
Merge branch 'master' of https://github.com/MightyPirates/OpenComponents