7c9226d6de
Fix mail to work with recent changes
2014-11-26 11:55:28 -06:00
c73a9f3bd5
Merge remote-tracking branch 'origin/master'
2014-11-26 11:39:13 -06:00
9928811a71
Merge pull request #2 from Better-Holograms to master
...
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
Remove the 'Made by Shaun'
Fix up mistakes in the previous modifications
You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
Ignore wither skulls for CustomTagFix
Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
ef59cb7a9d
Merging changes from master to Better-Holograms
...
* master:
Antistack replacement
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
30e2de6f22
Remove the 'Made by Shaun'
2014-11-27 00:50:02 +13:00
00e372820b
Fixed UI update when purchasing items.
2014-11-26 02:13:19 -08:00
2afe84d7c7
Fixed stupid query thing....defek7.
...
Removed extra logging.
2014-11-26 00:59:10 -08:00
3ad3fb21ff
Fix up mistakes in the previous modifications
2014-11-26 21:35:45 +13:00
f39e3dcec7
Fixed traversing resultSets.
2014-11-26 00:08:51 -08:00
06526d1e96
Fixed sql bug in FriendRepository
...
move/cleanup in RepoBase
2014-11-25 21:45:34 -08:00
15d129d184
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java
2014-11-25 21:18:12 -08:00
909877c869
Wiggle left, wiggle right, hope this works.
2014-11-25 21:17:30 -08:00
4ccb242066
i added a space!
2014-11-26 16:02:11 +11:00
95e428eb4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
2014-11-26 12:34:47 +11:00
731b0d89dd
Merge
2014-11-26 12:33:39 +11:00
03075fecae
You have your HologramManager presented in a light most fair.
...
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
d9c06e0fd3
Shauny!
2014-11-25 13:26:30 -08:00
484dfaaea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-25 13:25:41 -08:00
3b54789767
Optimized logins dealing with mysql with multiqueries.
...
Added lazy loading of Pool data and Loaded check before performing anything.
Refactored MiniClientPlugin and created MiniDbClientPlugin
Renamed RankBenefitManager9000 to BenefitManager
Removed /send ability for now.
2014-11-25 13:25:13 -08:00
3c76fde190
Ignore wither skulls for CustomTagFix
2014-11-26 09:51:08 +13:00
141c08ceb8
Remove old holograms and add new holograms
2014-11-26 09:18:36 +13:00
f1fbc21570
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
c7f2a8072e
Antistack replacement
2014-11-23 19:51:23 -06:00
1198426d8d
Little more work on Clans.
2014-11-23 05:08:33 -08:00
cb43bc04d3
Added /lobby
2014-11-23 03:35:16 -08:00
2871446f74
reduced max amount of blocks from explosions
2014-11-23 15:01:04 +11:00
0c5ec503be
reduced fireworks in dragons
2014-11-23 15:00:05 +11:00
089fdf8a64
sparklers no longer attract once they're in water or below 0
2014-11-23 14:55:06 +11:00
d4a127b8ad
reduced fps lag in runner
2014-11-23 14:47:28 +11:00
50b2870705
changed locked ability icon to diamond
2014-11-23 14:13:00 +11:00
dc5584d51b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-22 17:52:30 -08:00
37b5e495b8
Update local cache of inventory and if fail, revert change.
...
Removed full lock on login.
Removed Thanskgiving benefit.
2014-11-22 17:52:22 -08:00
0e4b21e6b1
disabled charge skills being usable in hub
2014-11-23 11:46:47 +11:00
f0c87e439a
fixed nametag color in paintball
2014-11-23 11:16:01 +11:00
b3a9410e54
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-23 10:36:11 +11:00
01f0e5fab4
fixed static laser not doing less dmg when not charged
2014-11-23 10:35:56 +11:00
695ed95b5d
Fixed StaffServer commands for inventory.
2014-11-21 18:34:28 -08:00
390c0dfff3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-21 18:30:38 -08:00
6efa416d81
Fixed glitching dom items in Hub due to portal throw.
2014-11-21 18:30:26 -08:00
19d3bba461
fixed fence glitch in dom
2014-11-22 13:20:34 +11:00
8a4de9bbdc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-22 10:29:12 +11:00
6dfcdce027
increased illusion cooldown
...
cleaned axethrow
2014-11-22 10:29:00 +11:00
d1578b12d4
Removed extra console logging.
2014-11-21 14:45:55 -08:00
7bd12ab850
Re-did benefits and inventory to only update locally if db succeeeds......DOH
2014-11-21 14:41:25 -08:00
3dfd7e6036
Fixed Champions bug with losing builds.
2014-11-21 14:39:51 -08:00
64a1426463
Added custom build load check on login.
2014-11-20 23:52:56 -08:00
29204de987
Removed old benefits.
...
Added youtube rank application from Owner
Fixed Dom bug : https://trello.com/c/OtwrpFXg/90-champions-24-skill-tokens-2-item-tokens-in-champions-so-broken
2014-11-20 21:58:39 -08:00
2446e6d64d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-20 21:42:40 -08:00
1f5be77880
Fixed text in Dom shop.
...
Cleaned up some code in benefit stuff.
2014-11-20 21:42:33 -08:00
f1ba5947a4
Some more wither updates
2014-11-21 16:32:12 +11:00
Shaun Bennett
libraryaddict
libraryaddict
Jonathan Williams
Chiss
Shaun Bennett