david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,231 Commits 9 Branches 44 Tags
984c11e2ac5f0e7b2c1c95da367f0d8d4f8fbb14
Commit Graph

1231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniël van Noord
9252d10f23 Merge pull request #848 from tsr488/achievementsort 
Adding option to sort buildings by price until next achievement
 2021-06-08 08:57:33 +02:00
Tom
0278162dce Update sort to handle the case where the source data is out of order 2021-06-07 19:36:04 -04:00
Daniël van Noord
ee0ed81aba Merge pull request #851 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.1 
Bump prettier from 2.3.0 to 2.3.1
 2021-06-07 10:31:54 +02:00
Daniël van Noord
f69fb191d1 Merge pull request #852 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.28.0 
Bump eslint from 7.27.0 to 7.28.0
 2021-06-07 10:31:42 +02:00
Daniël van Noord
c0e93f316f Merge pull request #850 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.26.0 
Bump @typescript-eslint/parser from 4.25.0 to 4.26.0
 2021-06-07 10:30:35 +02:00
dependabot[bot]
058555b148 Bump prettier from 2.3.0 to 2.3.1 
Bumps [prettier](https://github.com/prettier/prettier) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.3.0...2.3.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 08:28:11 +00:00
dependabot[bot]
dd2c4e56b4 Bump @typescript-eslint/parser from 4.25.0 to 4.26.0 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.25.0 to 4.26.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.26.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 08:27:48 +00:00
dependabot[bot]
be569ee218 Bump eslint from 7.27.0 to 7.28.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.27.0 to 7.28.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.27.0...v7.28.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 08:27:32 +00:00
Daniël van Noord
c0e27f3c52 Merge pull request #853 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.26.0 
Bump @typescript-eslint/eslint-plugin from 4.25.0 to 4.26.0
 2021-06-07 09:00:32 +02:00
dependabot[bot]
d694e82b02 Bump @typescript-eslint/eslint-plugin from 4.25.0 to 4.26.0 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.25.0 to 4.26.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.26.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 06:59:16 +00:00
Daniël van Noord
ca796c0b48 Merge pull request #849 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.3 
Bump ts-loader from 9.2.2 to 9.2.3
 2021-06-07 08:58:55 +02:00
dependabot[bot]
6c95e341f5 Bump ts-loader from 9.2.2 to 9.2.3 
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 9.2.2 to 9.2.3.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/ts-loader/compare/v9.2.2...v9.2.3)

---
updated-dependencies:
- dependency-name: ts-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 06:57:58 +00:00
Daniël van Noord
f84f6fc348 Merge pull request #847 from tsr488/automerge 
Adding auto merge from 'dev' branch to 'gh-pages'
 2021-06-07 08:57:25 +02:00
Daniël van Noord
be245da05f Update publish-dev.yml 2021-06-07 08:56:27 +02:00
Daniël van Noord
977c25e77a Update and rename merge-branch.yml to publish-dev.yml 2021-06-07 08:55:16 +02:00
Tom
6ab791d762 Adding option to sort buildings by price until next achievement 2021-06-06 17:43:00 -04:00
Tom
962a709489 Adding auto branch merge 2021-06-06 15:22:21 -04:00
Daniël van Noord
4fb58719d3 Merge pull request #839 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.25.0 
Bump @typescript-eslint/parser from 4.24.0 to 4.25.0
 2021-05-31 11:41:24 +02:00
dependabot[bot]
eaff9ef93d Bump @typescript-eslint/parser from 4.24.0 to 4.25.0 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.24.0 to 4.25.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.25.0/packages/parser)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-31 09:40:38 +00:00
Daniël van Noord
f403f89c20 Merge pull request #840 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.4 
Bump eslint-plugin-import from 2.23.3 to 2.23.4
 2021-05-31 11:39:39 +02:00
dependabot[bot]
100745946e Bump eslint-plugin-import from 2.23.3 to 2.23.4 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.23.3 to 2.23.4.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.23.3...v2.23.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-31 09:38:37 +00:00
Daniël van Noord
18b151d7c0 Merge pull request #841 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.25.0 
Bump @typescript-eslint/eslint-plugin from 4.24.0 to 4.25.0
 2021-05-31 11:38:06 +02:00
