flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures

Browse Source 
Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp
This commit is contained in:
Tiger Wang
2013-12-08 14:02:45 +00:00
parent f64dd786aa 6785bb7c16
commit 1d554677b4
48 changed files with 1376 additions and 1279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Player.cpp
View File

@@ -8,7 +8,7 @@
#include "../UI/WindowOwner.h"
#include "../World.h"
#include "Pickup.h"
#include "../PluginManager.h"
#include "../Bindings/PluginManager.h"
#include "../BlockEntities/BlockEntity.h"
#include "../GroupManager.h"
#include "../Group.h"