Merge branch 'master' into EntityCustomName

Browse Source

Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h

...

This commit is contained in:

Howaner

2014-09-23 14:39:49 +02:00

parent 42dcd534df de163f0134

commit 4b38e077cf

232 changed files with 10895 additions and 4787 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3244

src/Protocol/Protocol18x.cpp Normal file

File diff suppressed because it is too large Load Diff