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

5946 Commits

Author SHA1 Message Date
Jonathan Williams 95a81ef368 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
 2015-12-11 01:26:20 -05:00
Cheese 66011cde8c fixed player count 2015-12-11 17:25:23 +11:00
Jonathan Williams 222173ab17 Improved and implemented GameProfile caching. 2015-12-11 01:24:59 -05:00
Jonathan Williams b5c157c123 Changed PlayerCache to Cache 2015-12-11 01:24:16 -05:00
Cheese 98e91d29f6 more cosmetic stuff :) 2015-12-11 17:21:54 +11:00
Cheese 7f8c9c02bc and the mounts 2015-12-11 16:38:44 +11:00
Cheese fe7ce40783 finished cosmetic names 2015-12-11 16:31:15 +11:00
Cheese 05a80b23a1 converting gadget text. (kill me now) 2015-12-11 16:07:02 +11:00
Cheese 88f44a293b candy! 2015-12-11 15:31:35 +11:00
Cheese 3447de9a92 Merge branch 'master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
 2015-12-11 15:20:50 +11:00
Cheese a5b28422cd cosmetics 2015-12-11 15:19:20 +11:00
libraryaddict 9a4006df27 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-11 17:18:07 +13:00
libraryaddict c5f0624bf7 Add build file 2015-12-11 17:17:52 +13:00
Shaun Bennett 4588091c5b Merge remote-tracking branch 'origin/master' 2015-12-10 23:15:42 -05:00
Shaun Bennett 21c8a66917 Fix imports 2015-12-10 23:15:35 -05:00
libraryaddict 3cd187ff04 Move LineFormat.java 2015-12-11 16:57:21 +13:00
Shaun Bennett bc46518a05 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 22:54:53 -05:00
Shaun Bennett 1ab13d2ef5 Treasure Shards! 2015-12-10 22:52:15 -05:00
libraryaddict 4cfa7c436b Add missing file 2015-12-11 16:48:40 +13:00
William Burns a760dba783 i lied. 2015-12-11 02:59:16 +00:00
William Burns 7a597d90b7 final push goodnight 2015-12-11 02:48:06 +00:00
William Burns 1607345f04 title + debug 2015-12-11 02:41:44 +00:00
Shaun Bennett 557f3e97a5 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:32:35 -05:00
Shaun Bennett 5a1892e1ed Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 2015-12-10 21:32:14 -05:00
Shaun Bennett d6aed5dff7 More work 2015-12-10 21:32:10 -05:00
William Burns 563a0f0ec7 remove tutorial and no flicker 2015-12-11 02:30:44 +00:00
libraryaddict a0b7870acc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-11 15:21:18 +13:00
libraryaddict 1661c056c1 Added line stuff 2015-12-11 15:21:05 +13:00
Cheese 31cea3342e some gadget stuff 2015-12-11 13:17:38 +11:00
Shaun Bennett ffd4658740 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:06:50 -05:00
Shaun Bennett 2694787590 Reverting 2015-12-10 20:59:57 -05:00
Shaun Bennett cf73d27a84 Merge remote-tracking branch 'origin/master' 2015-12-10 20:53:42 -05:00
Shaun Bennett 4d05bd5c50 Player count for chiss 2015-12-10 20:53:38 -05:00
Shaun Bennett 16f39c1e71 Pushing changes to go help william 2015-12-10 20:51:34 -05:00
William Burns f8d7aeb5ea before revert 2015-12-11 01:32:32 +00:00
William Burns dda5ac6728 work 2015-12-11 01:20:36 +00:00
Sarah 4abad9e1c4 fixing chat and test commands. 2015-12-11 02:00:26 +01:00
Sarah ffb75a7832 Adding CustomEnding 2015-12-11 01:44:19 +01:00
William Burns 626a812844 Many changes 2015-12-11 00:40:54 +00:00
Shaun Bennett 4d8b8bd58b Fix errors, update cosmetic menu 2015-12-10 19:27:32 -05:00
Shaun Bennett a9e6224eca Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:21:33 -05:00
Shaun Bennett 5d96ceb41e Let owner+ disguise as staff - easy way to check a player's rank 2015-12-10 19:20:11 -05:00
Shaun Bennett 7b4f5d5b75 Christmas chest in gui 2015-12-10 19:19:20 -05:00
Shaun Bennett 72a8aaf556 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:18:49 -05:00
xGamingDudex 44a244caf4 Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics 2015-12-11 01:10:54 +01:00
xGamingDudex 5b0909012d Renamed GadgetActivateEvent to GadgetEnable event 
Some files didn't make it to prev commit
 2015-12-11 01:07:47 +01:00
xGamingDudex a6a4c8be36 Cosmetic Update 
+ Added GadgetDisable Event
+ Renamed GadgetActivateEvent to GadgetEnable event
+ Added hat framework, and some example hats
+ Added sets and Frost Lord set
+ Fixed some imports
+ Added new way of checking ownership of gadgets
+ Added some utility methods to GadgetManager
+ Added support for alternative package name of gadgets
+ Fixed coal
+ New Blood Helix particle
 2015-12-11 01:05:32 +01:00
Shaun Bennett d16d9a36e9 Use Account ID from client manager instead of PlayerCache 2015-12-10 17:25:39 -05:00
Shaun Bennett ab16bf89e5 Merge remote-tracking branch 'origin/master' 2015-12-10 17:04:25 -05:00
Shaun Bennett 851b613d2e Now playing fix 2015-12-10 17:04:15 -05:00