Commit Graph

3 Commits

Author SHA1 Message Date
Jonathan Williams be7ea65033 Website bin/obj cleanup
Fixed Pet Rename problem.
Fixed Extra Pet tag problem.

Added ServerStatus for dedicated servers.
2013-11-21 12:08:58 -08:00
Jonathan Williams 6885f89130 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2013-11-08 15:21:19 -08:00
Jonathan Williams 3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00