Thanos paravantis 821ff58ab0 Merge branch 'master' into thanos-mineware ... Conflicts: .gitignore		2016-01-17 14:03:00 +02:00
..
.externalToolBuilders	Fixed creating clan delay in clans/ClientClan.java	2014-11-28 14:06:41 -08:00
.settings	Small fixes	2015-12-16 15:41:08 +01:00
src/mineplex/core	Merge branch 'master' into thanos-mineware	2016-01-17 14:03:00 +02:00
.classpath	Fix classpath on mineplex core.	2015-12-26 12:54:47 +02:00
.project	Added back buttons for sub menus.	2014-08-08 20:48:15 -05:00
Mineplex.Core.iml	Fix IntellIJ Files	2015-12-13 23:51:47 -05:00