Keir ef6fd0eaa3 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java		2015-12-05 00:05:05 +00:00
..
.externalToolBuilders	Fix slashes (this won't affect windows users, right?)	2015-06-26 10:14:37 -07:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/hub	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-12-05 00:05:05 +00:00
.classpath	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-09-29 18:09:52 -04:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Hub.iml	Setup new module for intellij, fix field ore	2015-08-29 16:56:26 -07:00
plugin.yml	Initial Commit	2013-08-27 08:14:08 -07:00