Commit Graph

3192 Commits

Author SHA1 Message Date
libraryaddict 23ea7bbce4 Spectators: Set fire ticks to 0 on damage 2015-04-30 20:55:30 +12:00
Peter Miller 152f5d3046 Ditto previous commit... 2015-04-29 16:52:06 -04:00
Peter Miller 69d4d2dfdb Another try at build changes. 2015-04-29 16:47:06 -04:00
libraryaddict 33bbe96964 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 2015-04-30 01:33:43 +12:00
libraryaddict 497550549b ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub. 2015-04-30 01:33:21 +12:00
libraryaddict c2b7001fcc Wizards: Current progress 2015-04-30 01:32:22 +12:00
Peter Miller 1e6084bfb2 Another compilation order change. 2015-04-28 10:31:25 -04:00
Peter Miller 93abe301c2 More compilation depedency changes. 2015-04-28 10:18:53 -04:00
Peter Miller 1dc9864e4c Added necessary libraries to compilation targets. 2015-04-28 10:00:12 -04:00
Peter Miller e1ddf55860 Adjusting build order of compile targets in common.xml. 2015-04-28 09:36:43 -04:00
Peter Miller e68e99d1f6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-28 09:25:05 -04:00
Peter Miller 0ce7f657e1 Added compilation targets for Arcade/Hub building with Ant. 2015-04-28 09:24:35 -04:00
Mini-Chiss 45b801ba81 hitbox changes 2015-04-27 19:21:33 -05:00
libraryaddict 1c1ab9bbe3 Throwing TNT: Fixed tnt not being movable from other inventories 2015-04-23 08:30:23 +12:00
Jonathan Williams ae1480fb1e Little bit of spacing fixed. 2015-04-21 23:36:33 -05:00
Jonathan Williams a662c93a92 Fix so 0.0.0.0 doesn't get selected for DNS rotation. 2015-04-21 23:36:12 -05:00
Jonathan Williams d8ed866ada Fix for duplicate names in db.
Adjusted staff server whitelist and op list.
2015-04-21 23:35:41 -05:00
Shaun Bennett 5c6c4a23d5 Rename SDK to 1.8 instead of 1.7 (IDEA) 2015-04-21 20:10:01 -04:00
libraryaddict 2aaa93e58f ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name 2015-04-22 05:38:32 +12:00
libraryaddict b29893ff60 Merge branch 'ResourcePack' into Wizards 2015-04-22 03:46:25 +12:00
libraryaddict 9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-04-22 03:45:59 +12:00
libraryaddict aeff6bf4b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-22 00:25:56 +12:00
Shaun Bennett 2b8137fc66 Merge remote-tracking branch 'origin/master' 2015-04-21 00:20:40 -04:00
libraryaddict 0196a5c359 Wizards: Latest changes by Chiss 2015-04-21 13:54:19 +12:00
Shaun Bennett 3dddd7112c Update MOTD to not use animation anymore (Bug fixed in 1.8.4!) 2015-04-20 17:16:57 -04:00
Cheese c73a6ae62f champs balance 2015-04-19 13:49:46 +10:00
Cheese f4a91455f6 Champions Balance 2015-04-19 12:22:51 +10:00
libraryaddict cd47da179a Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining 2015-04-18 06:12:34 +12:00
libraryaddict 9db8aff37a Wizards: Changed spell icons for resource pack 2015-04-18 06:10:23 +12:00
Cheese 91a70d6a04 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-16 21:06:19 +10:00
Cheese b352b28fdc fixed MAC still being disabled 2015-04-16 21:05:56 +10:00
libraryaddict 25dfeacb09 Wizards: Spell levels are now viewable on items in chest as item amount 2015-04-16 16:20:01 +12:00
libraryaddict 8803941bd8 Wizards: More changes as per demand. 2015-04-16 05:51:08 +12:00
Jonathan Williams 99436b4a42 Added Tab event back :D 2015-04-14 02:01:04 -05:00
Jonathan Williams 556a9df945 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 01:59:59 -05:00
Jonathan Williams c454973398 Changed login deets for new new db cluster. 2015-04-14 01:59:29 -05:00
Jonathan Williams eea4b98069 Removed unused AccountManager.java 2015-04-14 01:59:09 -05:00
Cheese f7ef44b007 More hitbox nerfs 2015-04-14 16:43:02 +10:00
Cheese 6cc18b61d1 reduced hitbox on flesh hook and lightning orb 2015-04-14 16:38:11 +10:00
Jonathan Williams 3d6dce24ff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 01:32:11 -05:00
Jonathan Williams e3a328c70d Revert "Work on FriendRepository, still not enabled yet."
This reverts commit 405d0fec18.

Re-enabled friends.
2015-04-14 01:32:03 -05:00
Cheese 058e5b9045 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 09:44:58 +10:00
Cheese 482ee6eb79 changed builder rank name 2015-04-14 09:35:35 +10:00
libraryaddict 073c7d16c2 Wizards Napalm: Make glazed blocks more common, raise damage 2015-04-13 15:06:52 +12:00
libraryaddict e0b0975195 Bridge: Prevent hoppers being crafted to prevent abuse 2015-04-13 14:38:32 +12:00
libraryaddict c36c800bb5 AchievementManager: Add SnrMod as a min MP level of 15 2015-04-13 14:05:50 +12:00
libraryaddict 12b3a582b2 CustomExplosion: Fixed loop, added max damage 2015-04-12 23:21:19 +12:00
libraryaddict be21968805 UtilBlock: Added a method that may or may not tell you the blocks destroyed in an explosion 2015-04-12 23:20:52 +12:00
libraryaddict 03fb8c203e Wizards: Balancing 2015-04-12 23:20:15 +12:00
libraryaddict 81aeff86bf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-12 20:15:28 +12:00