dependabot[bot]
2febfb4cbe Bump @typescript-eslint/eslint-plugin from 4.24.0 to 4.25.0 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.24.0 to 4.25.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.25.0/packages/eslint-plugin)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-31 09:37:15 +00:00
Daniël van Noord
73b9ebce7f Merge pull request #838 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.38.1 2021-05-31 11:16:21 +02:00
dependabot[bot]
39744d52b3 Bump webpack from 5.37.1 to 5.38.1 
Bumps [webpack](https://github.com/webpack/webpack) from 5.37.1 to 5.38.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.37.1...v5.38.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-31 08:26:49 +00:00
Daniël van Noord
97624bd4da Merge pull request #842 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-4.3.2 2021-05-31 09:23:51 +02:00
dependabot[bot]
66549c5c96 Bump typescript from 4.2.4 to 4.3.2 
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.2.4 to 4.3.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.2.4...v4.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-31 07:05:57 +00:00
Daniël van Noord
df152fd302 Merge pull request #837 from DanielNoord/autosavetimer 
Add option for autosave timer bar #799
 2021-05-30 16:38:46 +02:00
Daniël van Noord
ff31c45a4a Add option for autosave timer bar #799 2021-05-30 16:37:26 +02:00
Daniël van Noord
9ba81afae1 Update README.md 2021-05-30 11:51:27 +02:00
Daniël van Noord
66e906e878 Merge pull request #836 from DanielNoord/tillnextachiev 
Make current season green in Stats section #821
 2021-05-30 11:47:27 +02:00
Daniël van Noord
865fc3b227 Make current season green in Stats section #821 2021-05-30 11:45:51 +02:00
Daniël van Noord
47ebed0925 Merge pull request #835 from DanielNoord/tillnextachiev 
Some optimizations in Left till next achievement calculations
 2021-05-30 10:57:32 +02:00
Daniël van Noord
734f3c38c2 Optimize & fix LeftTillNext calculation #805 #832 2021-05-30 10:55:42 +02:00
Daniël van Noord
fcbf1b2377 Simple refactor of calculation 2021-05-30 10:35:33 +02:00
Daniël van Noord
4c6dfbba69 Merge pull request #828 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.2 
Bump ts-loader from 9.1.2 to 9.2.2
 2021-05-24 11:03:57 +02:00
dependabot[bot]
3edcb0300b Bump ts-loader from 9.1.2 to 9.2.2 
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 9.1.2 to 9.2.2.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/ts-loader/compare/v9.1.2...v9.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-24 09:03:07 +00:00
Daniël van Noord
49e9711b7c Merge pull request #830 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.27.0 
Bump eslint from 7.26.0 to 7.27.0
 2021-05-24 11:02:43 +02:00
Daniël van Noord
a48ad37b7f Merge pull request #829 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.37.1 
Bump webpack from 5.37.0 to 5.37.1
 2021-05-24 11:02:19 +02:00
dependabot[bot]
ace1c9f6a9 Bump eslint from 7.26.0 to 7.27.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.26.0 to 7.27.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.26.0...v7.27.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-24 08:14:17 +00:00
dependabot[bot]
fa942ff81d Bump webpack from 5.37.0 to 5.37.1 
Bumps [webpack](https://github.com/webpack/webpack) from 5.37.0 to 5.37.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.37.0...v5.37.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-24 08:13:57 +00:00
Daniël van Noord
974b948583 Merge pull request #827 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.24.0 
Bump @typescript-eslint/eslint-plugin from 4.23.0 to 4.24.0
 2021-05-24 09:21:50 +02:00
dependabot[bot]
e1e4327173 Bump @typescript-eslint/eslint-plugin from 4.23.0 to 4.24.0 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.23.0 to 4.24.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.24.0/packages/eslint-plugin)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-24 07:20:17 +00:00
Daniël van Noord
d054b55ddc Merge pull request #826 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.24.0 
Bump @typescript-eslint/parser from 4.23.0 to 4.24.0
 2021-05-24 09:19:11 +02:00
dependabot[bot]
6e0add10fb Bump @typescript-eslint/parser from 4.23.0 to 4.24.0 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.23.0 to 4.24.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.24.0/packages/parser)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-24 07:16:40 +00:00
Daniël van Noord
f431d2b6be Merge pull request #825 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.3 
Bump eslint-plugin-import from 2.23.2 to 2.23.3
 2021-05-24 09:15:01 +02:00
Daniël van Noord
68ad398b27 Merge pull request #824 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-node-10.0.0 
Bump ts-node from 9.1.1 to 10.0.0
 2021-05-24 09:13:26 +02:00
dependabot[bot]
68d7295bbc Bump eslint-plugin-import from 2.23.2 to 2.23.3 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.23.2 to 2.23.3.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.23.2...v2.23.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-24 07:00:20 +00:00
dependabot[bot]
2be4e2de57 Bump ts-node from 9.1.1 to 10.0.0 
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 9.1.1 to 10.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v9.1.1...v10.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-24 07:00:03 +00:00
Daniël van Noord
ae6db8f330 Merge pull request #820 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.23.0 
Bump @typescript-eslint/parser from 4.22.1 to 4.23.0
 2021-05-17 13:28:38 +02:00