Upstream merge.

This commit is contained in:
md_5 2015-01-05 14:32:01 +11:00 committed by Zach Brown
parent 6ae735e2e3
commit 384699a51a
188 changed files with 247 additions and 253 deletions

View file

@ -1,4 +1,4 @@
From bddf7e37af12bf5f8ff0e317ec382ebd3e84b227 Mon Sep 17 00:00:00 2001
From 3df6151ebd32243ea5a07ab3910c97767043fbb3 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:01 -0500
Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent