Shaun Bennett
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
Jonathan Williams
0d5fa70632
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 23:05:32 -06:00
Jonathan Williams
5acf6b19a4
Fixed bed checking interval.
...
Added timing logging to map rendering.
2015-11-28 23:05:22 -06:00
Shaun Bennett
e0c5581204
Merge pull request #82 in MIN/mineplex from clans-beta to master
...
* commit '7c947ad97be2fd811a8a73dcedc9e71426c80bd4':
stuff
teleport stuff
added self clan create/delete messages
fixed task 2
tutorial tasks reset
fixed stuck manager taking 0 seconds
tutorial ending message
force join command
tutorial revamp 2.0
dupe fix
don't cull an entity if a player is nearby
added force join command for ADMIN+
fixed the clan claim box check
staff mode
creative scoreboard team. and fixed npe in tutorials
tutorial revamp [clans]
2015-11-28 22:55:04 -06:00
Shaun Bennett
7c947ad97b
Merge master
2015-11-28 23:55:00 -05:00
Jonathan Williams
c6ff01b92d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 22:33:03 -06:00
Jonathan Williams
118af20f44
Updated EnjinTranslator.
2015-11-28 22:32:50 -06:00
NewGarbo
b88a842f1c
stuff
2015-11-29 03:22:52 +00:00
NewGarbo
c870d99e0e
teleport stuff
2015-11-29 02:55:45 +00:00
NewGarbo
a9afe1f068
added self clan create/delete messages
2015-11-29 02:54:40 +00:00
NewGarbo
84303234fd
fixed task 2
2015-11-29 02:48:03 +00:00
NewGarbo
392ab601c2
tutorial tasks reset
2015-11-29 02:43:12 +00:00
NewGarbo
d7658f3838
fixed stuck manager taking 0 seconds
2015-11-29 02:39:09 +00:00
NewGarbo
dc5aec33b4
tutorial ending message
2015-11-29 02:37:20 +00:00
NewGarbo
8dca384d35
force join command
2015-11-29 02:31:14 +00:00
NewGarbo
9ff9724fc8
tutorial revamp 2.0
2015-11-29 02:10:39 +00:00
Cheese
5cefe27257
cosmetic fixes
2015-11-29 11:40:19 +11:00
NewGarbo
e1be0b1dbd
dupe fix
2015-11-28 23:34:41 +00:00
Sarah
66fd85af1f
Adding Phase Event.
2015-11-28 23:32:09 +01:00
NewGarbo
aa68701ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 20:16:49 +00:00
NewGarbo
ace4548b1e
don't cull an entity if a player is nearby
2015-11-28 20:14:48 +00:00
NewGarbo
afbccba36f
added force join command for ADMIN+
2015-11-28 19:56:47 +00:00
NewGarbo
75ef42d8c9
fixed the clan claim box check
2015-11-28 19:37:03 +00:00
fooify
8cdae7ce1a
Merge remote-tracking branch 'origin/master' into foo
2015-11-28 09:33:47 -08:00
fooify
0dff0ffe1d
fixed bacon blast exloding blocks
...
fixed sg compass pointing to teammates
2015-11-28 09:32:54 -08:00
xGamingDudex
dc0da3987b
TitanMount fixes
...
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
2015-11-28 17:22:17 +01:00
Cheese
51227ae4f3
fixed leak
2015-11-29 01:25:15 +11:00
xGamingDudex
24dee651da
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-28 14:05:20 +01:00
NewGarbo
f5384a1382
staff mode
2015-11-28 09:31:18 +00:00
NewGarbo
d8ae035f84
creative scoreboard team. and fixed npe in tutorials
2015-11-28 09:20:42 +00:00
NewGarbo
0dceca5cfc
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 09:04:15 +00:00
NewGarbo
a0ae500876
tutorial revamp [clans]
2015-11-28 09:03:58 +00:00
Jonathan Williams
b6f6d4458e
Fixed StaffServer.
2015-11-28 01:43:00 -06:00
Cheese
700cf51206
titan stuff almost done
2015-11-28 16:35:11 +11:00
Cheese
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
Cheese
8af545af80
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
2015-11-28 15:59:26 +11:00
Cheese
0871663498
titan stuff
...
I HATE YOU SNAKE.
2015-11-28 15:57:07 +11:00
Shaun Bennett
79dbbc593f
Merge pull request #81 in MIN/mineplex from clans-beta to master
...
* commit 'bcbc5244c67a79ec74178037060732e814c3b6ef': (427 commits)
Add Clans.core to hub build (IntelliJ)
final changes
fixes
remove trust command
fixes & changes
loaaads of stuff
Adjustments
fixed (I BELIEVE) chests not opening in own territory
fixer
add info into chat if a player is in creative
remove old items
set players time to day during tutorial
sethome command now places bed even if theres grass
force place bed on first claim
updated tutorials. added worldmanager to cull entities.
fixed undead camp item naming being italic
item frame cancel!
Enable tutorial, fix stuck command
Fixes for release
fixed colors
...
2015-11-27 22:15:53 -06:00
Shaun Bennett
bcbc5244c6
Add Clans.core to hub build (IntelliJ)
2015-11-27 23:14:54 -05:00
Shaun Bennett
1a87d85174
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-27 23:13:43 -05:00
xGamingDudex
070c436677
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-28 02:31:09 +01:00
xGamingDudex
24f8a98545
Added titan particle trail.
2015-11-28 02:22:41 +01:00
Sarah
ad54d28b0d
fixing teleportation issues.
2015-11-27 22:29:29 +01:00
NewGarbo
260002c9cf
final changes
2015-11-27 21:02:20 +00:00
NewGarbo
9e84029e04
fixes
2015-11-27 20:50:00 +00:00
NewGarbo
b36642b22b
remove trust command
2015-11-27 20:27:33 +00:00
NewGarbo
d5502500b6
fixes & changes
2015-11-27 20:24:07 +00:00
Sarah
fd0c5cf273
Adding some more flags.
2015-11-27 20:47:57 +01:00
NewGarbo
6ac871f04c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 19:43:48 +00:00
NewGarbo
fe085c1571
loaaads of stuff
2015-11-27 19:42:15 +00:00
