Dylan K. Taylor fb059cda69 Merge commit 'a4e250a3e61cbf1e75fe2785e71158f16a4a9039' ...

# Conflicts:
#	resources/vanilla

2020-06-17 20:48:19 +01:00

..

block

Merge commit '04191ec44a00dd058f5d7e9e315d451e44285494'

2020-06-17 20:40:12 +01:00

command

Merge commit '409c8c170'

2020-06-13 11:57:58 +01:00

crafting

Merge commit '3d50aafcc'

2020-06-13 11:30:44 +01:00

data/bedrock

cumulative imports cleanup (again)

2020-05-12 22:38:59 +01:00

entity

Merge commit '62ea7c93a9ba1e71bef868efefdd9cc6dcc84a08'

2020-06-17 20:34:19 +01:00

event

Merge commit '097c260db'

2020-06-14 19:28:05 +01:00

form

phpdoc armageddon for master, pass 1

2020-01-22 11:55:03 +00:00

inventory

Merge commit '2dc3cf816'

2020-06-03 12:52:42 +01:00

item

Merge commit '097c260db'

2020-06-14 19:28:05 +01:00

lang

Scrap TextContainer, make TranslationContainer immutable

2020-02-08 13:38:27 +00:00

network

more jsonmapper models for login

2020-06-17 19:10:27 +01:00

permission

Merge commit '189f12a644aa6474bc91650cce0eb0ae9735db91'

2020-05-18 10:34:00 +01:00

player

Merge commit 'a0de9b0d4'

2020-06-04 14:11:00 +01:00

plugin

DiskResourceProvider: do not trim backslashes from path when we're not on Windows

2020-05-24 14:26:12 +01:00

resourcepacks

Merge commit 'f3e436592a180c8d4fbcd346a97abdd746056c38'

2020-05-18 10:30:55 +01:00

scheduler

Merge commit 'd8d994351'

2020-06-14 19:47:21 +01:00

stats

Extract ServerConfigGroup from Server

2020-05-24 15:48:03 +01:00

thread

start using pocketmine/errorhandler

2020-05-10 13:04:40 +01:00

timings

added Timings::INCLUDED_BY_OTHER_TIMINGS constant

2020-05-24 16:09:45 +01:00

updater

Extract ServerConfigGroup from Server

2020-05-24 15:48:03 +01:00

utils

Merge commit 'a4e250a3e61cbf1e75fe2785e71158f16a4a9039'

2020-06-17 20:48:19 +01:00

wizard

strip extra blank lines (php-cs-fixer)

2020-01-22 15:14:10 +00:00

world

Merge commit 'f3063e797fab56ff8d0213c8e5a3904085a6eb79'

2020-06-17 20:43:30 +01:00

CoreConstants.php

Merge branch 'next-minor'

2020-03-10 13:05:37 +00:00

CrashDump.php

Merge commit '097c260db'

2020-06-14 19:28:05 +01:00

MemoryManager.php

Merge commit '097c260db'

2020-06-14 19:28:05 +01:00

PocketMine.php

start using pocketmine/errorhandler

2020-05-10 13:04:40 +01:00

Server.php

Eliminate usages of BaseNbtSerializer->readCompressed() and BaseNbtSerializer->writeCompressed()

2020-06-17 14:31:56 +01:00

ServerConfigGroup.php

Extract ServerConfigGroup from Server

2020-05-24 15:48:03 +01:00

VersionInfo.php

Merge branch 'next-minor'

2020-03-10 13:05:37 +00:00