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

1413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniël van Noord
9a6086d823 Merge pull request #866 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.39.1 
Bump webpack from 5.38.1 to 5.39.1
 2021-06-21 08:58:16 +02:00
github-actions[bot]
e6b5bddda6 [Automated] Merge dev into gh-pages 2021-06-21 06:58:03 +00:00
Daniël van Noord
527de03493 Merge pull request #863 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.29.0 
Bump eslint from 7.28.0 to 7.29.0
 2021-06-21 08:57:50 +02:00
dependabot[bot]
52d52baf8e Bump webpack from 5.38.1 to 5.39.1 
Bumps [webpack](https://github.com/webpack/webpack) from 5.38.1 to 5.39.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.38.1...v5.39.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 06:57:01 +00:00
dependabot[bot]
9c1bfbf80a Bump eslint from 7.28.0 to 7.29.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.29.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.28.0...v7.29.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-21 06:56:55 +00:00
github-actions[bot]
712a3dd5c3 [Automated] Merge dev into gh-pages 2021-06-21 06:56:46 +00:00
Daniël van Noord
d4043689a4 Merge pull request #864 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.27.0 
Bump @typescript-eslint/eslint-plugin from 4.26.1 to 4.27.0
 2021-06-21 08:56:38 +02:00
Daniël van Noord
8cb0471694 Merge pull request #865 from CookieMonsterTeam/dependabot/npm_and_yarn/types/chai-4.2.19 
Bump @types/chai from 4.2.18 to 4.2.19
 2021-06-21 08:56:29 +02:00
github-actions[bot]
e0756c4943 [Automated] Merge dev into gh-pages 2021-06-21 06:56:22 +00:00
Daniël van Noord
ce7f0eb7e3 Merge pull request #861 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-4.3.4 
Bump typescript from 4.3.2 to 4.3.4
 2021-06-21 08:56:07 +02:00
dependabot[bot]
70df241c8f Bump @types/chai from 4.2.18 to 4.2.19 
Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai) from 4.2.18 to 4.2.19.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai)

---
updated-dependencies:
- dependency-name: "@types/chai"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 02:04:34 +00:00
dependabot[bot]
3ba2a31363 Bump @typescript-eslint/eslint-plugin from 4.26.1 to 4.27.0 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.26.1 to 4.27.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.27.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-21 02:04:24 +00:00
dependabot[bot]
c4907e9582 Bump typescript from 4.3.2 to 4.3.4 
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.3.2 to 4.3.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.3.2...v4.3.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 02:03:52 +00:00
github-actions[bot]
96b55fb77c [Automated] Merge dev into gh-pages 2021-06-20 20:36:12 +00:00
Daniël van Noord
1c1afb6880 Merge pull request #860 from tsr488/shiny 
Fix Pop All Normal wrinkler tooltip
 2021-06-20 22:35:59 +02:00
Tom
1905f9a953 Fixing Pop All Normal wrinkler tooltip 2021-06-16 21:32:23 -04:00
github-actions[bot]
b06ff269a1 [Automated] Merge dev into gh-pages 2021-06-14 07:09:07 +00:00
Daniël van Noord
23eb28e29c Merge pull request #855 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.26.1 
Bump @typescript-eslint/eslint-plugin from 4.26.0 to 4.26.1
 2021-06-14 09:08:54 +02:00
dependabot[bot]
38f430c930 Bump @typescript-eslint/eslint-plugin from 4.26.0 to 4.26.1 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.26.0 to 4.26.1.
- [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.1/packages/eslint-plugin)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-14 07:08:03 +00:00
github-actions[bot]
17a3ef0d83 [Automated] Merge dev into gh-pages 2021-06-14 07:07:02 +00:00
Daniël van Noord
035318c33f Merge pull request #857 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.26.1 
Bump @typescript-eslint/parser from 4.26.0 to 4.26.1
 2021-06-14 09:06:47 +02:00
github-actions[bot]
8cc7bb7f99 [Automated] Merge dev into gh-pages 2021-06-14 06:52:45 +00:00
Daniël van Noord
a620efe44a Merge pull request #858 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-cli-4.7.2 
Bump webpack-cli from 4.7.0 to 4.7.2
 2021-06-14 08:52:31 +02:00
dependabot[bot]
26b08c77ce Bump webpack-cli from 4.7.0 to 4.7.2 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.7.0 to 4.7.2.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.7.0...webpack-cli@4.7.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-14 06:49:43 +00:00
dependabot[bot]
3e53ba7c6d Bump @typescript-eslint/parser from 4.26.0 to 4.26.1 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.26.0 to 4.26.1.
- [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.1/packages/parser)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-14 06:49:27 +00:00
github-actions[bot]
0bff74bddd [Automated] Merge dev into gh-pages 2021-06-08 06:57:48 +00:00
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
github-actions[bot]
ad146f9a43 [Automated] Merge dev into gh-pages 2021-06-07 08:31:57 +00: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
github-actions[bot]
aba1b88eac [Automated] Merge dev into gh-pages 2021-06-07 08:30:49 +00: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
github-actions[bot]
af547ee2c4 [Automated] Merge dev into gh-pages 2021-06-07 07:00:47 +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
github-actions[bot]
6344c454a6 [Automated] Merge dev into gh-pages 2021-06-07 06:59:13 +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
github-actions[bot]
65cec9da50 [Automated] Merge dev into gh-pages 2021-06-07 06:57:40 +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