Merge remote-tracking branch 'origin/pistonfixes'

Conflicts: src/Chunk.cpp
2014-06-02 19:49:14 +01:00
parent b9ca7bd120 a84f107400
commit 5fc7592cba
15 changed files with 401 additions and 457 deletions
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -12,7 +12,6 @@
 #include "BlockEntities/SignEntity.h"
 #include "UI/Window.h"
 #include "Item.h"
-#include "Piston.h"
 #include "Mobs/Monster.h"
 #include "ChatColor.h"
 #include "OSSupport/Socket.h"