JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,530 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

5530 Commits

Author SHA1 Message Date
William Burns cdc602a435 Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-08 10:55:57 +00:00
Shaun Bennett 89e8a7a2b5 Merge pull request #91 in MIN/mineplex from clans-beta to master 
* commit 'b22c64ca6a5419e6b23abea1681cc750d15b6d37':
  Fix excludes
 2015-12-08 04:51:58 -06:00
Shaun Bennett b22c64ca6a Fix excludes 2015-12-08 05:51:21 -05:00
Shaun Bennett ffbf76a125 Merge pull request #90 in MIN/mineplex from clans-beta to master 
* commit 'a84f580719d1b221bbcaa49cd19d4251defa3b11':
  Update IntelliJ to Java 8
 2015-12-08 04:46:47 -06:00
Shaun Bennett a84f580719 Update IntelliJ to Java 8 2015-12-08 05:45:26 -05:00
William Burns 99cf7ea22c Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-08 10:44:43 +00:00
William Burns e6d995008e Arenas 2015-12-08 10:44:24 +00:00
Cheese fe1f763374 changed order blocks will be added to the list 2015-12-08 15:26:32 +11:00
Cheese 719297ebb1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-08 10:31:25 +11:00
Cheese 4ba2e8c96c fixed old staff being stuck invis. 
partially changed scoreboard to show playercount
 2015-12-08 10:31:11 +11:00
William Burns 43192317ad Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-07 23:20:21 +00:00
William Burns 55f0453897 Start of re-write 2015-12-07 23:20:03 +00:00
Sarah 0619fb857f fixing invisibility. 2015-12-07 23:44:02 +01:00
Shaun Bennett 8ff034fb5d Merge pull request #89 in MIN/mineplex from clans-beta to master 
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
  Winter MOTD, Stat fixes (maybe?!)
  made use ability teleport player back to where they should be
  Forgot to push these changes last update!
  fixed tnt blowing up in claims when offline
  fixed task not getting cleanup up after /skiptutorial
  fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
  Fix heavy attribute, disable claim visualizer
  Disable subtasks for now
  Clans alpha 0.17
  clan claim visualizer
  fixed infinite claims
 2015-12-07 12:22:10 -06:00
Shaun Bennett eed6966a5b Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-07 13:21:17 -05:00
Shaun Bennett c3ace42a68 Winter MOTD, Stat fixes (maybe?!) 2015-12-07 13:21:11 -05:00
Shaun Bennett ffbb057d23 Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
  Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
 2015-12-07 11:25:17 -06:00
Shaun Bennett 7984c0ac31 Add ! 2015-12-07 06:12:49 -05:00
Cheese a39b11ce67 slowed meteors 2015-12-07 21:56:00 +11:00
Cheese 1fe6b5489a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 21:53:49 +11:00
Cheese d318a5cf87 interacto! 2015-12-07 21:53:34 +11:00
Shaun Bennett c6c012031f Less ugly formatting 2015-12-07 04:44:19 -05:00
Shaun Bennett 4354133de9 Add Minecraft timings to /lag 2015-12-07 04:40:34 -05:00
Cheese 6e67f34db1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 20:39:46 +11:00
Cheese e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Shaun Bennett 3cdf8c4b08 Merge remote-tracking branch 'origin/master' 2015-12-07 04:23:33 -05:00
Shaun Bennett 2afbe23a7c Load songs from update folder 2015-12-07 04:23:26 -05:00
Cheese 7b11baf24b Christmas sale bossbars 2015-12-07 20:20:49 +11:00
Cheese 8c4615203c sale message 2015-12-07 20:07:20 +11:00
Cheese ed3bea8e85 DONE! 2015-12-07 18:36:05 +11:00
Cheese 5c632a1e3a sharper target 2015-12-07 18:20:12 +11:00
Cheese 1a0d90a495 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 18:06:43 +11:00
Cheese fea637db80 fixed some freeze 2015-12-07 18:06:26 +11:00
Shaun Bennett ecde1dd314 Merge remote-tracking branch 'origin/master' 2015-12-07 02:06:09 -05:00
Shaun Bennett 44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Cheese d75d7a2c8f snowfight finish 2015-12-07 17:56:35 +11:00
Cheese 1e441ac017 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 17:37:04 +11:00
Cheese 1ada06af91 rewrote lots! 2015-12-07 17:36:45 +11:00
Shaun Bennett 7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Cheese 5486d8acf6 more prep 2015-12-07 13:42:59 +11:00
Cheese 97fe633e4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 13:25:48 +11:00
Cheese 54ec0e39bb more polisshhhh on snowfight 
enabled xmas chests
 2015-12-07 13:25:32 +11:00
Shaun Bennett 488895ea53 Note block player 2015-12-06 21:12:10 -05:00
Cheese cbafb2ba91 fixes 2015-12-07 13:04:45 +11:00
Cheese 0c397d6a81 simplified kits and intro 2015-12-07 13:02:26 +11:00
Cheese b2a595b01b snwo fight changes 2015-12-07 12:02:53 +11:00
Sarah 072856be7d teleportations. 2015-12-06 23:19:53 +01:00
Cheese 6f16eeead7 missin files 2015-12-07 08:48:55 +11:00
Sarah 10d26ca32b timer fixes. 2015-12-06 22:41:04 +01:00
Sarah 64f8ee7280 fixing some timings. 2015-12-06 21:48:21 +01:00