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

2062 Commits

Author SHA1 Message Date
Cheese
0f38c7b287 increased minimum coal 2015-12-14 22:12:50 +11:00
Cheese
951cd65903 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 22:05:22 +11:00
Cheese
045bc760c2 increassed cooldown, people getting trapped perm 2015-12-14 22:05:08 +11:00
Cheese
809ff649be lowered rarities a bit 2015-12-14 22:03:09 +11:00
Shaun Bennett
7181a26e58 Remove pointless equals() 2015-12-14 05:56:39 -05:00
Cheese
9e72e5adf1 nicer text 2015-12-14 21:43:11 +11:00
Cheese
daa9f165b1 removed coins from gadgets 2015-12-14 21:41:47 +11:00
Cheese
0ecd5a05f5 fixed hat ownership 
reduced coal cost
 2015-12-14 21:32:06 +11:00
Cheese
00de6880ba fixed wrong types 2015-12-14 21:25:30 +11:00
Cheese
342e9f2345 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 20:53:49 +11:00
Cheese
1189535748 icon fixes 2015-12-14 20:53:34 +11:00
Shaun Bennett
816c057eb3 Notify server about opening chest 2015-12-14 04:49:44 -05:00
Shaun Bennett
daf1d29ce0 Fix Carl 2015-12-14 04:44:11 -05:00
Shaun Bennett
50bf97ae4a Fancy treasure changes 2015-12-14 04:19:15 -05:00
Cheese
670eaa1954 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:16:03 +11:00
Shaun Bennett
e4fd97467f More treasure changes 2015-12-14 03:14:52 -05:00
Cheese
288c20fc74 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:13:05 +11:00
Cheese
9e35399d1d rarities tweaked + shards 2015-12-14 19:09:55 +11:00
Shaun Bennett
db9db558a0 Update GUI slots 2015-12-14 02:56:07 -05:00
Shaun Bennett
4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Cheese
c508b5ea96 chest visuals 2015-12-14 18:13:19 +11:00
Shaun Bennett
063c87c4fe Merge remote-tracking branch 'origin/master' 2015-12-14 00:29:11 -05:00
Shaun Bennett
cdbcae7e3e Cosmetic Menu Update 2015-12-14 00:28:28 -05:00
Cheese
048a9a81b8 gadget ammo should no logner be purchasable 2015-12-14 16:20:39 +11:00
Cheese
7f9e5c4ec9 more coal 2015-12-14 16:06:49 +11:00
Cheese
55fffdad59 fixed some colors 2015-12-14 16:03:51 +11:00
Cheese
bccade55bc reduced coal fumes size 2015-12-14 15:43:45 +11: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
libraryaddict
b5bdf7ced4 Remove custom name on players on join and arcade spectator 2015-12-14 15:42:32 +13: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
9058428484 Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage 2015-12-13 16:40:46 +13:00
Shaun Bennett
c470ad880d Merge pull request #77 in MIN/mineplex from foo to master 
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
  Fixed Micro Battle icon not appearing in stats menu
  Gravity's icon changed to ENDER_PORTAL_FRAME
  world's smallest bugfix - admin->co-host
  Fixed advertisement being able to be bypassed by spec and instant join
  fixed naming pets non-alphanumeric characters
  changed reference to premium ranks
  removed important debug thing
  fixed ssm enderman always facing south on teleport
  fixed bacon blast exloding blocks
  fixed shield smash and fissure affecting spectators
  fixed slab issue with Assassin's Flash
  Re-fixed Barbarian bug
  Fixed SG Barbarian bug
  SSM bug fix: magma cube flame dash doesn't make player invisible
  fixed several smash bugs and one global issue
  Slightly bumped Monster Maze jump time value
  fixed bridge bug "Death Bomber counts suicides as well"
  typo fix in legendary aura description
  Update achievement kit reference text
  Fixed tnt bug (SG)
  ...
 2015-12-11 18:57:18 -06:00
xGamingDudex
6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
xGamingDudex
9af6fd6904 Merge branch 'project-cosmetics' of 
http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java
 2015-12-11 18:06:35 +01:00
xGamingDudex
ba087d119a Small tweaks 2015-12-11 17:31:05 +01:00
Cheese
2ffd1d4595 BOB ROSS 2015-12-11 23:11:33 +11:00
Cheese
d5612a8f27 added a hint to how many more coal you need to your next prize. 2015-12-11 23:09:06 +11:00
Cheese
39f5f70a5f fixing up coal things 2015-12-11 22:43:34 +11:00
Shaun Bennett
ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Cheese
7c432461c9 changed coal item rewards to 3 tier :) 2015-12-11 22:25:14 +11:00
Cheese
e01a5369fd set bonuses 
item gadget gui update
 2015-12-11 21:53:39 +11:00
Cheese
40c2fdc3fc fixed suits 2015-12-11 21:11:35 +11:00
Cheese
d7f39bdfd8 costume sets 2015-12-11 20:59:55 +11:00
Cheese
7fc08f34a7 fixed typo 2015-12-11 20:34:01 +11:00
Cheese
f717a5f8cc more set stuff 2015-12-11 20:30:41 +11:00
Cheese
0cda29e135 improved cosmetic set implementation 2015-12-11 20:08:36 +11:00
Cheese
a6f664006f set display in gui 2015-12-11 20:01:54 +11:00
Cheese
d8a5edf9e9 fixed up gui items 2015-12-11 19:24:19 +11:00
Cheese
61a8d2825e gadget gui overhaul 2015-12-11 19:20:13 +11:00