Update to latest upstream
See MassiveCraft/mcore@84652500619f62bb6a45177ff8f0c6c9863b1189 and MassiveCraft/mcore@edea6807c6af86013540ff2ed853b9fa1c467850 for more info