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

938 Commits

Author SHA1 Message Date
Cheese
02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
 2015-10-10 10:36:42 +11:00
Cheese
7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Jonathan Williams
586cc6e3e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-09 09:40:58 -06:00
Mysticate
cdb9741438 Changed the SG icon in hub, fixed EULA breaking thing in Class Shop 2015-10-08 20:36:16 -04:00
Cheese
3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
Cheese
e2e2356b04 stuffs 2015-10-06 13:25:15 +11:00
Jonathan Williams
631bd9cfa6 Removed sale notification. 
Removed queue create table query.

Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.
 2015-10-01 07:38:59 -07:00
Ty Sayers
b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-29 18:09:52 -04:00
AlexTheCoder
49908e7550 - Added game to hub text 2015-09-25 04:28:11 -04:00
AlexTheCoder
a488bfab3e - Rewritten testrank system 
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
 2015-09-24 11:44:45 -04:00
Shaun Bennett
cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04:00
libraryaddict
5e8fc77164 Add pages to spectator and in-progress server menu 2015-09-17 04:34:45 +12:00
Cheese
4184fe20cf minor fixes 2015-09-12 14:09:04 +10:00
Cheese
0ac808ba43 stacker pref is now only for pvp stacking. 2015-09-05 10:30:11 +10:00
Cheese
fc5ccd4a5e fixed 'self scoring' in Soccer 
removed silverfish on wither pet despawn
 2015-09-05 10:04:54 +10:00
Cheese
106a7dab2e removed ability for entities to change blcoks in hub 2015-09-05 09:48:06 +10:00
Ty Sayers
54f910845e Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop. 2015-08-30 12:28:44 -07:00
Ty Sayers
c1b356e42f Fix asynchronous race conditions in ServerData. 2015-08-29 19:05:14 -07:00
Ty Sayers
da3810e5a3 Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers. 2015-08-29 17:57:18 -07:00
Ty Sayers
138a4cf638 Fix bug where transferring a clan to destination server would not load properly server-side. 2015-08-29 17:43:12 -07:00
Ty Sayers
f47c1b5c14 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-29 17:33:08 -07:00
Ty Sayers
5df7a5e0c9 Fix bugs related to multiple server UI and clan server transferring. 2015-08-29 17:31:54 -07:00
Shaun Bennett
820bc1af44 Setup new module for intellij, fix field ore 2015-08-29 16:56:26 -07:00
Ty Sayers
197309b914 Commit left-over changes to merge and pull. 2015-08-29 15:44:29 -07:00
Ty Sayers
aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00
Mysticate
ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Jonathan Williams
e9b33668bc Added donorsOnline to MinecraftServer snapshot 
Refactored Rank class to use lowercase methods.
 2015-08-28 13:22:04 -07:00
Shaun Bennett
cd145324d8 Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit 2015-08-28 12:00:23 -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
Jonathan Williams
bbe5b79c7e Disabled AntiHack create table. 
Fixed NPE with ServerManager
 2015-08-19 04:11:34 -05:00
Mini-Chiss
14bf8faf3a disabled big sale 2015-08-18 09:49:53 +02:00
Shaun Bennett
8ab8388344 Merge remote-tracking branch 'origin/master' 2015-08-17 05:05:36 -05:00
Shaun Bennett
dc8bec340e Rename Quick game menu for consistency 2015-08-17 03:18:35 -05:00
Mini-Chiss
7a7543886f fixed a ton of commands NPEing on no args 2015-08-17 09:04:39 +02:00
Mini-Chiss
91ce9cfba7 fixed a crash with fireworks 2015-08-16 08:39:03 +02: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
Mini-Chiss
5fa9135b08 renamed soccer to slimeball :) 2015-08-13 14:11:22 +02:00
Mini-Chiss
534c91c706 remove items from inside soccer 2015-08-13 13:24:55 +02:00
Jonathan Williams
a308244966 Merge pull request #29 in MIN/mineplex from foo to master 
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
  minor grammar issue
  remove duplicate method
  manually updating something
  *crosses fingers* please work!
  please work...
  Freezes the time using doDayLightCycle instead of using a UpdateEvent.
  Fixed double-half-slabs (line 68)
  remove custom level to fix merge conflicts
  squirrel!
  fix getting snowballs from bedrock
  add jnr_dev to updaterank
  fix this agaaaaain
  FOOIFY IS A NOOB OKAY
  fix concurrentmodificationexception
  fix turfforts bug
  prevent STATIONARY_LAVA from breaking in creeper smash
  fix creeper smash exploding lava and bedrock
  fix spleef lava issue
  ishh also wanted this :P (let me know if I should remove it)
  ishh wanted it...k
  ...
 2015-08-13 01:49:00 -05:00
