Eoghanmc22 7cbd13a560 Merge branches 'experimental' and 'master' of https://github.com/Minestom/Minestom ... Conflicts: src/main/java/net/minestom/server/inventory/Inventory.java		2020-07-01 15:55:13 -04:00
..
java	Merge branches 'experimental' and 'master' of https://github.com/Minestom/Minestom	2020-07-01 15:55:13 -04:00
resources	kick for invalid version, use disconnect after kick packet, change logging level back to info, fix problem with compression on and encryption off.	2020-06-29 18:07:40 -04:00