Commit Graph

7 Commits

Author SHA1 Message Date
Shaun Bennett
75ff5bb3da Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 02:46:56 -05:00
NewGarbo
0d43ffc7b2 fixessss 2015-11-26 06:54:49 +00:00
Shaun Bennett
8f14c8beae Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-25 23:26:29 -05:00
Shaun Bennett
7a663b4f7b Fix legendaries 2015-11-25 23:24:07 -05:00
NewGarbo
abcee009dd stuff 2015-11-26 04:07:33 +00:00
NewGarbo
7e23f896ca changes 2015-11-26 02:49:01 +00:00
NewGarbo
7e9dc7968e gear gui fixes and legendaries changes 2015-11-25 01:32:05 +00:00