Shaun Bennett ea315a1447 Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop ... # Conflicts: # Plugins/Libraries/craftbukkit.jar		2016-01-20 10:19:09 -05:00
..
craftbukkit.jar	Use Maven for Compilation	2016-01-20 11:20:58 +11:00