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/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -28,7 +28,7 @@ public:

 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cCommandBlockEntity);
+	BLOCKENTITY_PROTODEF(cCommandBlockEntity)
 	
 	/// Creates a new empty command block entity
 	cCommandBlockEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);