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/BeaconEntity.cpp
+++ b/src/BlockEntities/BeaconEntity.cpp
@@ -267,7 +267,7 @@ void cBeaconEntity::GiveEffects(void)



-bool cBeaconEntity::Tick(float a_Dt, cChunk & a_Chunk)
+bool cBeaconEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	// Update the beacon every 4 seconds
 	if ((GetWorld()->GetWorldAge() % 80) == 0)