Commit Graph

5 Commits

Author SHA1 Message Date
libraryaddict
4205dc6c25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
Shaun Bennett
e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
CoderTim
3859a42f1d Removed broken and obsolete shifter code
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
Jonathan Williams
85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Jonathan Williams
3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00