NewGarbo 7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta ... Conflicts: Plugins/.idea/dataSources.xml Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java ** CONFLICTS ALL FIXED **		2015-11-09 08:59:37 +00:00
..
.externalToolBuilders	Fixed creating clan delay in clans/ClientClan.java	2014-11-28 14:06:41 -08:00
.settings	Updated Motd.	2015-08-28 23:17:14 -07:00
src/mineplex/core	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-09 08:59:37 +00:00
.classpath	removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay!	2015-11-03 22:06:23 +00:00
.project	Added back buttons for sub menus.	2014-08-08 20:48:15 -05:00
Mineplex.Core.iml	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