From dac97826f7d0c9b9135c1a08c4d5f16b61494bd1 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Wed, 26 Aug 2015 10:58:51 +0200 Subject: [PATCH] Renamed output directory to Server --- .gitignore | 17 +-- .gitmodules | 14 +-- .travis.yml | 6 +- CIbuild.sh | 14 +-- CMakeLists.txt | 41 ++++--- MCServer/delete_windows_service.cmd | 4 - MCServer/favicon.png | Bin 9265 -> 0 bytes MCServer/install_windows_service.cmd | 7 -- MCServer/profile_run.cmd | 101 ------------------ MCServer/profile_run_debug.cmd | 5 - MCServer/profile_run_x64.cmd | 5 - {MCServer => Server}/.gitignore | 5 +- {MCServer => Server}/Plugins/.gitignore | 0 .../Plugins/APIDump/APIDesc.lua | 0 .../Plugins/APIDump/APIDump.deproj | 0 .../Plugins/APIDump/Classes/BlockEntities.lua | 0 .../Plugins/APIDump/Classes/Geometry.lua | 0 .../Plugins/APIDump/Classes/Network.lua | 0 .../Plugins/APIDump/Classes/Plugins.lua | 0 .../Plugins/APIDump/Classes/Projectiles.lua | 0 .../Plugins/APIDump/Classes/WebAdmin.lua | 0 .../Plugins/APIDump/Hooks/OnBlockSpread.lua | 0 .../APIDump/Hooks/OnBlockToPickups.lua | 0 .../Plugins/APIDump/Hooks/OnChat.lua | 0 .../APIDump/Hooks/OnChunkAvailable.lua | 0 .../APIDump/Hooks/OnChunkGenerated.lua | 0 .../APIDump/Hooks/OnChunkGenerating.lua | 0 .../Plugins/APIDump/Hooks/OnChunkUnloaded.lua | 0 .../APIDump/Hooks/OnChunkUnloading.lua | 0 .../APIDump/Hooks/OnCollectingPickup.lua | 0 .../APIDump/Hooks/OnCraftingNoRecipe.lua | 0 .../Plugins/APIDump/Hooks/OnDisconnect.lua | 0 .../APIDump/Hooks/OnEntityAddEffect.lua | 0 .../APIDump/Hooks/OnEntityChangedWorld.lua | 0 .../APIDump/Hooks/OnEntityChangingWorld.lua | 0 .../APIDump/Hooks/OnEntityTeleport.lua | 0 .../APIDump/Hooks/OnExecuteCommand.lua | 0 .../Plugins/APIDump/Hooks/OnExploded.lua | 0 .../Plugins/APIDump/Hooks/OnExploding.lua | 0 .../Plugins/APIDump/Hooks/OnHandshake.lua | 0 .../APIDump/Hooks/OnHopperPullingItem.lua | 0 .../APIDump/Hooks/OnHopperPushingItem.lua | 0 .../Plugins/APIDump/Hooks/OnKilled.lua | 0 .../Plugins/APIDump/Hooks/OnKilling.lua | 0 .../Plugins/APIDump/Hooks/OnLogin.lua | 0 .../APIDump/Hooks/OnPlayerAnimation.lua | 0 .../APIDump/Hooks/OnPlayerBreakingBlock.lua | 0 .../APIDump/Hooks/OnPlayerBrokenBlock.lua | 0 .../APIDump/Hooks/OnPlayerDestroyed.lua | 0 .../Plugins/APIDump/Hooks/OnPlayerEating.lua | 0 .../Plugins/APIDump/Hooks/OnPlayerFished.lua | 0 .../Plugins/APIDump/Hooks/OnPlayerFishing.lua | 0 .../APIDump/Hooks/OnPlayerFoodLevelChange.lua | 0 .../Plugins/APIDump/Hooks/OnPlayerJoined.lua | 0 .../APIDump/Hooks/OnPlayerLeftClick.lua | 0 .../Plugins/APIDump/Hooks/OnPlayerMoving.lua | 0 .../APIDump/Hooks/OnPlayerPlacedBlock.lua | 0 .../APIDump/Hooks/OnPlayerPlacingBlock.lua | 0 .../APIDump/Hooks/OnPlayerRightClick.lua | 0 .../Hooks/OnPlayerRightClickingEntity.lua | 0 .../APIDump/Hooks/OnPlayerShooting.lua | 0 .../Plugins/APIDump/Hooks/OnPlayerSpawned.lua | 0 .../APIDump/Hooks/OnPlayerTossingItem.lua | 0 .../APIDump/Hooks/OnPlayerUsedBlock.lua | 0 .../APIDump/Hooks/OnPlayerUsedItem.lua | 0 .../APIDump/Hooks/OnPlayerUsingBlock.lua | 0 .../APIDump/Hooks/OnPlayerUsingItem.lua | 0 .../Plugins/APIDump/Hooks/OnPluginMessage.lua | 0 .../Plugins/APIDump/Hooks/OnPluginsLoaded.lua | 0 .../Plugins/APIDump/Hooks/OnPostCrafting.lua | 0 .../Plugins/APIDump/Hooks/OnPreCrafting.lua | 0 .../APIDump/Hooks/OnProjectileHitBlock.lua | 0 .../APIDump/Hooks/OnProjectileHitEntity.lua | 0 .../Plugins/APIDump/Hooks/OnServerPing.lua | 0 .../Plugins/APIDump/Hooks/OnSpawnedEntity.lua | 0 .../APIDump/Hooks/OnSpawnedMonster.lua | 0 .../APIDump/Hooks/OnSpawningEntity.lua | 0 .../APIDump/Hooks/OnSpawningMonster.lua | 0 .../Plugins/APIDump/Hooks/OnTakeDamage.lua | 0 .../Plugins/APIDump/Hooks/OnTick.lua | 0 .../Plugins/APIDump/Hooks/OnUpdatedSign.lua | 0 .../Plugins/APIDump/Hooks/OnUpdatingSign.lua | 0 .../APIDump/Hooks/OnWeatherChanged.lua | 0 .../APIDump/Hooks/OnWeatherChanging.lua | 0 .../Plugins/APIDump/Hooks/OnWorldStarted.lua | 0 .../Plugins/APIDump/Hooks/OnWorldTick.lua | 0 .../Plugins/APIDump/InfoFile.html | 0 .../Plugins/APIDump/LICENSE-prettify.txt | 0 .../Plugins/APIDump/SettingUpDecoda.html | 0 .../Plugins/APIDump/SettingUpZeroBrane.html | 0 .../Plugins/APIDump/Static/.gitignore | 0 .../APIDump/Static/decoda_debug_settings.png | Bin .../Plugins/APIDump/Static/decoda_logo.png | Bin .../APIDump/Static/decoda_workspace.png | Bin .../Plugins/APIDump/Static/zbs_logo.png | Bin .../Plugins/APIDump/Static/zbs_workspace.png | Bin .../Plugins/APIDump/UsingChunkStays.html | 0 .../Plugins/APIDump/WebWorldThreads.html | 0 .../APIDump/Writing-a-Cuberite-plugin.html | 0 .../Plugins/APIDump/lang-lua.js | 0 {MCServer => Server}/Plugins/APIDump/main.css | 0 .../Plugins/APIDump/main_APIDump.lua | 0 .../Plugins/APIDump/prettify.css | 0 .../Plugins/APIDump/prettify.js | 0 {MCServer => Server}/Plugins/ChatLog | 0 {MCServer => Server}/Plugins/ChunkWorx | 0 {MCServer => Server}/Plugins/Core | 0 .../Plugins/Debuggers/Debuggers.deproj | 0 .../Plugins/Debuggers/Debuggers.lua | 0 .../Plugins/Debuggers/Info.lua | 0 .../Plugins/DiamondMover/DiamondMover.lua | 0 .../Plugins/DumpInfo/Init.lua | 0 {MCServer => Server}/Plugins/Handy | 0 .../Plugins/HookNotify/HookNotify.lua | 0 {MCServer => Server}/Plugins/InfoDump.deproj | 0 {MCServer => Server}/Plugins/InfoDump.lua | 0 {MCServer => Server}/Plugins/InfoReg.lua | 0 {MCServer => Server}/Plugins/MagicCarpet | 0 .../Plugins/NetworkTest/Info.lua | 0 .../Plugins/NetworkTest/NetworkTest.lua | 0 .../Plugins/NetworkTest/splashes.txt | 0 {MCServer => Server}/Plugins/ProtectionAreas | 0 .../Plugins/TestLuaRocks/TestLuaRocks.lua | 0 {MCServer => Server}/Plugins/TransAPI | 0 .../Prefabs/Villages/AlchemistVillage.cubeset | 0 .../Prefabs/Villages/JapaneseVillage.cubeset | 0 .../Prefabs/Villages/PlainsVillage.cubeset | 0 .../Villages/SandFlatRoofVillage.cubeset | 0 .../Prefabs/Villages/SandVillage.cubeset | 0 {MCServer => Server}/README.txt | 0 {MCServer => Server}/crafting.txt | 0 Server/delete_windows_service.cmd | 4 + Server/favicon.png | Bin 0 -> 1769 bytes {MCServer => Server}/furnace.txt | 0 {MCServer => Server}/hg | 2 +- {MCServer => Server}/hg.supp | 0 Server/install_windows_service.cmd | 7 ++ {MCServer => Server}/items.ini | 0 {MCServer => Server}/lang/items_de.ini | 0 {MCServer => Server}/monsters.ini | 0 {MCServer => Server}/vg | 2 +- {MCServer => Server}/vg.supp | 0 ...enerateSelfSignedHTTPSCertUsingOpenssl.cmd | 0 ...GenerateSelfSignedHTTPSCertUsingOpenssl.sh | 0 .../webadmin/files/background.gif | Bin .../webadmin/files/favicon.ico | Bin .../webadmin/files/guest.html | 0 .../webadmin/files/header.png | Bin {MCServer => Server}/webadmin/files/home.gif | Bin .../webadmin/files/loading.gif | Bin .../webadmin/files/log_out.png | Bin {MCServer => Server}/webadmin/files/login.css | 0 {MCServer => Server}/webadmin/files/login.gif | Bin {MCServer => Server}/webadmin/files/logo.png | Bin .../webadmin/files/logo_login.png | Bin .../webadmin/files/mc-logo.png | Bin .../webadmin/files/pmfolder.gif | Bin {MCServer => Server}/webadmin/files/style.css | 0 .../webadmin/files/sub_pmfolder.gif | Bin {MCServer => Server}/webadmin/files/tcat.png | Bin {MCServer => Server}/webadmin/files/thead.png | Bin .../webadmin/login_template.html | 0 {MCServer => Server}/webadmin/template.html | 0 {MCServer => Server}/webadmin/template.lua | 0 appveyor.yml | 2 +- src/CMakeLists.txt | 16 +-- uploadCoverage.sh | 2 +- 167 files changed, 71 insertions(+), 183 deletions(-) delete mode 100644 MCServer/delete_windows_service.cmd delete mode 100644 MCServer/favicon.png delete mode 100644 MCServer/install_windows_service.cmd delete mode 100644 MCServer/profile_run.cmd delete mode 100644 MCServer/profile_run_debug.cmd delete mode 100644 MCServer/profile_run_x64.cmd rename {MCServer => Server}/.gitignore (93%) rename {MCServer => Server}/Plugins/.gitignore (100%) rename {MCServer => Server}/Plugins/APIDump/APIDesc.lua (100%) rename {MCServer => Server}/Plugins/APIDump/APIDump.deproj (100%) rename {MCServer => Server}/Plugins/APIDump/Classes/BlockEntities.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Classes/Geometry.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Classes/Network.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Classes/Plugins.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Classes/Projectiles.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Classes/WebAdmin.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnBlockSpread.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnBlockToPickups.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnChat.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnChunkAvailable.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnChunkGenerated.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnChunkGenerating.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnChunkUnloaded.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnChunkUnloading.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnCollectingPickup.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnDisconnect.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnEntityAddEffect.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnEntityTeleport.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnExecuteCommand.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnExploded.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnExploding.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnHandshake.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnHopperPullingItem.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnHopperPushingItem.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnKilled.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnKilling.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnLogin.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerAnimation.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerEating.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerFished.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerFishing.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerJoined.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerMoving.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerRightClick.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerShooting.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerSpawned.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPluginMessage.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPluginsLoaded.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPostCrafting.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnPreCrafting.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnServerPing.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnSpawnedEntity.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnSpawnedMonster.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnSpawningEntity.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnSpawningMonster.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnTakeDamage.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnTick.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnUpdatedSign.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnUpdatingSign.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnWeatherChanged.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnWeatherChanging.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnWorldStarted.lua (100%) rename {MCServer => Server}/Plugins/APIDump/Hooks/OnWorldTick.lua (100%) rename {MCServer => Server}/Plugins/APIDump/InfoFile.html (100%) rename {MCServer => Server}/Plugins/APIDump/LICENSE-prettify.txt (100%) rename {MCServer => Server}/Plugins/APIDump/SettingUpDecoda.html (100%) rename {MCServer => Server}/Plugins/APIDump/SettingUpZeroBrane.html (100%) rename {MCServer => Server}/Plugins/APIDump/Static/.gitignore (100%) rename {MCServer => Server}/Plugins/APIDump/Static/decoda_debug_settings.png (100%) rename {MCServer => Server}/Plugins/APIDump/Static/decoda_logo.png (100%) rename {MCServer => Server}/Plugins/APIDump/Static/decoda_workspace.png (100%) rename {MCServer => Server}/Plugins/APIDump/Static/zbs_logo.png (100%) rename {MCServer => Server}/Plugins/APIDump/Static/zbs_workspace.png (100%) rename {MCServer => Server}/Plugins/APIDump/UsingChunkStays.html (100%) rename {MCServer => Server}/Plugins/APIDump/WebWorldThreads.html (100%) rename {MCServer => Server}/Plugins/APIDump/Writing-a-Cuberite-plugin.html (100%) rename {MCServer => Server}/Plugins/APIDump/lang-lua.js (100%) rename {MCServer => Server}/Plugins/APIDump/main.css (100%) rename {MCServer => Server}/Plugins/APIDump/main_APIDump.lua (100%) rename {MCServer => Server}/Plugins/APIDump/prettify.css (100%) rename {MCServer => Server}/Plugins/APIDump/prettify.js (100%) rename {MCServer => Server}/Plugins/ChatLog (100%) rename {MCServer => Server}/Plugins/ChunkWorx (100%) rename {MCServer => Server}/Plugins/Core (100%) rename {MCServer => Server}/Plugins/Debuggers/Debuggers.deproj (100%) rename {MCServer => Server}/Plugins/Debuggers/Debuggers.lua (100%) rename {MCServer => Server}/Plugins/Debuggers/Info.lua (100%) rename {MCServer => Server}/Plugins/DiamondMover/DiamondMover.lua (100%) rename {MCServer => Server}/Plugins/DumpInfo/Init.lua (100%) rename {MCServer => Server}/Plugins/Handy (100%) rename {MCServer => Server}/Plugins/HookNotify/HookNotify.lua (100%) rename {MCServer => Server}/Plugins/InfoDump.deproj (100%) rename {MCServer => Server}/Plugins/InfoDump.lua (100%) rename {MCServer => Server}/Plugins/InfoReg.lua (100%) rename {MCServer => Server}/Plugins/MagicCarpet (100%) rename {MCServer => Server}/Plugins/NetworkTest/Info.lua (100%) rename {MCServer => Server}/Plugins/NetworkTest/NetworkTest.lua (100%) rename {MCServer => Server}/Plugins/NetworkTest/splashes.txt (100%) rename {MCServer => Server}/Plugins/ProtectionAreas (100%) rename {MCServer => Server}/Plugins/TestLuaRocks/TestLuaRocks.lua (100%) rename {MCServer => Server}/Plugins/TransAPI (100%) rename {MCServer => Server}/Prefabs/Villages/AlchemistVillage.cubeset (100%) rename {MCServer => Server}/Prefabs/Villages/JapaneseVillage.cubeset (100%) rename {MCServer => Server}/Prefabs/Villages/PlainsVillage.cubeset (100%) rename {MCServer => Server}/Prefabs/Villages/SandFlatRoofVillage.cubeset (100%) rename {MCServer => Server}/Prefabs/Villages/SandVillage.cubeset (100%) rename {MCServer => Server}/README.txt (100%) rename {MCServer => Server}/crafting.txt (100%) create mode 100644 Server/delete_windows_service.cmd create mode 100644 Server/favicon.png rename {MCServer => Server}/furnace.txt (100%) rename {MCServer => Server}/hg (85%) rename {MCServer => Server}/hg.supp (100%) create mode 100644 Server/install_windows_service.cmd rename {MCServer => Server}/items.ini (100%) rename {MCServer => Server}/lang/items_de.ini (100%) rename {MCServer => Server}/monsters.ini (100%) rename {MCServer => Server}/vg (89%) rename {MCServer => Server}/vg.supp (100%) rename {MCServer => Server}/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd (100%) rename {MCServer => Server}/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh (100%) rename {MCServer => Server}/webadmin/files/background.gif (100%) rename {MCServer => Server}/webadmin/files/favicon.ico (100%) rename {MCServer => Server}/webadmin/files/guest.html (100%) rename {MCServer => Server}/webadmin/files/header.png (100%) rename {MCServer => Server}/webadmin/files/home.gif (100%) rename {MCServer => Server}/webadmin/files/loading.gif (100%) rename {MCServer => Server}/webadmin/files/log_out.png (100%) rename {MCServer => Server}/webadmin/files/login.css (100%) rename {MCServer => Server}/webadmin/files/login.gif (100%) rename {MCServer => Server}/webadmin/files/logo.png (100%) rename {MCServer => Server}/webadmin/files/logo_login.png (100%) rename {MCServer => Server}/webadmin/files/mc-logo.png (100%) rename {MCServer => Server}/webadmin/files/pmfolder.gif (100%) rename {MCServer => Server}/webadmin/files/style.css (100%) rename {MCServer => Server}/webadmin/files/sub_pmfolder.gif (100%) rename {MCServer => Server}/webadmin/files/tcat.png (100%) rename {MCServer => Server}/webadmin/files/thead.png (100%) rename {MCServer => Server}/webadmin/login_template.html (100%) rename {MCServer => Server}/webadmin/template.html (100%) rename {MCServer => Server}/webadmin/template.lua (100%) diff --git a/.gitignore b/.gitignore index 8dc90910c..1386548bb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,12 +2,13 @@ build/ nbproject/ ipch/ Win32/ -MCServer/MCServer -MCServer/buildinfo -MCServer/CONTRIBUTORS -MCServer/LICENSE -MCServer/Licenses -MCServer/itemblacklist +MCServer +Server/Cuberite +Server/buildinfo +Server/CONTRIBUTORS +Server/LICENSE +Server/Licenses +Server/itemblacklist Testing/ ChunkWorxSave.ini doxy/ @@ -71,11 +72,11 @@ CMakeFiles Makefile cmake_install.cmake install_mainfest.txt -src/MCServer +src/Cuberite lib/tolua++/tolua src/Bindings/Bindings.* src/Bindings/BindingDependencies.txt -MCServer.dir/ +Cuberite.dir/ src/AllFiles.lst #win32 cmake stuff diff --git a/.gitmodules b/.gitmodules index f3653ec9f..7ea69d180 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,23 +1,23 @@ [submodule "MCServer/Plugins/Core"] - path = MCServer/Plugins/Core + path = Server/Plugins/Core url = https://github.com/mc-server/Core.git [submodule "MCServer/Plugins/ProtectionAreas"] - path = MCServer/Plugins/ProtectionAreas + path = Server/Plugins/ProtectionAreas url = https://github.com/mc-server/ProtectionAreas.git [submodule "MCServer/Plugins/TransAPI"] - path = MCServer/Plugins/TransAPI + path = Server/Plugins/TransAPI url = https://github.com/bearbin/transapi.git [submodule "MCServer/Plugins/ChunkWorx"] - path = MCServer/Plugins/ChunkWorx + path = Server/Plugins/ChunkWorx url = https://github.com/mc-server/ChunkWorx.git [submodule "MCServer/Plugins/ChatLog"] - path = MCServer/Plugins/ChatLog + path = Server/Plugins/ChatLog url = https://github.com/mc-server/ChatLog.git [submodule "MCServer/Plugins/Handy"] - path = MCServer/Plugins/Handy + path = Server/Plugins/Handy url = https://github.com/mc-server/Handy.git [submodule "MCServer/Plugins/MagicCarpet"] - path = MCServer/Plugins/MagicCarpet + path = Server/Plugins/MagicCarpet url = https://github.com/mc-server/MagicCarpet.git [submodule "lib/polarssl"] path = lib/polarssl diff --git a/.travis.yml b/.travis.yml index d5305f601..01b51ee9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp sudo: false -compiler: +compiler: - clang - gcc @@ -16,8 +16,8 @@ addons: script: ./CIbuild.sh env: - - TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer - - TRAVIS_MCSERVER_BUILD_TYPE=DEBUG MCSERVER_PATH=./MCServer_debug + - TRAVIS_CUBERITE_BUILD_TYPE=RELEASE CUBERITE_PATH=./Cuberite + - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG CUBERITE_PATH=./Cuberite_debug notifications: email: diff --git a/CIbuild.sh b/CIbuild.sh index f1a583c79..8a91549ad 100755 --- a/CIbuild.sh +++ b/CIbuild.sh @@ -2,9 +2,9 @@ set -e -export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE" -export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER -export MCSERVER_BUILD_DATETIME=`date` +export CUBERITE_BUILD_SERIES_NAME="Travis $CC $TRAVIS_CUBERITE_BUILD_TYPE" +export CUBERITE_BUILD_ID=$TRAVIS_JOB_NUMBER +export CUBERITE_BUILD_DATETIME=`date` if [ "$CXX" == "g++" ]; then # This is a temporary workaround to allow the identification of GCC-4.8 by CMake, required for C++11 features @@ -21,8 +21,8 @@ cd .. echo "Building..." make -j 2; make -j 2 test ARGS="-V"; -cd MCServer/; -if [ "$TRAVIS_MCSERVER_BUILD_TYPE" != "COVERAGE" ]; then - echo restart | $MCSERVER_PATH; - echo stop | $MCSERVER_PATH; +cd Server/; +if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then + echo restart | $CUBERITE_PATH; + echo stop | $CUBERITE_PATH; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index c95e10a53..78bbc5c89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,9 @@ endif() # These env variables are used for configuring Travis CI builds. # See https://github.com/mc-server/MCServer/pull/767 -if(DEFINED ENV{TRAVIS_MCSERVER_BUILD_TYPE}) - message("Setting build type to $ENV{TRAVIS_MCSERVER_BUILD_TYPE}") - set(CMAKE_BUILD_TYPE $ENV{TRAVIS_MCSERVER_BUILD_TYPE}) +if(DEFINED ENV{TRAVIS_CUBERITE_BUILD_TYPE}) + message("Setting build type to $ENV{TRAVIS_CUBERITE_BUILD_TYPE}") + set(CMAKE_BUILD_TYPE $ENV{TRAVIS_CUBERITE_BUILD_TYPE}) endif() if(DEFINED ENV{TRAVIS_MCSERVER_FORCE32}) @@ -23,13 +23,13 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE}) set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE}) endif() -if(DEFINED ENV{MCSERVER_BUILD_ID}) +if(DEFINED ENV{CUBERITE_BUILD_ID}) # The build info is defined by the build system (Travis / Jenkins) - set(BUILD_ID $ENV{MCSERVER_BUILD_ID}) - set(BUILD_SERIES_NAME $ENV{MCSERVER_BUILD_SERIES_NAME}) - set(BUILD_DATETIME $ENV{MCSERVER_BUILD_DATETIME}) - if(DEFINED ENV{MCSERVER_BUILD_COMMIT_ID}) - set(BUILD_COMMIT_ID $ENV{MCSERVER_BUILD_COMMIT_ID}) + set(BUILD_ID $ENV{CUBERITE_BUILD_ID}) + set(BUILD_SERIES_NAME $ENV{CUBERITE_BUILD_SERIES_NAME}) + set(BUILD_DATETIME $ENV{CUBERITE_BUILD_DATETIME}) + if(DEFINED ENV{CUBERITE_BUILD_COMMIT_ID}) + set(BUILD_COMMIT_ID $ENV{CUBERITE_BUILD_COMMIT_ID}) else() message("Commit id not set, attempting to determine id from git") execute_process( @@ -75,16 +75,16 @@ endif() # We need C++11 features, Visual Studio has those from VS2012, but it needs a new platform toolset for those; VS2013 supports them natively: # Adapted from http://binglongx.wordpress.com/2013/06/28/set-non-default-platform-toolset-in-cmake/ if(MSVC OR MSVC_IDE) - if( MSVC_VERSION LESS 1700 ) # VC10- / VS2010- - message(FATAL_ERROR "The project requires C++11 features. " - "You need at least Visual Studio 11 (Microsoft Visual Studio 2012), " - "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).") - elseif( MSVC_VERSION EQUAL 1700 ) # VC11 / VS2012 - message( "VC11: using Microsoft Visual Studio 2012 " - "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" ) - set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE) - else() # VC12+, assuming C++11 supported. - endif() + if( MSVC_VERSION LESS 1700 ) # VC10- / VS2010- + message(FATAL_ERROR "The project requires C++11 features. " + "You need at least Visual Studio 11 (Microsoft Visual Studio 2012), " + "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).") + elseif( MSVC_VERSION EQUAL 1700 ) # VC11 / VS2012 + message( "VC11: using Microsoft Visual Studio 2012 " + "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" ) + set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE) + else() # VC12+, assuming C++11 supported. + endif() endif() set(BUILD_TOOLS OFF CACHE BOOL "") @@ -129,7 +129,7 @@ endif() -project (MCServer) +project (Cuberite) # Set options for SQLiteCpp, disable all their tests and lints: set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "Run cpplint.py tool for Google C++ StyleGuide." FORCE) @@ -259,4 +259,3 @@ if (MSVC) ) endif() endif() - diff --git a/MCServer/delete_windows_service.cmd b/MCServer/delete_windows_service.cmd deleted file mode 100644 index ab6238e2f..000000000 --- a/MCServer/delete_windows_service.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -set SERVICENAME="MCServer" - -sc delete %SERVICENAME% \ No newline at end of file diff --git a/MCServer/favicon.png b/MCServer/favicon.png deleted file mode 100644 index 946cce005ed483fce079aa31d9227551ca50d065..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9265 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 Tx19@400000NkvXXu0mjf>QF|Z diff --git a/MCServer/install_windows_service.cmd b/MCServer/install_windows_service.cmd deleted file mode 100644 index d6b6c15a3..000000000 --- a/MCServer/install_windows_service.cmd +++ /dev/null @@ -1,7 +0,0 @@ -rem Alter this if you need to install multiple instances. -@echo off -set SERVICENAME="MCServer" - -set CURRENTDIR=%CD% -sc create %SERVICENAME% binPath= "%CURRENTDIR%\MCServer.exe -d" start= auto DisplayName= %SERVICENAME% -sc description %SERVICENAME% "Minecraft server instance" \ No newline at end of file diff --git a/MCServer/profile_run.cmd b/MCServer/profile_run.cmd deleted file mode 100644 index 6137e9d4d..000000000 --- a/MCServer/profile_run.cmd +++ /dev/null @@ -1,101 +0,0 @@ -@echo off -:: -:: Profiling using a MSVC standalone profiler -:: -:: See http://www.codeproject.com/Articles/144643/Profiling-of-C-Applications-in-Visual-Studio-for-F for details -:: Note that this script assumes a newer version of the tool, Performance Tools 2010, so that it is Win7-compatible -:: Download at http://www.microsoft.com/en-ca/download/details.aspx?id=23205 -:: -:: This script sets the profiler up, then starts the app, waits for it to finish and stops the profiler. -:: Then it generates all the CSV report files -:: -:: It expects the MS Performance tools installed in C:\Program Files\Microsoft Visual Studio 9.0\Team Tools\Performance Tools -:: You can override this path by setting the pt environment variable prior to launching this script -:: -:: By default it will launch the 32-bit release version of MCServer; set the app environment variable to another executable to run that instead. -:: Set the IsExecutablex64 env variable to \x64 to profile a 64-bit executable instead (available as the profile_run_x64.cmd script) -:: Note that the app needs to be compiled with the "/PROFILE" flag in order for the profiling to work - - - - -setlocal - -:: Get the 32-bit program files folder -:: Note that in Win7 the %ProgramFiles% variable points to 32-bit program files for normal users and to 64-bit program files for elevated users -:: This script needs elevation, but the performance tools are 32-bit only -if "%programfiles(x86)%p" == "p" ( - set ProgFiles="%ProgramFiles%" -) else ( - set ProgFiles="%ProgramFiles(x86)%" -) - -:: Check that the required variables exist, provide defaults: -if %pt%n == n ( - set pt="%ProgFiles:"=%\Microsoft Visual Studio 10.0\Team Tools\Performance Tools" -) - -if %app%n == n ( - set app=MCServer_profile.exe -) - -if %outputdir%n == n ( - set outputdir=..\Profiling -) - - - - -:: Create the output directory, if it didn't exist -mkdir %outputdir% - - - - - -:: Start the profiler -set outputname=profile.vsp -set output=%outputdir%\%outputname% -%pt%%IsExecutablex64%\vsperfcmd /start:sample /output:%output% -if errorlevel 1 goto haderror - -:: Launch the application via the profiler -%pt%%IsExecutablex64%\vsperfcmd /launch:%app% -if errorlevel 1 goto haderrorshutdown - -:: Shut down the profiler (this command waits, until the application is terminated) -%pt%%IsExecutablex64%\vsperfcmd /shutdown -if errorlevel 1 goto haderror - - - - - -:: cd to outputdir, so that the reports are generated there -cd %outputdir% - -:: generate the report files (.csv) -%pt%\vsperfreport /summary:all %outputname% /symbolpath:"srv*C:\Programovani\Symbols*http://msdl.microsoft.com/download/symbols" -if errorlevel 1 goto haderror - - - - - -goto finished - - - - -:haderrorshutdown -echo An error was encountered, shutting down the profiler -%pt%%IsExecutablex64%\vsperfcmd /shutdown - -:haderror -echo An error was encountered -pause - - - - -:finished diff --git a/MCServer/profile_run_debug.cmd b/MCServer/profile_run_debug.cmd deleted file mode 100644 index a9792541a..000000000 --- a/MCServer/profile_run_debug.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -:: This script uses the profile_run.cmd script to run profiling on the DebugProfile executable - -set app=MCServer_debug_profile.exe -call profile_run.cmd diff --git a/MCServer/profile_run_x64.cmd b/MCServer/profile_run_x64.cmd deleted file mode 100644 index 242136f4b..000000000 --- a/MCServer/profile_run_x64.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -:: This script uses the profile_run.cmd script to run profiling on a x64 release executable - -set IsExecutablex64=\x64 -call profile_run.cmd diff --git a/MCServer/.gitignore b/Server/.gitignore similarity index 93% rename from MCServer/.gitignore rename to Server/.gitignore index 6da9aa7c7..161734f86 100644 --- a/MCServer/.gitignore +++ b/Server/.gitignore @@ -3,8 +3,8 @@ *.exp *.lib *.ini -MCServer -MCServer_debug +Cuberite +Cuberite_debug CommLogs/ GalExports/ logs @@ -33,4 +33,3 @@ mcserver_api.lua # Ignore the webadmin certs / privkey, so that no-one commits theirs by accident: webadmin/httpscert.crt webadmin/httpskey.pem - diff --git a/MCServer/Plugins/.gitignore b/Server/Plugins/.gitignore similarity index 100% rename from MCServer/Plugins/.gitignore rename to Server/Plugins/.gitignore diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua similarity index 100% rename from MCServer/Plugins/APIDump/APIDesc.lua rename to Server/Plugins/APIDump/APIDesc.lua diff --git a/MCServer/Plugins/APIDump/APIDump.deproj b/Server/Plugins/APIDump/APIDump.deproj similarity index 100% rename from MCServer/Plugins/APIDump/APIDump.deproj rename to Server/Plugins/APIDump/APIDump.deproj diff --git a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua b/Server/Plugins/APIDump/Classes/BlockEntities.lua similarity index 100% rename from MCServer/Plugins/APIDump/Classes/BlockEntities.lua rename to Server/Plugins/APIDump/Classes/BlockEntities.lua diff --git a/MCServer/Plugins/APIDump/Classes/Geometry.lua b/Server/Plugins/APIDump/Classes/Geometry.lua similarity index 100% rename from MCServer/Plugins/APIDump/Classes/Geometry.lua rename to Server/Plugins/APIDump/Classes/Geometry.lua diff --git a/MCServer/Plugins/APIDump/Classes/Network.lua b/Server/Plugins/APIDump/Classes/Network.lua similarity index 100% rename from MCServer/Plugins/APIDump/Classes/Network.lua rename to Server/Plugins/APIDump/Classes/Network.lua diff --git a/MCServer/Plugins/APIDump/Classes/Plugins.lua b/Server/Plugins/APIDump/Classes/Plugins.lua similarity index 100% rename from MCServer/Plugins/APIDump/Classes/Plugins.lua rename to Server/Plugins/APIDump/Classes/Plugins.lua diff --git a/MCServer/Plugins/APIDump/Classes/Projectiles.lua b/Server/Plugins/APIDump/Classes/Projectiles.lua similarity index 100% rename from MCServer/Plugins/APIDump/Classes/Projectiles.lua rename to Server/Plugins/APIDump/Classes/Projectiles.lua diff --git a/MCServer/Plugins/APIDump/Classes/WebAdmin.lua b/Server/Plugins/APIDump/Classes/WebAdmin.lua similarity index 100% rename from MCServer/Plugins/APIDump/Classes/WebAdmin.lua rename to Server/Plugins/APIDump/Classes/WebAdmin.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnBlockSpread.lua b/Server/Plugins/APIDump/Hooks/OnBlockSpread.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnBlockSpread.lua rename to Server/Plugins/APIDump/Hooks/OnBlockSpread.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnBlockToPickups.lua b/Server/Plugins/APIDump/Hooks/OnBlockToPickups.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnBlockToPickups.lua rename to Server/Plugins/APIDump/Hooks/OnBlockToPickups.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnChat.lua b/Server/Plugins/APIDump/Hooks/OnChat.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnChat.lua rename to Server/Plugins/APIDump/Hooks/OnChat.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkAvailable.lua b/Server/Plugins/APIDump/Hooks/OnChunkAvailable.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnChunkAvailable.lua rename to Server/Plugins/APIDump/Hooks/OnChunkAvailable.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkGenerated.lua b/Server/Plugins/APIDump/Hooks/OnChunkGenerated.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnChunkGenerated.lua rename to Server/Plugins/APIDump/Hooks/OnChunkGenerated.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkGenerating.lua b/Server/Plugins/APIDump/Hooks/OnChunkGenerating.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnChunkGenerating.lua rename to Server/Plugins/APIDump/Hooks/OnChunkGenerating.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkUnloaded.lua b/Server/Plugins/APIDump/Hooks/OnChunkUnloaded.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnChunkUnloaded.lua rename to Server/Plugins/APIDump/Hooks/OnChunkUnloaded.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkUnloading.lua b/Server/Plugins/APIDump/Hooks/OnChunkUnloading.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnChunkUnloading.lua rename to Server/Plugins/APIDump/Hooks/OnChunkUnloading.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnCollectingPickup.lua b/Server/Plugins/APIDump/Hooks/OnCollectingPickup.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnCollectingPickup.lua rename to Server/Plugins/APIDump/Hooks/OnCollectingPickup.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua b/Server/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua rename to Server/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnDisconnect.lua b/Server/Plugins/APIDump/Hooks/OnDisconnect.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnDisconnect.lua rename to Server/Plugins/APIDump/Hooks/OnDisconnect.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityAddEffect.lua b/Server/Plugins/APIDump/Hooks/OnEntityAddEffect.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnEntityAddEffect.lua rename to Server/Plugins/APIDump/Hooks/OnEntityAddEffect.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua b/Server/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua rename to Server/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua b/Server/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua rename to Server/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityTeleport.lua b/Server/Plugins/APIDump/Hooks/OnEntityTeleport.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnEntityTeleport.lua rename to Server/Plugins/APIDump/Hooks/OnEntityTeleport.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnExecuteCommand.lua b/Server/Plugins/APIDump/Hooks/OnExecuteCommand.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnExecuteCommand.lua rename to Server/Plugins/APIDump/Hooks/OnExecuteCommand.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnExploded.lua b/Server/Plugins/APIDump/Hooks/OnExploded.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnExploded.lua rename to Server/Plugins/APIDump/Hooks/OnExploded.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnExploding.lua b/Server/Plugins/APIDump/Hooks/OnExploding.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnExploding.lua rename to Server/Plugins/APIDump/Hooks/OnExploding.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnHandshake.lua b/Server/Plugins/APIDump/Hooks/OnHandshake.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnHandshake.lua rename to Server/Plugins/APIDump/Hooks/OnHandshake.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnHopperPullingItem.lua b/Server/Plugins/APIDump/Hooks/OnHopperPullingItem.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnHopperPullingItem.lua rename to Server/Plugins/APIDump/Hooks/OnHopperPullingItem.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnHopperPushingItem.lua b/Server/Plugins/APIDump/Hooks/OnHopperPushingItem.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnHopperPushingItem.lua rename to Server/Plugins/APIDump/Hooks/OnHopperPushingItem.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnKilled.lua b/Server/Plugins/APIDump/Hooks/OnKilled.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnKilled.lua rename to Server/Plugins/APIDump/Hooks/OnKilled.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnKilling.lua b/Server/Plugins/APIDump/Hooks/OnKilling.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnKilling.lua rename to Server/Plugins/APIDump/Hooks/OnKilling.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnLogin.lua b/Server/Plugins/APIDump/Hooks/OnLogin.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnLogin.lua rename to Server/Plugins/APIDump/Hooks/OnLogin.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerAnimation.lua b/Server/Plugins/APIDump/Hooks/OnPlayerAnimation.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerAnimation.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerAnimation.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua b/Server/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerEating.lua b/Server/Plugins/APIDump/Hooks/OnPlayerEating.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerEating.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerEating.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFished.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFished.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerFished.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerFished.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFishing.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFishing.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerFishing.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerFishing.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerJoined.lua b/Server/Plugins/APIDump/Hooks/OnPlayerJoined.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerJoined.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerJoined.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua b/Server/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua b/Server/Plugins/APIDump/Hooks/OnPlayerMoving.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerMoving.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua b/Server/Plugins/APIDump/Hooks/OnPlayerRightClick.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerRightClick.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua b/Server/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerShooting.lua b/Server/Plugins/APIDump/Hooks/OnPlayerShooting.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerShooting.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerShooting.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerSpawned.lua b/Server/Plugins/APIDump/Hooks/OnPlayerSpawned.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerSpawned.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerSpawned.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua rename to Server/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPluginMessage.lua b/Server/Plugins/APIDump/Hooks/OnPluginMessage.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPluginMessage.lua rename to Server/Plugins/APIDump/Hooks/OnPluginMessage.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPluginsLoaded.lua b/Server/Plugins/APIDump/Hooks/OnPluginsLoaded.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPluginsLoaded.lua rename to Server/Plugins/APIDump/Hooks/OnPluginsLoaded.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPostCrafting.lua b/Server/Plugins/APIDump/Hooks/OnPostCrafting.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPostCrafting.lua rename to Server/Plugins/APIDump/Hooks/OnPostCrafting.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnPreCrafting.lua b/Server/Plugins/APIDump/Hooks/OnPreCrafting.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnPreCrafting.lua rename to Server/Plugins/APIDump/Hooks/OnPreCrafting.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua b/Server/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua rename to Server/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua b/Server/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua rename to Server/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/Server/Plugins/APIDump/Hooks/OnServerPing.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnServerPing.lua rename to Server/Plugins/APIDump/Hooks/OnServerPing.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawnedEntity.lua b/Server/Plugins/APIDump/Hooks/OnSpawnedEntity.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnSpawnedEntity.lua rename to Server/Plugins/APIDump/Hooks/OnSpawnedEntity.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawnedMonster.lua b/Server/Plugins/APIDump/Hooks/OnSpawnedMonster.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnSpawnedMonster.lua rename to Server/Plugins/APIDump/Hooks/OnSpawnedMonster.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua b/Server/Plugins/APIDump/Hooks/OnSpawningEntity.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua rename to Server/Plugins/APIDump/Hooks/OnSpawningEntity.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawningMonster.lua b/Server/Plugins/APIDump/Hooks/OnSpawningMonster.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnSpawningMonster.lua rename to Server/Plugins/APIDump/Hooks/OnSpawningMonster.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnTakeDamage.lua b/Server/Plugins/APIDump/Hooks/OnTakeDamage.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnTakeDamage.lua rename to Server/Plugins/APIDump/Hooks/OnTakeDamage.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnTick.lua b/Server/Plugins/APIDump/Hooks/OnTick.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnTick.lua rename to Server/Plugins/APIDump/Hooks/OnTick.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnUpdatedSign.lua b/Server/Plugins/APIDump/Hooks/OnUpdatedSign.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnUpdatedSign.lua rename to Server/Plugins/APIDump/Hooks/OnUpdatedSign.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnUpdatingSign.lua b/Server/Plugins/APIDump/Hooks/OnUpdatingSign.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnUpdatingSign.lua rename to Server/Plugins/APIDump/Hooks/OnUpdatingSign.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnWeatherChanged.lua b/Server/Plugins/APIDump/Hooks/OnWeatherChanged.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnWeatherChanged.lua rename to Server/Plugins/APIDump/Hooks/OnWeatherChanged.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnWeatherChanging.lua b/Server/Plugins/APIDump/Hooks/OnWeatherChanging.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnWeatherChanging.lua rename to Server/Plugins/APIDump/Hooks/OnWeatherChanging.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua b/Server/Plugins/APIDump/Hooks/OnWorldStarted.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua rename to Server/Plugins/APIDump/Hooks/OnWorldStarted.lua diff --git a/MCServer/Plugins/APIDump/Hooks/OnWorldTick.lua b/Server/Plugins/APIDump/Hooks/OnWorldTick.lua similarity index 100% rename from MCServer/Plugins/APIDump/Hooks/OnWorldTick.lua rename to Server/Plugins/APIDump/Hooks/OnWorldTick.lua diff --git a/MCServer/Plugins/APIDump/InfoFile.html b/Server/Plugins/APIDump/InfoFile.html similarity index 100% rename from MCServer/Plugins/APIDump/InfoFile.html rename to Server/Plugins/APIDump/InfoFile.html diff --git a/MCServer/Plugins/APIDump/LICENSE-prettify.txt b/Server/Plugins/APIDump/LICENSE-prettify.txt similarity index 100% rename from MCServer/Plugins/APIDump/LICENSE-prettify.txt rename to Server/Plugins/APIDump/LICENSE-prettify.txt diff --git a/MCServer/Plugins/APIDump/SettingUpDecoda.html b/Server/Plugins/APIDump/SettingUpDecoda.html similarity index 100% rename from MCServer/Plugins/APIDump/SettingUpDecoda.html rename to Server/Plugins/APIDump/SettingUpDecoda.html diff --git a/MCServer/Plugins/APIDump/SettingUpZeroBrane.html b/Server/Plugins/APIDump/SettingUpZeroBrane.html similarity index 100% rename from MCServer/Plugins/APIDump/SettingUpZeroBrane.html rename to Server/Plugins/APIDump/SettingUpZeroBrane.html diff --git a/MCServer/Plugins/APIDump/Static/.gitignore b/Server/Plugins/APIDump/Static/.gitignore similarity index 100% rename from MCServer/Plugins/APIDump/Static/.gitignore rename to Server/Plugins/APIDump/Static/.gitignore diff --git a/MCServer/Plugins/APIDump/Static/decoda_debug_settings.png b/Server/Plugins/APIDump/Static/decoda_debug_settings.png similarity index 100% rename from MCServer/Plugins/APIDump/Static/decoda_debug_settings.png rename to Server/Plugins/APIDump/Static/decoda_debug_settings.png diff --git a/MCServer/Plugins/APIDump/Static/decoda_logo.png b/Server/Plugins/APIDump/Static/decoda_logo.png similarity index 100% rename from MCServer/Plugins/APIDump/Static/decoda_logo.png rename to Server/Plugins/APIDump/Static/decoda_logo.png diff --git a/MCServer/Plugins/APIDump/Static/decoda_workspace.png b/Server/Plugins/APIDump/Static/decoda_workspace.png similarity index 100% rename from MCServer/Plugins/APIDump/Static/decoda_workspace.png rename to Server/Plugins/APIDump/Static/decoda_workspace.png diff --git a/MCServer/Plugins/APIDump/Static/zbs_logo.png b/Server/Plugins/APIDump/Static/zbs_logo.png similarity index 100% rename from MCServer/Plugins/APIDump/Static/zbs_logo.png rename to Server/Plugins/APIDump/Static/zbs_logo.png diff --git a/MCServer/Plugins/APIDump/Static/zbs_workspace.png b/Server/Plugins/APIDump/Static/zbs_workspace.png similarity index 100% rename from MCServer/Plugins/APIDump/Static/zbs_workspace.png rename to Server/Plugins/APIDump/Static/zbs_workspace.png diff --git a/MCServer/Plugins/APIDump/UsingChunkStays.html b/Server/Plugins/APIDump/UsingChunkStays.html similarity index 100% rename from MCServer/Plugins/APIDump/UsingChunkStays.html rename to Server/Plugins/APIDump/UsingChunkStays.html diff --git a/MCServer/Plugins/APIDump/WebWorldThreads.html b/Server/Plugins/APIDump/WebWorldThreads.html similarity index 100% rename from MCServer/Plugins/APIDump/WebWorldThreads.html rename to Server/Plugins/APIDump/WebWorldThreads.html diff --git a/MCServer/Plugins/APIDump/Writing-a-Cuberite-plugin.html b/Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html similarity index 100% rename from MCServer/Plugins/APIDump/Writing-a-Cuberite-plugin.html rename to Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html diff --git a/MCServer/Plugins/APIDump/lang-lua.js b/Server/Plugins/APIDump/lang-lua.js similarity index 100% rename from MCServer/Plugins/APIDump/lang-lua.js rename to Server/Plugins/APIDump/lang-lua.js diff --git a/MCServer/Plugins/APIDump/main.css b/Server/Plugins/APIDump/main.css similarity index 100% rename from MCServer/Plugins/APIDump/main.css rename to Server/Plugins/APIDump/main.css diff --git a/MCServer/Plugins/APIDump/main_APIDump.lua b/Server/Plugins/APIDump/main_APIDump.lua similarity index 100% rename from MCServer/Plugins/APIDump/main_APIDump.lua rename to Server/Plugins/APIDump/main_APIDump.lua diff --git a/MCServer/Plugins/APIDump/prettify.css b/Server/Plugins/APIDump/prettify.css similarity index 100% rename from MCServer/Plugins/APIDump/prettify.css rename to Server/Plugins/APIDump/prettify.css diff --git a/MCServer/Plugins/APIDump/prettify.js b/Server/Plugins/APIDump/prettify.js similarity index 100% rename from MCServer/Plugins/APIDump/prettify.js rename to Server/Plugins/APIDump/prettify.js diff --git a/MCServer/Plugins/ChatLog b/Server/Plugins/ChatLog similarity index 100% rename from MCServer/Plugins/ChatLog rename to Server/Plugins/ChatLog diff --git a/MCServer/Plugins/ChunkWorx b/Server/Plugins/ChunkWorx similarity index 100% rename from MCServer/Plugins/ChunkWorx rename to Server/Plugins/ChunkWorx diff --git a/MCServer/Plugins/Core b/Server/Plugins/Core similarity index 100% rename from MCServer/Plugins/Core rename to Server/Plugins/Core diff --git a/MCServer/Plugins/Debuggers/Debuggers.deproj b/Server/Plugins/Debuggers/Debuggers.deproj similarity index 100% rename from MCServer/Plugins/Debuggers/Debuggers.deproj rename to Server/Plugins/Debuggers/Debuggers.deproj diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/Server/Plugins/Debuggers/Debuggers.lua similarity index 100% rename from MCServer/Plugins/Debuggers/Debuggers.lua rename to Server/Plugins/Debuggers/Debuggers.lua diff --git a/MCServer/Plugins/Debuggers/Info.lua b/Server/Plugins/Debuggers/Info.lua similarity index 100% rename from MCServer/Plugins/Debuggers/Info.lua rename to Server/Plugins/Debuggers/Info.lua diff --git a/MCServer/Plugins/DiamondMover/DiamondMover.lua b/Server/Plugins/DiamondMover/DiamondMover.lua similarity index 100% rename from MCServer/Plugins/DiamondMover/DiamondMover.lua rename to Server/Plugins/DiamondMover/DiamondMover.lua diff --git a/MCServer/Plugins/DumpInfo/Init.lua b/Server/Plugins/DumpInfo/Init.lua similarity index 100% rename from MCServer/Plugins/DumpInfo/Init.lua rename to Server/Plugins/DumpInfo/Init.lua diff --git a/MCServer/Plugins/Handy b/Server/Plugins/Handy similarity index 100% rename from MCServer/Plugins/Handy rename to Server/Plugins/Handy diff --git a/MCServer/Plugins/HookNotify/HookNotify.lua b/Server/Plugins/HookNotify/HookNotify.lua similarity index 100% rename from MCServer/Plugins/HookNotify/HookNotify.lua rename to Server/Plugins/HookNotify/HookNotify.lua diff --git a/MCServer/Plugins/InfoDump.deproj b/Server/Plugins/InfoDump.deproj similarity index 100% rename from MCServer/Plugins/InfoDump.deproj rename to Server/Plugins/InfoDump.deproj diff --git a/MCServer/Plugins/InfoDump.lua b/Server/Plugins/InfoDump.lua similarity index 100% rename from MCServer/Plugins/InfoDump.lua rename to Server/Plugins/InfoDump.lua diff --git a/MCServer/Plugins/InfoReg.lua b/Server/Plugins/InfoReg.lua similarity index 100% rename from MCServer/Plugins/InfoReg.lua rename to Server/Plugins/InfoReg.lua diff --git a/MCServer/Plugins/MagicCarpet b/Server/Plugins/MagicCarpet similarity index 100% rename from MCServer/Plugins/MagicCarpet rename to Server/Plugins/MagicCarpet diff --git a/MCServer/Plugins/NetworkTest/Info.lua b/Server/Plugins/NetworkTest/Info.lua similarity index 100% rename from MCServer/Plugins/NetworkTest/Info.lua rename to Server/Plugins/NetworkTest/Info.lua diff --git a/MCServer/Plugins/NetworkTest/NetworkTest.lua b/Server/Plugins/NetworkTest/NetworkTest.lua similarity index 100% rename from MCServer/Plugins/NetworkTest/NetworkTest.lua rename to Server/Plugins/NetworkTest/NetworkTest.lua diff --git a/MCServer/Plugins/NetworkTest/splashes.txt b/Server/Plugins/NetworkTest/splashes.txt similarity index 100% rename from MCServer/Plugins/NetworkTest/splashes.txt rename to Server/Plugins/NetworkTest/splashes.txt diff --git a/MCServer/Plugins/ProtectionAreas b/Server/Plugins/ProtectionAreas similarity index 100% rename from MCServer/Plugins/ProtectionAreas rename to Server/Plugins/ProtectionAreas diff --git a/MCServer/Plugins/TestLuaRocks/TestLuaRocks.lua b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua similarity index 100% rename from MCServer/Plugins/TestLuaRocks/TestLuaRocks.lua rename to Server/Plugins/TestLuaRocks/TestLuaRocks.lua diff --git a/MCServer/Plugins/TransAPI b/Server/Plugins/TransAPI similarity index 100% rename from MCServer/Plugins/TransAPI rename to Server/Plugins/TransAPI diff --git a/MCServer/Prefabs/Villages/AlchemistVillage.cubeset b/Server/Prefabs/Villages/AlchemistVillage.cubeset similarity index 100% rename from MCServer/Prefabs/Villages/AlchemistVillage.cubeset rename to Server/Prefabs/Villages/AlchemistVillage.cubeset diff --git a/MCServer/Prefabs/Villages/JapaneseVillage.cubeset b/Server/Prefabs/Villages/JapaneseVillage.cubeset similarity index 100% rename from MCServer/Prefabs/Villages/JapaneseVillage.cubeset rename to Server/Prefabs/Villages/JapaneseVillage.cubeset diff --git a/MCServer/Prefabs/Villages/PlainsVillage.cubeset b/Server/Prefabs/Villages/PlainsVillage.cubeset similarity index 100% rename from MCServer/Prefabs/Villages/PlainsVillage.cubeset rename to Server/Prefabs/Villages/PlainsVillage.cubeset diff --git a/MCServer/Prefabs/Villages/SandFlatRoofVillage.cubeset b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset similarity index 100% rename from MCServer/Prefabs/Villages/SandFlatRoofVillage.cubeset rename to Server/Prefabs/Villages/SandFlatRoofVillage.cubeset diff --git a/MCServer/Prefabs/Villages/SandVillage.cubeset b/Server/Prefabs/Villages/SandVillage.cubeset similarity index 100% rename from MCServer/Prefabs/Villages/SandVillage.cubeset rename to Server/Prefabs/Villages/SandVillage.cubeset diff --git a/MCServer/README.txt b/Server/README.txt similarity index 100% rename from MCServer/README.txt rename to Server/README.txt diff --git a/MCServer/crafting.txt b/Server/crafting.txt similarity index 100% rename from MCServer/crafting.txt rename to Server/crafting.txt diff --git a/Server/delete_windows_service.cmd b/Server/delete_windows_service.cmd new file mode 100644 index 000000000..14a55edfc --- /dev/null +++ b/Server/delete_windows_service.cmd @@ -0,0 +1,4 @@ +@echo off +set SERVICENAME="Cuberite" + +sc delete %SERVICENAME% diff --git a/Server/favicon.png b/Server/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..61d201abf33741581519229f7aa3bb10e0f4b193 GIT binary patch literal 1769 zcmV|Rv?J4g|1arzL7}VnftjY*S0gA znKN_Go#JnK?|FRR|DJp9Ip24#uu$~xT|;1Us4T(APV!qmSqL+v?LGGIU4xoOQM%_` zR~cIfA=)QEEypWqvk>tMkSX4T(Z?D(UWv*Ws*kffeIO>wfH(zc)$vMV7Q(#%*}{z= z+afz&iOLuf>|m((pvz|62@sd#l{gk6x&ZBRyb?!3v@Ss3$Z8V7K-(R!L}iQw+j%MV zX)D#67vNlRyb_f$&;f?ihnlHoFTjlBcQjS6-83mgV@I;Z<){t-o2<&8JB$L`8A>0i zSE#l_{e@MOWhcVzPRtPwpxkOzRym5WvaWr$C?Al}L0;-TI=@+!WJXpZ!A{_g$eqtN zU{T_GCW1fh>X=n9HH9R00XT`#n_s02f<`287 zW*I|Uz6GX7qRI}3lkO-+2f`5{u{$2pi~tF_oEK9+%(*tb-gwgbHL|f&&9)>)zQT#) z@*(J8qe;gKElpHi%lD20>&O(kFg$_E>WIB`A;G#N(Vaj0#8c574+)ah0)!0rjsl}( z3SEdi1FVS9lb8sV0U2N@z23=FpFt^4)D|FQxObF`F1`_!H=}eGQ2>34tbZ71QjO%73m=pfJ)xy|Wz-vfqF-mxie zzYY-nlA-hl0=)*<2Sgh=%59in9MLh{I6sQf8_1`7m|Aq)wo#f^VZnlauJoxH`^IlIH>p7@(0s0Ed@ccLENc>9Hf0zEkwROwO zl4Eu6&t|bXQTKkoe-)nZQ!f94=YLG!-s|VwH$jY_L2u-02zD@gwpY4Qxt*;40YP~O z!}onvRd4dN&|x_)YmwP|C1M^S;9h1PUKhq3BkR9UImoel>v75@!SWrj9|0=Y;T7J7 z;A`M+sy}rGr5i~c$Mc`HZg)N=I;w|ow(vY+z6DZL+bt;F(?S&ALKD`(68jOLykq%! zH|RWD*d-l8*=}a0bFzAwt#TEO4G>f}B5btl$i*aR%j7>%7e{BD*ik|I1X#Q%ssN26 z#Vyc20j8n~Ape^YaF9f>z3S@JnP>t?kO%629$UcOO0dxZ$Ihe>ShjU~qIwd{_l|>J zk5}9TJO^CTs;RSyJ_1z65YxqQYHj?dJ4G2v@8kEym!a}7V3%&ML&Omv0}Q90wkldm z3Z`V&?0KE_UzdHGCxI7uXwU1E5}yE9*fm^D^we0U_?cB|tYgA{4w&y1nA@+A^?N8K z_7lN*aPbO=t^qkf*56OxNbQt$Dd`|cqC%#)0k3%CY|t}umdGIDHpuDuAJbo`UI|7O zAXDhVD;`1gZQP{CMuF8cM!64ZjiP4Te`j*;f9)cYQ$JhPEKM!tl?P4%aU@FS#2Mz< zbi^b?qI{A-ezK}jnp%qKywY)KZQcM&Z3m}AS~-;49CWTIhY)VID&5SHy2g#wJ-XBQ z37@M+V;d9kpkyTrbt=4hnu;Yh|Bj!lLd1Spx)N8v#6+b<$3vpe@(U$I#Qy|B+@-K= ze~XKXBgaGB=kUTmLS5ziLmWFE5?>P2^Vd$F>WX;cBPPc~;!kIL{#t~=rWZCbJ08-$ ze7>y^ZE`%M{U/dev/null