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 |
|
Cheese
|
6f16eeead7
|
missin files
|
2015-12-07 08:48:55 +11:00 |
|
NewGarbo
|
425463d339
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-12-06 19:11:13 +00:00 |
|
NewGarbo
|
a9c7f088f3
|
made use ability teleport player back to where they should be
|
2015-12-06 19:10:18 +00:00 |
|
Keir
|
e21bd37b92
|
Add connection host for Jedis.
|
2015-12-06 19:05:20 +00:00 |
|
Cheese
|
fa6418769b
|
YT name change
|
2015-12-06 21:26:02 +11:00 |
|
Cheese
|
ccb6456110
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
|
2015-12-06 18:09:24 +11:00 |
|
Cheese
|
35c362b8bf
|
small youtuber perms
|
2015-12-06 18:08:36 +11:00 |
|
Shaun Bennett
|
b7b5235f59
|
Fix error
|
2015-12-06 00:57:43 -05:00 |
|
Cheese
|
d095e14b4c
|
Merge branch 'monster-league'
|
2015-12-06 16:33:21 +11:00 |
|
Cheese
|
9880e9a3c7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-06 16:32:59 +11:00 |
|
Cheese
|
040e94f1fb
|
bouncy
|
2015-12-06 16:32:45 +11:00 |
|
Shaun Bennett
|
618105b4c8
|
Add minimum rank to Announcement Command
|
2015-12-06 00:15:49 -05:00 |
|
Shaun Bennett
|
8d831d5228
|
Fix END_PORTAL bug causing gui's to break
|
2015-12-06 00:06:31 -05:00 |
|
Cheese
|
9c7eea86b4
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-06 14:56:18 +11:00 |
|
Shaun Bennett
|
32a6d572ee
|
Disable gadgets in arcade for player count > 40
|
2015-12-05 22:56:15 -05:00 |
|
Cheese
|
5aabd00972
|
set hub to christmas
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
|
2015-12-06 14:55:28 +11:00 |
|
Shaun Bennett
|
11e1e53a36
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-12-05 21:36:19 -05:00 |
|
Shaun Bennett
|
d5a9a92913
|
Forgot to push these changes last update!
|
2015-12-05 21:36:07 -05:00 |
|
libraryaddict
|
b98944b0a0
|
Handle attach entity
|
2015-12-06 14:38:00 +13:00 |
|
libraryaddict
|
d5606f55ea
|
Modified CustomTagFix to support player name titles
|
2015-12-06 10:18:35 +13:00 |
|
Keir
|
9bd7869e22
|
Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
|
2015-12-05 01:08:21 +00:00 |
|
Keir
|
2e72e46242
|
Add report preferences to exclusive preferences.
|
2015-12-05 01:05:43 +00:00 |
|
Keir
|
ef6fd0eaa3
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
|
2015-12-05 00:05:05 +00:00 |
|
Keir
|
ddf6037fc4
|
Wrote standalone chatsnap handler and implemented required changes in Core.
|
2015-12-04 23:30:27 +00:00 |
|
Keir
|
c19baf5750
|
Make periodic handler message display close command and clicking it suggests the command.
|
2015-12-04 22:08:44 +00:00 |
|
NewGarbo
|
5d59b1a015
|
fixed tnt blowing up in claims when offline
|
2015-12-04 18:32:46 +00:00 |
|
NewGarbo
|
bca65116ab
|
fixed task not getting cleanup up after /skiptutorial
|
2015-12-04 18:23:23 +00:00 |
|
Shaun Bennett
|
f57f4ed0aa
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-12-04 12:10:10 -05:00 |
|
NewGarbo
|
e158704534
|
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
|
2015-12-04 15:58:51 +00:00 |
|
Shaun Bennett
|
bb382a969c
|
Fix heavy attribute, disable claim visualizer
|
2015-12-04 08:02:38 -05:00 |
|
NewGarbo
|
3b125dc8a5
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
|
2015-12-04 11:12:19 +00:00 |
|
Shaun Bennett
|
2435ebba13
|
Disable subtasks for now
|
2015-12-04 05:16:14 -05:00 |
|
Shaun Bennett
|
5c575b41fc
|
Clans alpha 0.17
|
2015-12-04 05:15:28 -05:00 |
|
Cheese
|
e01d30b920
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-04 13:19:07 +11:00 |
|
Cheese
|
ef2511434d
|
tuber arnk
|
2015-12-04 13:18:23 +11:00 |
|