Commit Graph

11 Commits

Author SHA1 Message Date
Shaun Bennett
adfc451e9f You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift 2015-08-27 09:33:44 -07:00
Shaun Bennett
b13c9fe227 Field updates, War updates, bug fixes 2015-08-26 12:26:27 -07: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
William Burns
0c5cc25634 Stuff 2015-08-03 12:48:17 +01:00
William Burns
a964f343c7 xml files are ew 2015-08-01 14:55:01 +01:00
Shaun Bennett
abaa0ddee8 Level for Bobby 2015-07-05 13:30:16 -05:00
Shaun Bennett
3f9010fb7a Fix GameScore comparator 2015-06-09 13:21:15 -05:00
Shaun Bennett
8c7faf27dd Store gold drop amounts in item metadata (might be worth switching to our own storage?) 2015-06-06 16:04:11 -05:00
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Chiss
508ef65fcf Added missing file 2014-08-16 14:17:15 +10:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00