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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Temporarily commented out override directives."	Tycho	2014-09-05	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64. Conflicts: src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/Generating/ChunkGenerator.h src/LoggerListeners.cpp src/Mobs/Components/AIAggressiveComponent.h src/Mobs/Monster.h src/OSSupport/IsThread.h src/Protocol/Authenticator.h src/UI/SlotArea.h
*	Merge branch 'master' into ComponentRewrite	Tycho	2014-09-05	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: MCServer/Plugins/Core src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/LoggerListeners.cpp src/Mobs/Monster.cpp src/UI/SlotArea.h
\| *	In 1.8, carrots and potatoes yield one less hunger point.	archshift	2014-09-04	1	-1/+1
\| \|
* \|	Temporarily commented out override directives.	Samuel Barney	2014-08-21	1	-4/+4
\|/
*	More trailing whitespace fixes.	madmaxoft	2014-07-17	1	-1/+1
\|
*	Basic style fixes.	madmaxoft	2014-07-17	1	-2/+2
\|
*	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.
*	Merge branch 'master' into playerimprovements	Tiger Wang	2014-02-09	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
\| *	Improved Type safety of eBlockFace	Tycho	2014-02-04	1	-1/+1
\| \| \| \| \| \| \| \|	May Fix #640
* \|	Fixed #626	Tiger Wang	2014-02-03	1	-0/+20
\|/ \| \| \|	* Fixed consumption of carrots and potatoes
*	Fixed a few MSVC warnings.	madmaxoft	2014-01-07	1	-1/+0
\|
*	Moved source to src	Alexander Harkness	2013-11-24	1	-0/+65