Commit Graph
100 Commits
Author SHA1 Message Date
Daniel c978e8e748 Merge pull request #163 from psihius/master
Mass sync does not spam
2019-07-14 15:58:07 +02:00
Daniel 5a60f317ba Merge pull request #162 from psihius/master
Update to research sync plugin
2019-07-14 14:06:24 +02:00
Daniel Vestøl 1f8ac50950 Better error message for statisticsExporter 2019-07-09 22:50:28 +02:00
Daniel Vestøl 6c32271c56 Fixed rcon timeout in the right place, set to 200s for 1250kB commands 2019-07-06 12:44:31 +02:00
Daniel Vestøl a122f2b09e Increased rcon timeout to 20s, increased maxPending to 5 2019-07-06 00:46:22 +02:00
Daniel Vestøl f35be2f355 Set max pending rcon requests to 1 2019-07-05 23:42:51 +02:00
Daniel Vestøl d66d22a9cd Updated rcon-client 2019-07-05 23:07:25 +02:00
Daniel bf2e78d530 Merge pull request #159 from veladon/master
Added cluster model js to /lib/
2019-06-10 14:11:04 -07:00
Daniel 66ba706c56 Use neural net dole divider by default on new installs
See "useNeuralNetDoleDivider": true,

If this causes issues, simply set it to false in config.json. If you find normal dole division to work badly as well, set disableFairItemDistribution to true.
2019-06-02 15:27:50 +02:00
Daniel 79c9ac839e Merge pull request #158 from axapaxa123/master
New NN, added debt system
2019-06-02 06:26:11 -07:00
Daniel 7f59b200b1 Merge pull request #153 from veladon/master
player to character inventory renames and extra info for EACCESS problem
2019-06-02 06:24:23 -07:00
Daniel 7ae9ff6649 Merge pull request #152 from axapaxa123/master
New NN, updated required data
2019-05-13 10:42:53 -07:00
Daniel Vestøl 0c9ed582cc Fixed scenario_loader 2019-04-22 13:45:09 +02:00
Daniel d7bfc2193e Merge pull request #151 from axapaxa123/master
Neural Dole v2
2019-04-12 11:54:12 -07:00
Daniel Vestøl abf4b5d926 Updated freeplay script to 0.17 version 2019-03-31 17:56:34 +02:00
Daniel Vestøl 00dfae8bd1 Fixed another bug in scenarioLoader 2019-03-24 20:34:53 +01:00
Daniel Vestøl 2ef6c93b05 Use old doledivision as default, new NN based dole is optional 2019-03-24 20:18:03 +01:00
Daniel Vestøl 2165acb171 Merge branch 'neuralDoleDivision' 2019-03-24 20:16:32 +01:00
Daniel Vestøl 8357fa23ce Fixed bug in scenarioLoader 2019-03-24 20:14:47 +01:00
Daniel Vestøl 94d434c8ef Initial release of neural net based dole divider 2019-03-23 00:14:23 +01:00
Daniel Vestøl 56cf131c70 Moved most of /api/remove to its own file 2019-03-22 19:29:56 +01:00
Daniel Vestøl a2be560b8b Updated hotpatch 2019-03-13 20:13:03 +01:00
Daniel a3e33f6164 Merge pull request #148 from Danielv123/snyk-fix-9pjp3n
[Snyk] Fix for 7 vulnerable dependencies
2019-03-10 06:23:51 -07:00
Daniel 01e96a4dcb Merge pull request #149 from wchristian/patch-1
independant -> independent
2019-03-06 22:19:20 -08:00
Daniel Vestøl c15709ddc1 0.17 update: Fixed hotpatch and scenario_loader 2019-02-27 11:05:39 +01:00
Daniel Vestøl 103409b0cd Added setting disableFairItemDistribution to disable dole division factor 2019-02-18 19:49:49 +01:00
Daniel 7e0b131557 Merge pull request #147 from joshricker/patch-1
Remove command splitting
2019-02-18 10:27:45 +01:00
Daniel Vestøl 78061df0c2 Removed dead asset source from remoteMap 2.0 2019-02-04 13:02:07 +01:00
Daniel Vestøl 0024b84745 Added license note for Angels Icons 2019-02-04 12:50:20 +01:00
Daniel df7100ecba Merge pull request #146 from Teoxoy/master
Added logo
2019-02-01 07:48:53 +01:00
Daniel df1875f24d Update README.md 2019-02-01 07:48:33 +01:00
Daniel Vestøl 09f476ec40 Added support for 3625 Angels item icons 2019-01-31 14:34:02 +01:00
Daniel Vestøl 846853813a Added rcon tool and better prometheus monitoring for websockets 2019-01-05 14:35:43 +01:00
Daniel Vestøl 064ee0827a Updated Hotpatch to 1.1.11, might have fixed some desync issues 2019-01-02 13:50:18 +01:00
Daniel Vestøl d859cb554a Merge branch 'search' 2018-12-17 22:15:07 +01:00
Daniel Vestøl eaa8d5373c Readded whitespaces 2018-12-17 22:14:51 +01:00
Daniel abc94a16c1 Merge pull request #143 from J-Lassauw/ui_overhaul
Removed Duplicate entity draw entry
2018-12-15 18:59:15 +01:00
Daniel Vestøl 2efb628884 Merge remote-tracking branch 'origin/dev' 2018-12-15 16:48:41 +01:00
Daniel d4600c960e Merge pull request #142 from J-Lassauw/ui_overhaul
Web UI Overhaul
2018-12-15 16:47:38 +01:00
Daniel Vestøl 274c5af9f5 Added new auth function to lib/authenticate 2018-12-09 15:59:11 +01:00
Daniel Vestøl 8c0a4b1a9e . 2018-11-27 21:00:12 +01:00
Daniel Vestøl 3b9dd6dcc8 Fixed bug with serverManagers web interface 2018-11-21 07:35:51 +01:00
Daniel Vestøl 9b6f8cf652 Fixed error related to getting playerCount 2018-11-17 16:09:46 +01:00
Daniel Vestøl ce13ad50e0 Fixed desync when viewing scenario code in hotpatch 2018-11-17 11:05:10 +01:00
Daniel Vestøl 18c486855d Revamped scenario loader for cross platform compat 2018-11-15 21:37:42 +01:00
Daniel Vestøl 12a0ebf8d1 Scenario loading has big issues with paths, this is a bandaid 2018-11-14 22:17:09 +01:00
Daniel Vestøl 081d9a5bea Made scenario loading less insanely spammy 2018-11-13 21:28:13 +01:00
Daniel Vestøl 1e868b4ff4 Changed hotpatch scenario dir for visibility, made scenario loading recursive 2018-11-13 21:24:42 +01:00
Daniel Vestøl 58b609cbd0 Fixed portable instances 2018-11-10 17:29:32 +01:00
Daniel Vestøl 2c6b8becd4 Added setting disableImportsOfEverythingExceptElectricity 2018-11-07 19:24:04 +01:00
Daniel Vestøl 1676dc80db Merge branch 'dependencyRemoval' 2018-10-23 11:13:36 +02:00
Daniel Vestøl 52d35ab955 Added new plugin for reporting production/kills/construction statistics to Prometheus 2018-10-23 11:10:59 +02:00
Daniel Vestøl aaf4d8b6f1 Removed graphing functionality that utilized linvodb 2018-10-23 11:10:26 +02:00
Daniel Vestøl 8766529e5b Removed linvodb/leveldown dependency 2018-10-22 11:06:21 +02:00
Daniel Vestøl 1b518964fc Updated readme 2018-10-18 21:30:23 +02:00
Daniel Vestøl c4a2b50c08 Fixed some broken statistics 2018-10-17 21:50:32 +02:00
Daniel Vestøl 3f4309fab0 Added pushgateway for prometheus statistics 2018-10-12 23:28:10 +02:00
Daniel Vestøl 2855268e34 Attempted fix for breaking /slaves/ 2018-10-11 14:47:13 +02:00
Daniel Vestøl ffe42c523a Added trainTeleports to plugin list in readme 2018-10-04 19:33:36 +02:00
Daniel db20e9c780 Merge pull request #138 from jakedraddy/master
Add plugin list to readme (with discordchat plugin).
2018-10-01 23:39:15 +02:00
Daniel Vestøl 94ac9ca624 Added scenario_loader plugin, updated hotpatch (new saves now gives the starting items) 2018-09-29 15:21:35 +02:00
Daniel Vestøl e2566d2d1c [big change] Added serverManager plugin 2018-09-27 14:35:41 +02:00
Daniel Vestøl 852311e84c Plugin loading race condition, resolves #136 2018-09-27 13:48:41 +02:00
Daniel Vestøl 810e4a27b5 Removed snyk 2018-09-27 10:35:25 +02:00
Daniel Vestøl 8a84f4087a Bugfix and usability improvements 2018-09-23 09:17:07 +02:00
Daniel Vestøl 087ba8dabe Improved docs, disabled remoteMap by default 2018-09-09 19:55:09 +02:00
Daniel Vestøl 07b9d0a0f5 Fixed getMac spam in VMs, added log rotation 2018-08-23 10:04:19 +02:00
Daniel Vestøl 857a6824fc Added analytics 2018-08-16 14:52:26 +02:00
Daniel Vestøl 765146b559 Plugin loading now respects disabled plugins 2018-08-16 14:52:09 +02:00
Daniel Vestøl ffa2d0b0fb Fixed windows crash on ctrl+c preventing factorio from saving 2018-08-16 12:19:18 +02:00
Daniel Vestøl a76e07c07b Enable and disable plugins from the commandline (non functional as of yet) 2018-08-15 23:15:01 +02:00
Daniel Vestøl e71c183b48 Collet http performance statistics for plugins as well 2018-08-14 13:05:17 +02:00
Daniel Vestøl 1faa3671e4 configManager.js - more useful return values 2018-08-11 19:59:35 +02:00
Daniel Vestøl 5630f7f7f6 Rewrote master plugin loading 2018-08-10 17:17:19 +02:00
Daniel Vestøl da268d57e7 Serverside rendering of /slaves for more plugin functionality 2018-08-10 15:51:41 +02:00
Daniel Vestøl 8518cd54c6 Introduce more tools for use by plugins 2018-08-10 15:50:46 +02:00
Daniel 3a7527f053 Merge pull request #135 from Valansch/master
Readme typo
2018-08-01 14:21:26 +02:00
Daniel Vestøl 9461978a6e Reduced log spam 2018-07-30 13:30:03 +02:00
Daniel Vestøl 4fed43bad6 [big change] Moved core clusterio Lua mod functionality into its own plugin 2018-07-28 13:45:05 +02:00
Daniel f7f2ce6897 Merge pull request #133 from Gerkiz/patch-1
Added docker support
2018-07-25 21:58:03 +02:00
Daniel Vestøl 329f721b11 Fixed invalid json in config.json.dist 2018-07-25 02:09:00 +02:00
Daniel Vestøl 8abeb26dce Commandline tools to install/uninstall plugins from github 2018-07-25 01:14:43 +02:00
Daniel Vestøl 958cdfa15a Fixed node client.js manage * mods * 2018-07-24 23:14:02 +02:00
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
Daniel b12f12a91f Merge pull request #131 from Godmave/master
Fix inventory import
2018-07-23 15:19:33 +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
Daniel f91ff41dff Merge pull request #129 from Godmave/master
Add hotpatch
2018-07-17 18:10:16 +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