Shaun Bennett 9318ba4de2 Merge branch 'develop' into bugfix/samczsun ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java		2016-09-07 20:12:57 -04:00
..
src/mineplex/core	Merge branch 'develop' into bugfix/samczsun	2016-09-07 20:12:57 -04:00
pom.xml	Implement MineplexLink spectator check	2016-08-14 17:40:28 -04:00
version.properties	Include version.properties in Mineplex.Core	2016-01-21 16:37:35 -05:00