Mini-Chiss
fcfb2559b8 players cannot grab slime :O 2015-08-12 14:41:33 +02:00
Mini-Chiss
d1302e8dc3 fixed full msg 2015-08-12 12:42:59 +02:00
Mini-Chiss
5293e24469 fixed text 2015-08-12 11:58:40 +02:00
Mini-Chiss
cd5c7e7110 fixed kb 2015-08-12 11:23:19 +02:00
Mini-Chiss
f19efb4a93 renamed football to soccer 2015-08-12 09:23:00 +02:00
Mini-Chiss
7cda53cb28 carl spinner in arcade/ 
tutorial fixes
 2015-08-12 08:36:21 +02:00
fooify
07bdbdde46 minor grammar issue 2015-08-11 09:55:10 -07:00
fooify
10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
Shaun Bennett
fe153bee11 Fix revert issues 2015-08-11 03:19:27 -05:00
Mysticate
bd414cd231 Merge remote-tracking branch 'origin/master' into Myst_EVO 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
 2015-08-10 19:47:53 -04:00
Mini-Chiss
65b51a137c new party tute room 2015-08-10 14:50:44 +02:00
Mini-Chiss
bd2c9aa5e6 hub stuff 2015-08-10 14:00:02 +02:00
Shaun Bennett
8745884153 Various fixes 2015-08-10 04:51:11 -05: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
6f8d6f8a40 Move Bonus and Poll to core 2015-08-10 01:55:50 -05:00
Shaun Bennett
a0be3fa964 Use atomic mysql operations for modifying tickets 2015-08-10 01:19:10 -05:00
Shaun Bennett
511cc76bef Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working) 2015-08-10 00:47:36 -05:00
Shaun Bennett
28806aaf0a Update Bonus amounts, Attempting to fix Votifier plugin for EU/US 2015-08-10 00:33:54 -05:00
Shaun Bennett
d20fe54010 Disable carl features when carl can't be found 2015-08-09 16:36:48 -05:00
Mini-Chiss
c2d066a576 ui fixes 2015-08-09 19:31:24 +02:00
Mini-Chiss
41dcc564c9 polish polish polish 
MAKE IT SHINE!
 2015-08-09 19:02:07 +02:00
Sarah
8c66ef7f15 changing Hub items and adding Profile GUI. 2015-08-09 18:33:44 +02:00
Mini-Chiss
5a7de8ef3d hub fixes 2015-08-09 17:21:56 +02:00
Sarah
941e746ca9 Finalizing Poll GUI in Carl's GUI. 2015-08-09 16:47:03 +02:00
Sarah
85c8e42f53 Finalizing and improving the Carl spinner and adding creeper explosion animations. 2015-08-09 15:00:54 +02:00
Shaun Bennett
e6519206af Add event to be called when a player tries to buy a carl spin 2015-08-08 16:29:03 -05:00
Mini-Chiss
cbb0cb96c8 ensured white 2015-08-08 13:54:35 +02:00
Mini-Chiss
e030331565 fixed some bugs 2015-08-08 13:51:37 +02:00
Mini-Chiss
fa7f19bde5 removed debug 2015-08-08 13:47:30 +02:00
Mini-Chiss
328c31de88 hub Update 
fixed bad gameid
 2015-08-08 13:47:09 +02:00
