flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
Personal fork of Cuberite
1,680 Commits 1 Branch 0 Tags 92 MiB
C++ 89.5%
Lua 8%
HTML 1%
CMake 0.6%
C 0.5%
Other 0.2%
207a452171
Go to file
Alexander Harkness 207a452171 Pull in the latest core changes. 
Squashed commit of the following:

commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a
Merge: cc77056 a631484
Author: bearbin <bearbin@gmail.com>
Date:   Thu Aug 1 10:58:05 2013 -0700

    Merge pull request #10 from mc-server/tabmix

    Fix the inconsistency of spaces and tabs.

commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf
Author: Alexander Harkness <bearbin@gmail.com>
Date:   Thu Aug 1 16:47:15 2013 +0100

    Changed everything to use the correct system of tabs.

commit cc7705645b6b387c618c9448fa6b0d5c789370c6
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Wed Jul 31 16:56:41 2013 +0100

    Rewrote Info Messages + Implemented #7 [SEE DESC]

    Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE]
    [FATALITY] with colours Green, Gold, Red, Rose, and Yellow.
    Individual worlds have individual LimitWorld setting, with individual
    WebAdmin setting as well.

commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Mon Jul 29 14:47:45 2013 +0100

    Fix of nil value in SpawnProtect

commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Mon Jul 29 13:19:11 2013 +0100

    Fixed potential SpawnProtect nil value issue

    Now detects if PROTECTRADIUS is zero, and if so, cancels checks.

commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Mon Jul 29 13:07:50 2013 +0100

    Enhanced SpawnProtect greatly (thanks xoft)

    Wow. Who knew ~30 lines of code could become one?

commit 17f5ef4fed0b6f32900cc7473563848466139655
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Mon Jul 29 11:11:22 2013 +0100

    Removed Development LOGINFOs

commit 02034bf2d67f2ae62092b0688d81338f7b0788df
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Mon Jul 29 10:40:57 2013 +0100

    Implemented Issue #5 Enhancement [SEE DESC]

    Made spawn protection configurable in each world's world file. World has
    to be listed in settings.ini!

commit ccc73db8c51e45372069ec0a42f437cfb25253b1
Merge: 6bf4b40 21c7c68
Author: Alexander Harkness <bearbin@gmail.com>
Date:   Sun Jul 28 14:00:15 2013 +0100

    Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master

    Conflicts:
    	main.lua

commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sun Jul 28 12:55:50 2013 +0100

    Default WorldLimiter = Off

commit 141298481f3adef30b68d0c4200204aa264cb3e2
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sun Jul 28 12:47:24 2013 +0100

    Fixed Potential WorldLimit & OnDisable Bugs

    Changed WorldLimiter if detection from nil value to config boolean.
    Changed OnDisable to use hardcoded name as Plugin:GetName was apparently
    a nil value. ??

commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7
Merge: 1ca4217 bfd6c5f
Author: bearbin <bearbin@gmail.com>
Date:   Sat Jul 27 11:44:18 2013 -0700

    Merge pull request #3 from tonibm19/master

    Added /me command

commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849
Author: tonibm19 <tonibm19@gmail.com>
Date:   Sat Jul 27 20:35:22 2013 +0200

    Added /me command

commit d25abaf44a6f5828b90297ff80003d2cd2a90be5
Author: tonibm19 <tonibm19@gmail.com>
Date:   Sat Jul 27 20:30:31 2013 +0200

    Added /me command

commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e
Author: tonibm19 <tonibm19@gmail.com>
Date:   Sat Jul 27 20:29:24 2013 +0200

    added /me command

commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 09:01:45 2013 -0700

    Merge pull request #2 from tigerw/master

    Fixed /give descriptor & removed webadmin

commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 17:00:38 2013 +0100

    Fixed /give descriptor & removed webadmin

commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 08:51:45 2013 -0700

    Merge pull request #1 from tigerw/master

    Added TPA (tonibm9's fork)

commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 16:38:10 2013 +0100

    Added TPA (tonibm9's fork)

    With code from STR_Warrior.

commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 15:51:18 2013 +0100

    Integrated SpawnProtect & Bugfixes [SEE DESC.]

    Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
    SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
    File and filename cleanup.

commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 23:14:40 2013 +0100

    Update README.md

    Added info.

commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 19:37:59 2013 +0100

    Implemented Block Property checking for Collisions

    Used g_BlockIsSolid, instead of checking data values.

commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 15:49:55 2013 +0100

    Updated Files

    Buildpermandcollision: updated collision code to check for torches and
    redstone torches.
    Help: attempt at always showing page number
    Web_serversettings: attempt at introducing a check for Maximum Players
    (must be above zero).

commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:46:08 2013 +0100

    Update README.md

    Extended 'GUI Redesign' section.

commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:43:00 2013 +0100

    Update README.md

    Added features and fixes and instructions for use.

commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:35:27 2013 +0100

    Uploaded All Files

    All Core files, both modified and unmodified.

commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 04:59:50 2013 -0700

    Initial commit
2013-08-02 07:48:47 +01:00
Android Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
CryptoPP Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
docs Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
expat Fixed Expat / LuaExpat compilation for Linux 2013-04-09 13:53:54 +00:00
iniFile Forgotten files for previous merge commit (rev 1139) 2013-01-13 11:10:26 +00:00
Install Updated the nightbuild script for Git 2013-07-29 19:53:41 +02:00
jsoncpp-src-0.5.0 Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android! 2012-08-15 21:24:11 +00:00
lua-5.1.4 Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android! 2012-08-15 21:24:11 +00:00
MCServer Pull in the latest core changes. 2013-08-02 07:48:47 +01:00
nbt examples Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
source Implemented OnPlayerRightClickingEntity() hook 2013-08-02 08:44:06 +02:00
squirrel_3_0_1_stable Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
Tests/NoiseTest Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
tolua++-1.0.93 Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
Tools ProtoProxy: Tab completion logging lists the last item, too 2013-07-31 14:35:48 +02:00
VC2008 Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
WebServer Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
zlib-1.2.7 Updated zlib, added chat formatting, fixed upside down stairs and slabs, fixed makefiles, hopefully updated vc project files 2012-06-03 23:35:17 +00:00
.gitignore Updated the nightbuild script for Git 2013-07-29 19:53:41 +02:00
clean.bat Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
cloc-exclude.txt Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
COMPILING Fixed multiple issues with the COMPILING file, including a missing endline terminator, windows line endings and also the exclusion of the addm32 thing. 2013-07-28 20:17:56 +01:00
CONTRIBUTORS Added a contributors file. 2013-07-27 14:39:32 +01:00
Doxyfile Doxyfile: Added exclusions for SQLite and the unused Squuirrel bindings 2013-04-28 19:37:43 +00:00
GNUmakefile Added a makefile switch for 32bit-on-64bit compilation, addm32 2013-04-10 07:42:39 +00:00
LICENSE Added the license, so now it is clear for new people what it is. 2013-07-27 14:39:44 +01:00
Nightbuild2008.cmd Updated the nightbuild script for Git 2013-07-29 19:53:41 +02:00
README.md Fixed xoft build link 2013-07-27 15:58:37 +01:00
stats.cmd Extended the cloc stats for the entire project 2013-06-16 21:17:26 +00:00
UpdateVersions.cmd Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00

README.md

MCServer

MCServer is a performant C++ Minecraft server designed for use in memory and cpu-limited places, or just to make regular server perform better.

MCServer can run on PCs, Macs, and *nix. This includes android phones and tablets as well as Raspberry Pis.

Installation

To install MCServer, you can either download the repository and compile it, or download a pre-compiled version.

Compilation instructions are available in the COMPILING file.

Linux builds can be downloaded from the Berboe CI server and windows from xoft's nightly build service.

After you've extracted the files, simply run the MCServer executable.

Contributing

MCServer is licensed under the Apache license V2, and we welcome anybody to fork and submit a Pull Request back with their changes, and if you want to join as a permanent member we can add you to the team.

Other Stuff

For other stuff, including plugins and discussion, check the forums and wiki.