Tiger Wang 1d554677b4 Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures ... Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp		2013-12-08 14:02:45 +00:00
..
BlockEntity.cpp	Added basic ender chests	2013-12-07 00:18:58 +00:00
BlockEntity.h	Merge remote-tracking branch 'origin/master' into foldermove2	2013-11-24 14:37:03 +00:00
BlockEntityWithItems.h	Fixed pickups spawning for BlockEntities	2013-12-06 19:17:57 +00:00
ChestEntity.cpp	Fixed VC2008 compilation, normalized include paths.	2013-11-27 09:17:25 +01:00
ChestEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00
DispenserEntity.cpp	Moved source to src	2013-11-24 14:19:41 +00:00
DispenserEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00
DropperEntity.cpp	Moved source to src	2013-11-24 14:19:41 +00:00
DropperEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00
DropSpenserEntity.cpp	Moved json includes to where they are really needed.	2013-11-28 20:14:34 +01:00
DropSpenserEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00
EnderChestEntity.cpp	Added basic ender chests	2013-12-07 00:18:58 +00:00
EnderChestEntity.h	Added basic ender chests	2013-12-07 00:18:58 +00:00
FurnaceEntity.cpp	Fixed VC2008 compilation, normalized include paths.	2013-11-27 09:17:25 +01:00
FurnaceEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00
HopperEntity.cpp	Moved bindings-related to a Bindings subfolder.	2013-12-08 12:17:54 +01:00
HopperEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00
JukeboxEntity.cpp	Fixed VC2008 compilation, normalized include paths.	2013-11-27 09:17:25 +01:00
JukeboxEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00
NoteEntity.cpp	Fixed VC2008 compilation, normalized include paths.	2013-11-27 09:17:25 +01:00
NoteEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00
SignEntity.cpp	Fixed VC2008 compilation, normalized include paths.	2013-11-27 09:17:25 +01:00
SignEntity.h	Moved source to src	2013-11-24 14:19:41 +00:00