Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Heath123/pakkit
Browse files Browse the repository at this point in the history
  • Loading branch information
Heath123 committed Jan 25, 2021
2 parents 65e49c9 + edb9ec5 commit 12a6880
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions html/startPage/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function loadSettings (newPlatform) {
loadSetting(newPlatform + 'LastVersion', 'version', 'version', '1.16.4')
loadSetting(newPlatform + 'LastConnectAddress', 'connectAddress', 'connect-address', '127.0.0.1')
loadSetting(newPlatform + 'LastConnectPort', 'connectPort', 'connect-port', platform === 'java' ? '25565' : '19132')
loadSetting(newPlatform + 'LastListenPort', 'listenPort', 'listen-port', platform === 'java' ? '25566' : '19133')
loadSetting(newPlatform + 'LastListenPort', 'listenPort', 'listen-port', platform === 'java' ? '25566' : '19142')
}

function saveSettings (thePlatform) {
Expand Down Expand Up @@ -88,7 +88,7 @@ window.startProxy = function (event) {
connectAddress = (connectAddress === '') ? '127.0.0.1' : connectAddress
if (platform === 'bedrock') {
connectPort = (connectPort === '') ? '19132' : connectPort
listenPort = (listenPort === '') ? '19133' : listenPort
listenPort = (listenPort === '') ? '19142' : listenPort
} else {
connectPort = (connectPort === '') ? '25565' : connectPort
listenPort = (listenPort === '') ? '25566' : listenPort
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"electron-rebuild": "^2.3.4"
},
"dependencies": {
"axios": "^0.21.0",
"axios": "^0.21.1",
"clusterize.js": "^0.18.1",
"electron-localshortcut": "^3.2.1",
"electron-squirrel-startup": "^1.0.0",
Expand Down

0 comments on commit 12a6880

Please sign in to comment.