Commit Graph

4047 Commits

Author SHA1 Message Date
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
Jonathan Williams fec8398608 UPdated ChestConverter to convert stats. 2015-08-23 15:47:03 -07:00
Jonathan Williams 34a5d9c722 Updated MotdManager to update both repositories. 2015-08-23 15:46:23 -07:00
Jonathan Williams 1e7f2f01a7 Fixed problem where UUID api was preventing client loading from db. 2015-08-23 15:38:43 -07:00
Mini-Chiss d454d73ccb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-23 11:32:48 -07:00
Mini-Chiss 69ff514bf8 changed perms on write 2015-08-23 11:31:32 -07:00
Mysticate cbaaee60d9 Removed mob spectating method from evolving. 2015-08-21 13:00:08 -04:00
libraryaddict cdc92f8b2f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-22 00:38:55 +12:00
libraryaddict 7841b17d03 Add PacketPlayOutCamera for locking view to entity 2015-08-22 00:38:37 +12:00
libraryaddict 2fe188ac0c Merge pull request #39 in MIN/mineplex from DeadBodies to master
* commit 'bad339cf04ead2e63800b0bb41870b9df73ab4de':
  Tweak dead bodies more
  Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games
2015-08-21 03:54:17 -05:00
libraryaddict bad339cf04 Tweak dead bodies more 2015-08-21 20:52:57 +12:00
libraryaddict c41328d726 Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games 2015-08-21 20:40:09 +12:00
Mini-Chiss 63107b0c26 missing file 2015-08-20 20:39:20 +02:00
Mini-Chiss 15c873392a updated give to allow naming of items. 2015-08-20 20:38:07 +02:00
Mysticate 86ad6a09de Used armor stands for evolving. 2015-08-20 13:04:22 -04:00
Mini-Chiss f97da1bdba Merge branch 'SarahsAwesomeBugFixes' 2015-08-19 16:33:37 +02:00