Keir
31d05cdb3b
Fix error from last commit (git forced me to commit unfinished files due to the merge).
2015-12-07 18:13:48 +00:00
Keir
67b3fe1d23
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/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-07 18:11:40 +00: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
Keir
eed944597c
Commit PHP code.
2015-12-07 17:05:58 +00: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
Cheese
6f16eeead7
missin files
2015-12-07 08:48:55 +11: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
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
