Merge branch 'master' into Inventory

2015-01-25 00:34:19 +01:00
parent 8277e1ec4e e6b50b6037
commit 1eedccc56a
232 changed files with 5200 additions and 1556 deletions
--- a/src/BlockEntities/DropSpenserEntity.cpp
+++ b/src/BlockEntities/DropSpenserEntity.cpp
@@ -126,7 +126,7 @@ void cDropSpenserEntity::SetRedstonePower(bool a_IsPowered)



-bool cDropSpenserEntity::Tick(float a_Dt, cChunk & a_Chunk)
+bool cDropSpenserEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	UNUSED(a_Dt);
 	if (!m_ShouldDropSpense)