Commit Graph

4263 Commits

Author SHA1 Message Date
Mini-Chiss 181afaa2d6 Merge branch 'Myst_EVO' 2015-08-28 23:25:51 -07:00
Mysticate b71bcfab4b Fixed achievements. Merge ASAP 2015-08-29 00:19:39 -06:00
Jonathan Williams d4d0c4bed6 Updated Motd. 2015-08-28 23:17:14 -07:00
Jonathan Williams c98a85c2ba Added local storage of login time.
Hooked in onlineTime bonus feature to real values.
2015-08-28 22:09:42 -07:00
Jonathan Williams ba4da32939 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 21:44:07 -07:00
Jonathan Williams e47662f855 Added LoginTime setting as RedisTime for use in calculating time on server.
Optimized redis util for time calls to calculate time different and only pull redis time once.
2015-08-28 21:44:00 -07:00
Mini-Chiss 829c1d2ae8 Merge branch 'Myst_EVO' 2015-08-28 21:30:10 -07:00
Mysticate c40fecb03f Removed warning from private servers 2015-08-28 22:06:13 -06:00
Mini-Chiss 041c5ab53c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 21:00:34 -07:00
Mini-Chiss 3f1c4d24b9 Merge branch 'Myst_EVO' 2015-08-28 21:00:00 -07:00
Jonathan Williams ad4ba010b7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 20:59:08 -07:00
Jonathan Williams 6f0309622c Removed AccountCache.
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
Mysticate bb09720450 removed previous commit jesus 2015-08-28 21:56:35 -06:00
Mini-Chiss d68f1fa547 Merge branch 'Myst_EVO' 2015-08-28 20:50:27 -07:00
Mysticate 6628f5a1ae Added a checker for a no kit issue 2015-08-28 21:49:57 -06:00
Mini-Chiss 19b2ff5b58 fixed scoreboard 2015-08-28 20:48:32 -07:00
Mini-Chiss 11cc4a6cea removed msg 2015-08-28 20:45:59 -07:00
Mini-Chiss fda866a33f Merge branch 'Myst_EVO' 2015-08-28 20:35:59 -07:00
Mysticate 4466c10441 FIXED 2015-08-28 21:35:31 -06:00
Mini-Chiss 4ac6b22e53 Merge branch 'Myst_EVO' 2015-08-28 20:31:56 -07:00
Mini-Chiss 88ca205474 fixes 2015-08-28 20:31:29 -07:00
Mysticate 815add4c59 FIXED THE THIGNS 2015-08-28 21:28:39 -06:00
Mini-Chiss 5777309d18 Merge branch 'Myst_EVO' 2015-08-28 20:07:22 -07:00
Mini-Chiss 8238a199d5 gem stuff 2015-08-28 20:06:39 -07:00
Mysticate cc60371c1f Fixed perk cancelling on death 2015-08-28 21:04:35 -06:00
Mini-Chiss d879bc68ab Merge branch 'Myst_EVO'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
2015-08-28 19:59:48 -07:00
Mini-Chiss b5b8bef39e evo fixes 2015-08-28 19:58:51 -07:00
Mysticate d6c8e51104 Things ^_^ 2015-08-28 20:57:47 -06:00
Mysticate ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Mini-Chiss abf1f23087 double gem 2015-08-28 19:16:49 -07:00
Mysticate 56aa235e56 Fixed kit messages 2015-08-28 19:25:52 -06:00
Mini-Chiss c8c569281b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 16:18:49 -07:00
Mini-Chiss 5562345c05 Merge branch 'SarahsAwesomeBugFixes' 2015-08-28 16:02:40 -07:00
Sarah 3be6483ed3 editing /game set for test servers. 2015-08-29 01:01:05 +02:00
Mysticate 2d770a8dd1 More final tweaks. 2015-08-28 16:36:35 -06:00
Mysticate 513662e6e3 Fixed the block open flag. 2015-08-28 15:46:38 -06:00
Mysticate f21ca35638 Final bug changes. 2015-08-28 15:44:41 -06:00
Jonathan Williams e9b33668bc Added donorsOnline to MinecraftServer snapshot
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
Mysticate 571d992dbe Fixed a few bugs. 2015-08-27 20:47:55 -06:00
Mysticate f2f6afb6ca Fixes :D 2015-08-26 20:10:58 -06:00
Mysticate a351a8f1ed Minor improvements. 2015-08-26 13:47:01 -06:00
Mysticate cfdb0dfa4f Added kits + achievements. Hurrah! 2015-08-26 13:19:17 -06:00
Mysticate 988382375f Started adding kits 2015-08-25 23:36:18 -06:00
Jonathan Williams 61c80fd31d Fixed issue with player login sessions. 2015-08-24 20:21:14 -07:00
Jonathan Williams b64a75cbf3 Added maintenance message. 2015-08-24 18:35:11 -07:00
Mysticate 7b42f2155d Tweaks. :D 2015-08-24 20:40:34 -04:00
Mini-Chiss 6249dadf91 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-23 16:27:47 -07:00
Jonathan Williams 6d3c965f14 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-23 16:26:02 -07:00
Jonathan Williams 74fd729975 Updated BungeeCord to latest version. 2015-08-23 15:48:03 -07:00
Jonathan Williams 8ca2b8537c Fixed Logging of gems/coins for support staff. 2015-08-23 15:47:41 -07:00