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

1660 Commits

Author SHA1 Message Date
Ben Sihota 0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Mini-Chiss 1247f33b1e end game stats will display, even if no gems awarded. 2015-07-26 11:43:24 +02:00
Mini-Chiss dffde68982 fixed bug 
removed debug
 2015-07-25 17:11:02 +02:00
Mini-Chiss 7c7b166b4d reduced particles a little 2015-07-25 16:05:12 +02:00
Mini-Chiss aebd3eeb4f Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS 2015-07-25 15:56:23 +02:00
Mysticate 9feac87a15 Fixed not being able to buy Armorer. Lowered view distance on particles. 2015-07-25 09:51:23 -04:00
Mini-Chiss d64d713a87 Merge branch 'Myst_LOBBERS' 2015-07-25 10:50:55 +02:00
Mini-Chiss 9fa8c6ac45 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-07-25 10:48:06 +02:00
Jonathan Williams d3fede790a Merge pull request #17 in MIN/mineplex from MinorTweaks to master 
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
  Fixed report link
  http://pastebin.com/BRhT7pZP
  Reverted things
  Reverted Trainee to Helper due to popular demand.
  LOTS of tweaks :D
  Cleaned up somethings (lib's request)
  I'm a dumbass
  Fixed a few achievements
  Changed mineplex.com/supporthub > mineplex.com/reports
 2015-07-25 03:37:28 -05:00
Mysticate ae5c74680c SMALL CHANGE OMG DON'T MERGE WITH MASTER YET PELASE 2015-07-25 04:30:56 -04:00
Mini-Chiss 59d14624c0 Merge branch 'Myst_LOBBERS' 2015-07-25 10:26:47 +02:00
Mysticate d295cead09 Final stuff 2015-07-25 04:18:18 -04:00
Mysticate a002da4c0f Redid how lobbers works 2015-07-25 03:21:56 -04:00
Mysticate 5d87d9e1e4 . 2015-07-25 02:01:55 -04:00
Mysticate 365968f41d Added a bomb token thing 2015-07-23 16:26:43 -04:00
Mysticate 06d4de16cf Changed particle methods 2015-07-23 13:34:11 -04:00
Mini-Chiss 71148ef387 gave twitch same perms as youtubers 2015-07-23 16:29:42 +02:00
Mysticate e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
Mysticate e638674444 Fixed fuse on detonator 2015-07-22 20:17:19 -04:00
Mysticate b9762bddc4 Fixes 2015-07-22 16:50:57 -04:00
libraryaddict eff71c3e17 Champions: Add Morten G's changes to fix BlockToss 2015-07-22 08:10:57 +12:00
Mysticate b4df9f47c5 Added a mortar kit ;o (Please don't fire me b2) 2015-07-21 11:01:45 -04:00
Mysticate d38fc1a603 Reverted things 2015-07-20 16:40:37 -04:00
Mysticate 6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00
Mysticate 63df369700 Cleaned up somethings (lib's request) 2015-07-20 10:18:50 -04:00
Mysticate bb769aa0f4 I'm a dumbass 2015-07-20 10:02:50 -04:00
Mysticate 87cc40fc0c Fixed a few achievements 2015-07-19 22:38:03 -04:00
Mysticate 8b2b4c2826 Added to MPS 2015-07-19 15:51:34 -04:00
Mysticate 2dc2b8792c Fixes, updates 2015-07-17 17:01:24 -04:00
Mysticate 1e1cf6403d Added achievements 2015-07-14 13:31:41 -04:00
Mysticate df60659786 Core edits 2015-07-13 12:14:25 -04:00
Mysticate 616c444c16 Added some things and stuff 2015-07-12 18:15:33 -04:00
Mysticate 0a09ae29f3 Merge remote-tracking branch 'origin/master' into BombLobbers 2015-07-12 18:14:25 -04:00
Mysticate d0180910e9 Added two new kits. 2015-07-11 10:25:04 -04:00
Mysticate 0353b8571d Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers 2015-07-10 16:41:29 -04:00
Mysticate f812fd0530 Please push please 2015-07-10 16:31:37 -04:00
Mysticate 9e07be51c7 Bug fixes 2015-07-09 12:03:56 -04:00
Mysticate 1b3d7f1c20 Fixed and added things 2015-07-08 23:57:48 -04:00
Cheese 49daf597b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 12:47:57 +10:00
Cheese 7d073fdc0d fixed skywars icon 
changed LOSSES to GAMESPLAYED for consistency
 2015-07-09 12:47:40 +10:00
libraryaddict 7e3fdef2e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-08 18:43:56 +12:00
libraryaddict 1f250bf951 MineWare: Add current progress 2015-07-08 18:43:37 +12:00
Ben Sihota ca880371a6 Merge remote-tracking branch 'origin/master' 2015-07-07 21:19:43 -07:00
Cheese 480a29b874 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-08 13:55:16 +10:00
Cheese e36b0440a4 Merge branch 'bench' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
 2015-07-08 13:55:01 +10:00
Ben Sihota ffbee4a9aa Add more details to /game 
Fix NPE with /game set
 2015-07-07 18:20:27 -07:00
libraryaddict 9eff5b7245 Perks: Forgot to include this in last commit, no harm done. 2015-07-08 07:51:33 +12:00
libraryaddict bff3897fab Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered. 2015-07-07 12:30:20 +12:00
Shaun Bennett 6c8c3946a3 Revert "Add IntelliJ IDE library files" 
This reverts commit 71d696278d.
 2015-07-06 17:06:29 -05:00
Ben Sihota 71d696278d Add IntelliJ IDE library files 2015-07-06 13:48:47 -07:00