Commit Graph

5492 Commits

Author SHA1 Message Date
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
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
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
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
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