ok
Merge branch 'master' of https://github.com/powerumc/UmcCore

Conflicts:
	.gitignore