Merge branch 'ptr'

# Conflicts:
#	package.json
This commit is contained in:
Artem Chivchalov
2019-10-15 12:07:59 +03:00
2 changed files with 9 additions and 9 deletions

View File

@@ -22,7 +22,7 @@ npx screeps start
``` ```
Prerequisites: Prerequisites:
* Node.js 8 LTS or higher * Node.js 10 LTS or higher
* Python 2 (for node-gyp, [Python 3 is not supported](https://github.com/nodejs/node-gyp/issues/193)) * Python 2 (for node-gyp, [Python 3 is not supported](https://github.com/nodejs/node-gyp/issues/193))
* Build tools (`apt install build-essential` for Ubuntu, [Visual Studio](https://www.visualstudio.com/vs/) for Windows, etc) * Build tools (`apt install build-essential` for Ubuntu, [Visual Studio](https://www.visualstudio.com/vs/) for Windows, etc)

View File

@@ -1,6 +1,6 @@
{ {
"name": "screeps", "name": "screeps",
"version": "3.4.5", "version": "4.0.0-beta.7",
"description": "A standalone server for programming game Screeps", "description": "A standalone server for programming game Screeps",
"main": "package.json", "main": "package.json",
"bin": { "bin": {
@@ -13,16 +13,16 @@
"url": "https://github.com/screeps/screeps.git" "url": "https://github.com/screeps/screeps.git"
}, },
"dependencies": { "dependencies": {
"@screeps/backend": "2.7.4", "@screeps/backend": "3.0.0-beta.3",
"@screeps/common": "2.11.1", "@screeps/common": "2.12.0-beta.6",
"@screeps/driver": "4.3.2", "@screeps/driver": "5.0.0-beta.2",
"@screeps/engine": "3.3.2", "@screeps/engine": "4.0.0-beta.3",
"@screeps/launcher": "3.3.4", "@screeps/launcher": "4.0.0-beta.1",
"@screeps/pathfinding": "0.4.16", "@screeps/pathfinding": "0.4.16",
"@screeps/storage": "4.2.2" "@screeps/storage": "5.0.0-beta.2"
}, },
"engines": { "engines": {
"node": ">=8.10.0", "node": ">=10.13.0",
"npm": ">=3.10.3" "npm": ">=3.10.3"
} }
} }