Tiger Wang bfa8aaf41b Merge branch 'master' into portals ...

Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp

2014-06-10 20:51:22 +01:00

..

CMakeLists.txt

Cmake generated projects for IDEs include headers in project files.

2014-04-25 09:56:15 -07:00

SlotArea.cpp

derp

2014-06-04 11:39:21 +01:00

SlotArea.h

Players can't set items in the result slot, when they shift a item.

2014-06-01 00:50:35 +02:00

Window.cpp

Merge branch 'master' into portals

2014-06-10 20:51:22 +01:00

Window.h

This isn't a enchantment table :D

2014-05-05 17:34:32 +02:00

WindowOwner.h

Fixed non-virtual destructors warnings.

2014-03-28 21:35:45 +01:00