aperx/factorio-clusterio
1
0 Fork 0
mirror of https://github.com/clusterio/clusterio.git synced 2026-11-12 15:04:52 +09:00
Code Issues Packages Projects Releases Wiki Activity
680 Commits 15 Branches 45 Tags
d72a45cc662a136680d25dbcf89ae162ea628b2e
Commit Graph
680 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Vestøl d72a45cc66 Added autosaveInterval to the config.json.dist 2018-07-24 23:01:51 +02:00
Daniel Vestøl d913d59d72 Handle instance creation failing gracefully upon lacking internet 2018-07-24 23:00:42 +02:00
Daniel Vestøl 9ce4f064ad Add favicon to master (I think, just a quick-fix) 2018-07-24 22:59:40 +02:00
Godmave d9638b58ea #add configurable items autosave (default 1 minute, config.autosaveInterval) 2018-07-23 19:16:53 +02:00
Godmave 260f8a0bb5 Merge pull request #5 from Danielv123/master 
Merge pull request #131 from Godmave/master
 2018-07-23 19:13:44 +02:00
Daniel b12f12a91f Merge pull request #131 from Godmave/master 
Fix inventory import
 2018-07-23 15:19:33 +02:00
Godmave 7784fecb12 #add inventory items up instead of overwriting them 2018-07-21 00:21:27 +02:00
Godmave 68637d78b8 Merge pull request #3 from Danielv123/master 
Get current
 2018-07-20 23:45:50 +02:00
Daniel dc52d64c7e Merge pull request #123 from Danielv123/snyk-fix-y7mchf 
[Snyk] Fix for 1 vulnerable dependencies
 2018-07-18 10:42:34 +02:00
Daniel Vestøl adbf28d6bd Made travis run against node 9 instead of 10 2018-07-18 10:33:39 +02:00
Daniel Vestøl 42037fc451 client.js now adds Hotpatch to new maps 2018-07-18 10:30:35 +02:00
Daniel Vestøl 8e9bcc6a62 Untracked package-lock.json 2018-07-18 10:20:20 +02:00
Daniel 789e9d37c8 Merge pull request #130 from Sir3lit/patch-1 
This will build correctly
 2018-07-18 09:56:45 +02:00
Sir3lit 5c2eb009e2 This will build correctly 
The build is successful :)
 2018-07-18 02:06:19 -04:00
Daniel f91ff41dff Merge pull request #129 from Godmave/master 
Add hotpatch
 2018-07-17 18:10:16 +02:00
Godmave 94b2bb5463 #add hotpatch to master 2018-07-16 23:10:56 +02:00
Godmave 002dae9911 Merge pull request #2 from Danielv123/master 
get latest
 2018-07-16 23:06:15 +02:00
Daniel Vestøl e73a6052fe Instance creation with external instance paths are now working 2018-07-15 17:43:26 +02:00
Daniel Vestøl 724248b09b Merge branch 'master' into #85 2018-07-15 16:10:28 +02:00
Daniel Vestøl 3557b2d0ad Merge remote-tracking branch 'origin/master' 2018-07-15 00:02:11 +02:00
Daniel 1d5d8abd12 Merge pull request #128 from hintss/patch-1 
fix typo in log message
 2018-07-14 21:44:57 +02:00
Daniel Vestøl 98131ee66e Very big changes to help custom config paths 2018-07-13 22:56:10 +02:00
Daniel Vestøl 509a13062e Merge branch '#85' 2018-07-13 22:55:38 +02:00
Daniel Vestøl 02c545c650 Small change allowing plugins to add sidebar entries 2018-07-13 22:54:58 +02:00
hintss af42b1fcd3 fix typo in log message 2018-07-13 01:36:12 -07:00
Daniel 5dcbf45487 Merge pull request #127 from chrisgbk/master 
Fix race condition in node client download
 2018-07-10 13:20:35 +02:00
chrisgbk 9501861285 Fix race condition in node client download 
Fix race condition in node client download
 2018-07-10 04:23:40 -06:00
snyk-bot f8bf979327 fix: .snyk & package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/npm:lodash:20180130
 2018-07-03 06:07:59 +00:00
Daniel Vestøl 6962324a45 Tried to fix path problem in the master db 2018-06-28 15:34:31 +02:00
Daniel Vestøl cf0c3b012a Added config settings for globalChat (broadcast all messages) 2018-06-27 11:40:20 +02:00
Daniel ca49564fb7 Update README.md 2018-06-27 00:18:36 +02:00
Daniel Vestøl f13d90aa58 Merge branch '#85' 2018-06-27 00:13:27 +02:00
Daniel Vestøl 9721071ffb Merge branch 'master' into #85 2018-06-27 00:12:41 +02:00
Daniel Vestøl a77aeb9e5b Improved readme 2018-06-27 00:11:28 +02:00
Daniel dbd9876b8b Merge pull request #120 from Alauraa/patch-2 
Updated to reflect Bug #118
1.1.0 		2018-06-24 19:19:08 +02:00
Daniel cfa52dbcca Clarified a few things 2018-06-24 19:18:52 +02:00
Alaura 8f8436a809 Updated to reflect Bug #118 
Updated to reflect Bug #118 

Adds the node client.js manage shared mods add clusterio To line 95
 2018-06-24 11:48:59 -05:00
Daniel Vestøl bf19001055 Fixed --config, is probably unstable on client.js 2018-06-24 16:48:08 +02:00
Daniel Vestøl 443e5dc286 Arguments: --port --masterPort --sslPort --config --rcon-port --rcon-password 2018-06-24 16:46:31 +02:00
Daniel Vestøl 8267dae10e #85 update config.ini with absolute paths 2018-06-24 15:00:48 +02:00
Daniel Vestøl d177fb7304 client.js exits after creating and instance, better comments 2018-06-24 14:24:36 +02:00
Daniel Vestøl 7d99162072 Merge branch '#85' 2018-06-24 13:57:24 +02:00
Daniel 2a8228c5a9 Merge pull request #117 from Alauraa/patch-1 
Updated Readme with npmPostinstall.js.
 2018-06-23 13:56:39 +02:00
Alaura b86d4fa2ab Updated Readme with npmPostinstall.js. 
Updated Readme with npmPostinstall.js.

Made it so after you npm install, it adds all the required files the server needs and allows you to run it using node. Without errors.
 2018-06-23 06:55:43 -05:00
Daniel Vestøl b783ccf2cb Changed default config values 2018-06-20 14:24:15 +02:00
Daniel Vestøl 010e5271ea Might have fixed bug related to mod uploads 2018-06-19 23:58:56 +02:00
Daniel Vestøl 447766c752 Fixed mod manager not exiting after downloading mods 2018-06-16 15:41:06 +02:00
Daniel Vestøl e4c276054b Don't spam internal errors when server is paused/shutting down 2018-06-13 20:59:39 +02:00
Daniel Vestøl b7f76bf451 resolves #90 - Added ups and gametick reporting to prometheus (/metrics) 2018-06-12 23:01:42 +02:00
Daniel Vestøl 780feb7eb8 Prevented \n in playerCount, webinterface function to get queryString params added 2018-06-10 09:53:22 +02:00