JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6a00f26d5f
Mineplex2018-withcommit/Plugins/Mineplex.Core/src/mineplex/core
History
Keir Nellyer 6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
..
account Added getRepoElo to EloRepository 2016-04-14 15:21:28 -04:00
achievement - Fixed using water in restricted zones in MCL 2016-04-28 00:53:04 -04:00
antihack Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:11:12 +13:00
aprilfools
arena
benefit Use DBPool for everything 2016-02-19 00:17:38 -06:00
blockrestore Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
blood
bonuses Added gem and coin rewards back into bonus. 2016-04-22 05:33:25 -05:00
botspam Use DBPool for everything 2016-02-19 00:17:38 -06:00
chat Fix merge-related errors 2016-04-07 16:40:30 -04:00
chatsnap Add class headers and remove @author tags 2016-04-24 17:10:29 +01:00
command Reset these files to their previous state (IDE added tabs). 2016-02-23 00:26:10 +00:00
cosmetic Prevent players from naming their pets "ULTRA" 2016-04-13 16:37:13 -05:00
creature Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
customdata Use DBPool for everything 2016-02-19 00:17:38 -06:00
database Use DBPool for everything 2016-02-19 00:17:38 -06:00
delayedtask fixed some teleportation bugs and a bit of cleanup 2016-03-05 22:50:06 +00:00
disguise Communities work 2016-04-28 19:30:05 -05:00
donation Make sure a user has enough gold to make a purchase. 2016-04-08 10:48:55 -04:00
elo - Fixed order of Top Elo 2016-04-29 00:12:25 -04:00
energy
event
explosion - More polish and bugfixes 2016-04-16 23:59:44 -04:00
facebook Use DBPool for everything 2016-02-19 00:17:38 -06:00
fallingblock I'm committing this so I can checkout to a different branch 2016-04-05 16:41:50 -04:00
friend Fix online friends list 2016-04-13 17:24:46 -05:00
gadget Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 2016-02-18 16:45:37 +13:00
game Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge 2016-04-17 12:02:08 -04:00
give updated give to allow naming of items. 2015-08-20 20:38:07 +02:00
giveaway Use DBPool for everything 2016-02-19 00:17:38 -06:00
globalpacket Remove GiveawayManager (not used anymore) 2016-02-07 13:18:29 -06:00
gui Added automatic timings report in the event of lag. 2015-09-11 22:50:53 -07:00
hologram implement temporary holograms 2016-03-15 00:48:50 +00:00
ignore Use DBPool for everything 2016-02-19 00:17:38 -06:00
incognito Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01:00
inventory Added @a argument to /shard, /gem and /giveitem PC-13 2016-03-08 19:52:31 -05:00
itemstack cannons updates 2016-01-24 20:56:47 +00:00
leaderboard Use DBPool for everything 2016-02-19 00:17:38 -06:00
loot
map Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-12 21:23:58 -05:00
memory Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 2015-11-12 17:51:13 -05:00
message Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-04-29 23:42:27 +01:00
monitor Less ugly formatting 2015-12-07 04:44:19 -05:00
mount Fix highly annoying exception in Reindeer mount. 2016-02-16 12:46:39 +11:00
movement Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 2015-11-12 17:51:13 -05:00
noteblock Now playing fix 2015-12-10 17:04:15 -05:00
notifier Remove in game notifications, change sale message 2015-12-31 15:07:26 -06:00
npc Fix merge-related errors 2016-04-07 16:40:30 -04:00
packethandler packet hnadler beginning, switching to clans to fix errors 2016-03-08 18:10:57 +00:00
party Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-09-29 18:09:52 -04:00
personalServer Increase ram and cpu for event server 2016-03-23 10:23:04 +11:00
pet Use DBPool for everything 2016-02-19 00:17:38 -06:00
playerCount Emergency patch to slow down redis player count updates. 2016-01-30 12:36:20 +11:00
poll Use DBPool for everything 2016-02-19 00:17:38 -06:00
portal Clans alpha 0.17 2015-12-04 05:15:28 -05:00
preferences Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-04-29 23:42:27 +01:00
profileCache Improved and implemented GameProfile caching. 2015-12-11 01:24:59 -05:00
projectile Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
punish merge with develop 2016-01-29 03:44:04 -05:00
recharge Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
report Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-04-29 23:42:27 +01:00
resourcepack Fix merge-related errors 2016-04-07 16:40:30 -04:00
reward Valentines final changes, Change Gift Giver achievement 2016-02-15 20:43:46 -06:00
scoreboard Clans alpha 0.17 2015-12-04 05:15:28 -05:00
server Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 2015-11-12 17:51:13 -05:00
serverConfig Fixes for release 2015-11-27 05:53:57 -05:00
shop Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-06 19:40:01 -04:00
slack Remove Slack attachment functionality (for now). 2016-03-26 13:12:59 -04:00
spawn Use DBPool for everything 2016-02-19 00:17:38 -06:00
stats Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-05 23:14:32 +00:00
status Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-09-29 18:09:52 -04:00
task Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-05 23:14:32 +00:00
teleport Fixes for release 2015-11-27 05:53:57 -05:00
texttutorial I'm committing this so I can checkout to a different branch 2016-04-05 16:41:50 -04:00
thread Create an API for sending Slack message to multiple teams and channels. 2016-03-26 13:07:41 -04:00
timing UHC map gen 2015-05-11 13:25:05 -05:00
titangiveaway Use DBPool for everything 2016-02-19 00:17:38 -06:00
tournament Properly store teamId locally after registering for tournament. 2016-04-15 12:36:28 -05:00
treasure Process item for treasure before opening 2016-03-23 10:21:36 +11:00
updater Fix merge-related errors 2016-04-07 16:40:30 -04:00
valentines Use DBPool for everything 2016-02-19 00:17:38 -06:00
velocity refactored a little so theres no data stored in the util 2015-08-02 12:07:00 +02:00
visibility Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 2015-11-12 17:51:13 -05:00
CustomTagFix.java Merge pull request #14 from Mineplex-LLC/Dual_1.9 2016-03-22 19:25:37 +11:00
FoodDupeFix.java Fix priority for dupe fix 2015-09-28 20:44:57 -04:00
MiniClientPlugin.java new pvp timer management, fixed build house task, fixed incognito 2016-03-18 01:18:35 +00:00
MiniDbClientPlugin.java Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method. 2015-07-25 01:30:50 -07:00
MiniPlugin.java Fix merge-related errors 2016-04-07 16:40:30 -04:00
NCPDataManFix.java fixed some stuff 2015-08-07 22:59:50 +02:00
PacketsInteractionFix.java Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 2015-11-12 17:51:13 -05:00
Replay.java