Commit Graph

12526 Commits

Author SHA1 Message Date
LCastr0
3268a49f82 Fixed more conflicts 2017-04-30 12:05:30 -03:00
LCastr0
91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -03:00
LCastr0
28a5a438f5 Fix item being thrown from the throne 2017-04-30 12:02:00 -03:00
LCastr0
95e4170cc1 Added creeper 2017-04-30 11:47:57 -03:00
LCastr0
08150b2c0f Added rank-based win effects 2017-04-30 11:28:40 -03:00
cnr
6ae6f7b627 Revert "Rate limit book/sign edits as a temporary measure against a crash exploit"
This reverts commit f5cba1eb1e.
2017-04-30 01:54:43 -07:00
cnr
d99f51f3a9 Revert "Clans doesn't have access to this through core for some reason"
This reverts commit 20264ff1af.
2017-04-30 01:54:36 -07:00
Sarah
dda09d51e5 Fix Commit 2017-04-30 01:38:04 -07:00
Sarah
a0c00e86c4 Implement LoggedCommand into Event Commands 2017-04-30 01:38:04 -07:00
Sarah
8a33eabe3d Add a way to log commands 2017-04-30 01:38:04 -07:00
Sarah
fdee6b1163 Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR 2017-04-30 01:38:04 -07:00
Sam
0bbd0659a0 Fix the water not being replaced bug 2017-04-30 01:38:04 -07:00
Sam
fd31706333 5 seconds rather than 50 2017-04-30 01:38:04 -07:00
Sam
ee7a29d387 Stop command spam 2017-04-30 01:38:04 -07:00
Sam
f315689dda Staff Oscars 2017-04-30 01:38:04 -07:00
Sam
ee8f970673 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-29 23:40:16 +01:00
Sam
acb5963dd4 Balance changes 2017-04-29 23:25:13 +01:00
LCastr0
e6852d92f2 Fixed item, spawn particles even if player is moving 2017-04-29 13:24:27 -03:00
Kenny
26c772b8b8 Merge branch '2xXP' into develop 2017-04-29 02:19:40 -04:00
Kenny
20264ff1af Clans doesn't have access to this through core for some reason 2017-04-29 02:17:50 -04:00
Kenny
7994ed082e Enable 2x XP 2017-04-29 02:16:31 -04:00
Kenny
f5cba1eb1e Rate limit book/sign edits as a temporary measure against a crash exploit 2017-04-29 02:05:07 -04:00
LCastr0
1879a92261 Changed to items... 2017-04-29 01:03:30 -03:00
LCastr0
146274001f Fix height (again) 2017-04-28 22:32:40 -03:00
LCastr0
25adf3fa33 Fix height 2017-04-28 22:04:00 -03:00
LCastr0
0a1a5eae7a Changed arrow to armor stand 2017-04-28 21:37:39 -03:00
LCastr0
f8566437d5 Fixed shimmering rings 2017-04-28 21:23:19 -03:00
Sam
8a54e19695 Fix Fissure skipping snow blocks 2017-04-28 19:30:19 +01:00
Sam
6beeec20d6 Disable morphs when changing kits 2017-04-28 19:30:00 +01:00
Sam
26d97bf7eb Up the water damage check rate 2017-04-28 19:29:23 +01:00
LCastr0
df563793c5 Fixed name 2017-04-28 13:25:10 -03:00
LCastr0
adef8945a4 Disable other gadgets before enabling 2017-04-28 13:20:25 -03:00
LCastr0
c1f06595bb Fix NPE 2017-04-28 13:17:00 -03:00
Sam
59699f930e Re-implemented triple jumps 2017-04-28 16:26:02 +01:00
LCastr0
1b686a1446 Shimmering Ring kit selector 2017-04-28 11:43:13 -03:00
LCastr0
89f47d4c6c Rain Cloud selector 2017-04-28 11:20:27 -03:00
LCastr0
42e4564a25 Rainbow Dance selector 2017-04-28 11:14:22 -03:00
LCastr0
e9d1ac85f1 Changed single-type particle to an enum, added love particles 2017-04-28 01:46:26 -03:00
LCastr0
ae8b348264 Ember Kit selector 2017-04-28 01:37:27 -03:00
LCastr0
1000c190a2 Fixed Y offset for Water Wings and added Flames of Fury and Halo effects 2017-04-28 00:32:29 -03:00
LCastr0
494fd4787c Skip disabling kit selectors between game restarts 2017-04-27 23:53:37 -03:00
LCastr0
073bc2eea7 Update hologram when player claims peasant 2017-04-27 21:18:12 -03:00
LCastr0
55f85966c1 Fixed arrow location 2017-04-27 21:17:05 -03:00
LCastr0
99363d9af5 Lore 2017-04-27 21:06:35 -03:00
LCastr0
16e9263874 Lets the player sit on the throne 2017-04-27 21:05:03 -03:00
LCastr0
d62d9a813b Javadocs 2017-04-27 20:55:21 -03:00
LCastr0
601c9e31c6 Updated hologram to display the amount of peasants in the kingdom 2017-04-27 20:54:49 -03:00
LCastr0
f1670bc550 Increase the height of the crown 2017-04-27 20:33:31 -03:00
LCastr0
e7c270847b Fixed message, and no longer updates without needing 2017-04-27 20:32:46 -03:00
LCastr0
e45e3be4e8 Added first kit selector 2017-04-27 20:01:29 -03:00