JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,485 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

686 Commits

Author SHA1 Message Date
Keir Nellyer 9601eabfeb Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-01-31 17:38:08 +00:00
Shaun Bennett c23855bd65 Merge with develop 2016-01-30 02:44:24 -05:00
Keir Nellyer 8cf32ef8bf Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-30 00:46:43 +00:00
NewGarbo fe01c9b8d5 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-29 20:57:10 +00:00
NewGarbo d10266c4d1 sapling fix 2016-01-29 20:56:38 +00:00
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Shaun Bennett 50fc1f5a10 merge with develop 2016-01-29 03:44:04 -05:00
NewGarbo 7860ca24c8 disallow all staff from using /we 2016-01-28 23:33:06 +00:00
NewGarbo 88c1391ba2 disallow sapling in dispensers (grrr working in two different branches is really strange) 2016-01-28 13:30:16 +00:00
NewGarbo b5f04011e5 fixed chatslow not working + filter not working for players not in clan 2016-01-28 13:24:30 +00:00
NewGarbo ceeeb3bc45 no tnt from dispensers 2016-01-28 10:58:46 +00:00
Keir Nellyer ac37417fca Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
 2016-01-27 21:44:04 +00:00
NewGarbo e68dea65e1 stop dispensers being used for flint-andsteal, bonemeal etc etc 2016-01-25 17:46:39 +00:00
NewGarbo 18e892c4ec finally fixed that windblade dupe 2016-01-25 17:41:07 +00:00
NewGarbo 71bb1ed3d6 this is just really slowing down startup time by A LOT 2016-01-25 17:22:56 +00:00
NewGarbo 9d77632fcc allow clans moderators to use /cb 2016-01-25 17:18:00 +00:00
NewGarbo 2bf2050844 increased sapling cooldown to 20 minutes from one second. 2016-01-25 17:13:53 +00:00
NewGarbo 7f1c74ced5 bumped version up to 0.19 2016-01-25 17:11:08 +00:00
NewGarbo d82a7b353f allow C.Mods to join all server regardless of home servers 2016-01-25 08:42:38 +00:00
NewGarbo 1f7e1fb6cf fix dupe bug and safelog 2016-01-23 13:40:49 +00:00
NewGarbo bf6f1a1701 sapling stuff messed up oops 2016-01-22 15:28:12 +00:00
NewGarbo 6638562866 npe fix 2016-01-22 15:21:20 +00:00
NewGarbo c4bbeb2535 more control over saplings 2016-01-22 14:55:50 +00:00
NewGarbo a377a09925 fixed wind blade dupe bug 2016-01-22 11:22:20 +00:00
Shaun Bennett 359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop 
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
 2016-01-20 12:23:55 -06:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
md_5 4927bb8c0b Fix some misc suspicious calls to Collection methods. 2016-01-17 20:20:48 +11:00
Keir 53133d51ee Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-01-13 11:47:13 +00:00
NewGarbo ed8d9459b2 goes with the commit below VVVV 2016-01-12 07:02:19 +00:00
NewGarbo d3452772ed outposts work (grr git is weird trying to switch over to clans/beta) 2016-01-12 07:02:03 +00:00
NewGarbo c873b6b886 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-12 06:58:53 +00:00
NewGarbo d656c7a212 fixed clans banned players counting as being online after joining and their territory then being blown up 2016-01-11 18:02:03 +00:00
NewGarbo 3773ab3f0b fixed safelog npcs sticking around some time 2016-01-11 10:14:32 +00:00
NewGarbo 60a78e396f remove legendary announcement in chat/middle text 2016-01-11 09:16:11 +00:00
NewGarbo d5b5ac7bb0 changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out 2016-01-10 23:06:39 +00:00
NewGarbo d4ccb82791 didn't push this earlier 2016-01-10 23:03:16 +00:00
NewGarbo 6673081fb3 fixed LeechingAttribute from throwing an error when setting health above 20 2016-01-10 22:31:51 +00:00
NewGarbo bccee71ff7 made signs placed by muted players get cleared on being placed 2016-01-10 21:16:49 +00:00
NewGarbo 734351011a made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading. 2016-01-10 21:15:50 +00:00
NewGarbo 9c3a62a308 made it so punished players can't place signs 2016-01-10 21:03:34 +00:00
NewGarbo 68808efb49 made players not be able to chat while chat is silenced 2016-01-10 20:57:12 +00:00
NewGarbo fa3de2a479 made clans ban messages not public 2016-01-10 20:55:29 +00:00
NewGarbo 51872faa04 fix mutes not working 2016-01-10 20:53:55 +00:00
Keir 5f362a878a Run some Redis functions async (as it sometimes blocks). 2016-01-09 22:21:15 +00:00
NewGarbo fa509f0043 fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP 2016-01-09 19:58:31 +00:00
Shaun Bennett ee73b374a6 Forgot to uncomment in ClansLoginManager 2016-01-08 06:36:59 -05:00
Shaun Bennett a75e2c15b8 Merge remote-tracking branch 'origin/develop' into develop 2016-01-08 06:35:37 -05:00
NewGarbo 025615d080 Clans Alpha 0.18b fixes 2016-01-08 11:24:36 +00:00
Shaun Bennett 0a56a838d2 Fix ClansLoginManager, Remove pointless code in CoreClientManager 2016-01-08 05:45:49 -05:00
NewGarbo 15d2118bc1 Added C.Mod rank, and started on rank info. 2016-01-07 23:32:51 +00:00