15 Commits

Author	SHA1	Message	Date
Dylan K. Taylor	b07000f613	Merge branch 'pm3-bedrock-1.17.10' into pm4-bedrock-1.17.10	2021-07-09 20:02:30 +01:00
Dylan K. Taylor	2bbb24fab7	Merge branch 'stable'	2021-06-08 20:00:08 +01:00
Dylan K. Taylor	1e6d97a157	Merge branch 'stable'	2021-04-07 21:25:39 +01:00
Dylan K. Taylor	3fe0adbd7f	Merge branch 'stable'	2021-03-14 20:14:08 +00:00
Dylan K. Taylor	197b1a8566	Merge branch 'stable' ... # Conflicts: # resources/vanilla # src/network/mcpe/protocol/types/inventory/stackresponse/ItemStackResponseSlotInfo.php # src/network/mcpe/raklib/FilterTextPacket.php # src/pocketmine/VersionInfo.php # src/pocketmine/network/mcpe/protocol/PacketPool.php # src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php	2020-12-08 21:34:06 +00:00
Dylan K. Taylor	af1fe7c293	Merge branch 'stable'	2020-11-21 21:13:48 +00:00
Dylan K. Taylor	a35ca1fa71	Merge branch 'stable' into master	2020-08-15 20:32:14 +01:00
Dylan K. Taylor	0caf99445b	Merge commit '4fed08bcd4655d7eec8d2cdf88950789f99ed2ee' ... # Conflicts: # resources/vanilla	2020-06-26 22:21:49 +01:00
Dylan K. Taylor	7e6adc41f0	Merge 1.16 support into PM4 (with changes)	2020-06-26 22:21:09 +01:00
Dylan K. Taylor	9bfc1df486	Merge branch 'stable'	2020-04-18 13:19:31 +01:00
Dylan K. Taylor	ca909ebc1d	Merge branch 'next-minor'	2020-03-10 13:05:37 +00:00
Dylan K. Taylor	a1610500e9	Merge tag '3.11.1'	2019-12-11 23:35:20 +00:00
Dylan K. Taylor	c85c1c3c3f	Merge commit '82d9e481d2a0a389fbbc6dfd3672fc366127febc'	2019-12-11 23:06:35 +00:00
Dylan K. Taylor	75a2d79671	convert more constant interfaces to final classes, close #2885	2019-08-24 15:39:23 +01:00
Dylan K. Taylor	5499ac620c	Removed pocketmine subdirectory, map PSR-4 style	2019-07-30 19:14:57 +01:00