Aaron Brock
|
060a928dd5
|
Added bench time stuff.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-03 01:02:16 -04:00 |
|
libraryaddict
|
68f7bd533d
|
Clans Map stuff
|
2015-07-03 14:23:37 +12:00 |
|
Cheese
|
556e524e18
|
changed notifications back to 75% sale
|
2015-07-02 16:14:47 +10:00 |
|
Aaron Brock
|
61d2247cee
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-01 22:12:42 -04:00 |
|
Aaron Brock
|
6d05e40df2
|
Things
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 22:11:57 -04:00 |
|
Cheese
|
42580c09d5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-02 12:06:04 +10:00 |
|
Cheese
|
aa072d7f58
|
improved updateevent
|
2015-07-02 12:05:48 +10:00 |
|
Aaron Brock
|
0920c27040
|
Stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 21:59:38 -04:00 |
|
Aaron Brock
|
dec7d55fb0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-01 20:12:07 -04:00 |
|
Aaron Brock
|
a240181650
|
More stuff...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 20:11:07 -04:00 |
|
Cheese
|
1e26ebe0bd
|
disabled ice forming
|
2015-07-02 10:09:39 +10:00 |
|
fooify
|
70d351adae
|
fix getting snowballs from bedrock
|
2015-07-01 16:58:16 -07:00 |
|
Cheese
|
607a94f985
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-02 09:41:47 +10:00 |
|
Cheese
|
0100ca1b8c
|
fixed a derp bug
|
2015-07-02 09:41:33 +10:00 |
|
fooify
|
e7b51ac1c1
|
add jnr_dev to updaterank
|
2015-07-01 16:40:15 -07:00 |
|
fooify
|
d1e4306684
|
fix this agaaaaain
|
2015-07-01 16:38:10 -07:00 |
|
fooify
|
04c863c0eb
|
FOOIFY IS A NOOB OKAY
|
2015-07-01 16:10:41 -07:00 |
|
fooify
|
4495468c7f
|
fix concurrentmodificationexception
|
2015-07-01 15:50:07 -07:00 |
|
Aaron Brock
|
88241fa4d5
|
Added some stuff and things
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 18:36:05 -04:00 |
|
fooify
|
8574c0bdeb
|
fix turfforts bug
|
2015-07-01 09:58:45 -07:00 |
|
fooify
|
b7476cec5e
|
prevent STATIONARY_LAVA from breaking in creeper smash
|
2015-07-01 08:25:17 -07:00 |
|
fooify
|
6dc7384c82
|
fix creeper smash exploding lava and bedrock
|
2015-07-01 08:16:14 -07:00 |
|
fooify
|
6d42be4d13
|
fix spleef lava issue
|
2015-07-01 07:17:41 -07:00 |
|
Aaron Brock
|
28927a5965
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-01 02:19:10 -04:00 |
|
Aaron Brock
|
7d55221515
|
Some game stuff I don't know why this no work!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 02:12:19 -04:00 |
|
Aaron Brock
|
e3b0ee9ae3
|
Switched it so it enables my game
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-01 02:02:51 -04:00 |
|
Cheese
|
dd9fc8e7c6
|
bridge speed increase
|
2015-07-01 15:14:46 +10:00 |
|
Cheese
|
0650b73374
|
more bridge tweaks
|
2015-07-01 14:16:56 +10:00 |
|
Shaun Bennett
|
9ccc85a79e
|
Improved block restore for Events
|
2015-06-30 22:30:49 -05:00 |
|
Cheese
|
190e58c37e
|
bridges update
|
2015-07-01 12:58:54 +10:00 |
|
fooify
|
b9b9c5f801
|
ishh also wanted this :P (let me know if I should remove it)
|
2015-06-30 13:37:46 -07:00 |
|
fooify
|
c824a39058
|
ishh wanted it...k
|
2015-06-30 13:33:41 -07:00 |
|
Shaun Bennett
|
0fce46f504
|
Finished Undead Camp Event (Loot tables still need adjusting)
|
2015-06-30 15:28:50 -05:00 |
|
Shaun Bennett
|
0fdc4e0008
|
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/event/undead/UndeadCamp.java
|
2015-06-30 14:04:35 -05:00 |
|
Shaun Bennett
|
be974bfaac
|
Work from laptop
|
2015-06-30 14:02:39 -05:00 |
|
fooify
|
a72eee9cf3
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-06-30 09:20:43 -07:00 |
|
fooify
|
d2cc8d5077
|
fix grammar bug
|
2015-06-30 09:19:21 -07:00 |
|
fooify
|
11fb02a594
|
add stained glass to list of blocks that can be broken in quiver
|
2015-06-30 09:03:43 -07:00 |
|
Cheese
|
fcedb4d6ba
|
added the plugin thingy that you need!
|
2015-07-01 00:27:28 +10:00 |
|
Cheese
|
de36e3d8e4
|
added WATER_DAMAGE support for maps
modified some bridges code
|
2015-07-01 00:18:06 +10:00 |
|
Jonathan Williams
|
c6e4c5c5e4
|
Fixed mineplexer server status link.
Fixed issue with ServerManager and default connection.
|
2015-06-30 03:49:53 -04:00 |
|
Shaun Bennett
|
e0284e2eb0
|
Loot for World Events
|
2015-06-29 22:32:40 -05:00 |
|
Cheese
|
e3d060376b
|
disabled double gem
|
2015-06-30 13:10:08 +10:00 |
|
Cheese
|
a92fddc4a1
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-30 10:13:03 +10:00 |
|
Jonathan Williams
|
24b2d35dda
|
Removed unnecessary files for POcket.
|
2015-06-29 20:11:09 -04:00 |
|
Cheese
|
63ef877d46
|
removed stuff
|
2015-06-30 10:01:32 +10:00 |
|
Cheese
|
6976b48645
|
update
|
2015-06-30 09:57:24 +10:00 |
|
Jonathan Williams
|
78c5b63e85
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-29 19:43:58 -04:00 |
|
Jonathan Williams
|
59f0053419
|
Implemented Updater for PE
|
2015-06-29 19:43:35 -04:00 |
|
Ty Sayers
|
cd4bebbeee
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-06-29 19:27:23 -04:00 |
|