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 |
madmaxoft
|
044fd237b6
|
Moved bindings-related to a Bindings subfolder.
Ref.: #407
|
2013-12-08 12:17:54 +01:00 |
|
Tiger Wang
|
b779d84663
|
Console trims its commands before executing 'em
|
2013-12-07 22:35:24 +00:00 |
|
madmaxoft
|
bf30528ec4
|
DeadlockDetect is configurable now.
This is needed when debugging Lua plugins.
|
2013-11-30 22:14:47 +01:00 |
Alexander Harkness
|
3b790bbf67
|
Fixed some of tiger's derpyness.
|
2013-11-27 07:27:19 +00:00 |
|
Tiger Wang
|
2ef9cf700d
|
Hopefully fixed last of the Linux compile errors
|
2013-11-26 22:50:33 +00:00 |
|
Tiger Wang
|
e3db69c4ae
|
Attempt to fix compilation
|
2013-11-24 18:44:22 +00:00 |
|
Alexander Harkness
|
c3cd436ec3
|
Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
GNUmakefile
|
2013-11-24 14:37:03 +00:00 |
|
Alexander Harkness
|
675b4aa878
|
Moved source to src
|
2013-11-24 14:19:41 +00:00 |