Merge branch 'master' into mcpe-0.11

This commit is contained in:
Shoghi Cervantes
2015-03-17 19:12:03 +01:00
38 changed files with 482 additions and 228 deletions

View File

@ -49,4 +49,4 @@ class EntityDamageByBlockEvent extends EntityDamageEvent{
}
}
}