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

7934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mysticate
efbd1c52d2 Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter 2015-12-31 03:01:23 -05:00
Mysticate
5ff9d1985b Monitoring for josh + the mods 2015-12-31 03:00:40 -05:00
William Burns
637baed830 Small edits 2015-12-31 01:24:58 +00:00
William Burns
874695cdf6 Flame 2015-12-31 00:50:53 +00:00
William Burns
a64dc6a8d4 Made it activate in all lobbies via command. 2015-12-31 00:46:31 +00:00
Keir
3496abe227 Java 8 goodness. 2015-12-30 21:41:24 +00:00
William Burns
1b40cece80 Added a new years countdown to the hub. 2015-12-30 20:04:01 +00:00
libraryaddict
1a30e0b335 Latest changes to CB 2015-12-30 23:34:27 +13:00
AlexTheCoder
a4853e667c - Gameplay edits and disabling broadcaster code 2015-12-30 03:23:21 -05:00
libraryaddict
92c4450eea Update the dual version 2015-12-30 21:12:11 +13:00
Keir
2716039d07 Small cleanup. 2015-12-29 23:49:57 +00:00
Keir
5841ab1101 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-12-29 23:47:00 +00:00
Keir
dffd7d95ec Don't include sender in recipients. 2015-12-29 23:35:54 +00:00
William Burns
f1c7424939 Fixing hotbar 2015-12-29 15:19:09 +00:00
Shaun Bennett
55cdf4148a Merge branch 'develop' 2015-12-29 03:21:03 -06:00
Shaun Bennett
16ee74885e Add maintenance line 2015-12-29 02:52:53 -06:00
Shaun Bennett
7ad12d0a6b Show Host Rank in private servers 2015-12-29 00:50:20 -06:00
Shaun Bennett
7104f1363a Give YT rank access to extra preferences 2015-12-29 00:34:18 -06:00
Keir
00e92f2569 Change date time format, biggest -> lowest units. 2015-12-29 06:20:13 +00:00
Keir
16b3ad6c1c Hovering over a reports age now shows the full date and time it was created. 2015-12-29 06:09:45 +00:00
Keir
738815bbb1 Show age of report instead of creation date and time for ease of use. 2015-12-29 05:51:50 +00:00
Keir
278932b9b8 Use CST timezone. 2015-12-29 05:23:18 +00:00
Keir
912b4aa4c8 Get Redis connection data from redis-servers.dat file. 2015-12-29 05:19:56 +00:00
fooify
fe337986bf Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-28 16:16:10 -08:00
Virizion
8a8d5b088b Switch to 7x7 builds. 2015-12-28 16:48:03 -05:00
Virizion
3d9a252868 Added auto pickup and fixed some stuff. 2015-12-27 15:26:43 -05:00
Virizion
162b3eb33f Stopped a bunch of block events. 2015-12-27 14:34:24 -05:00
William Burns
1066becd68 push 2015-12-26 20:21:46 +00:00
Virizion
845014b677 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-25 15:49:41 -05:00
Shaun Bennett
c680d91b56 Nerf TypeWars gems (again) 2015-12-25 03:12:04 -06:00
Shaun Bennett
dd8e91e463 Update MOTD 2015-12-25 03:03:53 -06:00
Shaun Bennett
25d36b546a Remove unnecessary files 2015-12-25 01:53:00 -06:00
Shaun Bennett
d08cfa0c4c Holiday Gifts 2015-12-25 01:51:36 -06:00
Keir
fb24f4a1b0 Re-add ReportServer module (got removed somehow) and add it under the "Other" group. 2015-12-25 00:37:21 +00:00
Keir
56c5b8edee Rename module to ReportServer. 2015-12-24 21:29:40 +00:00
Keir
2252a5397d Fix file filter and reduce it down to 1 line. 2015-12-24 21:25:55 +00:00
Keir
cc421c1435 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-12-24 21:19:30 +00:00
Keir
42aba8bda1 Added file purger (runs every 30 minutes, purges anything older than a day). 
Use a logger instead of sout.
General cleanup, especially of console messages.
 2015-12-24 21:13:09 +00:00
fooify
41f56e9853 Lots of typo fixes and such 2015-12-24 11:13:54 -08:00
fooify
b356bce177 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-24 11:09:08 -08:00
libraryaddict
2d974a781f Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-12-24 14:06:59 +13:00
Virizion
b0f8edb0f9 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-23 18:25:52 -05:00
NewGarbo
aa50c4762f fixes (?) 2015-12-23 18:55:44 +00:00
libraryaddict
1d4a5e5804 Clean up imports, set resource pack on clans. 2015-12-24 07:47:05 +13:00
libraryaddict
000b1f85b7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-24 07:41:55 +13:00
libraryaddict
67bdc6832f Tentative beginnings for clans resource packs 2015-12-24 07:40:49 +13:00
NewGarbo
369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 
Conflicts:
	Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
 2015-12-23 18:31:51 +00:00
NewGarbo
ff24ebc9f4 lots of changes that i can't remember at this point 2015-12-23 18:22:20 +00:00
William Burns
79dea726aa Added check for falling from map. 2015-12-23 10:59:12 +00:00
William Burns
c48df36459 Canvas reset with starting picture. 2015-12-23 10:26:14 +00:00