Jesse Boyd d89274ce09 Merge remote-tracking branch 'origin/master' ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java		2016-09-17 16:03:57 +10:00
..
events	Proper javadoc for event	2016-05-28 00:29:27 +02:00
generator	Sponge fixes	2016-09-02 15:58:24 +10:00
listener	Fix #1355	2016-09-14 19:27:30 -04:00
object	Change Sponge method behavior	2016-07-25 22:25:15 -04:00
util	Let generator be up to the implementation	2016-09-17 16:02:05 +10:00
uuid	Always cache * uuid	2016-06-05 20:11:02 +10:00
SpongeMain.java	Let generator be up to the implementation	2016-09-17 16:02:05 +10:00