Dylan K. Taylor d840e8c4d4 Merge commit 'a34f3261c' ...

# Conflicts:
#	resources/vanilla
#	src/event/entity/EntityExplodeEvent.php
#	src/pocketmine/event/block/SignChangeEvent.php
#	src/utils/Utils.php

2020-07-04 22:39:40 +01:00

..

actual-problems.neon

Merge branch 'stable'

2020-06-21 00:30:45 +01:00

check-explicit-mixed-baseline.neon

Separate consumable item interfaces from general consumable interfaces (#3595)

2020-06-28 17:53:03 +01:00

com-dotnet-magic.neon

Merge commit '30f2e7527818e3275ceb0ff26093c4f26a84c51c'

2020-01-13 19:17:54 +00:00

custom-leveldb.neon

Merge commit '30f2e7527818e3275ceb0ff26093c4f26a84c51c'

2020-01-13 19:17:54 +00:00

ds-bugs.neon

Merge commit '8e1b3ed'

2020-04-25 12:35:30 +01:00

gc-hacks.neon

phpstan: clean out some more dead error patterns

2020-06-22 19:59:57 +01:00

l7-baseline.neon

Merge 1.16 support into PM4 (with changes)

2020-06-26 22:21:09 +01:00

l8-baseline.neon

phpstan: clean some errors from level 8 baseline

2020-06-29 22:42:46 +01:00

php-bugs.neon

Merge commit '8e1b3ed'

2020-04-25 12:35:30 +01:00

phpstan-bugs.neon

Merge commit 'a34f3261c'

2020-07-04 22:39:40 +01:00

phpunit-wiring-tests.neon

Convert WorldProviderManager to singleton

2020-05-23 10:02:09 +01:00

pthreads-bugs.neon

Merge commit '8e1b3ed'

2020-04-25 12:35:30 +01:00

runtime-type-checks.neon

phpstan: clean out some more dead error patterns

2020-06-22 19:59:57 +01:00