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 |
|
Virizion
|
6904f7c9a9
|
Tons more stuff on the checklist.
|
2015-12-06 22:54:45 -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 |
|
xGamingDudex
|
c36182b8d4
|
Cosmetic Update
New:
+ New GUI System
+ Candy Cane Particle
+ Candy Cane Double Jump
+ Candy Cane Death Effect
+ Candy Cane Arrow Trail
+ Snowman Morph
+ Baby Reindeer Mount
+ Pet Coal Apparition
Fixed/Updated:
* Added getTick to UpdateEvent and UtilTime
* Added more methods to UtilParticle
* Gadget manager isMoving now counts flying as moving
* Updated some cosmetics
|
2015-12-07 02:53:14 +01:00 |
|
Cheese
|
b2a595b01b
|
snwo fight changes
|
2015-12-07 12:02:53 +11:00 |
|
Mysticate
|
09f7a03444
|
Quick changes to improve things.
|
2015-12-06 20:00:22 -05:00 |
|
AlexTheCoder
|
118bde5484
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
|
2015-12-06 19:57:27 -05:00 |
|
Sarah
|
072856be7d
|
teleportations.
|
2015-12-06 23:19:53 +01:00 |
|
Mysticate
|
b5967a1205
|
Uncommented bouncy balls
|
2015-12-06 17:14:51 -05:00 |
|
Mysticate
|
e74b83f8f2
|
Merge remote-tracking branch 'origin/master' into update-paintball
|
2015-12-06 17:12:29 -05:00 |
|
Mysticate
|
5e57caa94d
|
Final tweaks to random armorstand
|
2015-12-06 17:09:33 -05: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 |
|
Virizion
|
ca7e5d0d6d
|
remove later
|
2015-12-06 16:37:00 -05:00 |
|
Sarah
|
64f8ee7280
|
fixing some timings.
|
2015-12-06 21:48:21 +01: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 |
|
Sarah
|
3260550368
|
adding proper forcefield for minions and giants.
|
2015-12-06 19:38:23 +01:00 |
|
Mysticate
|
88dcdaa445
|
Merge remote-tracking branch 'origin/master' into update-paintball
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
|
2015-12-06 12:00:06 -05:00 |
|
Mysticate
|
11b2748a5a
|
Quick thing before merge
|
2015-12-06 11:45:10 -05:00 |
|
Cheese
|
fa6418769b
|
YT name change
|
2015-12-06 21:26:02 +11:00 |
|
AlexTheCoder
|
4278f3fa99
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
|
2015-12-06 03:51:08 -05:00 |
|
AlexTheCoder
|
430de10008
|
- Everything except maps [probably should've committed sooner]
|
2015-12-06 03:47:07 -05: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 |
|