TheBusyBiscuit 1646d7c82d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into tests Conflicts: src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java		2020-05-09 18:24:11 +02:00
..
guide	Player Profiles are now truly asynchronous	2020-05-08 18:47:25 +02:00
items	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-05-09 18:24:11 +02:00
listeners	Lots more refactoring	2020-05-08 18:59:51 +02:00
resources	[CI skip] Refactoring and documentation [javadocs]	2020-03-22 16:44:28 +01:00
setup	Small refactoring	2020-05-09 18:00:10 +02:00
tasks	Fixes #1798	2020-04-21 01:48:22 +02:00