Mysticate 90145bf8e7 Merge branch 'master' of ... http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into update-xmaschaos Conflicts: Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java		2015-12-13 18:57:35 -05:00
..
.externalToolBuilders	Fixed creating clan delay in clans/ClientClan.java	2014-11-28 14:06:41 -08:00
.settings	XMAS UPDATE OMG :O	2015-12-13 18:55:21 -05:00
src/mineplex/core	Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage	2015-12-13 16:40:46 +13:00
.classpath	XMAS UPDATE OMG :O	2015-12-13 18:55:21 -05: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