made hardmode.recipes include default.recipes to avoid missing recipes when players comment out the default recipes in the user.recipes; additionally using block break event to check if robots may break blocks (either by "clicking" them or by moving into them), making it compatible with WorldGuard, e.g.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
make analyzer show sided address and signal strength on access point; adding waila support
more waila support for a couple of blocks
An important one.

If you did not know, search for it, you'll maybe find out.
Merge pull request #168 from Vexatos/patch-3

An important one.
Added more names to robot.names
Merge pull request #169 from kebbanalex/patch-1

Added more names to robot.names
minor internal refactoring (moving tile entity traits to extra package); robots don't get scared and freeze when being watched anymore (if waila is installed); removed the general pause after sync calls again, too broad, e.g. slows down robots massively due to pauses after detect() and such; added pause to redstone component instead; fixed robot name tag always rendering behind robot tool (even when it should be in front of it)
some more minor cleanup and refactoring
added check for cc presence in access point (might have potentially crashed i think)
some more cleanup
fixed robots always dropping items forward into the world (even for dropUp and dropDown)
keeping updating envs managed by adapter in list and iterating that instead of all of them
Merge branch 'master' of github.com:MightyPirates/OpenComputers
avoid composite file systems have space total < space used
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Conflicts:
	src/main/scala/li/cil/oc/client/PacketSender.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/block/Capacitor.scala
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/block/Delegate.scala
	src/main/scala/li/cil/oc/common/block/Delegator.scala
	src/main/scala/li/cil/oc/common/block/DiskDrive.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/block/WirelessRouter.scala
	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
	src/main/scala/li/cil/oc/common/tileentity/Cable.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala
	src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
	src/main/scala/li/cil/oc/common/tileentity/WirelessRouter.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Inventory.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/PowerAcceptor.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/component/Redstone.scala
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7