Merge remote-tracking branch 'upstream/master' into management-server

This commit is contained in:
RedSparr0w 2019-11-06 13:43:45 +13:00
commit 4f12448e10
7 changed files with 7 additions and 5 deletions

1
Server/.gitignore vendored
View file

@ -7,7 +7,6 @@ data/profile/**
.DS_Store**
.project**
.classpath**
.class**
/bin/
/out/
*.iml

View file

@ -1,3 +1,5 @@
rm -rf org
cp -r ../CompiledServer/production/09Scape/org .
rm -rf plugin/
cp -r ../CompiledServer/production/09Scape/plugin/ .
java -server -cp ".:./bin;.:./data/libs/*" org.crandor.Server