anonymous/cuberite - A lightweight, fast and extensible game server for Minecraft

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix failed merge and other issues	Tiger Wang	2014-07-18	1	-1/+1
\|
*	Merge branch 'master' into portals	Tiger Wang	2014-07-18	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
\| *	Fixed respawning	Tiger Wang	2014-06-29	1	-1/+1
\| \| \| \| \| \| \| \|	* Fixes #1103
\| *	Fixed deadlock when moving players to other worlds.	Mattes D	2014-06-08	1	-1/+1
\| \| \| \| \| \| \| \|	Fixes #1039, fixes #851
* \|	Portals animate and delay correctly	Tiger Wang	2014-06-12	1	-1/+1
\| \|
* \|	Implemented end and nether portals	Tiger Wang	2014-05-31	1	-1/+1
\|/
*	Allow 1.6.4 Forge clients to log in.	Mattes D	2014-04-21	1	-0/+1
\| \| \| \|	Fixes #913.
*	Fixed 1.6.4 client crash on composite chat messages.	madmaxoft	2014-04-06	1	-0/+1
\|
*	Moved source to src	Alexander Harkness	2013-11-24	1	-0/+76