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

543 Commits

Author SHA1 Message Date
AlexTheCoder
9595a0ffae - Lot of stuff 2016-02-12 21:22:00 -05:00
Cheese
52394c89dd fixed skins beign wrong way around 2015-12-14 21:34:27 +11:00
Shaun Bennett
e4fd97467f More treasure changes 2015-12-14 03:14:52 -05:00
Shaun Bennett
5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Shaun Bennett
fe3431ba04 Cosmetic Menu Update 2015-12-13 23:31:21 -05:00
xGamingDudex
64fb2b11d8 Added fake skin data 
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
 2015-12-13 23:09:25 +01:00
libraryaddict
e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
xGamingDudex
6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
Shaun Bennett
ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Cheese
98e91d29f6 more cosmetic stuff :) 2015-12-11 17:21:54 +11:00
Cheese
05a80b23a1 converting gadget text. (kill me now) 2015-12-11 16:07:02 +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
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
libraryaddict
4cfa7c436b Add missing file 2015-12-11 16:48:40 +13:00
Shaun Bennett
557f3e97a5 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:32:35 -05:00
William Burns
563a0f0ec7 remove tutorial and no flicker 2015-12-11 02:30:44 +00:00
libraryaddict
1661c056c1 Added line stuff 2015-12-11 15:21:05 +13:00
Shaun Bennett
2694787590 Reverting 2015-12-10 20:59:57 -05:00
Shaun Bennett
16f39c1e71 Pushing changes to go help william 2015-12-10 20:51:34 -05:00
William Burns
626a812844 Many changes 2015-12-11 00:40:54 +00: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
Cheese
fabf3dab59 updated blocksearch 2015-12-10 13:12:01 +11:00
Cheese
09d8367b4b fixed method 2015-12-09 07:32:36 +11:00
Christopher Jozsa
0b8e0409b6 Merge pull request #92 in MIN/mineplex from update-SSM to master 
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
  SSM kit description change, grammar mistake
  SSM Pig bomb bug fix
 2015-12-08 14:29:32 -06:00
Teddy
2bf1012fa4 SSM Pig bomb bug fix 2015-12-08 16:34:07 +00:00
Shaun Bennett
a1915e324c Some java 8 code 2015-12-08 08:42:45 -05:00
Cheese
fe1f763374 changed order blocks will be added to the list 2015-12-08 15:26:32 +11:00
xGamingDudex
b1536547d3 Cosmetic Update 2 
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
 2015-12-08 00:50:08 +01:00
Shaun Bennett
8ff034fb5d Merge pull request #89 in MIN/mineplex from clans-beta to master 
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
  Winter MOTD, Stat fixes (maybe?!)
  made use ability teleport player back to where they should be
  Forgot to push these changes last update!
  fixed tnt blowing up in claims when offline
  fixed task not getting cleanup up after /skiptutorial
  fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
  Fix heavy attribute, disable claim visualizer
  Disable subtasks for now
  Clans alpha 0.17
  clan claim visualizer
  fixed infinite claims
 2015-12-07 12:22:10 -06:00
xGamingDudex
c36182b8d4 Cosmetic Update 
New:
+ New GUI System
+ Candy Cane Particle
+ Candy Cane Double Jump
+ Candy Cane Death Effect
+ Candy Cane Arrow Trail
+ Snowman Morph
+ Baby Reindeer Mount
+ Pet Coal Apparition

Fixed/Updated:
* Added getTick to UpdateEvent and UtilTime
* Added more methods to UtilParticle
* Gadget manager isMoving now counts flying as moving
* Updated some cosmetics
 2015-12-07 02:53:14 +01:00
Cheese
fa6418769b YT name change 2015-12-06 21:26:02 +11:00
Cheese
e01d30b920 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-04 13:19:07 +11:00
Cheese
ef2511434d tuber arnk 2015-12-04 13:18:23 +11:00
Christopher Jozsa
8717f962e6 Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master 
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
  Added missing MountData and SingleEntityMountData files.
  Mount bug fix.
  Added method to edit NoAI field on entities.
  Implemented new mount data system replacing instead of entities as data.
  We only need to add the "Go Back" page once...
  TitanMount fixes
 2015-12-03 17:15:21 -06:00
NewGarbo
584a02ae3e fixed infinite claims 2015-12-03 10:30:06 +00:00
Christopher Jozsa
fc0cae8e0f Merge pull request #85 in MIN/mineplex from virizion_utils to master 
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
  Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
 2015-12-02 18:53:30 -06:00
NewGarbo
d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
Virizion
bf92af647a Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames). 2015-12-02 00:00:32 -05:00
NewGarbo
f536bf23e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-01 12:06:25 +00:00
NewGarbo
d32e6fdb96 Got rid of deployed tasks. using different system now. (untested) 2015-12-01 11:28:14 +00:00
Virizion
666b9963e4 Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values. 2015-11-30 17:42:48 -05:00
xGamingDudex
6120c8246b Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 2015-11-29 19:11:24 +01:00
xGamingDudex
2c2370f8a0 Added method to edit NoAI field on entities. 2015-11-29 19:08:26 +01:00
Shaun Bennett
f82396d485 Clans changes/fixes 2015-11-29 02:41:53 -05:00
NewGarbo
aa68701ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 20:16:49 +00:00
NewGarbo
d8ae035f84 creative scoreboard team. and fixed npe in tutorials 2015-11-28 09:20:42 +00: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