Skip to content

Commit

Permalink
Merge cb6db14 into 07386e1
Browse files Browse the repository at this point in the history
  • Loading branch information
Tarnadas committed Nov 14, 2019
2 parents 07386e1 + cb6db14 commit 777c969
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
/coverage/
*.exe
*.7z
yarn-error.log
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"editor.formatOnSave": false,
"eslint.autoFixOnSave": true,
"typescript.tsdk": "node_modules/typescript/lib"
}
}
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This repository includes the dedicated server software. For the client please vi

## Server List

There is a [public server list](https://smmdb.ddns.net/net64) of all Net64+ server, that have enabled listing.
There is a [public server list](https://smmdb.net/net64) of all Net64+ server, that have enabled listing.

## Downloads

Expand All @@ -21,6 +21,8 @@ The prebuilt version is bundled with the [Net64+ Client](https://github.com/Tarn

- download and install [Node 8](https://nodejs.org/en/download/)
- you can try using a later version of Node, but you will need to install C++ compilers
- on Windows you can do the following: `npm i -g windows-build-tools` / or use `yarn global add`
- install yarn. It's a package manager for npm, which is generally faster
- `git clone` this repository or [download as zip](https://github.com/Tarnadas/net64plus-server/archive/master.zip)
- modify `settings.json`

Expand All @@ -38,7 +40,7 @@ The prebuilt version is bundled with the [Net64+ Client](https://github.com/Tarn
}
```

- (OPTIONAL) if you want your server to be listed, go to [SMMDB](https://smmdb.ddns.net), login with Google, go to profile and get your API key
- (OPTIONAL) if you want your server to be listed, go to [SMMDB](https://smmdb.net), login with Google, go to profile and get your API key
- _Do not share your API key, because it gives full access to your account_
- You can only list one server per API key
- `name` will be shortened to 40 characters at most
Expand All @@ -47,14 +49,14 @@ The prebuilt version is bundled with the [Net64+ Client](https://github.com/Tarn
- open a terminal in the folder of your server and execute the following commands

```
$ npm install
$ npm start
$ yarn install
$ yarn start
```

- (OPTIONAL) if you want to run your server indefinitely with auto restarts, I suggest to use pm2

```
$ npm i -g pm2
$ npm run build
$ yarn global add pm2
$ yarn build
$ pm2 start ./dist --name="net64 server"
```
2 changes: 1 addition & 1 deletion build.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function build (platform, platformName, arch) {
nexe.compile({
input: buildPath,
output: path.join('compile', `net64plus-server_${pjson.version}_${platform}-${arch}`),
target: `${platformName}-${arch}-8.15.0`,
target: `${platformName}-${arch}-8.16.0`,
native: {
uws: {
additionalFiles: [
Expand Down
6 changes: 6 additions & 0 deletions changelog/2.2.4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## [2.2.4](https://github.com/Tarnadas/net64plus-server/compare/2.1.2...2.2.4) (2019-11-09)


### Bug Fixes

* new domain ([df248b6](https://github.com/Tarnadas/net64plus-server/commit/df248b6))
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "net64plus-server",
"version": "2.2.3",
"version": "2.2.4",
"compatVersion": "1.0",
"description": "Net64+ Dedicated Server",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/WebHook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { webSocketServer } from './globals'
import { Settings } from './models/Settings.model'
import { Server } from './models/Server.model'

export const URL_API = 'https://smmdb.ddns.net/api/net64server'
export const URL_API = 'https://smmdb.net/api/net64server'

const apiKey = Symbol('apiKey')

Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Server } from './models/Server.model'
import { Arguments } from './Arguments'

const UPDATE_INTERVAL = 32
const PORT_CHECK_API = 'https://smmdb.ddns.net/api/v2/net64/portcheck'
const PORT_CHECK_API = 'https://smmdb.net/api/v2/net64/portcheck'

const args = new Arguments()
const settings = args.settings
Expand Down

0 comments on commit 777c969

Please sign in to comment.