Merge branch 'master' of git://github.com/sk89q/craftbook
Conflicts:
	circuits/src/main/java/com/sk89q/craftbook/bukkit/CircuitsPlugin.java
	circuits/src/main/java/com/sk89q/craftbook/gates/world/Detection.java
	circuits/src/main/java/com/sk89q/craftbook/gates/world/EntitySpawner.java
	circuits/src/main/java/com/sk89q/craftbook/gates/world/ParticleEffect.java
	circuits/src/main/java/com/sk89q/craftbook/gates/world/ParticleEffectST.java
	circuits/src/main/java/com/sk89q/craftbook/gates/world/PlayerDetection.java
	common/src/main/java/com/sk89q/craftbook/bukkit/MechanicListenerAdapter.java
Squashed commit of the following:

commit 509591db7b34c6246d8f3d2165aba70a5725be24
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 11:29:09 2012 +0200

    forgot that 3i30 have 2 blocks

commit 216beb08bf7ba520324a9e5109133a0e52c4326e
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 11:26:42 2012 +0200

    fixed the direction based messup

commit 71f979dc61eb6338032e0892e4836336d3b9c4d6
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 11:17:24 2012 +0200

    excluded powered rails from powering mechanics

commit 7c5e809c06fc87e73930e9969c821bda3f519c21
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 11:13:32 2012 +0200

    added lever to the block redstone update method

commit cb11aed2d42871ba3bb6d97f08678758fd019656
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 11:09:33 2012 +0200

    extended item not sensor from item sensor

commit a5fc84e9761a78aef69197cca4855a85720e0883
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 11:07:36 2012 +0200

    fixed item sensor detection

commit a80d65f517d73e500206c560f5161f39bba1b3d8
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 10:54:16 2012 +0200

    now correctly spawns the entity in the center above the highest block

commit 10af6004e9fd1c9c2204957092f852fc91d7ce02
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 10:40:27 2012 +0200

    needs to be added and not substracted

commit 9b4cacac3f68ec53dd49961ed852a8ba5a96edc3
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 10:34:19 2012 +0200

    entity spawn location is now calculated on trigger and should spawn centered

commit 08a2aba9c44d1ee872098b943dfd647426be15e7
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 10:15:19 2012 +0200

    version fix

commit da21a1aa04d7efa2a4a1ca42eed9a3965d32ed2e
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 10:11:56 2012 +0200

    fixed and improved entity spawner

commit e9ec637d7d5e40403e02609ae578a4214b44a89a
Author: Silthus <m.silthus@gmail.com>
Date:   Sun Jul 29 10:05:34 2012 +0200

    version bump

commit 36dfaac4b43dc022aef9f9d5d50122dd5a5812a6
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 16:23:20 2012 +0200

    renamed the itemvanisher to itemsensor

commit 0966cef6d764e59a710cdcf2efbbdb5d75a4da2c
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 16:20:02 2012 +0200

    added item vanisher detector MC1265 and MC0265

commit eead5c043affd908e557e6099dea749cc7c860ea
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 16:02:22 2012 +0200

    added item sensor and st item sensor MC0264 and MC1264

commit ff4242e6b204923bdb3b025c1c559c2d82dbc2af
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 15:26:17 2012 +0200

    added config option to allow indirect wire powering

commit 4c518df4f5f79c197013dd62d7b582d7915e65b7
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 15:08:16 2012 +0200

    some small bug fixes with sign parsing

commit 269a8916688b26f451c960a8c43712b6ca1a8589
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 14:40:11 2012 +0200

    added useful util methods and tested them in some ics

commit afaf6e65b3e9061ecdb8073ea983c821959a59e2
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 14:10:52 2012 +0200

    added possibility to add multiple families to one ic without copy and paste

commit 695a4793578a24b84a3798a3724ccf139db4879c
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 14:01:22 2012 +0200

    added power sensor self triggered and normal MC1264 and MC0264

commit 8ec188477d0021f35c5cc930fc057e39d55e0d8e
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 13:55:00 2012 +0200

    improved set lever method for all ics

commit 2747349a2f81fe0f40f584ebabbf9cc2cab6c88f
Author: Silthus <md.doering@yahoo.de>
Date:   Sat Jul 28 13:54:38 2012 +0200

    added power sensor ic

commit 3a9b76aeeabf7afc24ab972c39025053cb977888
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 21:21:24 2012 +0200

    improved and fixed entity spawner

commit 6d8a9c77a4cb57bc7cb43c05c671c46b78f056d5
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 20:59:58 2012 +0200

    PlayerDetectionSt needs to extend PlayerDetection

commit 9fe901feffe90b1572173ff840dcd9aebc03932c
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 20:53:40 2012 +0200

    added player detection and group detection IC as MC0272 and MC1272

commit 6c5dbc96cbc0d5149a69573203a5c961151849a9
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 20:28:56 2012 +0200

    factory creating wrong object

commit f827fb86d208729a880deaa7afe3fb39334c8a2b
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 20:25:59 2012 +0200

    fixed offset facing bug

commit e364383ba20bcd933790e0575104af25914c5db5
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 20:21:05 2012 +0200

    Door is now [MC1212] and Bridge [MC1211] Falsebook MC1210 will be converted automatically

commit 8c2a96c6eacf99ab0834dfc1b18950bb84eb002d
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 20:15:40 2012 +0200

    forgot bracers

commit d3e320741de026936483121ae10dddb132f795b0
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 20:12:40 2012 +0200

    fixed bug with width, height and depth when using default z value

commit 2d77a2f5a48d2da02d9d5430eea62c33525fcf38
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 20:09:26 2012 +0200

    fixed bug with data values and default z offset

commit 50227c07eab14fb74eeb5e041045f5f85b97dcdd
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 19:58:13 2012 +0200

    added Bridge IC MC1211

commit 8ac985daf17873252d4f11e39660033ee738120a
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 19:55:34 2012 +0200

    made it so that ICs are automatically converted to the new particle effect id

commit 536c1df24323b740c27de6ae0c0cae4f8d132ee2
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 19:32:18 2012 +0200

    added conversion method for MC1210 particle effect

commit 3c398fa1bf08ed8c31a0fec4f7dd0f69e946e595
Author: Silthus <m.silthus@gmail.com>
Date:   Tue Jul 24 17:16:58 2012 +0200

    added conversion method for MC1210 particle effect
Merge remote-tracking branch 'origin/master'