Shaun Bennett
4f6dfdb856 Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes 2015-08-08 06:35:25 -05:00
Mini-Chiss
eab7aa59f2 hub update! 2015-08-08 09:27:49 +02:00
Mini-Chiss
47cb98066d Hub fixes 2015-08-08 08:19:07 +02:00
Mini-Chiss
33c96f51ae fixed some stuff 2015-08-07 22:59:50 +02:00
Mini-Chiss
090c1f135d Merge branch 'SarahsAwesomeBugFixes' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
 2015-08-07 21:48:35 +02:00
Mini-Chiss
b22706e649 hub update part 1 2015-08-07 21:45:38 +02:00
Mysticate
a9350bfacd Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-07 11:58:53 -04:00
Shaun Bennett
f76d9b0d37 Replace Consumers with Callbacks 2015-08-07 04:20:54 -05:00
Shaun Bennett
5ebc7080ee Push fixes 2015-08-07 04:13:09 -05:00
Jonathan Williams
320a3efe5b Remove some debug code. 2015-08-07 02:22:58 -05:00
Jonathan Williams
e8c60e6e84 Added storage of pets in mysql. Going to have live while backend process is copying data over. 
Updated ServerTypePage to resolve clicking issues with solo/team pages.
 2015-08-07 02:22:13 -05:00
Sarah
181b778a9c Fixing some bugs and disallow MPS while disguised. 2015-08-07 07:39:40 +02:00
Morten
f37e25e9d7 Finish push for today <3 2015-08-07 07:03:15 +02:00
Morten
608e8bf693 For Sarah <3 2015-08-07 05:40:16 +02:00
Shaun Bennett
5f435a079e Update vote button 2015-08-06 21:59:21 -05:00
Shaun Bennett
be18dc1bf5 Add experience rewards to reward manager 2015-08-06 21:41:56 -05:00
Shaun Bennett
6311ceaa0f Reward work for new Game reward rarity and setup for carl, work on carl spinner 2015-08-06 21:15:17 -05:00
Morten
1680b652db Added Hat layer skin 
Added Sneak animation

With love from Morten <3
 2015-08-07 03:10:17 +02:00
Shaun Bennett
44e30a0903 SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui 2015-08-06 15:34:56 -05:00
Sarah
d8041ba582 Fixing Players can disguise as disguised Players. 2015-08-06 20:57:56 +02:00
Sarah
4a10f8d71a fixing very last bugs. Ready to push!!! 2015-08-06 13:23:38 +02:00
Shaun Bennett
35d999d747 Remove some debug messages 2015-08-06 05:56:31 -05:00
Shaun Bennett
9e9f9862d0 Bonus bonus bonus! 2015-08-06 05:47:32 -05:00
Sarah
6947b54e66 16 char limit and Steve Skin. 2015-08-06 09:45:02 +02:00
Sarah
5809359449 Random Player disguises. 2015-08-06 09:19:19 +02:00
Sarah
208ce95c97 No youtuber Disguise. 2015-08-06 09:11:39 +02:00
Sarah
b52a9477fe No Staff disguises! 2015-08-06 09:07:30 +02:00
Sarah
16a8164030 Fixing last bugs and disabling coin bombs while diguised. 2015-08-06 08:42:09 +02:00
Shaun Bennett
4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
Jonathan Williams
da5387c54f Fixed ConcurrentModification for ServerManager cooldowns. 2015-08-05 01:33:09 -05:00
Shaun Bennett
bcd4f4f9e2 Open gui through npc 2015-08-05 00:41:50 -05:00
Jonathan Williams
b2116cc7e8 Merge branch 'OldServerSelector' 2015-08-04 13:56:23 -05:00
Jonathan Williams
813dfb26b3 Finalized revert to old server menus. 
Tied in solo/team buttons to use old server menu as well.
 2015-08-04 13:54:06 -05:00
Shaun Bennett
b33b0ac935 More bonus work 2015-08-04 04:00:51 -05:00
Mini-Chiss
2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Shaun Bennett
e200ddd777 Merge branch 'master' into Bonus 
# Conflicts:
#	Plugins/.idea/misc.xml
 2015-08-03 08:32:45 -05:00
