Shaun Bennett e200ddd777 Merge branch 'master' into Bonus ... # Conflicts: # Plugins/.idea/misc.xml		2015-08-03 08:32:45 -05:00
..
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/core/common	Merge branch 'master' into Bonus	2015-08-03 08:32:45 -05: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