Commit Graph

1076 Commits

Author SHA1 Message Date
Mitch Roote
42935c4135
Merge pull request #214 from OpenFactorioServerManager/develop
Add discord badge to readme
2021-01-07 12:22:48 -05:00
Mitch Roote
c0c96c30e0 Add discord badge to readme 2021-01-07 12:21:15 -05:00
Mitch Roote
4339076135
Merge pull request #213 from OpenFactorioServerManager/develop
changelog formatting
2021-01-07 11:24:13 -05:00
Mitch Roote
1d9799fa1d changelog formatting 2021-01-07 11:23:13 -05:00
Mitch Roote
1f8968d8eb
Merge pull request #212 from OpenFactorioServerManager/develop
Develop -> Master
2021-01-07 11:23:00 -05:00
Mitch Roote
f37a5d4cdd Update changelog date 2021-01-07 11:17:58 -05:00
knoxfighter
eaa65d0171
Merge pull request #211 from OpenFactorioServerManager/dependabot/npm_and_yarn/ini-1.3.8
Bump ini from 1.3.5 to 1.3.8
2021-01-07 17:14:01 +01:00
knoxfighter
94cfdca9a9
Merge pull request #210 from OpenFactorioServerManager/dependabot/npm_and_yarn/axios-0.21.1
Bump axios from 0.19.2 to 0.21.1
2021-01-07 17:13:51 +01:00
Mitch Roote
e5254228d4 Bump dockerfile manager_version to 0.9.0 2021-01-07 11:10:25 -05:00
Mitch Roote
183b419111 Use latest container instead of develop 2021-01-07 11:08:31 -05:00
Mitch Roote
926c07b5ba Merge branch 'develop' of github.com:OpenFactorioServerManager/factorio-server-manager into develop 2021-01-07 11:06:05 -05:00
Mitch Roote
077c4786b9 Update changelog version number 2021-01-07 11:05:48 -05:00
dependabot[bot]
585f9d5408
Bump ini from 1.3.5 to 1.3.8
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-07 15:58:34 +00:00
dependabot[bot]
d2abaa45b7
Bump axios from 0.19.2 to 0.21.1
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-07 15:58:12 +00:00
Mitch Roote
bcbf3ffd3d
Merge pull request #209 from OpenFactorioServerManager/develop
Develop -> Master
2021-01-07 10:57:03 -05:00
knoxfighter
431a256cb7 fixed wrong calculation of newer version available check #208 2020-12-31 03:49:59 +01:00
knoxfighter
38ad38436d
Added develop to be used for contributions 2020-12-31 01:42:59 +01:00
Mitch Roote
7cae438523 move example screenshots 2020-12-30 16:50:40 -05:00
Mitch Roote
c9728a50e8 typo 2020-12-30 16:49:20 -05:00
Mitch Roote
70ca578ba9 Update readme links to wiki 2020-12-30 16:48:32 -05:00
Mitch Roote
a499cea123 Update help page URL 2020-12-30 16:35:42 -05:00
knoxfighter
9ee696c298
Merge pull request #207 from OpenFactorioServerManager/fix-Compatibility
Update dependency compatibility check
2020-12-30 04:34:49 +01:00
knoxfighter
65b3b20fba fixed crash, when server-adminlist.json is created 2020-12-27 22:03:34 +01:00
knoxfighter
8c74efbd82 fixed crash, when save die does not exist 2020-12-27 16:42:13 +01:00
knoxfighter
85074846be check dependencies also with factorio version && revert some changes, that mod dependencies also can be chacked by Version.Compatible 2020-12-27 16:14:24 +01:00
knoxfighter
90d27a1cac
Merge pull request #203 from OpenFactorioServerManager/autoselect-load-latest
autoselect "Load Latest" Save in Controls.jsx
2020-12-27 14:27:23 +01:00
knoxfighter
1f6ebbb992
Merge pull request #205 from OpenFactorioServerManager/fix/compatibility-check-for-mod-releases
fix compatibility check for mod releases
2020-12-27 14:26:20 +01:00
Jan Naahs
a4c4277509 fix compatibility check for mod releases 2020-12-27 11:21:23 +01:00
Jan Naahs
f3364dce9c
Merge pull request #204 from knoxfighter/fix-factorio-1.1
Fix factorio 1.1
2020-12-27 11:01:31 +01:00
knoxfighter
4f37dc3114 fixed compatibility between 0.18/1.0 2020-12-27 05:49:16 +01:00
knoxfighter
0acc2d41fd Updated tests, to also test compatibility 2020-12-27 05:04:26 +01:00
Jan Naahs
eeab2d9336 autoselect "Load Latest" Save in Controls.jsx 2020-12-27 01:18:30 +01:00
knoxfighter
4b13316b45 Update/Added tests for factorio 1.1 2020-12-27 00:22:47 +01:00
knoxfighter
fa9494c73f
Merge pull request #200 from Knuspel/docker-fix
Dockerfile - use new repo and use factorio-stable by default
2020-12-26 00:20:55 +01:00
Knuspel
246670275f
Update Dockerfile
Removed nginx from Dockerfile
2020-12-25 23:14:35 +01:00
Knuspel
dc1cde89f9
Update Dockerfile
Realized there as been a change within the setup of Dockerfile
Factorio is installed during the entrypoint.sh
2020-12-25 21:23:29 +01:00
Knuspel
f1405e827c
Merge branch 'develop' into docker-fix 2020-12-25 21:02:48 +01:00
knuspel
ae49c8a42f changed from mroote to OFSM 2020-12-25 17:23:36 +01:00
knuspel
d2122e5a20 changed latest to stable 2020-12-25 17:03:40 +01:00
Mitch Roote
5be9e79043
Merge pull request #198 from MichaelPereira/api-auth-instructions
Add instructions for API auth
2020-12-18 22:38:18 -05:00
Michael Pereira
3939890d9e Add instructions for API auth 2020-12-18 21:16:51 -06:00
Mitch Roote
6d9ad408ae fix readme command typo 2020-12-09 12:11:36 -05:00
knoxfighter
2c4ab7e843
Merge pull request #197 from knoxfighter/docker_fixes
Docker fixes
2020-12-09 18:02:41 +01:00
Mitch Roote
2c62426212 remove lonely c 2020-12-09 11:53:43 -05:00
knoxfighter
a78b085cea Merge remote-tracking branch 'mroote/develop' into docker_fixes 2020-12-09 17:51:40 +01:00
knoxfighter
019f237583 default to port 80 2020-12-09 17:51:14 +01:00
knoxfighter
c421e025ac updated Changelog 2020-12-09 17:50:43 +01:00
knoxfighter
1a33e7e15c fixed fsm not finding factorio 2020-12-09 17:46:21 +01:00
Mitch Roote
5b2df68995 Update links in README, add authors 2020-12-09 11:43:51 -05:00
Mitch Roote
2cf43daf47 run on published release 2020-12-09 11:29:41 -05:00