Commit Graph

5 Commits

Author SHA1 Message Date
Tahg
8e142e51c4 Merge branch 'master' of https://github.com/Bukkit/Bukkit
Conflicts:
	src/main/java/org/bukkit/Player.java
2011-01-10 17:27:51 -05:00
Tahg
10592530eb added getAddress interface for Player 2011-01-10 17:24:35 -05:00
Dinnerbone
6bbad0cdae Set. Not get. 2011-01-07 13:33:36 +00:00
Dinnerbone
2d7e048d33 Added Player.getDisplayName() and Player.setDisplayName(String) 2011-01-07 13:27:09 +00:00
Erik Broes
f46d9ada1c Transition to Maven 2011-01-01 11:23:14 +01:00