12-23-2014, 09:05 PM
(12-23-2014, 08:20 PM)Boo Wrote:(12-23-2014, 07:54 PM)STR_Warrior Wrote: Ok lets start over. Try this:
Code:git clone https://github.com/mc-server/MCServer.git
cd MCServer/
git checkout 0d834775
git submodule init
git submodule update
cmake .
checkout 0d834775 its version with 1.5.2 support?
Code:
[ 19%] Building C object Tools/ProtoProxy/lib/polarssl/library/CMakeFiles/polars sl.dir/x509_csr.c.o
[ 19%] Building C object Tools/ProtoProxy/lib/polarssl/library/CMakeFiles/polars sl.dir/x509_create.c.o
[ 19%] [ 19%] Building C object Tools/ProtoProxy/lib/polarssl/library/CMakeFiles /polarssl.dir/x509write_crt.c.o
Building C object Tools/ProtoProxy/lib/polarssl/library/CMakeFiles/polarssl.dir/ x509write_csr.c.o
[ 20%] Building C object Tools/ProtoProxy/lib/polarssl/library/CMakeFiles/polars sl.dir/xtea.c.o
Linking C static library libpolarssl.a
[ 20%] Built target polarssl
make: *** [all] Ошибка 2
root@raspberrypi:/media/usbstick2/MCServer#
Code:
root@raspberrypi:/media/usbstick2/MCServer# git checkout 0d834775
error: Your local changes to the following files would be overwritten by checkout:
.gitignore
.gitmodules
.travis.yml
Android/res/values-pl/strings.xml
CMakeLists.txt
COMPILING.md
CONTRIBUTORS
MCServer/Plugins/APIDump/APIDesc.lua
MCServer/Plugins/APIDump/Classes/BlockEntities.lua
MCServer/Plugins/APIDump/Classes/Projectiles.lua
MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
MCServer/Plugins/Debuggers/Debuggers.lua
MCServer/Plugins/Debuggers/Info.lua
MCServer/Plugins/InfoDump.lua
MCServer/Plugins/InfoReg.lua
MCServer/crafting.txt
MCServer/furnace.txt
MCServer/monsters.ini
MCServer/webadmin/(original).html
MCServer/webadmin/files/guest.html
MCServer/webadmin/files/header.png
MCServer/webadmin/files/home.gif
MCServer/webadmin/files/loading.gif
MCServer/webadmin/files/log_out.png
MCServer/webadmin/files/login.css
MCServer/webadmin/files/login.gif
MCServer/webadmin/files/logo_login.png
MCServer/webadmin/files/pmfolder.gif
MCServer/webadmin/files/style.css
MCServer/webadmin/files/sub_pmfolder.gif
MCServer/webadmin/files/tcat.png
MCServer/webadmin/files/thead.png
MCServer/webadmin/login_template.html
MCServer/webadmin/template.html
MCServer/webadmin/template.lua
MCServer/webadmin/template_orig.lua
README.md
SetFlags.cmake
Tools/AnvilStats/CMakeLists.txt
Tools/AnvilStats/Utils.cpp
Tools/AnvilStats/Utils.h
Tools/MCADefrag/CMakeLists.txt
Tools/MCADefrag/MCADefrag.cpp
Tools/ProtoProxy/CMakeLists.txt
Tools/ProtoProxy/Connection.cpp
Tools/ProtoProxy/Connection.h
Tools/QtBiomeVisualiser/BiomeView.cpp
Tools/QtBiomeVisualiser/BiomeView.h
Tools/QtBiomeVisualiser/ChunkSource.cpp
Tools/QtBiomeVisualiser/ChunkSource.h
Tools/QtBiomeVisualiser/GeneratorSetup.cpp
Tools/QtBiomeVisualiser/Globals.h
Tools/QtBiomeVisualiser/MainWindow.cpp
Tools/QtBiomeVisualiser/MainWindow.h
Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
Tools/QtBiomeVisualiser/QtChunk.cpp
Tools/QtBiomeVisualiser/QtChunk.h
Tools/QtBiomeVisualiser/Region.cpp
Tools/QtBiomeVisualiser/Region.h
Tools/QtBiomeVisualiser/RegionCache.cpp
Tools/QtBiomeVisualiser/RegionCache.h
Tools/QtBiomeVisualiser/RegionLoader.cpp
Tools/QtBiomeVisualiser/RegionLoader.h
app.yml
src/AllocationPool.h
src/Bindings/AllToLua.pkg
src/Bindings/CMakeLists.txt
src/Bindings/DeprecatedBindings.cpp
src/Bindings/LuaChunkStay.cpp
src/Bindings/LuaState.cpp
src/Bindings/LuaState.h
src/Bindings/LuaWindow.cpp
src/Bindings/ManualBindings.cpp
src/Bindings/ManualBindings_RankManager.cpp
src/Bindings/Plugin.h
src/Bindings/PluginLua.cpp
src/Bindings/PluginLua.h
src/Bindings/PluginManager.cpp
src/Bindings/PluginManager.h
src/Bindings/WebPlugin.cpp
src/Bindings/virtual_method_hooks.lua
src/BiomeDef.cpp
src/BiomeDef.h
src/BlockArea.cpp
src/BlockArea.h
src/BlockEntities/BeaconEntity.cpp
src/BlockEntities/BeaconEntity.h
src/BlockEntities/BlockEntity.cpp
src/BlockEntities/BlockEntity.h
src/BlockEntities/BlockEntityWithItems.h
src/BlockEntities/CMakeLists.txt
src/BlockEntities/ChestEntity.cpp
src/BlockEntities/ChestEntity.h
src/BlockEntities/CommandBlockEntity.cpp
src/BlockEntities/CommandBlockEntity.h
src/BlockEntities/DispenserEntity.cpp
src/BlockEntities/DispenserEntity.h
src/BlockEntities/DropSpenserEntity.cpp
src/BlockEntities/DropSpenserEntity.h
src/BlockEntities/DropperEntity.cpp
src/BlockEntities/DropperEntity.h
src/BlockEntities/EnderChestEntity.cpp
src/BlockEntities/EnderChestEntity.h
src/BlockEntities/FlowerPotEntity.cpp
src/BlockEntities/FlowerPotEntity.h
src/BlockEntities/FurnaceEntity.cpp
src/BlockEntities/FurnaceEntity.h
src/BlockEntities/HopperEntity.cpp
src/BlockEntities/HopperEntity.h
src/BlockEntities/JukeboxEntity.cpp
src/BlockEntities/JukeboxEntity.h
src/BlockEntities/MobHeadEntity.cpp
src/BlockEntities/MobHeadEntity.h
src/BlockEntities/MobSpawnerEntity.cpp
src/BlockEntities/MobSpawnerEntity.h
src/BlockEntities/NoteEntity.cpp
src/BlockEntities/NoteEntity.h
src/BlockEntities/SignEntity.cpp
src/BlockEntities/SignEntity.h
src/BlockID.cpp
src/BlockID.h
src/BlockInServerPluginInterface.h
src/BlockInfo.cpp
error: The following untracked working tree files would be overwritten by checkout:
MCServer/Plugins/ChatLog/plugin.lua
MCServer/Plugins/ChunkWorx/ChunkWorx.deproj
MCServer/Plugins/ChunkWorx/chunkworx_main.lua
MCServer/Plugins/ChunkWorx/chunkworx_web.lua
MCServer/Plugins/Handy/handy.lua
MCServer/Plugins/Handy/handy_functions.lua
MCServer/Plugins/MagicCarpet/objects.lua
MCServer/Plugins/MagicCarpet/plugin.lua
Please move or remove them before you can switch branches.
Aborting
root@raspberrypi:/media/usbstick2/MCServer#
Help... crap!