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 |
|
Sarah
|
e81aa72c7e
|
Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-11-27 20:33:18 +01:00 |
|
libraryaddict
|
636dcdf9f7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
|
2015-11-28 05:28:04 +13:00 |
|
libraryaddict
|
5f8f643d95
|
What snake mount code I did
|
2015-11-28 05:26:43 +13:00 |
|
Shaun Bennett
|
f06ceab277
|
Adjustments
|
2015-11-27 09:33:31 -05:00 |
|
NewGarbo
|
0c463cf7cd
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 14:24:25 +00:00 |
|
NewGarbo
|
4d23b2a39f
|
fixed (I BELIEVE) chests not opening in own territory
|
2015-11-27 14:24:02 +00:00 |
|
Cheese
|
def46c715e
|
fixer
|
2015-11-28 00:52:54 +11:00 |
|
NewGarbo
|
627fbc7df2
|
add info into chat if a player is in creative
|
2015-11-27 13:50:18 +00:00 |
|
Cheese
|
b45eb53dff
|
remove old items
|
2015-11-28 00:43:01 +11:00 |
|
NewGarbo
|
ad0c161f16
|
set players time to day during tutorial
|
2015-11-27 13:28:37 +00:00 |
|
NewGarbo
|
3be2986cea
|
sethome command now places bed even if theres grass
|
2015-11-27 13:26:12 +00:00 |
|
NewGarbo
|
691105b2cb
|
force place bed on first claim
|
2015-11-27 13:23:37 +00:00 |
|
Cheese
|
fdb493d95d
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-28 00:23:32 +11:00 |
|
Cheese
|
ab3d2ba098
|
updated tutorials.
added worldmanager to cull entities.
|
2015-11-28 00:23:18 +11:00 |
|
NewGarbo
|
4423baca96
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 13:15:46 +00:00 |
|
NewGarbo
|
f0669cb610
|
fixed undead camp item naming being italic
|
2015-11-27 13:15:26 +00:00 |
|
Cheese
|
67b9755f0d
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 22:27:33 +11:00 |
|
Cheese
|
53da9c97d0
|
item frame cancel!
|
2015-11-27 22:27:20 +11:00 |
|
Shaun Bennett
|
b996dc20ca
|
Enable tutorial, fix stuck command
|
2015-11-27 06:26:32 -05:00 |
|
Shaun Bennett
|
a5ebf9b059
|
Fixes for release
|
2015-11-27 05:53:57 -05:00 |
|
Cheese
|
ec0e2d2d64
|
fixed colors
|
2015-11-27 21:09:25 +11:00 |
|
Cheese
|
3e37a63aa8
|
fixed chome teleport height
|
2015-11-27 20:59:23 +11:00 |
|
Cheese
|
dda0e827e1
|
FGIXEXFSD
|
2015-11-27 20:46:33 +11:00 |
|
Cheese
|
9ce4440679
|
extra cmds
|
2015-11-27 20:36:00 +11:00 |
|
Cheese
|
6428d28275
|
travel hub bed fix
|
2015-11-27 20:31:19 +11:00 |
|
Cheese
|
797dcf8d8e
|
fxied song again T_T
|
2015-11-27 20:01:48 +11:00 |
|
Cheese
|
936e61de57
|
gui changes :)
|
2015-11-27 19:42:04 +11:00 |
|
Cheese
|
c501a42094
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 19:29:33 +11:00 |
|
Cheese
|
5d40a57df8
|
sound fix
|
2015-11-27 19:29:17 +11:00 |
|
Shaun Bennett
|
0b0710458f
|
Hub updates/try to fix chiss stuff
|
2015-11-27 03:22:17 -05:00 |
|
Cheese
|
4e2f48b37e
|
Merge branch 'master' into clans-beta
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
|
2015-11-27 19:16:30 +11:00 |
|
Cheese
|
f55b6761a8
|
disabled titan gadgets!
|
2015-11-27 19:14:35 +11:00 |
|
Cheese
|
e25df8739d
|
EAST 2 WEST
|
2015-11-27 18:46:15 +11:00 |
|
Cheese
|
4085c998cd
|
MUSIC 4 LIFE
|
2015-11-27 18:44:33 +11:00 |
|
Shaun Bennett
|
408c2cf72a
|
im an idiot
|
2015-11-27 01:40:28 -05:00 |
|
Shaun Bennett
|
bdbb75e196
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-27 01:35:16 -05:00 |
|
Shaun Bennett
|
34368722a9
|
Fix gold manager again
|
2015-11-27 01:35:10 -05:00 |
|
NewGarbo
|
7efcf5426d
|
no hunger depletion in safe zones
|
2015-11-27 06:34:29 +00:00 |
|
NewGarbo
|
c96b0c529a
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 06:26:23 +00:00 |
|
NewGarbo
|
42d39a40e9
|
WIND
|
2015-11-27 06:25:58 +00:00 |
|
Shaun Bennett
|
94090c9434
|
adjust gold drops
|
2015-11-27 01:24:03 -05:00 |
|
Shaun Bennett
|
e211fe182d
|
Adjust gem conversion rate
|
2015-11-27 01:06:53 -05:00 |
|
NewGarbo
|
c33eea28a2
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 06:05:39 +00:00 |
|
NewGarbo
|
a9669ade31
|
Immolate fix hopefully
|
2015-11-27 06:05:22 +00:00 |
|
Shaun Bennett
|
0aeca96746
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-27 01:05:16 -05:00 |
|
Shaun Bennett
|
32c17cad7e
|
Shop price changes
|
2015-11-27 01:04:51 -05:00 |
|
Cheese
|
77be81c216
|
pet changes
|
2015-11-27 16:50:22 +11:00 |
|