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
--- a/src/BlockEntities/DropSpenserEntity.h
+++ b/src/BlockEntities/DropSpenserEntity.h
@@ -41,7 +41,7 @@ public:
 	
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cDropSpenserEntity);
+	BLOCKENTITY_PROTODEF(cDropSpenserEntity)
 	
 	cDropSpenserEntity(BLOCKTYPE a_BlockType, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 	virtual ~cDropSpenserEntity();