Shaun Bennett
|
52c55335fa
|
Add chunk to unclaim map
|
2015-11-17 18:33:21 -05:00 |
|
Shaun Bennett
|
2627aa9933
|
War/War Points Update
|
2015-11-16 14:37:32 -05:00 |
|
Shaun Bennett
|
820bc1af44
|
Setup new module for intellij, fix field ore
|
2015-08-29 16:56:26 -07:00 |
|
Shaun Bennett
|
b13c9fe227
|
Field updates, War updates, bug fixes
|
2015-08-26 12:26:27 -07:00 |
|
Ty Sayers
|
a9f5197c64
|
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Database/src/mineplex/database/Account.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
|
2015-08-22 15:18:51 -04: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
|
4cad99eb76
|
Lots of bonus work, start adding Votifier plugin
|
2015-08-06 00:45:39 -05:00 |
|
William Burns
|
0c5cc25634
|
Stuff
|
2015-08-03 12:48:17 +01:00 |
|
Shaun Bennett
|
bd9d222cff
|
Fix IntellIJ Files
|
2015-08-03 05:50:02 -05:00 |
|
Shaun Bennett
|
11e49b9678
|
Some updates
|
2015-08-02 04:28:57 -05:00 |
|
William Burns
|
5deb699b02
|
Added rejected games and whitelist to MPS.
|
2015-07-23 18:24:41 +01:00 |
|
Shaun Bennett
|
05b1e03598
|
Remove BungeeSigns Module?
|
2015-07-14 21:57:30 -05:00 |
|
Shaun Bennett
|
ed1c275347
|
Add Nautilus.Game.PvP to IntelliJ
|
2015-06-06 15:48:29 -05:00 |
|
Shaun Bennett
|
90a7362440
|
Marge with twiggys code, work on slime splitting
|
2015-06-04 00:21:09 -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 |
|
Shaun Bennett
|
befc2cff7c
|
messing with jedis subpub
|
2014-12-22 22:49:28 -06:00 |
|
Shaun Bennett
|
1260e875fd
|
Add clans to intellij. Update button
|
2014-12-17 18:38:35 -06:00 |
|
Shaun Bennett
|
30a7eea628
|
Motd stuff for xmas update
|
2014-12-12 00:28:29 -06:00 |
|
CoderTim
|
91a2266a04
|
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
|
2014-09-05 04:00:51 -04:00 |
|
CoderTim
|
aae46bdeda
|
Removed unused intellij module
|
2014-09-03 16:58:53 -04:00 |
|
Shaun Bennett
|
ef6871491d
|
Add MapParser IntellIj configurations
|
2014-08-16 12:12:59 -05:00 |
|
CoderTim
|
19222c6815
|
Updated IntelliJ environment to be compatible with latest changes
|
2014-08-15 15:51:29 -04:00 |
|
CoderTim
|
aa6b5324eb
|
Set up IntelliJ IDEA
|
2014-05-20 00:39:50 -04:00 |
|