Teddy 1e72ebcbe6 Merge branch 'master' into rankdescriptions ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java		2016-01-21 12:54:12 +00:00
..
.settings	Remove project specific settings	2015-12-13 16:41:37 +13:00
src	Merge branch 'master' into rankdescriptions	2016-01-21 12:54:12 +00:00
.classpath	Treasure changes :O	2015-02-09 20:24:20 +13:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Core.Common.iml	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00