Keir Nellyer a8e891f247 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java		2016-08-11 14:53:57 +01:00
..
src/nautilus/game/arcade	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-08-11 14:53:57 +01:00
plugin.yml	Complete rework of disguising and antihack hook	2016-08-10 21:03:30 -04:00
pom.xml	UHC improvements	2016-06-30 17:15:01 -05:00