Merge branch 'master' into MobSpawner

2014-11-29 12:05:35 +01:00
parent 8b028c5c78 883230abbc
commit 648fee1a08
83 changed files with 3248 additions and 2297 deletions
@@ -26,7 +26,7 @@ public:

 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cMobHeadEntity);
+	BLOCKENTITY_PROTODEF(cMobHeadEntity)
 	
 	/** Creates a new mob head entity at the specified block coords. a_World may be nullptr */
 	cMobHeadEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);