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

Merge branch 'master' into MobSpawner

Browse Source 
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
This commit is contained in:
Howaner
2014-09-26 23:56:20 +02:00
parent 718eb227ab 305778f22f
commit 033d16babb
186 changed files with 10593 additions and 4070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/BlockEntities/BlockEntity.h
View File

@@ -1,8 +1,6 @@
#pragma once
#include "../ClientHandle.h"
#include "../World.h"
@@ -13,8 +11,9 @@ namespace Json
class Value;
};
class cChunk;
class cPlayer;
class cPacket;
class cWorld;