Some more work
Merge branch 'master' of https://luacs1998@github.com/ForgeEssentials/ForgeEssentialsMain.git