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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| *	Normalized comments.	madmaxoft	2014-07-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
* \|	Implemented end and nether portals	Tiger Wang	2014-05-31	1	-1/+1
\|/
*	Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).	madmaxoft	2013-12-20	1	-1/+1
\|
*	Fixed the remaining derps	Alexander Harkness	2013-11-27	1	-1/+1
\|
*	Further attempts to fix compile	Tiger Wang	2013-11-25	1	-1/+1
\|
*	Attempt to fix compilation	Tiger Wang	2013-11-24	1	-1/+1
\|
*	Merge remote-tracking branch 'origin/master' into foldermove2	Alexander Harkness	2013-11-24	1	-15/+15
\| \| \| \| \|	Conflicts: GNUmakefile
*	Moved source to src	Alexander Harkness	2013-11-24	1	-0/+217