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

4707 Commits

Author SHA1 Message Date
Cheese 7e2f5f0657 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 21:30:45 +11:00
Cheese 11a60a86a9 Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-24 21:30:17 +11:00
Jonathan Williams fbea0e702b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 02:56:40 -06:00
Cheese c5b5d07627 evade timing 2015-11-24 16:07:11 +11:00
Cheese 913d079623 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 15:23:53 +11:00
Cheese 7454cf7443 MS + Champs bugs, balance and more 2015-11-24 15:23:37 +11:00
libraryaddict c48c743ebf Merge pull request #79 in MIN/mineplex from WitherAssault-Fix to master 
* commit '19803a00ab50658b33b79ac4f2909932c9e4161b':
  Added the Wither Assault fixes to it's own Branch
 2015-11-23 10:11:30 -06:00
Jonathan Williams 875b87e0e4 Fixed memory leak crashing servers. 2015-11-23 02:41:38 -06:00
Morten 19803a00ab Added the Wither Assault fixes to it's own Branch 2015-11-22 19:06:24 +01:00
libraryaddict cfeafff2f6 EntityDismountEvent stuff 2015-11-22 14:44:32 +13:00
AlexTheCoder 3bb11bba08 - Fixed Stats [caused by bad communication between chiss and I] 2015-11-21 11:30:53 -05:00
Cheese 91e40d0e61 hide testing server MOTD 2015-11-21 13:37:19 +11:00
Cheese 9ef99cee20 fixed merge issues 2015-11-21 11:21:54 +11:00
Cheese 6eb1bef1c6 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-11-21 11:09:28 +11:00
Cheese 87a30513de Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-21 11:08:23 +11:00
Cheese 4a0cc79abf fixed silence not working in non-champs servers 2015-11-21 11:08:09 +11:00
AlexTheCoder 8b480cc32b Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 18:40:42 -05:00
AlexTheCoder 1274dc860d - Stuff for chiss 2015-11-20 18:40:20 -05:00
Cheese 2f91ca5a8a fixed errors 2015-11-21 10:35:17 +11:00
Cheese 4a70e4da90 more fixies 2015-11-21 10:34:08 +11:00
Cheese 4d128d9c7a fixed some skills and wierd hitbox error 2015-11-21 10:29:48 +11:00
Cheese c7297a7a38 fixed invalid proxies exploding 2015-11-21 09:45:01 +11:00
Cheese d5076b1c47 CTF fix 2015-11-21 09:41:02 +11:00
Cheese e0885feea6 Merge branch 'master' into alex-ctf 2015-11-21 09:40:07 +11:00
Cheese 04be896ff6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-21 09:39:50 +11:00
Cheese 0bc64fec16 Proxy limit fixes 2015-11-21 09:28:15 +11:00
AlexTheCoder 386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder f51358552a -B 2015-11-20 05:57:29 -05:00
Jonathan Williams 700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Jonathan Williams 411d6fdb22 Made PlayerTracker use existing code for determining region. 2015-11-19 22:11:45 -06:00
Cheese e14f5a36bd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-20 08:34:19 +11:00
Cheese f33eedf36d text fix 2015-11-20 08:33:51 +11:00
Sarah d7d11e57e5 Merge pull request #76 in MIN/mineplex from william-global to master 
* commit '4620a5a1626aaefb992ff62a14dc35ed9ae60a86':
  Hub fix
  testing excludes
 2015-11-18 15:49:18 -06:00
William Burns 4620a5a162 Hub fix 2015-11-18 21:47:52 +00:00
William Burns 6fa2a58f5d Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global 2015-11-18 18:50:09 +00:00
William Burns 0e1c72e25d testing excludes 2015-11-18 18:46:51 +00:00
Shaun Bennett 1eff698a34 Merge pull request #75 in MIN/mineplex from william-global to master 
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
  ranks
  woops easy fix
  rawr and fixes
  Added the ability to give out game loot.
  Reformatting titles
  Added GlobalGiveCoins. Changes Gems a little and the manager.
  More global stuff! Added GlobalGiveGems.
  Global Packet work. Added giveitem sub-command.
 2015-11-18 10:15:33 -06:00
William Burns a11ca138e7 ranks 2015-11-18 16:01:53 +00:00
William Burns 04a4b072af woops easy fix 2015-11-18 15:48:25 +00:00
William Burns 2e223d0660 rawr and fixes 2015-11-18 15:42:33 +00:00
William Burns e16ee9036a Added the ability to give out game loot. 2015-11-18 14:35:40 +00:00
William Burns e83b49d490 Reformatting titles 2015-11-18 13:43:22 +00:00
William Burns e19d4e11e1 Added GlobalGiveCoins. Changes Gems a little and the manager. 2015-11-17 18:54:39 +00:00
William Burns a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00
William Burns 0f7c52391f Global Packet work. Added giveitem sub-command. 2015-11-17 08:19:36 +00:00
Cheese adfc2f19eb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-17 09:20:15 +11:00
Cheese 46505a8e8e converted to new res pack locations 2015-11-17 09:19:33 +11:00
Shaun Bennett 007d5a00dc Merge remote-tracking branch 'origin/master' 2015-11-16 16:39:43 -05:00
Shaun Bennett e35eec4cb1 Update motdmanager and compiler.xml 2015-11-16 16:39:34 -05:00
libraryaddict 208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13:00