Shaun Bennett
|
cb7422b4fe
|
Re-enable world events
|
2015-11-24 17:27:35 -05:00 |
|
NewGarbo
|
befe4d129d
|
formatted PlayerGear.java (to avoid further confusion)
|
2015-11-24 22:21:01 +00:00 |
|
NewGarbo
|
459e1beeff
|
clans buggy fixers
|
2015-11-24 22:18:48 +00:00 |
|
Cheese
|
d66bad572f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 22:19:59 +11:00 |
|
libraryaddict
|
5799edae50
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-24 23:45:42 +13:00 |
|
libraryaddict
|
ddf7528796
|
Updated CB
|
2015-11-24 23:45:22 +13:00 |
|
Cheese
|
837be048a6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 21:38:47 +11:00 |
|
Jonathan Williams
|
f8d8b75586
|
Changed how timings is used.
|
2015-11-24 04:36:18 -06:00 |
|
Cheese
|
7e2f5f0657
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 21:30:45 +11:00 |
|
Cheese
|
11a60a86a9
|
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-24 21:30:17 +11:00 |
|
Jonathan Williams
|
fbea0e702b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 02:56:40 -06:00 |
|
Cheese
|
c5b5d07627
|
evade timing
|
2015-11-24 16:07:11 +11:00 |
|
Cheese
|
913d079623
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 15:23:53 +11:00 |
|
Cheese
|
7454cf7443
|
MS + Champs bugs, balance and more
|
2015-11-24 15:23:37 +11:00 |
|
NewGarbo
|
8559a63887
|
Added all rank names to Clans name blacklist
|
2015-11-23 22:10:29 +00:00 |
|
NewGarbo
|
3fa0beceb7
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-23 21:39:53 +00:00 |
|
Shaun Bennett
|
ef7c26c04c
|
Clans changes
|
2015-11-23 15:57:13 -05:00 |
|
NewGarbo
|
91067535db
|
changed getting started tutorial gold reward to be proper (5000 now)
|
2015-11-23 18:09:50 +00:00 |
|
NewGarbo
|
175a6bc31a
|
cleaned up world event times stuff
|
2015-11-23 17:24:17 +00:00 |
|
NewGarbo
|
9bae314278
|
fixed null pointer exception when interacting with a block when your clan home is null
|
2015-11-23 17:19:00 +00:00 |
|
NewGarbo
|
6ca4d12d98
|
fixed potential nofall exploit with logout npc
|
2015-11-23 17:09:51 +00:00 |
|
NewGarbo
|
ce2e616c74
|
fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-;
|
2015-11-23 16:57:50 +00:00 |
|
libraryaddict
|
c48c743ebf
|
Merge pull request #79 in MIN/mineplex from WitherAssault-Fix to master
* commit '19803a00ab50658b33b79ac4f2909932c9e4161b':
Added the Wither Assault fixes to it's own Branch
|
2015-11-23 10:11:30 -06:00 |
|
NewGarbo
|
da2c7d84a4
|
tutorial code cleanup. removed qa reset command
|
2015-11-23 11:19:23 +00:00 |
|
NewGarbo
|
a551e89310
|
fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT
|
2015-11-23 09:44:35 +00:00 |
|
NewGarbo
|
58ed9e586c
|
turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial
|
2015-11-23 09:04:30 +00:00 |
|
Jonathan Williams
|
875b87e0e4
|
Fixed memory leak crashing servers.
|
2015-11-23 02:41:38 -06:00 |
|
NewGarbo
|
47abbfbedf
|
implemented skip tutorial being permanent
|
2015-11-22 20:01:54 +00:00 |
|
Morten
|
19803a00ab
|
Added the Wither Assault fixes to it's own Branch
|
2015-11-22 19:06:24 +01:00 |
|
NewGarbo
|
2e047b54c2
|
removed stone weapons from loot
|
2015-11-22 11:54:38 +00:00 |
|
NewGarbo
|
0cdee95b87
|
formatted some classes
|
2015-11-22 11:23:19 +00:00 |
|
libraryaddict
|
cfeafff2f6
|
EntityDismountEvent stuff
|
2015-11-22 14:44:32 +13:00 |
|
AlexTheCoder
|
3bb11bba08
|
- Fixed Stats [caused by bad communication between chiss and I]
|
2015-11-21 11:30:53 -05:00 |
|
Cheese
|
91e40d0e61
|
hide testing server MOTD
|
2015-11-21 13:37:19 +11:00 |
|
Cheese
|
9ef99cee20
|
fixed merge issues
|
2015-11-21 11:21:54 +11:00 |
|
Cheese
|
6eb1bef1c6
|
Merge branch 'master' into minestrike-update
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
|
2015-11-21 11:09:28 +11:00 |
|
Cheese
|
87a30513de
|
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-21 11:08:23 +11:00 |
|
Cheese
|
4a0cc79abf
|
fixed silence not working in non-champs servers
|
2015-11-21 11:08:09 +11:00 |
|
AlexTheCoder
|
8b480cc32b
|
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-20 18:40:42 -05:00 |
|
AlexTheCoder
|
1274dc860d
|
- Stuff for chiss
|
2015-11-20 18:40:20 -05:00 |
|
Cheese
|
2f91ca5a8a
|
fixed errors
|
2015-11-21 10:35:17 +11:00 |
|
Cheese
|
4a70e4da90
|
more fixies
|
2015-11-21 10:34:08 +11:00 |
|
Cheese
|
4d128d9c7a
|
fixed some skills and wierd hitbox error
|
2015-11-21 10:29:48 +11:00 |
|
Cheese
|
c7297a7a38
|
fixed invalid proxies exploding
|
2015-11-21 09:45:01 +11:00 |
|
Cheese
|
d5076b1c47
|
CTF fix
|
2015-11-21 09:41:02 +11:00 |
|
Cheese
|
e0885feea6
|
Merge branch 'master' into alex-ctf
|
2015-11-21 09:40:07 +11:00 |
|
Cheese
|
04be896ff6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-21 09:39:50 +11:00 |
|
Cheese
|
0bc64fec16
|
Proxy limit fixes
|
2015-11-21 09:28:15 +11:00 |
|
NewGarbo
|
17e62f1f5a
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-20 18:31:37 +00:00 |
|
NewGarbo
|
fb04fac0f6
|
removed debug message
|
2015-11-20 18:31:14 +00:00 |
|