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

6485 Commits

Author SHA1 Message Date
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
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
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 08b5e7b4db Working loadouts. 2015-12-23 09:21:43 +00:00
Morten f83016e007 Also really quickly fixed the Invisibility in lobby bug (hopefully) 2015-12-23 00:39:16 +01:00
Morten 8c399f03da Removed a weird query :/ 
Status: Finished
 2015-12-22 21:36:19 +01:00
Morten 9336eb19fa Finished up the Unban feature... 2015-12-22 21:31:57 +01:00
fooify 0ac2158988 i before e! 2015-12-22 11:02:57 -08:00
fooify 255dd0bdb3 fixed cosmetic menu item dropping bug 2015-12-22 11:02:37 -08:00
fooify 592fcbd282 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-22 10:55:11 -08:00
fooify a8d9956846 more grammatical errors hast been fixed 2015-12-22 10:35:20 -08:00
Virizion 0322ae1217 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-12-22 00:02:21 -05:00
William Burns b255c58653 Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-21 21:56:08 +00:00
Shaun Bennett 2ccd7a5de0 Fix Type Wars stat icon 2015-12-21 13:20:04 -05:00
Shaun Bennett 893fea49ab Merge pull request #108 in MIN/mineplex from develop to master 
* commit '7a72762c78ff56b3390fef809e3f57f51e755d14': (81 commits)
  Update MOTD
  Updating Holiday Achievements
  Updating Stats GUI
  Achievements....
  changing Category
  adding PM message.
  fixing Kit NPEs
  Fixing ending Stats.
  Wrong iterator!
  Update game display
  Adjust GUI, fix beta button
  Yo shaun debug this m8 ty
  Fixing Gems
  adjusting some timings
  Fixing Tutorial Minion
  fixing last commit
  adding Tutorial notification
  Adding Tutorial notification
  nuke delay and Stats
  Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
  ...
 2015-12-21 12:19:10 -06:00
Shaun Bennett 7a72762c78 Update MOTD 2015-12-21 12:56:37 -05:00
Shaun Bennett c63014b51f Type-Wars merge 2015-12-21 12:49:10 -05:00
Sarah a5436d63c0 Updating Holiday Achievements 2015-12-21 18:45:26 +01:00
Sarah 7c66bdbbde Updating Stats GUI 2015-12-21 18:25:44 +01:00
Sarah 010b1b0a5d Achievements.... 2015-12-21 18:08:11 +01:00
Sarah 6e3274ff2f changing Category 2015-12-21 18:06:00 +01:00
Sarah f15c318e5c adding PM message. 2015-12-21 18:02:25 +01:00
Sarah 082b5e156c fixing Kit NPEs 2015-12-21 17:48:17 +01:00
Sarah ff5761cc1d Fixing ending Stats. 2015-12-21 17:44:15 +01:00
Sarah 590da2128c Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-12-21 17:43:51 +01:00
Morten 1726aa2530 Added a feature to unban clients across the network 
But there still a bug when you type a username of a none registered member.
Will fix ASAP - likely after Mineware
 2015-12-21 12:58:19 +01:00
Shaun Bennett 5469289d82 Wrong iterator! 2015-12-21 06:57:56 -05:00
Shaun Bennett fae2a5d2bf Update game display 2015-12-21 04:40:30 -05:00