Commit Graph

14 Commits

Author SHA1 Message Date
Cheese
8af545af80 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
2015-11-28 15:59:26 +11:00
Shaun Bennett
855bb89200 Update .gitignore with IntellIJ tasks file 2015-10-01 14:50:15 -04:00
Jonathan Williams
6f0309622c Removed AccountCache.
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
Cheese
0650b73374 more bridge tweaks 2015-07-01 14:16:56 +10:00
Jonathan Williams
678dff48fe Updated ignore list. 2015-06-16 12:42:55 -05:00
Jonathan Williams
f931bd26e6 Updated ServerConfiguration to support resourcepack and Arcade settings. 2014-11-06 00:25:49 -08:00
Jonathan Williams
0d350da6c0 Added more files and updated ignore list. 2014-05-28 11:23:32 -07:00
Jonathan Williams
48975d02c7 Adding some missing files for website. 2014-05-28 11:20:13 -07:00
Jonathan Williams
d5ea6c5377 Removed dead project ServerStatus
Tweaked connection strings so they autoreconnect.

Added dragon sound to pre-queue prompt.

Added rest of missing files.
2014-05-28 11:18:30 -07:00
CoderTim
3859a42f1d Removed broken and obsolete shifter code
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Chiss
7cf6391ddd Sheep Quest
Double Gem Weekend
2014-03-01 10:35:06 +11:00
Jonathan Williams
93c0575fe2 Fixed naming in some hub modules.
Fixed StatusManager ip and DynamicServer comparison.

Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
2014-01-03 01:37:39 -05:00
Chiss
bc9c309aa1 Xmas Game 2013-12-21 10:17:22 +11:00