Sarah
fc412b0782 Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG. 2015-08-03 14:36:51 +02:00
Jonathan Williams
37b779f108 Fixes for servers. 2015-08-03 05:55:33 -05:00
Jonathan Williams
6c0666c59b Fix for server groups / teams. 2015-08-03 03:20:27 -05:00
Jonathan Williams
302252f193 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 02:56:31 -05:00
Jonathan Williams
af0d769d3d Fixed skywars quick shop. 
Fixed issue with skywars not opening.
Fixed chest size for MPS
 2015-08-03 02:56:24 -05:00
Mini-Chiss
5bb2f80b8e fixed text 2015-08-03 09:54:34 +02:00
Mini-Chiss
72c473ad6b removed annoying mineplex thing from subtext in news 2015-08-03 09:51:10 +02:00
Jonathan Williams
adcd91bf61 Servers with more than 40 max slots always send to largest server. 
Fixed space in Solo lore.
 2015-08-03 02:07:23 -05:00
Mini-Chiss
6a1e5d6bfc changed item text 2015-08-03 08:23:49 +02:00
Jonathan Williams
c32074e733 Fixed MPS/Event server guis so they open up like old. 
Changed sticks to player heads in solo/team selection.
 2015-08-03 00:53:06 -05:00
Jonathan Williams
bfaa0e6849 Fixed event/mps hardcode. 2015-08-02 23:51:43 -05:00
Ty Sayers
58933fc855 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 21:19:00 -04:00
Ty Sayers
944a4a9535 Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process. 2015-08-02 21:18:24 -04:00
Jonathan Williams
a561bbbf12 Added hardcode for EVENT/MPS :D 2015-08-02 19:41:42 -05:00
Shaun Bennett
cadd21c18b More bonus work 2015-08-02 19:12:39 -05:00
Ty Sayers
32a2687991 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 20:00:15 -04:00
Jonathan Williams
d9a641fd92 Updated ServerManager to read server npc stuff from redis. 
Updated ServerGroup to have NPC name in it.
 2015-08-02 18:59:43 -05:00
Ty Sayers
4852e69991 Temporary un-finished changes for adding in team/solo UI pages and allowing players to select. 2015-08-02 19:19:40 -04:00
Ty Sayers
70c1b883db Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups. 2015-08-02 18:20:52 -04:00
Ty Sayers
c2f6c402da Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 13:25:09 -04:00
Ty Sayers
612d967aa0 Add ability for auto-joining of gametypes to bypass manual server selection by player. 2015-08-02 13:24:59 -04:00
Shaun Bennett
db15ffad72 Bonus changes + Update jooq 2015-08-02 05:17:51 -05:00
Mini-Chiss
afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Shaun Bennett
11e49b9678 Some updates 2015-08-02 04:28:57 -05:00
Mini-Chiss
ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Shaun Bennett
fd65f27f0f Fix some typos/formatting issues 2015-07-31 10:01:19 -05:00
fooify
b623f025ff manually updating something 2015-07-29 14:31:11 -07:00
fooify
db5c5a9888 *crosses fingers* please work! 2015-07-29 14:12:52 -07:00
Aaron Brock
971908d38b Stuff 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:52:43 -04:00
Aaron Brock
832fb4638a More things 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:42:00 -04:00
Ben Sihota
7d9fd61c8e Display changes 2015-07-26 22:31:40 -07:00
Ben Sihota
0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Ben Sihota
47d410370d Merge branch 'horus-bug-fixes' 2015-07-26 18:20:39 -07:00
Jonathan Williams
6d367e3cee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-25 01:38:54 -07:00
Jonathan Williams
84be48f264 Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method. 
Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.
 2015-07-25 01:30:50 -07:00
Ty Sayers
13f47ad903 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
 2015-07-24 13:59:01 -05:00
Ben Sihota
fe80ed373a Fix numerous trello bugs 
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
 2015-07-22 22:28:44 -07:00
Mysticate
e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
Ty Sayers
0b49d053fe Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events. 2015-07-20 15:57:57 -05: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
Shaun Bennett
2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
Shaun Bennett
5c5e7dd4a9 Merge master into clans 2015-07-13 20:42:10 -05: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
Shaun Bennett
9ccc85a79e Improved block restore for Events 2015-06-30 22:30:49 -05:00