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

34 Commits

Author SHA1 Message Date
Shaun Bennett cdbcae7e3e Cosmetic Menu Update 2015-12-14 00:28:28 -05:00
Shaun Bennett e8b0e5dd8e Fix IntellIJ Files 2015-12-13 23:51:47 -05:00
Shaun Bennett bcbc5244c6 Add Clans.core to hub build (IntelliJ) 2015-11-27 23:14:54 -05:00
Shaun Bennett 5bce1b5f2e Fix merge issues, fix observer command 2015-10-01 22:57:39 -04:00
Shaun Bennett f8ef46abde Merge master code into clans 2015-09-28 21:41:05 -04:00
Shaun Bennett 8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Shaun Bennett cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04:00
Shaun Bennett 820bc1af44 Setup new module for intellij, fix field ore 2015-08-29 16:56:26 -07:00
libraryaddict a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/.idea/modules.xml
	Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Mineplex.Database/src/mineplex/database/Routines.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-08-14 19:44:56 +12:00
Shaun Bennett b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-08-10 03:24:59 -05:00
Shaun Bennett c67f4fa7e6 Votifier fixes 2015-08-06 06:45:47 -05:00
Shaun Bennett 4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
William Burns a964f343c7 xml files are ew 2015-08-01 14:55:01 +01:00
William Burns 3ba7ba259c Added map selection to MPS. 2015-07-08 15:24:16 +01:00
Ben Sihota ffbee4a9aa Add more details to /game 
Fix NPE with /game set
 2015-07-07 18:20:27 -07:00
Shaun Bennett dbdb2b3fc5 Scoreboards and WorldEvent work 2015-06-17 17:40:16 -05:00
Shaun Bennett 37f1f7eabb Master Builders changes for chiss 2015-05-01 17:46:42 -05:00
Shaun Bennett 50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
CoderTim 44f453c56e Updated jOOQ and database tables 2015-02-18 18:51:36 -05:00
Shaun Bennett 7de1c05d1c Clans run configuration, build configurations, and minor fixes on hub and arcade build configs. (IntelliJ IDEA) 2015-01-03 15:35:47 -05:00
Shaun Bennett 93dc3c9090 pushing this for my laptop. not final code! 2014-12-11 09:17:19 -06:00
Shaun Bennett 88a8e3a896 Hackyish way to log rewards given out in a database 2014-09-18 14:35:59 -05:00
CoderTim 91a2266a04 Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking 2014-09-05 04:00:51 -04:00
Shaun Bennett 43fd604695 Queue up polls for players instead of constantly checking for next poll 2014-08-17 17:47:38 -05:00
Shaun Bennett 4ba7da9a54 Polls! Still needs tweaks 
Hub artifact stuff for IntelliJ
 2014-08-17 17:30:35 -05:00
Shaun Bennett e5340238b6 IntelliJ Hub Configurations 2014-08-17 13:57:20 -05:00
Shaun Bennett 4193ee53ea Merge remote-tracking branch 'origin/master' 2014-08-16 12:13:11 -05:00
Shaun Bennett ef6871491d Add MapParser IntellIj configurations 2014-08-16 12:12:59 -05:00
Chiss d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Chiss 508ef65fcf Added missing file 2014-08-16 14:17:15 +10:00
CoderTim 19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
CoderTim 8c19d618b6 Added missing dependency in intellij setup 2014-05-25 20:51:27 -04:00
CoderTim 3859a42f1d Removed broken and obsolete shifter code 
Set up more intellij stuff
 2014-05-25 19:11:58 -04:00
CoderTim aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00