Commit graph

3 commits

Author SHA1 Message Date
md_5
64352d6745 Upstream merge.
Mikeprimm's lighter nibble arrays have been removed since they have been incorporate d upstream.
2014-06-27 20:50:08 +10:00
md_5
b4a543d2c5 Partial upstream merge.
Still need to validate how some changes interact with our own.
2014-06-24 18:00:00 +10:00
md_5
e46e6c46a1 Upstream merge, lots of conflicts 2014-06-22 19:28:17 +10:00
Renamed from CraftBukkit-Patches/0044-Player-Collision-API.patch (Browse further)