github-actions[bot]
affd704443
[Automated] Merge dev into gh-pages
2026-02-14 11:36:55 +00:00
mdouros
7f06fd383a
Handle "Wrinkler ambergris" in CPS calculations ( #1250 )
2026-02-14 12:36:46 +01:00
github-actions[bot]
0f5aa41305
[Automated] Merge dev into gh-pages
2025-11-12 08:39:10 +00:00
acd0fbbaf5
Garden Probability Bug Fixes ( #1245 )
...
* Fix icons for locked plants in garden not showing
* Fix NaNs for weed mult edge case
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fix ESLint issue caused by pre-commit
---------
Co-authored-by: srs42006 <45675882+srs42006@users.noreply.github.com >
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-11-12 09:39:01 +01:00
github-actions[bot]
63e06d7133
[Automated] Merge dev into gh-pages
2025-11-10 20:33:32 +00:00
srs42006
38636f6323
Add Garden Tile Probabilities
2025-11-10 21:33:21 +01:00
github-actions[bot]
5a37e21d10
[Automated] Merge dev into gh-pages
2025-09-16 20:49:33 +00:00
Lilium
082bc89a4a
Fix "Extra Dragon Auro Info" causing the Dragon Aura window to flicker by increasing the minHeight
2025-09-16 22:49:23 +02:00
github-actions[bot]
8675bd041a
[Automated] Merge dev into gh-pages
2025-03-16 19:43:15 +00:00
WiseDragoon
bd772e3712
Update CalculateLuckyLevels.js ( #1217 )
...
* Update CalculateLuckyLevels.js
Fixed infinite loop when currentLevel is too big
* Update CalculateLuckyLevels.js Dev build
* Update CalculateLuckyLevels.js Final build
2025-03-16 20:43:05 +01:00
github-actions[bot]
570c0b760e
[Automated] Merge dev into gh-pages
2025-03-03 19:44:54 +00:00
Kevin Radloff
69b923de89
Show spells cast progress towards next achievement in stats
2025-03-03 20:44:43 +01:00
github-actions[bot]
fcd39a3860
[Automated] Merge dev into gh-pages
2025-02-26 20:42:31 +00:00
Kevin Radloff
4e6c828f8b
Minor refactor to remove unused probability functions and combine functions that were only used in one spot.
2025-02-26 21:42:20 +01:00
Kevin Radloff
270190feae
Change <0% GC/reindeer chance formatting to show <1% instead.
2025-02-26 21:42:20 +01:00
github-actions[bot]
859045b475
[Automated] Merge dev into gh-pages
2025-02-24 08:30:22 +00:00
dependabot[bot]
13dd628623
Bump @eslint/compat from 1.2.6 to 1.2.7
...
Bumps [@eslint/compat](https://github.com/eslint/rewrite ) from 1.2.6 to 1.2.7.
- [Release notes](https://github.com/eslint/rewrite/releases )
- [Changelog](https://github.com/eslint/rewrite/blob/main/release-please-config.json )
- [Commits](https://github.com/eslint/rewrite/compare/compat-v1.2.6...compat-v1.2.7 )
---
updated-dependencies:
- dependency-name: "@eslint/compat"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-02-24 09:29:59 +01:00
github-actions[bot]
60e9ced10e
[Automated] Merge dev into gh-pages
2025-02-24 08:29:46 +00:00
dependabot[bot]
5604a63652
Bump prettier from 3.5.1 to 3.5.2
...
Bumps [prettier](https://github.com/prettier/prettier ) from 3.5.1 to 3.5.2.
- [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/3.5.1...3.5.2 )
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-02-24 09:29:34 +01:00
github-actions[bot]
9f9a28b008
[Automated] Merge dev into gh-pages
2025-02-24 08:26:15 +00:00
dependabot[bot]
3f867b9023
Bump globals from 15.15.0 to 16.0.0
...
Bumps [globals](https://github.com/sindresorhus/globals ) from 15.15.0 to 16.0.0.
- [Release notes](https://github.com/sindresorhus/globals/releases )
- [Commits](https://github.com/sindresorhus/globals/compare/v15.15.0...v16.0.0 )
---
updated-dependencies:
- dependency-name: globals
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-02-24 09:26:04 +01:00
github-actions[bot]
5f26d36cc2
[Automated] Merge dev into gh-pages
2025-02-24 08:23:58 +00:00
dependabot[bot]
d4e243f2b7
Bump eslint from 9.20.1 to 9.21.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 9.20.1 to 9.21.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v9.20.1...v9.21.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-02-24 09:23:46 +01:00
github-actions[bot]
5403aa8bac
[Automated] Merge dev into gh-pages
2025-02-17 20:45:13 +00:00
Kevin Radloff
989e984eb5
Remove Cookie Clicker version check and the need for user confirmation.
2025-02-17 21:45:00 +01:00
github-actions[bot]
65add868f1
[Automated] Merge dev into gh-pages
2025-02-16 14:01:10 +00:00
dependabot[bot]
6e4644c3cc
Bump chai from 4.5.0 to 5.2.0
...
Bumps [chai](https://github.com/chaijs/chai ) from 4.5.0 to 5.2.0.
- [Release notes](https://github.com/chaijs/chai/releases )
- [Changelog](https://github.com/chaijs/chai/blob/main/History.md )
- [Commits](https://github.com/chaijs/chai/compare/v4.5.0...v5.2.0 )
---
updated-dependencies:
- dependency-name: chai
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-02-16 15:01:00 +01:00
github-actions[bot]
888b175f25
[Automated] Merge dev into gh-pages
2025-02-16 13:56:53 +00:00
Daniël van Noord
379593f7fc
Remove more whitespace
2025-02-16 14:56:41 +01:00
Kevin Radloff
16ec2ff06a
Specify node 22, npm update, and remove some whitespace.
2025-02-16 14:56:41 +01:00
Kevin Radloff
933a017335
Attempt to fix pre-commit hooks.
2025-02-16 14:56:41 +01:00
Kevin Radloff
492abb66dc
Try out removing prettier args from pre-commit config.
2025-02-16 14:56:41 +01:00
Kevin Radloff
a1aaa3de8f
Update dependencies and remove unneeded things. This allows building on node v22. Also rely on configs for eslint/prettier so CI and command line runs are guaranteed to be consistent.
2025-02-16 14:56:41 +01:00
github-actions[bot]
b17a8625bc
[Automated] Merge dev into gh-pages
2024-09-08 09:17:13 +00:00
Numbernaut
9e98208c19
Fixed Golden Cookie percentage calculation to cdf #921 ( #1190 )
...
* Added cummulative probability handling
* executed build-dev command
* executed build-final command
2024-09-08 11:17:00 +02:00
github-actions[bot]
df31286af0
[Automated] Merge dev into gh-pages
2024-09-02 07:22:13 +00:00
ca1c28d1fc
Add stock market tooltip info ( #1189 )
...
* Add info to stock market tooltips
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Add up and down arrows to expected value
---------
Co-authored-by: srs42006 <45675882+srs42006@users.noreply.github.com >
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-02 09:22:02 +02:00
github-actions[bot]
9291403f58
[Automated] Merge dev into gh-pages
2024-05-11 08:01:18 +00:00
dependabot[bot]
ce14fa6190
Bump chai and @types/chai
...
Bumps [chai](https://github.com/chaijs/chai ) and [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai ). These dependencies needed to be updated together.
Updates `chai` from 4.3.6 to 4.3.7
- [Release notes](https://github.com/chaijs/chai/releases )
- [Changelog](https://github.com/chaijs/chai/blob/4.x.x/History.md )
- [Commits](https://github.com/chaijs/chai/compare/v4.3.6...v4.3.7 )
Updates `@types/chai` from 4.3.1 to 4.3.4
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai )
---
updated-dependencies:
- dependency-name: chai
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: "@types/chai"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-11 10:01:08 +02:00
github-actions[bot]
5718e621f7
[Automated] Merge dev into gh-pages
2024-05-11 07:59:55 +00:00
dependabot[bot]
ec2c498b71
Bump eslint-config-prettier from 8.5.0 to 8.8.0
...
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier ) from 8.5.0 to 8.8.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases )
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md )
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v8.5.0...v8.8.0 )
---
updated-dependencies:
- dependency-name: eslint-config-prettier
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-11 09:59:43 +02:00
github-actions[bot]
370940000b
[Automated] Merge dev into gh-pages
2024-05-11 07:59:40 +00:00
dependabot[bot]
657ca1a963
Bump word-wrap from 1.2.3 to 1.2.4
...
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap ) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases )
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4 )
---
updated-dependencies:
- dependency-name: word-wrap
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-11 09:59:29 +02:00
github-actions[bot]
ee3e44cbba
[Automated] Merge dev into gh-pages
2024-05-11 07:59:18 +00:00
pre-commit-ci[bot]
f6ebfef6cd
[pre-commit.ci] pre-commit autoupdate ( #1169 )
2024-05-11 09:59:08 +02:00
github-actions[bot]
f5769ed74b
[Automated] Merge dev into gh-pages
2024-05-11 07:57:56 +00:00
Jeong Hansol
133ed74877
Calculations of lucky levels ( #1179 )
2024-05-11 09:57:46 +02:00
github-actions[bot]
dc96341087
[Automated] Merge dev into gh-pages
2023-08-22 07:37:44 +00:00
pre-commit-ci[bot]
8e975c2b20
[pre-commit.ci] pre-commit autoupdate
...
updates:
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.6 → v3.0.2](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.6...v3.0.2 )
2023-08-22 09:37:29 +02:00
github-actions[bot]
7a7419a2f6
[Automated] Merge dev into gh-pages
2023-07-17 18:18:19 +00:00
Grace Carr
d8b9d2f20c
Revert "update calculations for lucky levels ( #1161 )"
...
This reverts commit 9f78e14bec .
2023-07-17 20:18:06 +02:00
github-actions[bot]
33b968cab8
[Automated] Merge dev into gh-pages
2023-07-17 07:40:43 +00:00
Grace Carr and pre-commit-ci[bot]
9f78e14bec
update calculations for lucky levels ( #1161 )
...
* update calculations for lucky levels
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-07-17 09:40:29 +02:00
github-actions[bot]
096f18deef
[Automated] Merge dev into gh-pages
2023-06-22 19:27:10 +00:00
jessedufrene
7269577009
Add cookieclicker.ee to supported userscript sites
2023-06-22 21:26:58 +02:00
github-actions[bot]
a241ea51e7
[Automated] Merge dev into gh-pages
2023-05-07 11:20:04 +00:00
Stefan Ravn van Overeem and pre-commit-ci[bot]
8d89f23c35
Support 2.052 ( #1153 )
...
* Support 2.052
Support new upgrades and achievements in 2.052:
- Fortune #020
- Kitten strategists
- Septcentennial (Have 700 of everything)
- Oft we mar what's well (700 upgrades)
- Undecillion fingers
- 900 and 1000 cursors
- Omniplast mouse
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-05-07 13:19:49 +02:00
github-actions[bot]
86523a4a6c
[Automated] Merge dev into gh-pages
2023-04-18 15:10:06 +00:00
dependabot[bot] and Daniël van Noord
78f62affc5
Bump eslint-plugin-import from 2.26.0 to 2.27.5 ( #1146 )
...
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.26.0 to 2.27.5.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.26.0...v2.27.5 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniël van Noord <13665637+DanielNoord@users.noreply.github.com >
2023-04-18 17:05:42 +02:00
github-actions[bot]
bbc8ed6ec2
[Automated] Merge dev into gh-pages
2023-04-18 14:57:44 +00:00
pre-commit-ci[bot] and Daniël van Noord
4b8c35f271
[pre-commit.ci] pre-commit autoupdate ( #1116 )
...
updates:
- [github.com/pre-commit/mirrors-prettier: v2.7.1 → v3.0.0-alpha.6](https://github.com/pre-commit/mirrors-prettier/compare/v2.7.1...v3.0.0-alpha.6 )
- [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.4.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.3.0...v4.4.0 )
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Daniël van Noord <13665637+DanielNoord@users.noreply.github.com >
2023-04-18 14:49:38 +00:00
dependabot[bot]
1d19545a43
Bump prettier from 2.7.1 to 2.8.7
...
Bumps [prettier](https://github.com/prettier/prettier ) from 2.7.1 to 2.8.7.
- [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.7.1...2.8.7 )
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-04-18 16:47:29 +02:00
github-actions[bot]
6c939d0591
[Automated] Merge dev into gh-pages
2023-03-15 08:04:35 +00:00
Costas Basdekis
76d531a5b0
Fix buying with block protection & exact cookies
...
The check was wrong, since it wouldn't allow you to buy a building
for the exact amount of cookies in your bank, for example when
you're trying to buy your first cursor after clicking exactly 15 times.
2023-03-15 09:04:21 +01:00
github-actions[bot]
78bb328d5d
[Automated] Merge dev into gh-pages
2023-03-13 07:55:33 +00:00
dependabot[bot]
54bb9f793b
Bump json5 from 1.0.1 to 1.0.2
...
Bumps [json5](https://github.com/json5/json5 ) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases )
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md )
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2 )
---
updated-dependencies:
- dependency-name: json5
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-13 08:55:20 +01:00
github-actions[bot]
b8f8c3ef0c
[Automated] Merge dev into gh-pages
2023-03-13 07:54:03 +00:00
dependabot[bot]
70cc97b0e0
Bump webpack from 5.73.0 to 5.76.1
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.73.0 to 5.76.1.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.73.0...v5.76.1 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-13 08:53:50 +01:00
github-actions[bot]
0c64005603
[Automated] Merge dev into gh-pages
2023-03-13 07:53:28 +00:00
dependabot[bot]
adf6544e21
Bump eslint from 8.20.0 to 8.36.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.20.0 to 8.36.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.20.0...v8.36.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-13 08:53:12 +01:00
github-actions[bot]
f24e07465b
[Automated] Merge dev into gh-pages
2022-07-20 07:08:02 +00:00
dependabot[bot]
93702eefbe
Bump terser from 5.8.0 to 5.14.2
...
Bumps [terser](https://github.com/terser/terser ) from 5.8.0 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases )
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/terser/terser/commits )
---
updated-dependencies:
- dependency-name: terser
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-20 09:07:44 +02:00
github-actions[bot]
bed1647332
[Automated] Merge dev into gh-pages
2022-07-18 02:59:02 +00:00
dependabot[bot]
88eb28c5dd
Bump eslint from 8.19.0 to 8.20.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.19.0 to 8.20.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.19.0...v8.20.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-18 04:58:47 +02:00
github-actions[bot]
a02423f25b
[Automated] Merge dev into gh-pages
2022-07-08 13:11:08 +00:00
dependabot[bot]
049d0153fb
Bump eslint from 8.18.0 to 8.19.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.18.0 to 8.19.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.18.0...v8.19.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-08 15:10:48 +02:00
github-actions[bot]
b409ddd2ed
[Automated] Merge dev into gh-pages
2022-06-23 12:07:40 +00:00
dependabot[bot]
131547ec00
Bump shell-quote from 1.7.2 to 1.7.3
...
Bumps [shell-quote](https://github.com/substack/node-shell-quote ) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/substack/node-shell-quote/releases )
- [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md )
- [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3 )
---
updated-dependencies:
- dependency-name: shell-quote
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-23 14:07:20 +02:00
github-actions[bot]
7c78299ade
[Automated] Merge dev into gh-pages
2022-06-19 19:05:03 +00:00
dependabot[bot]
5e92bb5fa5
Bump eslint from 7.32.0 to 8.18.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.32.0 to 8.18.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.32.0...v8.18.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-19 21:04:50 +02:00
github-actions[bot]
1ac83d901a
[Automated] Merge dev into gh-pages
2022-06-19 19:02:53 +00:00
Daniël van Noord
5ebfdfd48e
Add additional hooks to pre-commit
2022-06-19 21:02:02 +02:00
Daniël van Noord
1f685f823a
Rebuild files
2022-06-19 20:59:45 +02:00
Daniël van Noord
197b744f56
Add exclude to prettier
2022-06-19 20:59:41 +02:00
Daniël van Noord
ab73a78a01
Add prettier to pre-commit and run it
2022-06-19 20:57:42 +02:00
github-actions[bot]
7b75ddddea
[Automated] Merge dev into gh-pages
2022-06-19 18:51:25 +00:00
Daniël van Noord
8cfc980546
Remove everything related to TypeScript
2022-06-19 20:50:56 +02:00
github-actions[bot]
9f55f279e7
[Automated] Merge dev into gh-pages
2022-06-19 18:42:45 +00:00
dependabot[bot]
3fddc1d249
Bump prettier from 2.6.2 to 2.7.1
...
Bumps [prettier](https://github.com/prettier/prettier ) from 2.6.2 to 2.7.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.6.2...2.7.1 )
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-19 20:42:34 +02:00
github-actions[bot]
1c14ee0267
[Automated] Merge dev into gh-pages
2022-06-16 12:40:16 +00:00
dependabot[bot]
2555828eb9
Bump webpack-cli from 4.9.2 to 4.10.0
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 4.9.2 to 4.10.0.
- [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.9.2...webpack-cli@4.10.0 )
---
updated-dependencies:
- dependency-name: webpack-cli
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-16 14:40:04 +02:00
github-actions[bot]
8bae0fdb85
[Automated] Merge dev into gh-pages
2022-06-06 20:12:41 +00:00
dependabot[bot]
66b2c567c2
Bump ts-node from 10.8.0 to 10.8.1
...
Bumps [ts-node](https://github.com/TypeStrong/ts-node ) from 10.8.0 to 10.8.1.
- [Release notes](https://github.com/TypeStrong/ts-node/releases )
- [Commits](https://github.com/TypeStrong/ts-node/compare/v10.8.0...v10.8.1 )
---
updated-dependencies:
- dependency-name: ts-node
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-06 22:12:28 +02:00
github-actions[bot]
362d403601
[Automated] Merge dev into gh-pages
2022-06-06 20:05:44 +00:00
dependabot[bot]
dd66674169
Bump typescript from 4.7.2 to 4.7.3
...
Bumps [typescript](https://github.com/Microsoft/TypeScript ) from 4.7.2 to 4.7.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases )
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.7.2...v4.7.3 )
---
updated-dependencies:
- dependency-name: typescript
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-06 22:05:31 +02:00
github-actions[bot]
4b16c896f1
[Automated] Merge dev into gh-pages
2022-06-06 20:04:29 +00:00
dependabot[bot]
cfca658703
Bump webpack from 5.72.1 to 5.73.0
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.72.1 to 5.73.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.72.1...v5.73.0 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-06 22:04:16 +02:00
github-actions[bot]
33c463b15a
[Automated] Merge dev into gh-pages
2022-06-06 20:03:12 +00:00
dependabot[bot]
a607842fdd
Bump chai from 4.3.4 to 4.3.6
...
Bumps [chai](https://github.com/chaijs/chai ) from 4.3.4 to 4.3.6.
- [Release notes](https://github.com/chaijs/chai/releases )
- [Changelog](https://github.com/chaijs/chai/blob/4.x.x/History.md )
- [Commits](https://github.com/chaijs/chai/compare/v4.3.4...v4.3.6 )
---
updated-dependencies:
- dependency-name: chai
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-06 22:02:56 +02:00
github-actions[bot]
5b982cf9cf
[Automated] Merge dev into gh-pages
2022-06-06 20:02:32 +00:00
dependabot[bot]
501b2df220
Bump eslint-config-prettier from 8.3.0 to 8.5.0
...
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier ) from 8.3.0 to 8.5.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases )
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md )
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v8.3.0...v8.5.0 )
---
updated-dependencies:
- dependency-name: eslint-config-prettier
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-06 22:02:18 +02:00
github-actions[bot]
e0ef8d7b11
[Automated] Merge dev into gh-pages
2022-06-04 08:42:32 +00:00
domoddball
1027d48b51
Resolve conjured baked goods tooltip miscalculation #1074 ( #1087 )
2022-06-04 10:42:18 +02:00
github-actions[bot]
38f33e2478
[Automated] Merge dev into gh-pages
2022-06-03 10:19:21 +00:00
domoddball
fdcbbd7ab2
Add support for unshackled upgrades ( #1086 )
2022-06-03 12:19:06 +02:00
github-actions[bot]
9bc392a0c5
[Automated] Merge dev into gh-pages
2022-06-02 06:26:18 +00:00
domoddball
9bfb8a44f9
Resolve Grimoire magic bar text rendering bug #1083 ( #1084 )
2022-06-02 08:26:04 +02:00
github-actions[bot]
50d4e3e215
[Automated] Merge dev into gh-pages
2022-06-01 17:10:31 +00:00
domoddball and Daniël van Noord
fec312df1c
Updates for cookieclicker v2.048 #1049 ( #1079 )
...
Co-authored-by: Daniël van Noord <13665637+DanielNoord@users.noreply.github.com >
2022-06-01 19:10:16 +02:00
github-actions[bot]
17ac30177c
[Automated] Merge dev into gh-pages
2022-06-01 08:59:35 +00:00
dependabot[bot]
1f23e58984
Bump ts-loader from 9.2.5 to 9.3.0
...
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader ) from 9.2.5 to 9.3.0.
- [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.5...v9.3.0 )
---
updated-dependencies:
- dependency-name: ts-loader
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 10:59:31 +02:00
dependabot[bot]
b1812afa2f
Bump webpack from 5.72.0 to 5.72.1
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.72.0 to 5.72.1.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.72.0...v5.72.1 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 10:59:20 +02:00
github-actions[bot]
ef6585b9af
[Automated] Merge dev into gh-pages
2022-06-01 08:53:46 +00:00
dependabot[bot]
22b8c8a61c
Bump ts-node from 10.2.1 to 10.8.0
...
Bumps [ts-node](https://github.com/TypeStrong/ts-node ) from 10.2.1 to 10.8.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases )
- [Commits](https://github.com/TypeStrong/ts-node/compare/v10.2.1...v10.8.0 )
---
updated-dependencies:
- dependency-name: ts-node
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 10:53:31 +02:00
github-actions[bot]
a89f440809
[Automated] Merge dev into gh-pages
2022-06-01 08:51:42 +00:00
dependabot[bot]
25838daede
Bump webpack-cli from 4.8.0 to 4.9.2
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 4.8.0 to 4.9.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.8.0...webpack-cli@4.9.2 )
---
updated-dependencies:
- dependency-name: webpack-cli
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 10:51:41 +02:00
dependabot[bot]
21c0042c24
Bump typescript from 4.4.3 to 4.7.2
...
Bumps [typescript](https://github.com/Microsoft/TypeScript ) from 4.4.3 to 4.7.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases )
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.4.3...v4.7.2 )
---
updated-dependencies:
- dependency-name: typescript
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-01 10:51:30 +02:00
github-actions[bot]
e928c0227e
[Automated] Merge dev into gh-pages
2022-04-20 19:02:18 +00:00
dependabot[bot]
b12fd5db72
Bump @typescript-eslint/eslint-plugin from 4.31.1 to 4.33.0
...
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin ) from 4.31.1 to 4.33.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.33.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 >
2022-04-20 21:02:02 +02:00
github-actions[bot]
c20abff9f4
[Automated] Merge dev into gh-pages
2022-04-20 18:56:46 +00:00
dependabot[bot]
ef7d46b6dc
Bump @typescript-eslint/parser from 4.31.1 to 4.33.0
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 4.31.1 to 4.33.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases )
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md )
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.33.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 >
2022-04-20 20:56:45 +02:00
github-actions[bot]
26672fe57b
[Automated] Merge dev into gh-pages
2022-04-20 18:56:35 +00:00
dependabot[bot]
ff8fe0644a
Bump eslint-plugin-import from 2.24.2 to 2.26.0
...
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.24.2 to 2.26.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.24.2...v2.26.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-20 20:56:35 +02:00
dependabot[bot]
6779133dd8
Bump ansi-regex from 3.0.0 to 3.0.1
...
Bumps [ansi-regex](https://github.com/chalk/ansi-regex ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases )
- [Commits](https://github.com/chalk/ansi-regex/compare/v3.0.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-20 20:56:22 +02:00
github-actions[bot]
f59b041e96
[Automated] Merge dev into gh-pages
2022-04-20 18:54:10 +00:00
dependabot[bot]
097ccd2048
Bump minimist from 1.2.5 to 1.2.6
...
Bumps [minimist](https://github.com/substack/minimist ) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases )
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6 )
---
updated-dependencies:
- dependency-name: minimist
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-20 20:53:57 +02:00
github-actions[bot]
89c94ea934
[Automated] Merge dev into gh-pages
2022-04-20 18:53:41 +00:00
dependabot[bot]
c45a630286
Bump prettier from 2.3.2 to 2.6.2
...
Bumps [prettier](https://github.com/prettier/prettier ) from 2.3.2 to 2.6.2.
- [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.2...2.6.2 )
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-20 20:53:39 +02:00
github-actions[bot]
3e525da15c
[Automated] Merge dev into gh-pages
2022-04-20 18:53:31 +00:00
dependabot[bot]
30809c7b45
Bump @types/chai from 4.2.21 to 4.3.1
...
Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai ) from 4.2.21 to 4.3.1.
- [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-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-20 20:53:29 +02:00
dependabot[bot]
db8d722479
Bump webpack from 5.52.1 to 5.72.0
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.52.1 to 5.72.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.52.1...v5.72.0 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-20 20:53:17 +02:00
github-actions[bot]
c498574a77
[Automated] Merge dev into gh-pages
2022-04-20 18:52:10 +00:00
humdogm
79f8079228
Re-order Garden max rewards by amount of cookies
...
Build CookieMonsterDev.js and .js.map
Ran npm build-dev
2022-04-20 20:51:57 +02:00
github-actions[bot]
0a6113cf72
[Automated] Merge dev into gh-pages
2021-12-30 08:28:30 +00:00
Daniël van Noord
9d101ddfd4
Merge pull request #1037 from dsf3449/dev
...
fix: duplicated cookie notation
2021-12-30 09:28:16 +01:00
dsf3449
0e69ac39dc
Remove no longer needed Beautify call
2021-12-30 01:03:53 -06:00
github-actions[bot]
248be6d9ce
[Automated] Merge dev into gh-pages
2021-09-29 21:03:57 +00:00
Daniël van Noord
f0757d2490
Bump cookiemonsterframework to 0.2.3
2021-09-29 23:03:37 +02:00
github-actions[bot]
a0b4d5eecb
[Automated] Merge dev into gh-pages
2021-09-29 19:10:49 +00:00
Daniël van Noord
65754bc29d
Fix jumping of options screen
2021-09-29 21:10:25 +02:00
github-actions[bot]
aa2e866cc5
[Automated] Merge dev into gh-pages
2021-09-22 10:34:56 +00:00
Daniël van Noord
1d26217f80
Merge pull request #994 from benblank/cmd-cache
...
Export caches via CookieMonsterData
2021-09-22 12:34:39 +02:00
Ben Blank
c0751438b6
Rebuild after updating dependencies.
2021-09-16 16:52:20 -07:00
Ben Blank
53ed8fe167
Fix handling of undefined in FillCMDCache.
2021-09-15 12:16:10 -07:00
Ben Blank
74e7c64ca2
Export caches via CookieMonsterData.
2021-09-15 12:14:22 -07:00
github-actions[bot]
46202be466
[Automated] Merge dev into gh-pages
2021-09-14 19:15:52 +00:00
Daniël van Noord
809bd4d35d
Update dependencies
2021-09-14 21:15:35 +02:00
github-actions[bot]
b2fcbcdb81
[Automated] Merge dev into gh-pages
2021-09-14 19:07:52 +00:00
Daniël van Noord
348ba4b9fd
Rebuild CM.js
2021-09-14 21:07:36 +02:00
github-actions[bot]
386dae3830
[Automated] Merge dev into gh-pages
2021-09-14 19:06:41 +00:00
Daniël van Noord
9e783cc3d7
Bump cookiemonsterframework to 0.2.2
2021-09-14 21:06:19 +02:00
github-actions[bot]
5ac33725b7
[Automated] Merge dev into gh-pages
2021-09-10 08:14:55 +00:00
Daniël van Noord
6766c05091
Use issue forms instead of issue templates
2021-09-10 10:14:16 +02:00
github-actions[bot]
96fa090f0d
[Automated] Merge dev into gh-pages
2021-09-10 07:47:13 +00:00
Daniël van Noord
e4143126a0
Update bug-report.yml
2021-09-10 09:46:59 +02:00
github-actions[bot]
c8a5a3c34f
[Automated] Merge dev into gh-pages
2021-09-10 07:46:51 +00:00
Daniël van Noord
0616887d28
Update bug-report.yml
2021-09-10 09:46:40 +02:00
github-actions[bot]
196a911e2d
[Automated] Merge dev into gh-pages
2021-09-10 07:46:26 +00:00
Daniël van Noord
2695fdb140
Create bug-report.yml
2021-09-10 09:46:15 +02:00
github-actions[bot]
11b1be5c71
[Automated] Merge dev into gh-pages
2021-09-10 07:45:52 +00:00
Daniël van Noord
bf4f910cee
Update bug-report.yml
2021-09-10 09:45:40 +02:00
github-actions[bot]
b0ad9b9786
[Automated] Merge dev into gh-pages
2021-09-10 07:45:26 +00:00
Daniël van Noord
eb0861c5d7
Update bug-report.yml
2021-09-10 09:45:12 +02:00
github-actions[bot]
4ebc2d597e
[Automated] Merge dev into gh-pages
2021-09-10 07:43:49 +00:00
Daniël van Noord
4a76fa9f95
Update bug-report.yml
2021-09-10 09:43:37 +02:00
github-actions[bot]
3b8adb7b9f
[Automated] Merge dev into gh-pages
2021-09-10 07:42:57 +00:00
Daniël van Noord
9c28ef5411
Rename bug_report.yml to bug-report.yml
2021-09-10 09:42:44 +02:00
github-actions[bot]
b1ba7f02f7
[Automated] Merge dev into gh-pages
2021-09-10 07:42:20 +00:00
Daniël van Noord
c78b06b16a
Delete feature_request.md
2021-09-10 09:42:17 +02:00
Daniël van Noord
ea1d288c39
Create feature-request.yml
2021-09-10 09:42:07 +02:00
github-actions[bot]
d69e249d58
[Automated] Merge dev into gh-pages
2021-09-10 07:39:32 +00:00
Daniël van Noord
a2db049b71
Update bug_report.yml
2021-09-10 09:39:21 +02:00
github-actions[bot]
beb894557b
[Automated] Merge dev into gh-pages
2021-09-10 07:36:16 +00:00
Daniël van Noord
6d9f6d61f4
Delete bug_report.md
2021-09-10 09:36:04 +02:00
github-actions[bot]
0dd3f2594b
[Automated] Merge dev into gh-pages
2021-09-10 07:35:55 +00:00
Daniël van Noord
75b59fdaa8
Create bug_report.yml
2021-09-10 09:35:40 +02:00
github-actions[bot]
627fcb7b52
[Automated] Merge dev into gh-pages
2021-09-06 13:46:51 +00:00
Daniël van Noord
1f6ca9ebe6
Merge pull request #981 from DanielNoord/dev
...
Fix Krumblor
2021-09-06 15:46:38 +02:00
Daniël van Noord
bbf31fe96f
Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into dev
2021-09-06 15:44:24 +02:00
Daniël van Noord
4be3942af3
Fix Krumblor on Steam
2021-09-06 15:43:41 +02:00
github-actions[bot]
1cde6308fa
[Automated] Merge dev into gh-pages
2021-09-05 18:15:24 +00:00
Daniël van Noord
488233c8dd
Merge pull request #979 from Pidgeot/dev
...
Disable automatic sizing on grimoire bar to allow text to fit
2021-09-05 20:15:11 +02:00
Daniël van Noord
a89f1eed1a
Update src/Main/ReplaceGameElements/NativeGrimoire.js
2021-09-05 20:13:58 +02:00
Michael Madsen
790cf411c3
Set grimoire bar width to 75%
2021-09-05 20:10:27 +02:00
Michael Madsen
46853f711a
Disable automatic sizing on grimoire bar to allow text to fit
2021-09-05 19:33:44 +02:00
github-actions[bot]
fa49f84262
[Automated] Merge dev into gh-pages
2021-09-05 15:35:05 +00:00
Daniël van Noord
60121c0be5
Merge pull request #977 from dmytrokyrychuk/short-time-format
...
Add short time format
2021-09-05 17:34:51 +02:00
Daniël van Noord
c7d9144dd2
Rebuild CookieMonster files
2021-09-05 17:33:49 +02:00
Daniël van Noord
aa5cad663b
Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into short-time-format
2021-09-05 17:33:29 +02:00
github-actions[bot]
2b174fe323
[Automated] Merge dev into gh-pages
2021-09-05 15:31:42 +00:00
Daniël van Noord
b191d9a434
Fix Grimoire bar on Steam
2021-09-05 17:31:23 +02:00
Daniël van Noord
1842c40c01
Rebuild CookieMonster files
2021-09-05 17:28:59 +02:00
Daniël van Noord
9c005b2f2f
Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into short-time-format
2021-09-05 17:23:37 +02:00
Dmytro Kyrychuk
e6d89fa0c7
Add short time format
2021-09-05 17:52:27 +03:00
github-actions[bot]
aaeb8a62eb
[Automated] Merge dev into gh-pages
2021-09-05 11:02:23 +00:00
Daniël van Noord
b74ae3eee0
Change order of Steam delay
2021-09-05 13:02:04 +02:00
github-actions[bot]
1c0a0a9851
[Automated] Merge dev into gh-pages
2021-09-04 14:18:38 +00:00
Daniël van Noord
e4267f4c41
Merge pull request #970 from DanielNoord/dev
...
Fix Steam delay
2021-09-04 16:18:25 +02:00
Daniël van Noord
62dc882e5a
Fix the delay for Steam
2021-09-04 16:16:28 +02:00
Daniël van Noord
f7e7d171e8
Increase delay for steam to 2000ms
2021-09-04 15:45:49 +02:00
Daniël van Noord
b1ec82b4b8
Merge pull request #962 from CookieMonsterTeam/dev
...
Add delay for steam
2021-09-03 12:41:00 +02:00
Daniël van Noord
669b5c1dd9
Merge branch 'gh-pages' into dev
2021-09-03 12:40:53 +02:00
Daniël van Noord
f67b561990
Add delay for steam
2021-09-03 12:38:38 +02:00
github-actions[bot]
5def4ee13b
[Automated] Merge dev into gh-pages
2021-09-03 10:35:36 +00:00
Daniël van Noord
c4812ef8fc
Add a delay for loading in Steam
2021-09-03 12:34:53 +02:00
github-actions[bot]
9b9bf962b7
[Automated] Merge dev into gh-pages
2021-09-02 21:00:13 +00:00
Daniël van Noord
2940d1c631
Merge pull request #955 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-4.4.2
...
Bump typescript from 4.3.5 to 4.4.2
2021-09-02 23:00:00 +02:00
github-actions[bot]
0cf30e5cea
[Automated] Merge dev into gh-pages
2021-09-02 20:58:35 +00:00
dependabot[bot]
700a5987a8
Bump typescript from 4.3.5 to 4.4.2
...
Bumps [typescript](https://github.com/Microsoft/TypeScript ) from 4.3.5 to 4.4.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases )
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.3.5...v4.4.2 )
---
updated-dependencies:
- dependency-name: typescript
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-09-02 20:58:34 +00:00
Daniël van Noord
029c25f48e
Merge pull request #956 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.30.0
...
Bump @typescript-eslint/parser from 4.29.1 to 4.30.0
2021-09-02 22:58:23 +02:00
github-actions[bot]
6fb8470432
[Automated] Merge dev into gh-pages
2021-09-02 20:58:05 +00:00
Daniël van Noord
518aff7ca7
Merge pull request #957 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.51.2
...
Bump webpack from 5.50.0 to 5.51.2
2021-09-02 22:57:51 +02:00
dependabot[bot]
f82b0fbc3a
Bump @typescript-eslint/parser from 4.29.1 to 4.30.0
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 4.29.1 to 4.30.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.30.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-09-02 20:57:22 +00:00
dependabot[bot]
c0c3414dea
Bump webpack from 5.50.0 to 5.51.2
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.50.0 to 5.51.2.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.50.0...v5.51.2 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-09-02 20:56:39 +00:00
github-actions[bot]
513780efc4
[Automated] Merge dev into gh-pages
2021-09-02 20:56:15 +00:00
Daniël van Noord
295771bcec
Merge pull request #954 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.30.0
...
Bump @typescript-eslint/eslint-plugin from 4.29.3 to 4.30.0
2021-09-02 22:56:04 +02:00
dependabot[bot]
0184fde289
Bump @typescript-eslint/eslint-plugin from 4.29.3 to 4.30.0
...
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin ) from 4.29.3 to 4.30.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.30.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-09-02 20:55:13 +00:00
github-actions[bot]
66d6be8039
[Automated] Merge dev into gh-pages
2021-09-02 20:52:31 +00:00
Daniël van Noord
612ab6a6f5
Merge pull request #945 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-node-10.2.1
...
Bump ts-node from 10.2.0 to 10.2.1
2021-09-02 22:52:18 +02:00
github-actions[bot]
fd3276a9a7
[Automated] Merge dev into gh-pages
2021-09-02 20:51:59 +00:00
Daniël van Noord
b9fe2aa3fb
Merge pull request #947 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.24.2
...
Bump eslint-plugin-import from 2.24.0 to 2.24.2
2021-09-02 22:51:54 +02:00
github-actions[bot]
765f2637f9
[Automated] Merge dev into gh-pages
2021-09-02 20:51:46 +00:00
Daniël van Noord
4b454cc123
Merge pull request #948 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.29.3
...
Bump @typescript-eslint/eslint-plugin from 4.29.1 to 4.29.3
2021-09-02 22:51:44 +02:00
Daniël van Noord
725e053df6
Merge pull request #953 from Urganot/steam-fix
...
Steam fix
2021-09-02 22:51:31 +02:00
Simon Balling
4008c2a8ee
Fix for steam
2021-09-02 22:16:17 +02:00
Simon Balling
248c36c357
steam fix
2021-09-02 22:02:17 +02:00
dependabot[bot]
5679f4ab01
Bump @typescript-eslint/eslint-plugin from 4.29.1 to 4.29.3
...
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin ) from 4.29.1 to 4.29.3.
- [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.29.3/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-08-30 02:04:54 +00:00
dependabot[bot]
40dc0b89cc
Bump eslint-plugin-import from 2.24.0 to 2.24.2
...
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.24.0 to 2.24.2.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.24.0...v2.24.2 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-08-30 02:04:34 +00:00
dependabot[bot]
c6b38aa501
Bump ts-node from 10.2.0 to 10.2.1
...
Bumps [ts-node](https://github.com/TypeStrong/ts-node ) from 10.2.0 to 10.2.1.
- [Release notes](https://github.com/TypeStrong/ts-node/releases )
- [Commits](https://github.com/TypeStrong/ts-node/compare/v10.2.0...v10.2.1 )
---
updated-dependencies:
- dependency-name: ts-node
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-08-23 02:05:20 +00:00
github-actions[bot]
667b91142f
[Automated] Merge dev into gh-pages
2021-08-16 10:03:28 +00:00
Daniël van Noord
f4445f7b0a
Merge pull request #938 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.5
...
Bump ts-loader from 9.2.4 to 9.2.5
2021-08-16 12:03:25 +02:00
github-actions[bot]
7e42c62f6b
[Automated] Merge dev into gh-pages
2021-08-16 10:03:17 +00:00
Daniël van Noord
3d99f818ab
Merge pull request #937 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.24.0
...
Bump eslint-plugin-import from 2.23.4 to 2.24.0
2021-08-16 12:03:15 +02:00
Daniël van Noord
5f40b2a45e
Merge pull request #936 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-cli-4.8.0
...
Bump webpack-cli from 4.7.2 to 4.8.0
2021-08-16 12:03:02 +02:00
dependabot[bot]
1fbe7c4b51
Bump ts-loader from 9.2.4 to 9.2.5
...
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader ) from 9.2.4 to 9.2.5.
- [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.4...v9.2.5 )
---
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-08-16 09:56:26 +00:00
dependabot[bot]
fbaa2cc8de
Bump webpack-cli from 4.7.2 to 4.8.0
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 4.7.2 to 4.8.0.
- [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.2...webpack-cli@4.8.0 )
---
updated-dependencies:
- dependency-name: webpack-cli
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-08-16 09:56:25 +00:00
dependabot[bot]
91dd817212
Bump eslint-plugin-import from 2.23.4 to 2.24.0
...
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.23.4 to 2.24.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.23.4...v2.24.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-08-16 09:56:22 +00:00
github-actions[bot]
dddf786567
[Automated] Merge dev into gh-pages
2021-08-16 09:55:44 +00:00
Daniël van Noord
df392029ce
Merge pull request #935 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-node-10.2.0
...
Bump ts-node from 10.1.0 to 10.2.0
2021-08-16 11:55:30 +02:00
dependabot[bot]
5ae4ed761f
Bump ts-node from 10.1.0 to 10.2.0
...
Bumps [ts-node](https://github.com/TypeStrong/ts-node ) from 10.1.0 to 10.2.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases )
- [Commits](https://github.com/TypeStrong/ts-node/compare/v10.1.0...v10.2.0 )
---
updated-dependencies:
- dependency-name: ts-node
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-08-16 09:54:16 +00:00
github-actions[bot]
c080876fc0
[Automated] Merge dev into gh-pages
2021-08-16 09:53:30 +00:00
Daniël van Noord
001efa24bd
Merge pull request #933 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.29.1
...
Bump @typescript-eslint/parser from 4.28.4 to 4.29.1
2021-08-16 11:53:29 +02:00
dependabot[bot]
0963a2b63a
Bump @typescript-eslint/parser from 4.28.4 to 4.29.1
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 4.28.4 to 4.29.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.29.1/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-08-16 09:53:21 +00:00
github-actions[bot]
fb8f6dbb49
[Automated] Merge dev into gh-pages
2021-08-16 09:53:16 +00:00
Daniël van Noord
88952e9986
Merge pull request #924 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.32.0
...
Bump eslint from 7.31.0 to 7.32.0
2021-08-16 11:53:16 +02:00
Daniël van Noord
946d0ff00e
Merge pull request #932 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.50.0
...
Bump webpack from 5.46.0 to 5.50.0
2021-08-16 11:53:04 +02:00
github-actions[bot]
27fd8626c8
[Automated] Merge dev into gh-pages
2021-08-16 09:53:00 +00:00
Daniël van Noord
cb23000caa
Merge pull request #934 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.29.1
...
Bump @typescript-eslint/eslint-plugin from 4.28.4 to 4.29.1
2021-08-16 11:52:47 +02:00
dependabot[bot]
2be1716c05
Bump @typescript-eslint/eslint-plugin from 4.28.4 to 4.29.1
...
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin ) from 4.28.4 to 4.29.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.29.1/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-08-16 02:06:16 +00:00
dependabot[bot]
b363e3a06a
Bump webpack from 5.46.0 to 5.50.0
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.46.0 to 5.50.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.46.0...v5.50.0 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-08-16 02:05:37 +00:00
dependabot[bot]
c909c99cb5
Bump eslint from 7.31.0 to 7.32.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.31.0 to 7.32.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.31.0...v7.32.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-08-02 02:04:58 +00:00
github-actions[bot]
4c63f6d9e2
[Automated] Merge dev into gh-pages
2021-07-25 14:23:06 +00:00
Daniël van Noord
97f8e974de
Merge pull request #911 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.4
...
Bump ts-loader from 9.2.3 to 9.2.4
2021-07-25 16:22:52 +02:00
github-actions[bot]
8e27b5980b
[Automated] Merge dev into gh-pages
2021-07-25 14:20:45 +00:00
Daniël van Noord
42543370b7
Fix Amortization tooltips
2021-07-25 16:20:22 +02:00
github-actions[bot]
ccc5f83491
[Automated] Merge dev into gh-pages
2021-07-25 13:39:17 +00:00
Daniël van Noord
b736015b1c
Merge pull request #913 from CookieMonsterTeam/master
...
Merge pull request #912 from CookieMonsterTeam/dev
2021-07-25 15:39:04 +02:00
Daniël van Noord
60f19e5084
Merge pull request #912 from CookieMonsterTeam/dev
...
Bump master to 2.031.10
2021-07-25 15:33:37 +02:00
dependabot[bot]
525ea72174
Bump ts-loader from 9.2.3 to 9.2.4
...
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader ) from 9.2.3 to 9.2.4.
- [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.3...v9.2.4 )
---
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-07-25 13:33:17 +00:00
github-actions[bot]
2489eb16ac
[Automated] Merge dev into gh-pages
2021-07-25 13:32:56 +00:00
Daniël van Noord
c455f940c6
Merge pull request #910 from DanielNoord/update
...
Bump to 2.031.10
2021-07-25 15:32:42 +02:00
Daniël van Noord
36780486a1
Bump to 2.031.10
2021-07-25 15:31:08 +02:00
github-actions[bot]
89f895f01e
[Automated] Merge dev into gh-pages
2021-07-25 13:28:39 +00:00
Daniël van Noord
55e3fe536c
Merge pull request #909 from DanielNoord/various
...
Various
2021-07-25 15:28:25 +02:00
Daniël van Noord
f60ac4889e
Add percentage to GC/Reindeer timer
2021-07-25 15:25:17 +02:00
Daniël van Noord
51713afaea
Fix building tooltips not updating correctly #893
2021-07-25 14:54:38 +02:00
Daniël van Noord
d0ddc93f7c
Change to "color" to "colour"
2021-07-25 14:42:21 +02:00
Daniël van Noord
65eff470cf
Fix bug with storing locked buildings
2021-07-25 14:41:51 +02:00
Daniël van Noord
9996e59024
Fix upgrade bar not displaying #908
2021-07-25 14:15:16 +02:00
Daniël van Noord
f59972892b
Add overlay and save to building locking #763
2021-07-25 14:09:37 +02:00
Daniël van Noord
4fe07ba1d3
Fix loading if no previous save is found
2021-07-25 10:33:03 +02:00
github-actions[bot]
7d40e12472
[Automated] Merge dev into gh-pages
2021-07-22 20:19:02 +00:00
Daniël van Noord
bedda0093d
Merge pull request #906 from CookieMonsterTeam/dependabot/npm_and_yarn/types/mocha-9.0.0
...
Bump @types/mocha from 8.2.3 to 9.0.0
2021-07-22 22:18:47 +02:00
dependabot[bot]
7c26b8015a
Bump @types/mocha from 8.2.3 to 9.0.0
...
Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha ) from 8.2.3 to 9.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha )
---
updated-dependencies:
- dependency-name: "@types/mocha"
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-22 20:15:37 +00:00
github-actions[bot]
ce768cb135
[Automated] Merge dev into gh-pages
2021-07-22 20:12:43 +00:00
Daniël van Noord
1f219df674
Merge branch 'gh-pages' into dev
2021-07-22 22:12:28 +02:00
github-actions[bot]
8280d3ae7a
[Automated] Merge dev into gh-pages
2021-07-22 20:07:49 +00:00
Daniël van Noord
3144e776b7
Update package name and version
2021-07-22 22:07:48 +02:00
Daniël van Noord
be0edd090d
Update packagename
2021-07-22 22:07:19 +02:00
github-actions[bot]
038a8b33b0
[Automated] Merge dev into gh-pages
2021-07-22 20:05:18 +00:00
Daniël van Noord
6395ad318a
Update README.md
2021-07-22 22:05:04 +02:00
github-actions[bot]
ed0049e367
[Automated] Merge dev into gh-pages
2021-07-22 20:00:26 +00:00
Daniël van Noord
bbd523ac3f
Get latest version of framework
2021-07-22 22:00:03 +02:00
github-actions[bot]
cb1f9d7ca5
[Automated] Merge dev into gh-pages
2021-07-22 19:58:13 +00:00
Daniël van Noord
fb0f42deed
Get latest version of Framework
2021-07-22 21:57:37 +02:00
Daniël van Noord
74bb5d924d
Update CI
2021-07-22 21:53:18 +02:00
Daniël van Noord
065f8b4c23
Move saveClasses to Framework
2021-07-22 21:17:30 +02:00
Daniël van Noord
e685489543
Bump packages
2021-07-22 21:10:26 +02:00
Daniël van Noord
6a4772d8e2
Add new build commands
2021-07-22 09:08:24 +02:00
Daniël van Noord
bd0a55609d
Fix sounds playing at start up #903
2021-07-21 14:42:17 +02:00
github-actions[bot]
6fcece6fc8
[Automated] Merge dev into gh-pages
2021-07-20 18:43:28 +00:00
Daniël van Noord
3e3659e2a4
Merge pull request #902 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.28.4
2021-07-20 20:43:13 +02:00
dependabot[bot]
10c1e9eefb
Bump @typescript-eslint/parser from 4.28.3 to 4.28.4
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 4.28.3 to 4.28.4.
- [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.28.4/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-07-20 18:42:19 +00:00
github-actions[bot]
4c4ef57ce4
[Automated] Merge dev into gh-pages
2021-07-20 18:41:37 +00:00
Daniël van Noord
02bf0d6455
Merge pull request #901 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.28.4
2021-07-20 20:41:22 +02:00
dependabot[bot]
f89a685c49
Bump @typescript-eslint/eslint-plugin from 4.28.3 to 4.28.4
...
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin ) from 4.28.3 to 4.28.4.
- [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.28.4/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-07-20 16:14:24 +00:00
github-actions[bot]
d776b9b799
[Automated] Merge dev into gh-pages
2021-07-20 16:11:47 +00:00
Daniël van Noord
2a82fc2b1f
Merge pull request #900 from CookieMonsterTeam/master
...
Fix commit history
2021-07-20 18:11:33 +02:00
Daniël van Noord
80b373ff6c
Build CM
2021-07-20 18:09:02 +02:00
Daniël van Noord
8c118b6aef
Fix imports after changes to folder structure
2021-07-20 18:08:53 +02:00
Daniël van Noord
82c872ef18
Use framework for Options menu
2021-07-20 18:08:32 +02:00
Daniël van Noord
e9dc2ffa51
Use Framework notifications
2021-07-20 18:08:11 +02:00
Daniël van Noord
9294a5bc87
Remove functions and tests that moved to framework
2021-07-20 18:06:16 +02:00
Daniël van Noord
248fd32e91
Bump CM Framework to 0.2.0
2021-07-20 18:05:21 +02:00
Daniël van Noord
436c1d7239
Remove PlaySound from globals
2021-07-20 14:55:17 +02:00
github-actions[bot]
055ba22ee2
[Automated] Merge dev into gh-pages
2021-07-20 06:13:35 +00:00
Daniël van Noord
b84e511e52
Merge pull request #899 from DanielNoord/fix/ascensionlag
...
Fix lag on ascencion screen #890
2021-07-20 08:13:20 +02:00
Daniël van Noord
ec35013be7
Fix lag on ascencion screen #890
2021-07-20 08:11:43 +02:00
github-actions[bot]
52edc5696a
[Automated] Merge dev into gh-pages
2021-07-19 20:02:19 +00:00
Daniël van Noord
eefecb7829
Merge pull request #898 from DanielNoord/optimize
...
Optimize
2021-07-19 22:02:04 +02:00
Daniël van Noord
bb0ba7f116
Small optimization to AscendButton()
2021-07-19 21:59:45 +02:00
Daniël van Noord
075bd89669
Fix BuildingGetPrice() and remove getSumPrice()
2021-07-19 21:42:04 +02:00
Daniël van Noord
43a651ea4a
Only iterate over UpgradesInStore
2021-07-19 21:05:50 +02:00
github-actions[bot]
fde93b5639
[Automated] Merge dev into gh-pages
2021-07-19 14:55:05 +00:00
Daniël van Noord
80dab239b6
Update CI to also run on push to main branches
2021-07-19 16:54:24 +02:00
Daniël van Noord
22faf1edc2
Update README
2021-07-19 16:48:27 +02:00
Daniël van Noord
522443c30f
Change env variable name
2021-07-19 16:45:26 +02:00
Daniël van Noord
d8eea6939e
Update packages
2021-07-19 16:45:16 +02:00
github-actions[bot]
ab7a092ab9
[Automated] Merge dev into gh-pages
2021-07-19 05:59:54 +00:00
Daniël van Noord
c661cba533
Merge pull request #895 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.28.3
...
Bump @typescript-eslint/eslint-plugin from 4.28.2 to 4.28.3
2021-07-19 07:59:42 +02:00
dependabot[bot]
451ed9ee7a
Bump @typescript-eslint/eslint-plugin from 4.28.2 to 4.28.3
...
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin ) from 4.28.2 to 4.28.3.
- [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.28.3/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-07-19 05:58:12 +00:00
github-actions[bot]
6ac737d3af
[Automated] Merge dev into gh-pages
2021-07-19 05:57:44 +00:00
Daniël van Noord
4572d0e5c5
Merge pull request #897 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.28.3
...
Bump @typescript-eslint/parser from 4.28.2 to 4.28.3
2021-07-19 07:57:38 +02:00
Daniël van Noord
b7c7739a25
Merge pull request #896 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.31.0
...
Bump eslint from 7.30.0 to 7.31.0
2021-07-19 07:57:29 +02:00
github-actions[bot]
85b6d96be6
[Automated] Merge dev into gh-pages
2021-07-19 05:57:21 +00:00
Daniël van Noord
68e42e2744
Merge pull request #894 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.45.1
...
Bump webpack from 5.44.0 to 5.45.1
2021-07-19 07:57:01 +02:00
dependabot[bot]
984c11e2ac
Bump @typescript-eslint/parser from 4.28.2 to 4.28.3
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 4.28.2 to 4.28.3.
- [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.28.3/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-07-19 02:15:16 +00:00
dependabot[bot]
e3eccf25e8
Bump eslint from 7.30.0 to 7.31.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.30.0 to 7.31.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.30.0...v7.31.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-07-19 02:14:53 +00:00
dependabot[bot]
85b161fe14
Bump webpack from 5.44.0 to 5.45.1
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.44.0 to 5.45.1.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.44.0...v5.45.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-07-19 02:13:55 +00:00
github-actions[bot]
a497dec741
[Automated] Merge dev into gh-pages
2021-07-11 10:57:24 +00:00
Daniël van Noord
5a7187aa3c
Merge pull request #887 from DanielNoord/framework
...
Start using the CookieMonsterFramework
2021-07-11 12:57:12 +02:00
Daniël van Noord
db07ab6c3e
Add token to workflow and .npmrc
2021-07-11 12:56:01 +02:00
Daniël van Noord
c0e788b143
Use CookieMonsterFramework for save/load, infoMenu
2021-07-11 10:21:16 +02:00
Daniël van Noord
b959b3c024
Update CookieMonsterFramework to 0.1.0
2021-07-11 10:19:30 +02:00
Daniël van Noord
c8eeab45af
Add .nprmc
2021-07-06 22:40:51 +02:00
github-actions[bot]
28bc2b5620
[Automated] Merge dev into gh-pages
2021-07-05 14:04:19 +00:00
Daniël van Noord
ecf73d815f
Merge pull request #883 from DanielNoord/upmaster
...
Upmaster
2021-07-05 16:04:06 +02:00
Daniël van Noord
094b153f7e
Add option to "lock" buildings #763
2021-07-05 16:02:29 +02:00
Daniël van Noord
3ac2c75b6f
Fixed annotation
2021-07-05 15:32:33 +02:00
Daniël van Noord
3b444c2b69
Merge pull request #882 from CookieMonsterTeam/master
...
Merge pull request #881 from CookieMonsterTeam/dev
2021-07-05 10:11:53 +02:00
Daniël van Noord
a5c052b46e
Merge pull request #881 from CookieMonsterTeam/dev
...
Hotfix
2021-07-05 10:11:10 +02:00
github-actions[bot]
531adb2a16
[Automated] Merge dev into gh-pages
2021-07-05 08:10:57 +00:00
Daniël van Noord
e3fddd4450
Merge pull request #880 from DanielNoord/cookieduplication
...
Cookieduplication
2021-07-05 10:10:42 +02:00
Daniël van Noord
07bb28cf46
Push hotfix to master file
2021-07-05 10:09:13 +02:00
Daniël van Noord
a9eb56de0c
Add hotfix to release notes
2021-07-05 10:08:19 +02:00
Daniël van Noord
dcf00b82b8
Fix duplicate golden cookie with autoclickers #762
2021-07-05 10:05:26 +02:00
github-actions[bot]
27a621d9b0
[Automated] Merge dev into gh-pages
2021-07-05 05:25:29 +00:00
Daniël van Noord
14ba9105ca
Merge pull request #879 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.30.0
...
Bump eslint from 7.29.0 to 7.30.0
2021-07-05 07:25:24 +02:00
Daniël van Noord
6f36d1dcf1
Merge pull request #878 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.42.0
...
Bump webpack from 5.41.1 to 5.42.0
2021-07-05 07:25:15 +02:00
dependabot[bot]
69afafd0fb
Bump eslint from 7.29.0 to 7.30.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.29.0 to 7.30.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.29.0...v7.30.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-07-05 02:04:56 +00:00
dependabot[bot]
c9b6a06908
Bump webpack from 5.41.1 to 5.42.0
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.41.1 to 5.42.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.41.1...v5.42.0 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-05 02:04:48 +00:00
github-actions[bot]
a877dc5ad3
[Automated] Merge dev into gh-pages
2021-07-01 20:46:21 +00:00
Daniël van Noord
68e6afa410
Merge pull request #872 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.2
2021-07-01 22:46:07 +02:00
dependabot[bot]
3401a6165f
Bump prettier from 2.3.1 to 2.3.2
...
Bumps [prettier](https://github.com/prettier/prettier ) from 2.3.1 to 2.3.2.
- [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.1...2.3.2 )
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-01 20:37:58 +00:00
github-actions[bot]
59217317b3
[Automated] Merge dev into gh-pages
2021-07-01 20:37:31 +00:00
Daniël van Noord
a147065fd6
Merge pull request #876 from DanielNoord/updatepackage
...
Updatepackage
2021-07-01 22:37:16 +02:00
Daniël van Noord
27ad606380
Update packages
2021-07-01 22:36:05 +02:00
Daniël van Noord
cff2928535
Merge pull request #870 from CookieMonsterTeam/dev
...
Master to 2.031.9
2021-06-27 23:25:29 +02:00
github-actions[bot]
6a30843c7d
[Automated] Merge dev into gh-pages
2021-06-27 21:25:09 +00:00
Daniël van Noord
5fec38625f
Merge pull request #869 from DanielNoord/update
...
Update
2021-06-27 23:24:58 +02:00
Daniël van Noord
1d325a253c
Update CookieMonster.js
2021-06-27 23:23:37 +02:00
Daniël van Noord
33caf8838c
Push to 2.031.9
2021-06-27 23:22:53 +02:00
github-actions[bot]
ca5acc1d37
[Automated] Merge dev into gh-pages
2021-06-27 21:22:04 +00:00
Daniël van Noord
2708903e92
Merge pull request #868 from DanielNoord/achievement
...
Achievement
2021-06-27 23:21:50 +02:00
Daniël van Noord
6b346e0272
Add info about next achievement in stats #833
2021-06-27 23:18:15 +02:00
Daniël van Noord
d6a3209c43
Update package-lock
2021-06-27 23:03:57 +02:00
Daniël van Noord
dfd0d790bc
Add Achievements section to Stats page
2021-06-27 23:03:48 +02:00
github-actions[bot]
a8c9fea127
[Automated] Merge dev into gh-pages
2021-06-21 06:59:42 +00:00
Daniël van Noord
f228365978
Merge pull request #867 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.27.0
...
Bump @typescript-eslint/parser from 4.26.1 to 4.27.0
2021-06-21 08:59:26 +02:00
github-actions[bot]
d549bbdf9b
[Automated] Merge dev into gh-pages
2021-06-21 06:58:36 +00:00
dependabot[bot]
e7536d4bd4
Bump @typescript-eslint/parser from 4.26.1 to 4.27.0
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) 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/parser/CHANGELOG.md )
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.27.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-21 06:58:33 +00:00
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
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
dependabot[bot]
5715274d1a
Bump @typescript-eslint/parser from 4.22.1 to 4.23.0
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 4.22.1 to 4.23.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.23.0/packages/parser )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-17 11:18:35 +00:00
Daniël van Noord
74cdb613ca
Merge pull request #819 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.23.0
...
Bump @typescript-eslint/eslint-plugin from 4.22.1 to 4.23.0
2021-05-17 13:17:43 +02:00
Daniël van Noord
4eae4598a7
Merge pull request #818 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.2
...
Bump eslint-plugin-import from 2.22.1 to 2.23.2
2021-05-17 13:17:21 +02:00
Daniël van Noord
d9ef469980
Merge pull request #817 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.37.0
...
Bump webpack from 5.36.2 to 5.37.0
2021-05-17 13:16:24 +02:00
dependabot[bot]
5532e4d0ba
Bump @typescript-eslint/eslint-plugin from 4.22.1 to 4.23.0
...
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin ) from 4.22.1 to 4.23.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.23.0/packages/eslint-plugin )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-17 06:43:28 +00:00
dependabot[bot]
e78703130e
Bump eslint-plugin-import from 2.22.1 to 2.23.2
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.22.1 to 2.23.2.
- [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.22.1...v2.23.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-17 06:43:09 +00:00
dependabot[bot]
63240b01bc
Bump webpack from 5.36.2 to 5.37.0
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.36.2 to 5.37.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.36.2...v5.37.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-17 06:42:54 +00:00
Daniël van Noord
1a520b4d52
Merge pull request #814 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.22.1
...
Bump @typescript-eslint/parser from 4.22.0 to 4.22.1
2021-05-10 14:06:06 +02:00
dependabot[bot]
c7fd910a26
Bump @typescript-eslint/parser from 4.22.0 to 4.22.1
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 4.22.0 to 4.22.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.22.1/packages/parser )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-10 12:05:01 +00:00
Daniël van Noord
a3ad66a058
Merge pull request #815 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.0
...
Bump prettier from 2.2.1 to 2.3.0
2021-05-10 14:03:33 +02:00
Daniël van Noord
ee3aac59ce
Merge pull request #812 from CookieMonsterTeam/dependabot/npm_and_yarn/mocha-8.4.0
...
Bump mocha from 8.3.2 to 8.4.0
2021-05-10 14:03:01 +02:00
Daniël van Noord
598a36493f
Merge pull request #813 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.26.0
...
Bump eslint from 7.25.0 to 7.26.0
2021-05-10 13:37:11 +02:00
dependabot[bot]
507e168e24
Bump prettier from 2.2.1 to 2.3.0
...
Bumps [prettier](https://github.com/prettier/prettier ) from 2.2.1 to 2.3.0.
- [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.2.1...2.3.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-10 11:35:32 +00:00
dependabot[bot]
35bd55f884
Bump eslint from 7.25.0 to 7.26.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.25.0 to 7.26.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.25.0...v7.26.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-10 11:35:11 +00:00
dependabot[bot]
7202f0122d
Bump mocha from 8.3.2 to 8.4.0
...
Bumps [mocha](https://github.com/mochajs/mocha ) from 8.3.2 to 8.4.0.
- [Release notes](https://github.com/mochajs/mocha/releases )
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mochajs/mocha/compare/v8.3.2...v8.4.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-10 11:32:17 +00:00
Daniël van Noord
19edf86751
Merge pull request #808 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-cli-4.7.0
2021-05-10 13:02:08 +02:00
Daniël van Noord
28857220f3
Merge pull request #811 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.1.2
2021-05-10 13:01:14 +02:00
Daniël van Noord
8d1d9697c1
Merge pull request #809 from CookieMonsterTeam/dependabot/npm_and_yarn/types/chai-4.2.18
...
Bump @types/chai from 4.2.17 to 4.2.18
2021-05-10 12:17:41 +02:00
Daniël van Noord
6eb2b76d9f
Merge pull request #810 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.22.1
...
Bump @typescript-eslint/eslint-plugin from 4.22.0 to 4.22.1
2021-05-10 11:27:32 +02:00
dependabot[bot]
b674376433
Bump ts-loader from 9.1.1 to 9.1.2
...
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader ) from 9.1.1 to 9.1.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.1...v9.1.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-10 08:35:34 +00:00
dependabot[bot]
9c24deb5aa
Bump @typescript-eslint/eslint-plugin from 4.22.0 to 4.22.1
...
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin ) from 4.22.0 to 4.22.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.22.1/packages/eslint-plugin )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-10 08:35:18 +00:00
dependabot[bot]
88a6fc31a1
Bump @types/chai from 4.2.17 to 4.2.18
...
Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai ) from 4.2.17 to 4.2.18.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-10 08:34:56 +00:00
dependabot[bot]
f791d47845
Bump webpack-cli from 4.6.0 to 4.7.0
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 4.6.0 to 4.7.0.
- [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.6.0...webpack-cli@4.7.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-10 08:34:45 +00:00
Daniël van Noord
d6b0284da1
Merge pull request #807 from tsr488/patch-1
...
Fix edge cases when sorting buildings/upgrades by PP
2021-05-08 10:48:19 +02:00
Tom
0f2bd0a10e
Small optimization when creating temp array for sorting buildings
2021-05-08 04:45:08 -04:00
Tom
41c28c21df
Sorting fixes
2021-05-08 03:51:47 -04:00
Tom Rogan
67d3562659
Update Upgrades.js
2021-05-08 02:13:27 -04:00
Daniël van Noord
770b238f70
Merge pull request #804 from DanielNoord/bugfixes
...
Fix issues with "till next achievement"
2021-05-06 21:54:52 +02:00
Daniël van Noord
305454b802
Fix issues with "till next achievement"
2021-05-06 21:45:58 +02:00
Daniël van Noord
18ace33231
Merge pull request #803 from DanielNoord/exposedata
...
Couple of new functions
2021-05-06 21:14:38 +02:00
Daniël van Noord
af803b4ead
Fix link to old repo
2021-05-06 21:03:39 +02:00
Daniël van Noord
210f4d4aee
Colour column of green option #773
2021-05-06 21:02:26 +02:00
Daniël van Noord
5a045e7ac4
Expose building and upgrade data to global scope
2021-05-06 20:27:17 +02:00
Daniël van Noord
cc2a754425
Run tests before build
2021-05-06 20:19:09 +02:00
Daniël van Noord
e44e39bc2c
Stop making report minified
2021-05-06 20:17:32 +02:00
Daniël van Noord
48c1d12d86
Update to new repo location
2021-05-06 19:41:32 +02:00
Daniël van Noord
195d7335f8
Merge pull request #796 from DanielNoord/eslint
...
Updated ESLint to 7.25.0
2021-05-02 11:45:43 +02:00
Daniël van Noord
941ccfeb79
Updated ESLint to 7.25.0
2021-05-02 11:44:27 +02:00
Daniël van Noord
eb71fd9bd2
Merge pull request #792 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.1.1
...
Bump ts-loader from 8.1.0 to 9.1.1
2021-05-02 11:01:02 +02:00
dependabot[bot]
039155a607
Bump ts-loader from 8.1.0 to 9.1.1
...
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader ) from 8.1.0 to 9.1.1.
- [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/v8.1.0...v9.1.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-02 09:00:07 +00:00
Daniël van Noord
9fe2e8b9b9
Merge pull request #795 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.36.2
...
Bump webpack from 5.32.0 to 5.36.2
2021-05-02 10:59:38 +02:00
Daniël van Noord
11b3a99314
Merge pull request #794 from CookieMonsterTeam/dependabot/npm_and_yarn/types/chai-4.2.17
...
Bump @types/chai from 4.2.16 to 4.2.17
2021-05-02 10:59:27 +02:00
dependabot[bot]
932b03fd51
Bump webpack from 5.32.0 to 5.36.2
...
Bumps [webpack](https://github.com/webpack/webpack ) from 5.32.0 to 5.36.2.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v5.32.0...v5.36.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-02 08:55:41 +00:00
dependabot[bot]
be8cf101e4
Bump @types/chai from 4.2.16 to 4.2.17
...
Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai ) from 4.2.16 to 4.2.17.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-02 08:55:33 +00:00
Daniël van Noord
98e6cd1dfc
Create dependabot.yml
2021-05-02 10:49:31 +02:00
Daniël van Noord
7df6e5fa54
Merge pull request #791 from CookieMonsterTeam/master
...
Hotfix #1 for 2.031.08
2021-05-02 10:46:27 +02:00
Daniël van Noord
c3adcf4d81
Merge pull request #790 from CookieMonsterTeam/dev
...
Hotfix #1 for 2.031.08
2021-05-02 10:45:54 +02:00
Daniël van Noord
82bf56cee0
Merge pull request #789 from DanielNoord/hotfix
...
Hotfix
2021-05-02 10:44:39 +02:00
Daniël van Noord
21c714008c
Push hotfix
2021-05-02 10:43:04 +02:00
Daniël van Noord
d377702d09
Removed unnecessary lines of code
2021-05-02 10:39:45 +02:00
Daniël van Noord
32f0572ab3
Merge pull request #788 from puggan/feature/paybackClicks
...
Feature/payback clicks
2021-05-02 10:37:16 +02:00
Puggan Sundragon
89952f20c2
compile
2021-05-02 10:28:59 +02:00
Puggan Sundragon
8bab891231
Show Payback Period x clicks
2021-05-02 10:27:18 +02:00
Daniël van Noord
0f6cffc9bf
Rename CookieMonsterDev.js.LICENSE copy.txt to CookieMonsterDev.js.LICENSE.txt
2021-05-02 10:11:44 +02:00
Daniël van Noord
0aebc35a8b
Update README.md
2021-05-02 10:08:09 +02:00
Daniël van Noord
ec87a8ad3c
Update README.md
2021-05-02 10:07:42 +02:00
Daniël van Noord
6ff15db4da
Merge pull request #787 from DanielNoord/newrepo
...
New repository
2021-05-02 09:57:08 +02:00
Daniël van Noord
21b8a169ef
Create CookieMonsterDev
2021-05-02 09:55:00 +02:00
Daniël van Noord
32b7bfc2c9
Update userscript for new repository
2021-05-02 09:32:14 +02:00
Daniël van Noord
e66ecb2be5
Moved and updated license
2021-05-02 09:31:05 +02:00
Daniël van Noord
ddc46113bc
Removed CookieMonster.js from root
2021-05-02 09:30:18 +02:00
Daniël van Noord
3e80f95947
Removed CookieMonster.js in root
2021-05-02 09:30:03 +02:00
Daniël van Noord
52ac7558c7
Push version and changelog to 2.031.8
2021-05-02 09:28:55 +02:00
Daniël van Noord
76c6d584df
Merge pull request #783 from DanielNoord/fix/upgradesorting
...
Fix upgrade sorting on firefox #780
2021-05-01 23:18:50 +02:00
Daniël van Noord
fa70faf386
Fix upgrade sorting on firefox #780
2021-05-01 23:15:48 +02:00
Daniël van Noord
4222e2d275
Merge pull request #782 from DanielNoord/linting
...
Fixed linting issues
2021-05-01 22:49:33 +02:00
Daniël van Noord
f95609a36d
Fixed build of CookieMonster.js
2021-05-01 22:47:56 +02:00
Daniël van Noord
209d35d30e
Revert "Changed CI to run on push"
...
This reverts commit 4da9d379c5 .
2021-05-01 22:47:10 +02:00
Daniël van Noord
4da9d379c5
Changed CI to run on push
2021-05-01 22:44:32 +02:00
Daniël van Noord
1c8bd79640
Fixed linting issues
2021-05-01 22:43:02 +02:00
Daniël van Noord
1d12977984
Update bug_report.md
2021-05-01 22:00:28 +02:00
Daniël van Noord
0f960b9ad4
Merge pull request #781 from DanielNoord/bugfix
...
Fix bug with expanded upgrade section
2021-05-01 20:29:44 +02:00
Daniël van Noord
87e4a6821a
Fix bug with expanded upgrade section
2021-05-01 20:24:28 +02:00
Daniël van Noord
134828692a
Merge pull request #779 from DanielNoord/lintingandtoggle
...
Linting and new toggle
2021-04-30 20:44:57 +02:00
Daniël van Noord
1b548e2beb
Fixed error in build
2021-04-30 20:43:07 +02:00
Daniël van Noord
30602b6ff7
Fix ESLint installation
2021-04-30 20:41:16 +02:00
Daniël van Noord
09b0ca83ae
Allow upgrades section to no longer collapse #767
2021-04-30 20:37:56 +02:00
Daniël van Noord
091b1f100e
Linting in tests
2021-04-30 20:26:52 +02:00
Daniël van Noord
c7a3a0a329
Linting changes
2021-04-30 20:22:54 +02:00
Daniël van Noord
4d7e138e09
Additional fix to prettier
2021-04-30 20:21:38 +02:00
Daniël van Noord
d909f593a7
Fix prettier installation #774
2021-04-30 20:18:30 +02:00
Daniël van Noord
266b808c4a
Merge pull request #778 from DanielNoord/fix/timers
...
Actually fix #772
2021-04-29 23:28:02 +02:00
Daniël van Noord
bc936ebf20
Actually fix #772
2021-04-29 23:26:28 +02:00
Daniël van Noord
32b3167697
Merge pull request #777 from DanielNoord/tests
...
Tests and bug fix
2021-04-29 23:11:26 +02:00
Daniël van Noord
f47e1f59fe
Remove GC timers upon ascension #772
2021-04-29 23:09:23 +02:00
Daniël van Noord
e4cdc6b85a
Added tests for Toggles
2021-04-13 15:59:37 +02:00
Daniël van Noord
d23719c2a8
Added tests for toggles
2021-04-13 11:38:23 +02:00
Daniël van Noord
652d00ee72
Added typescript testing
2021-04-13 11:38:11 +02:00
Daniël van Noord
f8a13302b1
Merge pull request #770 from DanielNoord/tests
...
Tests
2021-04-13 00:05:14 +02:00
Daniël van Noord
8aac67b665
Fixed build
2021-04-13 00:03:46 +02:00
Daniël van Noord
8ce4e13646
Added additional tests
2021-04-13 00:03:35 +02:00
Daniël van Noord
80d03e1cbc
Added test directory to eslint
2021-04-12 23:47:11 +02:00
Daniël van Noord
d300d7c0fc
Changed Mocha reporter to Min
2021-04-12 23:42:48 +02:00
Daniël van Noord
fbcee9a425
Reloaded packages
2021-04-12 21:45:15 +02:00
Daniël van Noord
bf5e44ed9e
Merge pull request #769 from DanielNoord/tests
...
Tests
2021-04-12 21:30:32 +02:00
Daniël van Noord
d56ffd9961
Update to CI and incorporate tests
2021-04-12 21:27:56 +02:00
Daniël van Noord
adca267cfc
Added test to build command
2021-04-12 21:21:10 +02:00
Daniël van Noord
75dac873dc
Removed Beta
2021-04-12 21:19:48 +02:00
Daniël van Noord
84eed2d7c4
Fixed small bug
2021-04-12 21:19:07 +02:00
Daniël van Noord
f5e342f7c5
Added testing via Mocha
2021-04-12 21:19:00 +02:00
Daniël van Noord
23db16917c
Changed to .json
2021-04-12 21:18:31 +02:00
Daniël van Noord
077f0120b7
Changed folder structure
2021-04-12 13:02:28 +02:00
Daniël van Noord
1545d9782b
Improved building tooltip #766
2021-04-11 22:04:58 +02:00
Daniël van Noord
62dea78e65
Merge pull request #765 from DanielNoord/nextachiev
...
Nextachiev
2021-04-09 16:02:43 +02:00
Daniël van Noord
309ebd6805
Update menu after changing setting
2021-04-09 15:58:49 +02:00
Daniël van Noord
3e3945461d
Show buildings left till achievement in tooltip #4
2021-04-09 15:53:33 +02:00
Daniël van Noord
d99837df61
Merge pull request #760 from Aktanusa/gh-pages
...
Push dev to be in line with gh-pages
2021-04-07 20:22:43 +02:00
Daniël van Noord
fc37ae1b95
Merge pull request #759 from Aktanusa/master
...
Push hot fix to Pages
2021-04-07 20:20:36 +02:00
Daniël van Noord
1a07cb6a01
Merge pull request #758 from DanielNoord/hotfix
...
Hotfix
2021-04-07 20:19:51 +02:00
Daniël van Noord
3d6e1d0c84
Fixed mod on Safari #753
2021-04-07 20:18:21 +02:00
Daniël van Noord
5cd0613398
Additional changes to typescript
2021-04-06 14:47:04 +02:00
Daniël van Noord
b011556841
Merge pull request #756 from Aktanusa/master
...
Push fixes to pages
2021-04-06 11:57:14 +02:00
Daniël van Noord
2d0b499a14
Merge pull request #757 from DanielNoord/hotfixes
...
Fix display error with 0 cps #754
2021-04-06 11:56:16 +02:00
Daniël van Noord
210ac67701
Fix display error with 0 cps #754
2021-04-06 11:54:37 +02:00
Daniël van Noord
6ff8ee69f2
Merge pull request #755 from DanielNoord/typescript
...
Prepared partial move to TypeScript
2021-04-06 11:41:07 +02:00
Daniël van Noord
16c80cbf4b
Prepared partial move to TypeScript
2021-04-06 11:36:24 +02:00
Daniël van Noord
d02ce3cd8f
Merge pull request #752 from Aktanusa/master
...
Hotfixes to Pages
2021-04-04 22:16:48 +02:00
Daniël van Noord
df639be579
Merge pull request #751 from DanielNoord/hotfixes
...
Hotfixes
2021-04-04 22:16:27 +02:00
Daniël van Noord
86678b0871
Fixed break when Temple is not loaded
2021-04-04 22:15:05 +02:00
Daniël van Noord
90be659c13
Fixed background colours being transparant #750
2021-04-04 22:13:52 +02:00
Daniël van Noord
c51c900d1c
Merge pull request #749 from Aktanusa/master
...
Pages to version 2.031.7
2021-04-04 20:45:03 +02:00
Daniël van Noord
ca5d9bae11
Merge pull request #748 from Aktanusa/dev
...
Master to version 2.031.7
2021-04-04 20:44:39 +02:00
Daniël van Noord
cba8eb7632
Merge pull request #747 from DanielNoord/version20317
...
Update to version 2.031.7
2021-04-04 20:44:01 +02:00
Daniël van Noord
119faa5305
Update to version 2.031.7
2021-04-04 20:42:05 +02:00
Daniël van Noord
32c38fd9fa
Merge pull request #746 from DanielNoord/fixflicker
...
Fixflicker
2021-04-04 20:37:08 +02:00
Daniël van Noord
fd2d22564c
Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into fixflicker
2021-04-04 20:29:44 +02:00
Daniël van Noord
48e8fd2154
Fix black flicker at loading & timers change #621
2021-04-04 20:29:29 +02:00
Daniël van Noord
e7cf3b076d
Merge pull request #745 from DanielNoord/cyclius
...
Cyclius and ESLint errors
2021-04-04 20:15:17 +02:00
Daniël van Noord
37bff7df1e
Fixed #707
2021-04-04 20:13:44 +02:00
Daniël van Noord
9b04663cd8
Build CookieMonster.js
2021-04-04 17:06:45 +02:00
Daniël van Noord
e3321ebe2f
Fixed high number of ESLint errors
2021-04-04 17:05:39 +02:00
Daniël van Noord
e2f99d1cf9
Removed eslintignore file
2021-04-04 15:14:29 +02:00
Daniël van Noord
3f08ed3e2d
Additional fixes for #707
2021-04-04 14:04:56 +02:00
Daniël van Noord
444462ae53
Initial fix for #707
2021-04-04 13:52:34 +02:00
Daniël van Noord
5017f1c217
Merge pull request #744 from DanielNoord/missingachievements
...
Missingachievements
2021-04-04 13:36:35 +02:00
Daniël van Noord
d5aaba3546
Build CookieMonster.js
2021-04-04 13:25:02 +02:00
Daniël van Noord
d511f4f1f2
Show missing achievements toggle
2021-04-04 13:22:44 +02:00
Daniël van Noord
5a14712841
Renamed Draw hook
2021-04-03 16:25:24 +02:00
Daniël van Noord
383be573c9
Merge pull request #743 from DanielNoord/clickscps
...
Show cookies from clicks in stats
2021-04-03 16:13:56 +02:00
Daniël van Noord
66ede34b92
Fixed some typos
2021-04-03 16:11:42 +02:00
Daniël van Noord
e482a62fe8
Updated npm and dependencies
2021-04-03 16:11:34 +02:00
Daniël van Noord
e1c6f60726
Show cookies from clicking in stats #698
2021-04-03 16:00:00 +02:00
Daniël van Noord
bfc54bf9de
Merge pull request #742 from DanielNoord/favouritesettingsfixes
...
Changes to favourite settings
2021-04-03 09:13:14 +02:00
Daniël van Noord
812a2aaa69
Reordered directory Disp/Settings
2021-04-03 09:09:14 +02:00
Daniël van Noord
08a1e5aa6b
Fixed overlapping labels in settings
2021-04-03 09:06:07 +02:00
Daniël van Noord
566efbc68b
Made favourite settings stars yellow
2021-04-03 08:50:35 +02:00
Daniël van Noord
66e74bb702
Merge pull request #741 from DanielNoord/favouritesettings
...
Created favourite settings functionality #727
2021-04-02 23:23:06 +02:00
Daniël van Noord
9a84b0abe5
Created favourite settings functionality #727
2021-04-02 23:20:19 +02:00
Daniël van Noord
ddc77b332d
Merge pull request #740 from DanielNoord/bugfixes
...
Fixed bug in Dragon Aura cps change display #734
2021-04-02 20:11:32 +02:00
Daniël van Noord
2cff52f5c7
Fixed bug in Dragon Aura cps change display #734
2021-04-02 19:29:49 +02:00
Daniël van Noord
3a28263099
Merge pull request #738 from DanielNoord/bugfixes
...
Bugfixes
2021-04-02 15:12:37 +02:00
Daniël van Noord
822e8a8066
Fixed red and purple PP switched #735
2021-04-02 15:10:13 +02:00
Daniël van Noord
ba0ff40aba
Fixed dragon tooltip #736
2021-04-02 15:08:02 +02:00
Daniël van Noord
5f64d2dd9f
Fixed notation of negative numbers #736
2021-04-02 14:58:31 +02:00
Daniël van Noord
10eb88cde1
Fixed typo
2021-04-02 14:50:55 +02:00
Daniël van Noord
aebd62317b
Merge pull request #733 from DanielNoord/bugfixes
...
Bugfixes
2021-03-28 15:09:51 +02:00
Daniël van Noord
305762e797
Fixed edit prompts in settings #732
2021-03-28 15:07:41 +02:00
Daniël van Noord
fb0f9c3bf3
Increase max length to 100
2021-03-28 14:53:20 +02:00
Daniël van Noord
f506cb136e
Fixed incorrect mature for Garden tooltip #731
2021-03-28 14:11:58 +02:00
Daniël van Noord
adb020dfc2
Merge pull request #730 from DanielNoord/functions
...
Functions
2021-03-28 10:56:51 +02:00
Daniël van Noord
972d4723ed
New colour settings, changeable flash colour #728
2021-03-28 10:55:10 +02:00
Daniël van Noord
fe8749e7b2
Wrinkler button disappear when not active
2021-03-26 16:26:57 +01:00
Daniël van Noord
48c3bad336
Fixed #726
2021-03-26 13:08:04 +01:00
Daniël van Noord
212a358a6a
Merge pull request #725 from DanielNoord/reordersettings
...
Reordersettings
2021-03-23 09:38:45 +01:00
Daniël van Noord
02d49dca2e
Changed order and reformatted settings #721
2021-03-23 09:35:48 +01:00
Daniël van Noord
cf1c2c39f4
Merge pull request #724 from Aktanusa/master
...
Master
2021-03-23 08:42:31 +01:00
Daniël van Noord
f7c4e23eb3
Merge pull request #723 from Aktanusa/dev
...
Push to master
2021-03-23 08:42:17 +01:00
Daniël van Noord
202913179c
Merge pull request #722 from DanielNoord/fix/hotfixes
...
Hotfixes
2021-03-23 08:41:44 +01:00
Daniël van Noord
c0a13231ad
Fix formatting of Cookie Counter #714
2021-03-23 08:38:03 +01:00
Daniël van Noord
5b34685cd4
Merge pull request #719 from Aktanusa/master
...
Push fixes to pages
2021-03-22 08:28:47 +01:00
Daniël van Noord
d1daa6d434
Merge pull request #718 from Aktanusa/dev
...
Push fixes to master
2021-03-22 08:28:28 +01:00
Daniël van Noord
9d9ef9b514
Merge pull request #717 from DanielNoord/fix/hotfixes
...
Fix/hotfixes
2021-03-22 08:28:03 +01:00
Daniël van Noord
be529d0b71
Update commands and removed comment
2021-03-22 08:21:28 +01:00
Daniël van Noord
68c8cc9d54
Fix break upon 0 wrinklers #715
2021-03-22 08:20:52 +01:00
Daniël van Noord
81114acfa2
Merge pull request #713 from Aktanusa/master
...
Master
2021-03-21 14:57:17 +01:00
Daniël van Noord
e882cb15f5
Merge pull request #712 from Aktanusa/dev
...
Push fixes to master
2021-03-21 14:57:02 +01:00
Daniël van Noord
ae7ea4fbd4
Merge pull request #711 from DanielNoord/fix/hotfixes
...
Fix/hotfixes
2021-03-21 14:56:35 +01:00
Daniël van Noord
1653c18c55
Fixed negative GC effect breaking mod #710
2021-03-21 14:13:35 +01:00
Daniël van Noord
3e5671f39e
Merge pull request #706 from Aktanusa/master
...
Push hot fixes to Pages
2021-03-19 17:52:23 +01:00
Daniël van Noord
2438da6e38
Merge pull request #705 from Aktanusa/dev
...
Push hot fixes to master
2021-03-19 17:51:59 +01:00
Daniël van Noord
79b960bde7
Merge pull request #704 from DanielNoord/fix/hotfixes
...
Fix/hotfixes
2021-03-19 17:51:31 +01:00
Daniël van Noord
11554722ed
Update changelog to reflect hotfixes
2021-03-19 17:49:06 +01:00
Daniël van Noord
a4e2b9f68c
Changed name of Rigidel option
2021-03-19 17:44:24 +01:00
Daniël van Noord
823d12fa70
Created RIgidel mode #694
2021-03-19 17:39:27 +01:00
Daniël van Noord
51c89bdc88
Fix upgr bar legend, wrink butt tooltip #700 , #695
2021-03-19 17:38:45 +01:00
Daniël van Noord
9e107c7a3a
Update README.md
2021-03-19 08:52:07 +01:00
Daniël van Noord
9b33169fcc
Merge pull request #693 from Aktanusa/master
...
Push 2.031.6 to Pages
2021-03-18 09:31:52 +01:00
Daniël van Noord
641471b5bc
Merge pull request #692 from Aktanusa/dev
...
Push 2.031.6 to master
2021-03-18 09:30:30 +01:00
Daniël van Noord
b470d13316
Merge pull request #691 from DanielNoord/randomchance
...
Last functions for 2.031.6
2021-03-18 09:29:34 +01:00
Daniël van Noord
36534be654
Pushed version number and changelog to 2.031.6
2021-03-18 09:28:49 +01:00
Daniël van Noord
1c3a27bc9a
Made description of decimal setting clearer #690
2021-03-18 09:17:08 +01:00
Daniël van Noord
8f5e40d3be
Display chance for random drops in stats #25
2021-03-18 09:15:30 +01:00
Daniël van Noord
2c309c04c2
Update bug_report.md
2021-03-18 00:01:59 +01:00
Daniël van Noord
6b2425fa19
Updated CONTRIBUTING.md to reflect new structure
2021-03-18 00:00:23 +01:00
Daniël van Noord
104159e4ac
Merge pull request #689 from DanielNoord/update
...
Update
2021-03-17 23:57:44 +01:00
Daniël van Noord
00edec127c
Buttons to hide upgrade and building sections #47
2021-03-17 23:52:23 +01:00
Daniël van Noord
4d716e77e4
Toggle to display PP as time period #625
2021-03-17 23:19:34 +01:00
Daniël van Noord
1a0750e8d7
Regenerated package lock
2021-03-17 00:08:07 +01:00
Daniël van Noord
ff81b4ff02
Renamed commands
2021-03-17 00:05:57 +01:00
Daniël van Noord
f3b0bfa16d
Merge pull request #688 from DanielNoord/ppvalues
...
Number of functions
2021-03-17 00:01:36 +01:00
Daniël van Noord
9c2350a8e3
Fixed elder pledge tooltip #613
2021-03-16 23:53:41 +01:00
Daniël van Noord
b66caab11e
Set max length of lines
2021-03-16 23:53:28 +01:00
Daniël van Noord
5390c1af58
Updated max length of lines
2021-03-16 23:13:26 +01:00
Daniël van Noord
af508ceee5
Fix simple tooltips #687
2021-03-16 23:10:33 +01:00
Daniël van Noord
f6b2e70f9b
Fixed formatting and flickering of bottom bar #686
2021-03-16 22:55:02 +01:00
Daniël van Noord
6caee4d8fb
Changed PP colour coding #683
2021-03-16 22:28:54 +01:00
Daniël van Noord
e3d3f649c3
Moved files into Github folder
2021-03-16 13:34:23 +01:00
Daniël van Noord
f138745a0f
Formatting changes
2021-03-16 13:31:30 +01:00
Daniël van Noord
0253e9b80d
Merge pull request #685 from DanielNoord/soundtest
...
Test button for sounds and new Audio() code #630
2021-03-16 13:29:10 +01:00
Daniël van Noord
d35217b6d5
Test button for sounds and new Audio() code #630
2021-03-16 13:27:21 +01:00
Daniël van Noord
b201e15c8e
Merge pull request #684 from DanielNoord/code/linting
...
Code/linting
2021-03-16 09:38:24 +01:00
Daniël van Noord
0a30d8e3e8
Removed unnecessary globals
2021-03-16 09:35:53 +01:00
Daniël van Noord
a65af049b6
Changes according to Eslint
2021-03-16 09:32:50 +01:00
Daniël van Noord
26d8e75935
Merge pull request #682 from DanielNoord/fixdev
...
Fix dev build
2021-03-15 23:48:27 +01:00
Daniël van Noord
87eac02185
Fix dev build
2021-03-15 23:47:48 +01:00
Daniël van Noord
8ff50fbbb9
Merge pull request #681 from DanielNoord/mastertodev
...
Mastertodev
2021-03-15 23:46:14 +01:00
Daniël van Noord
c3b1637d08
Merge branch 'dev' into mastertodev
2021-03-15 23:46:03 +01:00
Daniël van Noord
f9513d3615
Merge pull request #678 from Aktanusa/master
...
Master
2021-03-15 23:44:09 +01:00
Daniël van Noord
c72e01687f
Merge pull request #680 from DanielNoord/fix/font
...
Fix #677
2021-03-15 23:42:40 +01:00
Daniël van Noord
022b3860eb
Fix #677
2021-03-15 23:39:42 +01:00
Daniël van Noord
b09dcd6f47
Merge pull request #679 from DanielNoord/tooltip/pantheon
...
Added tooltips to Pantheon #597
2021-03-15 23:35:47 +01:00
Daniël van Noord
eee72bceb6
Added tooltips to Pantheon #597
2021-03-15 23:32:52 +01:00
Daniël van Noord
7b3a7816f1
Merge pull request #676 from DanielNoord/hotfix/plant
...
Hotfix/plant
2021-03-15 22:17:05 +01:00
Daniël van Noord
403eb59cfd
Actually fix #675
2021-03-15 21:39:59 +01:00
Daniël van Noord
220b67b440
Fixed #675
2021-03-15 21:37:22 +01:00
Daniël van Noord
b6d9ca8dbb
Merge pull request #674 from DanielNoord/fix/hotfix
...
Create tooltip for wrinkler buttons #628
2021-03-15 12:54:01 +01:00
Daniël van Noord
1c955e5da3
Merge pull request #672 from Aktanusa/master
...
Push hotfixes to dev
2021-03-15 12:51:49 +01:00
Daniël van Noord
9e9158ce81
Create tooltip for wrinkler buttons #628
2021-03-15 12:51:25 +01:00
Daniël van Noord
ad4e6560d6
Merge pull request #673 from Aktanusa/master
...
Push fixes to GH Pages
2021-03-15 09:03:25 +01:00
Daniël van Noord
71479a05e7
Merge pull request #671 from DanielNoord/fix/hotfix
...
Apply hotfixes
2021-03-15 09:02:32 +01:00
Daniël van Noord
7ec13d80bd
Fix #668 and #669
2021-03-15 09:00:12 +01:00
Daniël van Noord
fd2aa16c60
Fix display of cookies needed tk next HC
2021-03-15 08:57:48 +01:00
Daniël van Noord
7831521bc5
Fix #667
2021-03-15 08:47:59 +01:00
Daniël van Noord
6193fc8d3e
Fix #647
2021-03-15 08:30:05 +01:00
Daniël van Noord
91c0fd1165
Merge pull request #666 from Aktanusa/master
...
Master
2021-03-14 19:38:13 +01:00
Daniël van Noord
f85cde5fea
Merge pull request #665 from DanielNoord/fix/hotfix
...
Hotfix
2021-03-14 19:37:48 +01:00
Daniël van Noord
2f34b26602
Fix #660
2021-03-14 19:35:58 +01:00
Daniël van Noord
189ccbce49
Merge pull request #664 from Aktanusa/master
...
Master into dev
2021-03-14 19:11:38 +01:00
Daniël van Noord
3534466a58
Merge pull request #663 from Aktanusa/master
...
Added prettier
2021-03-14 19:09:13 +01:00
Daniël van Noord
3e07541fd5
Added prettier to master ( #662 )
...
* Bump dev to 2.031.6
* Added prettier (#661 )
* Added prettier
* Added prettier
* Added prettier
2021-03-14 19:08:36 +01:00
Daniël van Noord
932509a877
Added prettier ( #661 )
...
* Added prettier
* Added prettier
* Added prettier
2021-03-14 18:57:07 +01:00
Daniël van Noord
f3e7964262
Merge pull request #656 from DanielNoord/fix/hotfix
...
Push hot fixes to dev branch
2021-03-14 18:07:25 +01:00
Daniël van Noord
9b0429c141
Merge branch 'dev' into fix/hotfix
2021-03-14 18:06:17 +01:00
Daniël van Noord
7a3e153319
Merge pull request #659 from Aktanusa/master
...
Master
2021-03-14 17:24:57 +01:00
Daniël van Noord
5dda8cac55
Merge pull request #658 from DanielNoord/fix/hotfix
...
Fix #657
2021-03-14 17:24:36 +01:00
Daniël van Noord
d6675fe86d
Fix #657
2021-03-14 17:23:55 +01:00
Daniël van Noord
918790cad4
Merge pull request #655 from Aktanusa/master
...
Master
2021-03-14 16:38:39 +01:00
Daniël van Noord
80b8a0b834
Merge pull request #654 from DanielNoord/fix/hotfix
...
Fixed secondary issues in #648
2021-03-14 16:38:08 +01:00
Daniël van Noord
817c5b0e3c
Fixed secondary issues in #648
2021-03-14 16:37:25 +01:00
Daniël van Noord
b4426e48db
Merge pull request #653 from Aktanusa/master
...
Master
2021-03-14 16:24:04 +01:00
Daniël van Noord
49b8414edf
Merge pull request #652 from DanielNoord/fix/hotfix
...
Fix #651
2021-03-14 16:22:36 +01:00
Daniël van Noord
99ae657c45
Fix #651
2021-03-14 16:21:58 +01:00
Daniël van Noord
a9c1d6a170
Merge pull request #650 from Aktanusa/master
...
Master
2021-03-14 16:12:45 +01:00
Daniël van Noord
409a8e2911
Merge pull request #649 from DanielNoord/fix/hotfix
...
Hotfix 1
2021-03-14 16:12:30 +01:00
Daniël van Noord
08c2f99b21
Hotfix 1
2021-03-14 16:10:52 +01:00
Daniël van Noord
3247057394
Merge pull request #646 from DanielNoord/bumpdev
...
Set up dev for 2.031.6
2021-03-14 14:51:09 +01:00
Daniël van Noord
d1fe5c013c
Bump dev to 2.031.6
2021-03-14 14:50:04 +01:00
Daniël van Noord
d9429418e9
Merge pull request #645 from Aktanusa/master
...
Publish v 2.031.5
2021-03-14 14:47:12 +01:00
Daniël van Noord
0cd5732e65
Merge pull request #644 from Aktanusa/dev
...
Hotfix
2021-03-14 14:46:04 +01:00
Daniël van Noord
2b3b9a6f34
Merge pull request #643 from DanielNoord/hotfix/fix
...
Hotfix for version 2.051.3
2021-03-14 14:45:35 +01:00
Daniël van Noord
458dd873b4
Hotfix for version 2.051.3
2021-03-14 14:45:05 +01:00
Daniël van Noord
5a3627b6d3
Merge pull request #642 from Aktanusa/dev
...
Version 2.031.5 to master
2021-03-14 14:38:48 +01:00
Daniël van Noord
8099a5794b
Version 2.031.5 and change to action ( #641 )
...
* Remove sourcemap comment
* Bumped version and updated release notes
* Updated CI to remove sourcemap comment
* Fixed faulty command in action
* Fixed fault command (again)
* Fixed action
* Update action
* Action
* Try 123512
* Try 123541
* Action?
* Action
* Better Action
* Maybe?
* Maybe
* Please...
2021-03-14 14:38:11 +01:00
Daniël van Noord
a983ec23b0
Update README.md
2021-03-14 13:41:55 +01:00
Daniël van Noord
9a5e2d2e66
Merge pull request #640 from DanielNoord/fix/fixes
...
Fixed #638 and #636
2021-03-14 13:35:47 +01:00
Daniël van Noord
5f864d9055
Fixed #638 and #636
2021-03-14 13:18:56 +01:00
Daniël van Noord
1bffb58782
Complete overhaul of code structure and relevant files ( #639 )
2021-03-14 00:41:14 +01:00
Daniël van Noord
bb34bce9a5
Merge pull request #635 from DanielNoord/code/modules
...
Code/modules
2021-03-09 23:35:04 +01:00
Daniël van Noord
1604b4697e
Updated action to reflect new structure
2021-03-09 23:33:20 +01:00
Daniël van Noord
d429719a57
Added comments
2021-03-09 23:31:02 +01:00
Daniël van Noord
3902589306
Change in structure and first use of webpack
2021-03-09 23:14:47 +01:00
Daniël van Noord
1d01caef98
Merge pull request #634 from DanielNoord/fix/bugs
...
Fix/bugs
2021-03-09 21:37:58 +01:00
Daniël van Noord
b388e2eb9c
Fix garden tooltip when pressing shift #632
2021-03-09 21:34:18 +01:00
Daniël van Noord
e60d514ad6
Fix heavenly chips per second display #629
2021-03-09 21:21:22 +01:00
Daniël van Noord
2835438e8e
Fixed selling with block buying #627
2021-03-09 21:02:19 +01:00
Daniël van Noord
aa89b6f13c
Merge pull request #624 from Aktanusa/master
...
Publish hotfixes
2021-02-26 00:13:59 +01:00
Daniël van Noord
771180776e
Merge pull request #623 from DanielNoord/hotfixes
...
Hotfixes
2021-02-26 00:13:34 +01:00
Daniël van Noord
5cd266b91f
Merge pull request #622 from DanielNoord/hotfixes
...
Hotfixes
2021-02-26 00:13:22 +01:00
Daniël van Noord
6ca414ed17
Fixed crash on selecting sell all #620
2021-02-25 22:50:06 +01:00
Daniël van Noord
61a30c704f
Fix issues with warning not displaying #619
2021-02-25 22:33:35 +01:00
Daniël van Noord
75bf3f5c17
Fix pop fattest wrinkler #618
2021-02-25 22:20:55 +01:00
Daniël van Noord
db22e07d8e
Fixed #617
2021-02-25 22:17:21 +01:00
Daniël van Noord
0bd8cc898e
Merge pull request #616 from DanielNoord/hotfixes
...
Hotfixes to dev branch
2021-02-24 18:24:51 +01:00
Daniël van Noord
c96a2f4f89
Merge branch 'dev' into hotfixes
2021-02-24 18:24:31 +01:00
Daniël van Noord
7986f2ab46
Merge pull request #615 from Aktanusa/master
...
Push hot fixes
2021-02-24 18:22:27 +01:00
Daniël van Noord
31088ca686
Merge pull request #614 from DanielNoord/hotfixes
...
Hotfixes
2021-02-24 18:21:20 +01:00
Daniël van Noord
c95711d8b9
Fixed two issues with warning #612 , #610
2021-02-24 18:15:25 +01:00
Daniël van Noord
3ce7822854
Fixed Upgrades not sorting on PP #609
2021-02-24 17:58:44 +01:00
Daniël van Noord
57fb8430a0
Fixed Disp.Beautify and tooltips of upgrades #608
2021-02-24 17:56:02 +01:00
Daniël van Noord
3975032f4b
Added build-test command
2021-02-24 17:55:34 +01:00
Daniël van Noord
2ccb4ad550
Merge pull request #607 from DanielNoord/pushdev
...
Push version of dev branch
2021-02-24 00:37:46 +01:00
Daniël van Noord
2cf5ba6820
Pushed dev branch to 2.031.5
2021-02-24 00:33:08 +01:00
Daniël van Noord
a985c3ba89
Removed push stage from actions
2021-02-24 00:32:38 +01:00
Daniël van Noord
936f538343
Merge pull request #606 from Aktanusa/master
...
Push to GH Pages (v2.031.4)
2021-02-24 00:31:27 +01:00
Daniël van Noord
f3617d5fc2
Merge pull request #605 from Aktanusa/dev (v 2.031.4)
...
Version 2.031.4
2021-02-24 00:26:25 +01:00
Daniël van Noord
71f16eb6e1
Merge branch 'master' into dev
2021-02-24 00:25:39 +01:00
Daniël van Noord
4cf847376f
Merge pull request #604 from DanielNoord/feature/changelog
...
Final update for 2.031.4
2021-02-24 00:22:28 +01:00
Daniël van Noord
ab3a4b37bc
Updated ESLint action
2021-02-24 00:21:44 +01:00
Daniël van Noord
fcd5588a03
Added changelog
2021-02-24 00:18:38 +01:00
Daniël van Noord
08faf9f198
Made prelimenary switch to airbnb-base
2021-02-24 00:14:14 +01:00
Daniël van Noord
3ad492c23f
Merge pull request #603 from DanielNoord/feature/changelog
...
Feature/changelog
2021-02-23 22:17:57 +01:00
Daniël van Noord
081a8317f9
Fix edifice warning showing when not relevant #600
2021-02-23 22:11:33 +01:00
Daniël van Noord
ab4012b5ad
Added requirements for garden to stats page #602
2021-02-23 22:08:26 +01:00
Daniël van Noord
4a552352c8
Added pop-up notifying of new version
2021-02-23 21:51:13 +01:00
Daniël van Noord
19903378f2
Added a changelog to the info tab #473
2021-02-23 21:12:16 +01:00
Daniël van Noord
ef05396841
Merge pull request #601 from DanielNoord/feature/chainstats
...
Feature/chainstats
2021-02-23 09:02:19 +01:00
Daniël van Noord
9281ec7e8c
Show req. CPS for next Chain level in stats #29
2021-02-23 08:59:51 +01:00
Daniël van Noord
2fcb7c0f66
FIxed #580 and started at #29
2021-02-23 00:35:06 +01:00
Daniël van Noord
e6596713b9
Fix small bug in Wrinkler stats
2021-02-22 22:53:45 +01:00
Daniël van Noord
a1c1209386
Merge pull request #598 from DanielNoord/fix/smallfixes
...
Small fixes and new functions
2021-02-21 23:39:25 +01:00
Daniël van Noord
e0c7643671
Allow user-customizable tooltip warnings #105
2021-02-21 23:37:15 +01:00
Daniël van Noord
b854773766
Fixed TimerBar not disappearing with 0 timers #588
2021-02-21 23:12:15 +01:00
Daniël van Noord
e139f9d500
Changed default setting of ColorPPBulkMode
2021-02-21 20:17:18 +01:00
Daniël van Noord
6d60ffb139
Merge pull request #594 from DanielNoord/feature/pp
...
Feature/pp
2021-02-21 17:37:28 +01:00
Daniël van Noord
ad61e8cf09
Allow PP to ignore non-buyable buildings #148
2021-02-21 17:32:37 +01:00
Daniël van Noord
5dffa1c2ac
Allow ignoring 1, 2 or 3 best build with PP #155
2021-02-21 16:50:57 +01:00
Daniël van Noord
69f972fac2
Allow pp based on "less than x secs of CPS" #149
2021-02-21 16:21:43 +01:00
Daniël van Noord
9ead87dd16
Merge pull request #592 from DanielNoord/fix/sim
...
Fixes to Sim.js and content mod acceptance #560
2021-02-21 10:44:42 +01:00
Daniël van Noord
e2d5c7e6e2
Check for new mods and update functions #560
2021-02-21 10:40:52 +01:00
Daniël van Noord
e4e364ade3
Fixes to Sim.js and content mod acceptance #560
2021-02-21 10:30:55 +01:00
Daniël van Noord
6ca617381a
Merge pull request #590 from DanielNoord/feature/heavenly
...
Number of functions related to Stats page and registration to CCRepo
2021-02-21 00:17:45 +01:00
Daniël van Noord
69a151a25a
Fixed rounding issues with HC per second
2021-02-21 00:15:27 +01:00
Daniël van Noord
fdc94dd2db
Make Missed GC stat toggable #434
2021-02-21 00:06:03 +01:00
Daniël van Noord
c02d2c10d1
Allow target Heavenly Chips in stats #269
2021-02-21 00:00:51 +01:00
Daniël van Noord
963116ba2f
Added HC per second to stats and tooltip #169
2021-02-20 23:25:52 +01:00
Daniël van Noord
f1183801a8
Change package name to avoid conflict
2021-02-20 20:41:25 +01:00
Daniël van Noord
db19976e3e
Small visual changes to stats page
2021-02-20 20:20:53 +01:00
Daniël van Noord
894f4359cd
Added info for CCRepo
2021-02-20 20:20:10 +01:00
Daniël van Noord
8cb3c43188
Merge pull request #586 from DanielNoord/fix/todo
...
Fix/todo
2021-02-20 17:20:15 +01:00
Daniël van Noord
88d7b11b87
Fixed fatal error in CM.Disp.UpdateAscendState
2021-02-20 17:17:41 +01:00
Daniël van Noord
af5a44eb9a
Added 'time left' to ascend tooltip #80
2021-02-20 17:13:50 +01:00
Daniël van Noord
fd77e84a90
Removed old code
2021-02-20 16:15:03 +01:00
Daniël van Noord
43fb9112a7
Replaced var with let
2021-02-20 16:12:16 +01:00
Daniël van Noord
f3ceec3c91
Removed nearly all TODO's #485
2021-02-20 16:10:25 +01:00
Daniël van Noord
b3c2eaeb3e
Merge pull request #585 from DanielNoord/feature/title
...
Show in title if GC/Reindeer can spawn #73
2021-02-20 13:56:46 +01:00
Daniël van Noord
717f106468
Show in title if GC/Reindeer can spawn #73
2021-02-20 13:55:26 +01:00
Daniël van Noord
50911eb01a
Merge pull request #583 from DanielNoord/annotate/sim
2021-02-20 13:37:34 +01:00
Daniël van Noord
12657df5cf
Big update to structure and annotation #557
2021-02-20 13:35:31 +01:00
Daniël van Noord
bef40336a5
Merged actions into one file
2021-02-19 21:35:01 +01:00
Daniël van Noord
d9c2f3f432
Merge pull request #581 from DanielNoord/annotate/main
...
Annotate/main
2021-02-19 21:18:28 +01:00
Daniël van Noord
59f8808b61
Finished annotation of Main.js #556
2021-02-19 21:16:36 +01:00
Daniël van Noord
d3aa2c30db
Small naming fixes
2021-02-19 20:59:29 +01:00
Daniël van Noord
1e92ff6b92
Merge pull request #579 from DanielNoord/annotate
...
Updated Cache.js
2021-02-19 00:00:12 +01:00
Daniël van Noord
ebbb552100
Merge branch 'dev'
2021-02-18 23:57:27 +01:00
Daniël van Noord
67535eaa4c
Annotated Cache.js and solved issues #555
2021-02-18 23:53:51 +01:00
Daniël van Noord
ca46c10c55
Fixes to chain cookies stats
2021-02-18 22:57:26 +01:00
Daniël van Noord
cfb7659c1f
Merge pull request #577 from DanielNoord/hotfix/dev
...
Fix missing upgrades display on dev branch
2021-02-18 21:34:07 +01:00
Daniël van Noord
1ebc8cacc6
Fix missing upgrades display on dev branch
2021-02-18 21:32:58 +01:00
Daniël van Noord
0310d23eb4
Merge pull request #576 from Aktanusa/master
...
Push hot fix to master
2021-02-18 21:31:09 +01:00
Daniël van Noord
e9ced31639
Merge pull request #575 from DanielNoord/hotfix
...
Fix missing upgrades display #574
2021-02-18 21:30:43 +01:00
Daniël van Noord
c4c95eaa31
Fix missing upgrades display #574
2021-02-18 21:29:14 +01:00
Daniël van Noord
b7c47bbe6c
Merge pull request #571 from DanielNoord/fix/missinupgrades
...
Fixed crash with no upgrades purchased #528
2021-02-17 22:49:26 +01:00
Daniël van Noord
392c473839
Merge pull request #573 from Aktanusa/master
...
Publish hot fix
2021-02-17 22:47:35 +01:00
Daniël van Noord
f5ea276a63
Merge pull request #572 from DanielNoord/hotfix/missingupgrades
...
Fix crash with no upgrades #528
2021-02-17 22:47:08 +01:00
Daniël van Noord
9357e16dec
Fix crash with no upgrades #528
2021-02-17 22:45:39 +01:00
Daniël van Noord
1aecb8a8e1
Fixed crash with no upgrades purchased #528
2021-02-17 22:42:21 +01:00
Daniël van Noord
eb99ba1b78
Changed all "==" to "==="
2021-02-16 23:47:44 +01:00
Daniël van Noord
6f67c171f4
Merge pull request #570 from DanielNoord/fix/sound
...
Fix/sound
2021-02-16 23:43:58 +01:00
Daniël van Noord
88b58f209f
Allow decoupling of base game and mod volume #567
2021-02-16 23:41:22 +01:00
Daniël van Noord
25250e8c46
Fix sounds playing during mod initialization #558
2021-02-16 23:40:34 +01:00
Daniël van Noord
84502bff4a
Merge pull request #566 from Aktanusa/master
...
Master
2021-02-11 23:09:54 +01:00
Daniël van Noord
cfa32ef295
Merge pull request #565 from DanielNoord/hotfixmain
...
Fix #563
2021-02-11 23:09:31 +01:00
Daniël van Noord
1de5dd27dd
Fix #563
2021-02-11 23:08:52 +01:00
Daniël van Noord
1c4e988e90
Merge pull request #564 from DanielNoord/hotfix
...
Fixed Title option not showing #563
2021-02-11 23:05:46 +01:00
Daniël van Noord
e3f58e2e73
Fixed Title option not showing #563
2021-02-11 23:04:36 +01:00
Daniël van Noord
e85a775468
Merge pull request #562 from DanielNoord/cache
...
Correctly build CookieMonster.js
2021-02-10 20:39:22 +01:00
Daniël van Noord
7af043bc55
Correctly build CookieMonster.js
2021-02-10 20:38:24 +01:00
Daniël van Noord
2b28cd64b1
Merge branch 'cache' into dev
2021-02-10 20:34:35 +01:00
Daniël van Noord
a24c666993
Resolved additional conflicts
2021-02-10 20:32:54 +01:00
Daniël van Noord
39b1ec6db4
Resolve conflicts
2021-02-10 20:30:50 +01:00
Daniël van Noord
11732b10aa
Updated mail address of Aktanusa
2021-02-10 20:23:12 +01:00
DanielNoord
346bf2b353
Merge pull request #561 from Aktanusa/npm
...
Add NPM
2021-02-10 00:09:56 +01:00
Daniel van Noord
e2ad102bb4
Added final newline
2021-02-10 00:09:11 +01:00
Daniel van Noord
975650fad6
Make terser run from npx
2021-02-10 00:07:30 +01:00
Daniel van Noord
e864dee788
Update name of CheckMainFile action
2021-02-10 00:04:19 +01:00
Daniel van Noord
76718f8c74
Fix CheckMainFile action
2021-02-10 00:01:34 +01:00
Daniel van Noord
66e61614dd
Updated README
2021-02-10 00:00:11 +01:00
Daniel van Noord
c061ed5b9e
Updated actions
2021-02-09 23:51:13 +01:00
Daniel van Noord
4c009df819
Changed Header.js to use const
2021-02-09 23:51:03 +01:00
Daniel van Noord
d1336efb90
Added NPM and created Build script
2021-02-09 23:46:39 +01:00
Daniel van Noord
fec72bbf91
Changed variable names
2021-02-09 23:13:42 +01:00
DanielNoord
1cd430f814
Update README.md
2021-02-08 09:14:13 +01:00
Daniel van Noord
a025fe51d7
Small fixes here and there
2021-02-07 10:32:30 +01:00
Daniel van Noord
df8957338b
Started annotating Cache.js
2021-02-07 10:32:23 +01:00
Daniel van Noord
4d0b5097fd
Annotated Header.js
2021-02-06 23:25:05 +01:00
Daniel van Noord
8ceef4cf2d
Updated Cache to use Objects1
2021-02-06 22:07:25 +01:00
Daniel van Noord
bc6e6eb110
Add Userscript variable to ESLint settings
2021-02-06 21:51:41 +01:00
DanielNoord
f3e84d0920
Merge pull request #552 from mason1920/dev
...
Make a Userscript and refer the README to It
2021-02-03 08:05:52 +01:00
DanielNoord
e9d7fc800f
Rename cookie-monster.user.js to CookieMonster.user.js
2021-02-03 08:04:47 +01:00
DanielNoord
f6461642e9
Update README.md with instruction for userscript
2021-02-03 08:03:28 +01:00
mason1920
769f7f18dd
Make a Userscript and Refer the README to It
...
Tested and works with Greasemonkey, Tampermonkey, and Violentmonkey.
2021-02-02 05:25:42 -05:00
DanielNoord
9e21fc8586
Merge pull request #551 from Aktanusa/DanielNoord-patch-2
...
Fixed some debugging left overs
2021-01-31 23:50:08 +01:00
DanielNoord
5f9b990854
Fixed some debugging left overs
2021-01-31 23:49:36 +01:00
DanielNoord
8724a2a334
Merge pull request #550 from Aktanusa/revert-519-dev
...
Revert "Added a feature to show mysterious achievements"
2021-01-31 23:46:25 +01:00
DanielNoord
a801e79790
Revert "Added a feature to show mysterious achievements"
2021-01-31 23:43:59 +01:00
DanielNoord
0cd64198ed
Merge pull request #549 from DanielNoord/todos
...
Fixed number of TODOs
2021-01-31 21:43:20 +01:00
Daniel van Noord
60859a774e
Test aciton
2021-01-31 21:36:44 +01:00
DanielNoord
cdff551384
Update CheckMainFile.yml
2021-01-31 21:36:23 +01:00
Daniel van Noord
a200763a6e
Small check 2
2021-01-31 21:33:14 +01:00
Daniel van Noord
e5d8aabb66
Small action test
2021-01-31 21:32:27 +01:00
DanielNoord
e2afebe1c8
Update CheckMainFile.yml
2021-01-31 21:31:03 +01:00
DanielNoord
3e4b9a0dd3
Update CheckMainFile.yml
2021-01-31 21:15:22 +01:00
DanielNoord
fd02f172dc
Update CheckMainFile.yml
2021-01-31 21:12:21 +01:00
DanielNoord
59061a5af0
Update CheckMainFile.yml
2021-01-31 21:08:40 +01:00
DanielNoord
5f35ccc76b
Update CheckMainFile.yml
2021-01-31 21:00:56 +01:00
DanielNoord
7e1597dae2
Merge branch 'dev' into dev
2021-01-31 20:51:54 +01:00
DanielNoord
968353d3fa
Update CheckMainFile.yml
2021-01-31 20:46:08 +01:00
DanielNoord
d29096bf72
Update CheckMainFile.yml
2021-01-31 20:41:31 +01:00
DanielNoord
9e696cafb1
Create CheckMainFile.yml
2021-01-31 20:37:44 +01:00
Daniel van Noord
545a1a3102
Fixed number of TODOs
2021-01-31 20:32:15 +01:00
DanielNoord
c602ea5f45
Merge pull request #544 from DanielNoord/modapi
...
Incorporate Modding API
2021-01-31 19:46:08 +01:00
Daniel van Noord
bbdbbfb667
Added Loop to hook of modding api #468
2021-01-31 19:44:00 +01:00
Daniel van Noord
d9e0e46e64
Added Loop to hook of modding api #468
2021-01-31 18:28:14 +01:00
DanielNoord
2608ff9149
Merge pull request #543 from DanielNoord/bulkbuy
...
Bulkbuy
2021-01-31 18:19:18 +01:00
Daniel van Noord
0e7880816e
Implement blocking of Bulk buying #143
2021-01-31 18:15:42 +01:00
Daniel van Noord
4e238e800c
Added BulkBuyBlock to settings
2021-01-31 17:37:02 +01:00
Daniel van Noord
8c6de64ac9
Spelling error in TimeFormat
2021-01-31 17:33:41 +01:00
DanielNoord
ca676c3b6a
Final test ESLint successful
2021-01-31 14:12:46 +01:00
DanielNoord
425d640592
Final test ESLint Action
2021-01-31 14:11:17 +01:00
DanielNoord
9c61d62a8f
Update README.md
2021-01-31 14:10:17 +01:00
DanielNoord
f4becd6a91
Create ESLint.yml
2021-01-31 14:08:07 +01:00
DanielNoord
d07964cfc5
Merge pull request #542 from DanielNoord/jshint
...
Jshint
2021-01-31 14:07:35 +01:00
Daniel van Noord
6519497ffc
Fixed ESLint install
2021-01-31 13:55:47 +01:00
Daniel van Noord
4dd640ef4b
Installed ESLint
2021-01-31 13:54:31 +01:00
Daniel van Noord
2d9af222c1
ESLint compliant
2021-01-31 13:33:34 +01:00
Daniel van Noord
416637bac3
Cache.js, Config.js & Data.js compy with JSHint
2021-01-30 16:12:09 +01:00
Daniel van Noord
f7de9831e5
Semicolons and easy fixes for all documents
2021-01-30 15:25:19 +01:00
Daniel van Noord
e4113d21e1
Semicolons and var declarations in Cache.js
2021-01-30 14:50:40 +01:00
DanielNoord
f4711c74da
Merge pull request #541 from DanielNoord/timerdisplay
...
Timerdisplay
2021-01-30 13:57:46 +01:00
Daniel van Noord
33d0478ca9
Make overlays of timers toggleable #494
2021-01-30 13:57:15 +01:00
Daniel van Noord
ac457ed8dc
Fixed TimerBarOverlay
2021-01-30 13:44:31 +01:00
Daniel van Noord
efcaccfb26
Added TimerBarOverlay option
2021-01-30 13:43:28 +01:00
DanielNoord
63a38e564c
Merge pull request #540 from DanielNoord/jscolorfix
...
Fixed JSColor display not updating #539
2021-01-30 11:36:00 +01:00
Daniel van Noord
2491f7a7cc
Fixed JSColor display not updating #539
2021-01-30 11:35:28 +01:00
DanielNoord
8deb0c435d
Merge pull request #538 from Aktanusa/master
...
Master
2021-01-30 01:18:23 +01:00
DanielNoord
b42daead36
Merge pull request #537 from Aktanusa/master
...
Master
2021-01-30 01:17:57 +01:00
DanielNoord
6ed19f23e6
Merge pull request #536 from Aktanusa/jscolor
...
Hot fix for jscolor
2021-01-30 01:17:33 +01:00
Daniel van Noord
13e1233e0f
Hot fix for jscolor
2021-01-30 01:16:18 +01:00
DanielNoord
d3af77e2c8
Merge pull request #535 from Aktanusa/master (JSColor update)
...
Update dev with JSColor
2021-01-30 01:13:26 +01:00
DanielNoord
314efc87f6
Merge pull request #534 from Aktanusa/master
...
Publish JSColor update
2021-01-30 01:12:45 +01:00
DanielNoord
b628d20363
Merge pull request #533 from Aktanusa/jscolor
...
Update JSColor and integrate it
2021-01-30 01:12:15 +01:00
Daniel van Noord
63139933ce
Clean up
2021-01-30 01:10:08 +01:00
Daniel van Noord
0547381845
Changed the settings for colours
2021-01-30 01:07:09 +01:00
Daniel van Noord
455e99e2ab
Updated jscolor to 2.4.5
2021-01-29 20:53:04 +01:00
DanielNoord
b2ae7c71cf
Merge pull request #532 from Aktanusa/revert-531-jscolor
...
Revert "Update JSColor to 2.4.5"
2021-01-29 18:46:03 +01:00
DanielNoord
eee663f414
Revert "Update JSColor to 2.4.5"
2021-01-29 18:45:53 +01:00
DanielNoord
3dd2e65092
Merge pull request #531 from DanielNoord/jscolor
...
Update JSColor to 2.4.5
2021-01-29 18:23:22 +01:00
Daniel van Noord
16ad8f78dc
Update JSColor to 2.4.5
2021-01-29 18:22:57 +01:00
DanielNoord
ce5b7940e4
Merge pull request #529 from DanielNoord/fixsound
...
Notify's don't occur when loading the mod #495
2021-01-28 22:01:41 +01:00
Daniel van Noord
7b8e29e346
Notify's don't occur when loading the mod #495
2021-01-28 22:01:01 +01:00
PneuJai
5e5e8f5e22
set Missing Achievements OFF to the first label
...
the switch statements make the coding much more easy to understand dont they?
2021-01-28 13:36:50 +08:00
PneuJai
d228967fe7
set Missing Achievements OFF to the first label
2021-01-28 13:34:19 +08:00
DanielNoord
b3757c452a
Merge pull request #527 from DanielNoord/harvestalltooltip
...
Tooltip for Harvest All button in Farm
2021-01-27 22:13:29 +01:00
Daniel van Noord
6c852e2c50
Tooltip for harvest all button #227
2021-01-27 22:12:37 +01:00
Daniel van Noord
5abdc77e30
Added data on possible effects
2021-01-27 21:43:24 +01:00
DanielNoord
5af7be93e3
Merge pull request #526 from DanielNoord/fix/gardentooltip
...
Make tooltips be replaced even when minigames were not loaded initially
2021-01-27 21:31:29 +01:00
Daniel van Noord
0171732e70
Made Grimoire tooltip always launch
2021-01-27 21:30:50 +01:00
Daniel van Noord
00c513798a
Make Garden tooltip load on LoadMinigames
2021-01-27 21:20:22 +01:00
PneuJai
235900c826
rename labels of MissingAchievements
2021-01-27 15:12:17 +08:00
DanielNoord
abc7dce047
Delete .github/workflows directory
2021-01-27 00:05:42 +01:00
DanielNoord
61fc4aaaef
Update main.yml
2021-01-27 00:00:29 +01:00
DanielNoord
4649ab87c6
Update main.yml
2021-01-26 23:58:53 +01:00
DanielNoord
7186be028b
Update main.yml
2021-01-26 23:54:49 +01:00
DanielNoord
e6728157b3
Update main.yml
2021-01-26 23:52:25 +01:00
DanielNoord
843bb00f34
Update main.yml
2021-01-26 23:50:52 +01:00
DanielNoord
1a73fb8a2d
Update main.yml
2021-01-26 23:50:02 +01:00
DanielNoord
1aa6d3797b
Update main.yml
2021-01-26 23:48:51 +01:00
DanielNoord
31ea583edb
Update main.yml
2021-01-26 23:47:49 +01:00
DanielNoord
b4cb0fee52
Update main.yml
2021-01-26 23:43:08 +01:00
DanielNoord
6dd4022a80
Update main.yml
2021-01-26 23:39:01 +01:00
DanielNoord
d30a064c69
Update main.yml
2021-01-26 23:38:03 +01:00
DanielNoord
cb91c91321
Update main.yml
2021-01-26 23:33:42 +01:00
DanielNoord
93e50181fe
Update main.yml
2021-01-26 23:31:49 +01:00
DanielNoord
3b137aa882
Update main.yml
2021-01-26 23:30:01 +01:00
DanielNoord
1d51a36ccd
Update main.yml
2021-01-26 23:28:24 +01:00
DanielNoord
30f6ecf8f2
Update main.yml
2021-01-26 23:23:05 +01:00
DanielNoord
1d639a9721
Update main.yml
2021-01-26 23:20:39 +01:00
DanielNoord
19260f9361
Merge pull request #525 from Aktanusa/action-1
...
Create main.yml
2021-01-26 23:18:42 +01:00
DanielNoord
94ba7487b1
Create main.yml
2021-01-26 23:17:59 +01:00
DanielNoord
cd3a9caab5
Merge pull request #524 from DanielNoord/gardentooltip
...
Gardentooltip
2021-01-26 22:32:24 +01:00
Daniel van Noord
45c3df2d4b
Fixed plant tooltips
2021-01-26 22:30:27 +01:00
Daniel van Noord
80e3ac746a
Fixed CM.Options.TooltipBuildUpgrade #523
2021-01-26 22:26:46 +01:00
Daniel van Noord
52cfd9ddc2
Renamed ToolWrink to TooltipWrink
2021-01-26 22:22:32 +01:00
Daniel van Noord
ffa664c476
Added option foor plot tooltip
2021-01-26 22:21:17 +01:00
Daniel van Noord
a9dfcaab75
Tooltip with curr/max reward for plants #183
2021-01-26 22:18:21 +01:00
PneuJai
91a2edf348
Fixed typos of ReplaceCrateTooltipAchievements
2021-01-26 23:27:31 +08:00
PneuJai
f450ae98ae
Fixed the default value for MissingAchievements
2021-01-26 23:26:35 +08:00
PneuJai
cd90b15fa3
Adapt to new option MissingAchievements
2021-01-26 22:39:17 +08:00
PneuJai
8a3eac78d4
Merge MissingShadowAchievements and MissingAchievements
2021-01-26 22:35:00 +08:00
PneuJai
cdfb35aa1b
rename ShowMysteriousAchievements to MissingAchievements
...
also moved to stats group
2021-01-26 22:23:06 +08:00
Daniel van Noord
23f19b4d62
Created (empty) tooltip for garden plots
2021-01-26 14:57:59 +01:00
Daniel van Noord
ab08bc60e7
Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip
2021-01-26 13:56:49 +01:00
DanielNoord
b48834e416
Merge pull request #522 from Aktanusa/master
...
Master
2021-01-26 13:56:26 +01:00
DanielNoord
3f20fac752
Merge pull request #521 from Aktanusa/master
...
Master
2021-01-26 13:56:09 +01:00
DanielNoord
2f12f9839a
Merge pull request #520 from DanielNoord/hotfix
...
Fix tooltips
2021-01-26 13:55:43 +01:00
Daniel van Noord
c62b514f0a
Fix tooltips
2021-01-26 13:55:14 +01:00
PneuJai
125113133a
Added CM.Disp.ReplaceCrateTooltipAchievements() into init
2021-01-26 20:45:37 +08:00
PneuJai
e5bd08c0c4
Added CM.Disp.ReplaceCrateTooltipAchievements
...
CM.Disp.ReplaceCrateTooltipAchievements will backup and replace Game.crate and Game.crateTooltip and edit their outputs to show mysterious achievements
Also this will check for CM.Options.ShowMysteriousAchievements and CM.Options.ShowMysteriousShadowAchievements
2021-01-26 20:44:48 +08:00
PneuJai
abfeabf08f
Added default values for those two options
2021-01-26 20:42:17 +08:00
PneuJai
d958fc08bf
Added two options
...
They are options to show/hide mysterious achievements, and they dont need functions cuz CM.Disp.ReplaceCrateTooltipAchievements will check for them
2021-01-26 20:41:22 +08:00
Daniel van Noord
1372942705
Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip
2021-01-26 13:37:55 +01:00
DanielNoord
e64e41e523
Merge pull request #518 from Aktanusa/master
...
Push hot fix to dev-branch
2021-01-26 13:37:03 +01:00
DanielNoord
f916008a3b
Merge pull request #517 from Aktanusa/master
...
Master
2021-01-26 13:36:18 +01:00
DanielNoord
fda6e65176
Merge pull request #516 from DanielNoord/fixes
...
Fix building sorting #515
2021-01-26 13:35:53 +01:00
Daniel van Noord
7795aa79a5
Fix building sorting #515
2021-01-26 13:31:01 +01:00
DanielNoord
1a94c4cb7c
Merge pull request #513 from Aktanusa/master
...
Master
2021-01-25 23:43:58 +01:00
DanielNoord
b6069e2358
Merge pull request #512 from Aktanusa/dev
...
Merge pull request #511 from Aktanusa/master
2021-01-25 23:43:36 +01:00
DanielNoord
a7af602aa3
Merge pull request #511 from Aktanusa/master
...
Merge dev and master
2021-01-25 23:43:10 +01:00
DanielNoord
937fa23569
Merge pull request #510 from Aktanusa/master
...
Publish hot fixes to GitHub Pages
2021-01-25 23:42:18 +01:00
DanielNoord
f36dcf012a
Merge pull request #509 from Aktanusa/dev
...
Publish hotfixes
2021-01-25 23:41:46 +01:00
DanielNoord
5a64ed45be
Merge pull request #508 from DanielNoord/fixes
...
A number of hot fixes for 2.031.3
2021-01-25 23:40:41 +01:00
Daniel van Noord
e5b24b393e
Fixed decimal notation #500
2021-01-25 23:37:41 +01:00
Daniel van Noord
92c28b092b
Timer bar now adjusts height correctly #499
2021-01-25 23:29:21 +01:00
Daniel van Noord
d5c5a5f62e
Show tooltip warnings when extra info is off #496
2021-01-25 23:24:25 +01:00
Daniel van Noord
867249e8cb
Missing upgrades no longer shows debug #497
2021-01-25 23:00:30 +01:00
Daniel van Noord
28e28fd5a0
Single fattest wrinkler now excludes shiny #498
2021-01-25 22:55:57 +01:00
Daniel van Noord
5f93186e7d
Fixed bug with display of missing upgrades
2021-01-25 22:46:08 +01:00
Daniel van Noord
0a57450815
Fix colour settings not displaying #504
2021-01-25 22:39:03 +01:00
Daniel van Noord
c08cefd1a6
Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip
2021-01-25 22:32:53 +01:00
Zohnannor
51ab15f2ec
Fix in Disp.js and combine
2021-01-25 20:31:32 +01:00
Zohnannor
8505b1621d
Update CM.Disp.FormatTime
...
Add years to date formatting, fixes #502
2021-01-25 20:31:32 +01:00
DanielNoord
be1ecf306a
Merge pull request #505 from Aktanusa/master (Hotfix for #502 )
...
Push hotfix to Github Pages
2021-01-25 20:30:14 +01:00
DanielNoord
901bc7c61f
Merge pull request #503 from Zohnannor/patch-1
...
Update CM.Disp.FormatTime
2021-01-25 20:29:05 +01:00
Zohnannor
192c5d105c
Fix in Disp.js and combine
2021-01-25 22:20:59 +03:00
DanielNoord
519e67dce9
Create CONTRIBUTING.md
2021-01-25 18:07:55 +01:00
Zohnannor
c184d8b7a7
Update CM.Disp.FormatTime
...
Add years to date formatting, fixes #502
2021-01-25 19:02:24 +03:00
Daniel van Noord
55c6b5db8b
Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip
2021-01-23 23:03:24 +01:00
DanielNoord
6df4abf945
Merge pull request #493 from Aktanusa/master
...
Rebase dev to incorporate hot fix for #490
2021-01-23 23:02:21 +01:00
DanielNoord
8ebb2f85ed
Merge pull request #492 from Aktanusa/master
...
Publish hot fix for #490 to GH-Pages
2021-01-23 23:01:01 +01:00
DanielNoord
242c6ba754
Merge pull request #491 from Aktanusa/fix/hasGod
...
Fixed hasGod #490
2021-01-23 23:00:21 +01:00
Daniel van Noord
00f79cb073
Fixed hasGod #490
2021-01-23 22:59:46 +01:00
Daniel van Noord
c64f42bcfa
Start work on Garden Tooltip
2021-01-23 22:55:39 +01:00
Daniel van Noord
29ba1c66cf
Moved most replace tooltip funcs to Main.js
2021-01-23 22:36:26 +01:00
DanielNoord
1875423a7b
Merge pull request #489 from DanielNoord/enhance/warnings
...
Some new functions related to warnings
2021-01-23 22:11:21 +01:00
Daniel van Noord
62f8e1fe82
Base warnings on new income instead of curr #488
2021-01-23 22:10:06 +01:00
Daniel van Noord
f257243b38
Optional warning for Conjure with Frenzy ( #487 )
2021-01-23 22:02:21 +01:00
Daniel van Noord
d71c197ec9
Added Conjure Frenzy to stats
2021-01-23 21:53:36 +01:00
DanielNoord
116679a5c9
Merge pull request #484 from Aktanusa/master (Release version 2.031.3)
...
Push master branch to GitHub Pages for version 2.031.3
2021-01-23 21:35:38 +01:00
DanielNoord
0ccd16577f
Merge pull request #436 from Aktanusa/dev (Version 2.031.3)
...
Merge dev-branch for v2.031.3 into master-branch
2020-12-28 14:10:06 +01:00
DanielNoord
7c9d6f570d
Merge branch 'master' into dev
2020-12-28 14:08:13 +01:00
DanielNoord
2648af3095
Merge pull request #483 from DanielNoord/version, Bump to version 2.031.3 ( #397 )
...
Bump to version 2.031.3
2020-12-28 14:01:53 +01:00
Daniel van Noord
cb284ed22d
Bumped version to 2.031.3
2020-12-28 14:00:35 +01:00
Daniel van Noord
5f5a1abac0
Removed a TODO
2020-12-28 14:00:21 +01:00
DanielNoord
66429ff0d2
Merge pull request #482 from DanielNoord/popbutton
...
Option for extra wrinkler popping buttons (#126 )
2020-12-28 13:26:09 +01:00
Daniel van Noord
c997ace2cf
Option for extra wrinkler popping buttons ( #126 )
2020-12-28 13:25:26 +01:00
DanielNoord
9e0dac5413
Merge pull request #481 from DanielNoord/popbutton
...
Another hotfix for levelup tooltip
2020-12-28 13:02:49 +01:00
Daniel van Noord
4a3bb46f8b
Another hotfix for levelup tooltip
2020-12-28 12:57:34 +01:00
DanielNoord
69fb8af639
Merge pull request #480 from DanielNoord/tooltip
...
Hotfix for dragon levelup Tooltip
2020-12-28 12:53:04 +01:00
Daniel van Noord
ad7d35e1ee
Hotfix for dragon levelup Tooltip
2020-12-28 12:51:50 +01:00
DanielNoord
2bedae477d
Merge pull request #479 from DanielNoord/tooltip ( #65 )
...
Added tooltip with costs for Dragon Levels (#65 )
2020-12-28 12:41:39 +01:00
Daniel van Noord
91ebbf39b9
Added tooltip with costs for Dragon Levels ( #65 )
2020-12-28 12:41:01 +01:00
DanielNoord
a8b874f37d
Merge pull request #478 from DanielNoord/save
...
Allow saving outside of autosave-interval (#469 )
2020-12-28 10:55:22 +01:00
Daniel van Noord
b58c3ea292
Allow saving outside of autosave-interval ( #469 )
2020-12-28 10:53:58 +01:00
DanielNoord
cafa12204e
Merge pull request #477 from DanielNoord/fix/timerbar ( #88 )
...
Added indicator when upgrades/buildings are purchasable with wrinklers
2020-12-27 14:13:05 +01:00
Daniel van Noord
b4e2236fb7
Fixed #88
2020-12-27 14:11:21 +01:00
DanielNoord
5d126b6be3
Merge pull request #476 from DanielNoord/fix/timerbar ( #147 , #304 , #388 )
...
Multiple commits related tot he TimerBar
2020-12-27 13:37:56 +01:00
Daniel van Noord
b6cd262ff2
Fixed ( #388 ) and add percentage overlay to timers
2020-12-27 13:27:44 +01:00
Daniel van Noord
6edda5420f
Fixed Timers for loans ( #304 )
2020-12-27 13:07:07 +01:00
Daniel van Noord
97014d273e
Added timer overlays in TimerBar ( #147 )
2020-12-27 12:39:33 +01:00
DanielNoord
319a3102de
Merge pull request #475 from DanielNoord/fix/avgcps ( #401 , #97 )
...
Fixed calculation of average and current CPS
2020-12-26 17:56:08 +01:00
Daniel van Noord
b9a1a5444f
Fixed calculation of average and current CPS
2020-12-26 17:53:12 +01:00
DanielNoord
3f405da833
Merge pull request #447 from Aktanusa/readmeupdate
...
Update README.md
2020-12-24 23:52:05 +01:00
Daniel van Noord
9a649f93d2
Removed action .yml files
2020-12-24 11:02:22 +01:00
DanielNoord
d89c8e3a0f
Create Lint.yml
2020-12-24 10:58:01 +01:00
DanielNoord
6bb99ace11
Update main.yml
2020-12-24 10:54:32 +01:00
DanielNoord
68c30e7bdd
Update main.yml
2020-12-24 10:51:56 +01:00
DanielNoord
3ca1018a51
Create main.yml
2020-12-24 10:42:15 +01:00
DanielNoord
aed9b75397
Merge pull request #472 from DanielNoord/fix/various ( #470 , #471 )
...
Fix/various
2020-12-22 23:17:58 +01:00
Daniel van Noord
0c095e4d81
Add new options section ( #470 )
2020-12-22 23:16:50 +01:00
Daniel van Noord
2f430e82e1
Added CM to version number in BotBar ( #471 )
2020-12-22 23:13:12 +01:00
DanielNoord
56d23aae22
Merge pull request #466 from DanielNoord/removecookies ( #445 )
...
Started to remove left over cookies and made subsections in notifications options
2020-12-21 23:58:29 +01:00
Daniel van Noord
c1501b47d6
Add subsections for notifications settings ( #445 )
2020-12-21 23:56:50 +01:00
Daniel van Noord
63ddf7fa38
Added code to remove cookies from old save system
2020-12-21 23:28:00 +01:00
DanielNoord
798f61cafe
Merge pull request #465 from DanielNoord/saveapi ( #463 )
...
Incorporated Modding API
2020-12-21 22:55:39 +01:00
Daniel van Noord
72aef84fcc
Combined CookieMonster ( #364 )
2020-12-21 22:54:14 +01:00
Daniel van Noord
203dc8137e
Incorporated Modding API
2020-12-21 22:53:23 +01:00
DanielNoord
e6118f14c2
Merge pull request #464 from DanielNoord/missingupgrades ( #386 )
...
Rewrote Missing Upgrades code
2020-12-21 11:25:35 +01:00
Daniel van Noord
1cffb822fb
Rewrote Missing Upgrades code
2020-12-21 11:24:23 +01:00
DanielNoord
1a0f9ed1a2
Merge pull request #462 from DanielNoord/edificestats
...
Fixed lay-out of code
2020-12-20 13:14:26 +01:00
Daniel van Noord
ca0889790d
Fixed lay-out of code
2020-12-20 13:13:02 +01:00
DanielNoord
5fc662980a
Merge pull request #461 from DanielNoord/edificestats
...
Added Edifice to Spells stats section
2020-12-20 13:09:50 +01:00
Daniel van Noord
5d5256bfc9
Added Edifice to Spells stats section
2020-12-20 13:09:16 +01:00
DanielNoord
0f5f244fdc
Merge pull request #460 from DanielNoord/edifice ( #168 )
...
Optional warning for spontaneous edifice
2020-12-20 12:28:39 +01:00
Daniel van Noord
1715306374
Removed tooltip box from Sell tooltip
2020-12-20 12:27:43 +01:00
Daniel van Noord
a05c9290de
Created warning for ToolWarnEdifice
2020-12-20 12:15:50 +01:00
Daniel van Noord
51617c9777
Added ToolWarnEdifice option
2020-12-20 11:50:48 +01:00
DanielNoord
f7bf34d7af
Merge pull request #459 from DanielNoord/wrinklers ( #177 , #245 )
...
Added some functionality related to wrinklers
2020-12-19 18:34:48 +01:00
Daniel van Noord
07d73b10e3
Option to calc with single fattest wrinkler ( #245 )
2020-12-19 18:32:53 +01:00
Daniel van Noord
0f865f3897
Button and stat for single fattest wrinkler ( #177 )
2020-12-19 18:26:38 +01:00
Daniel van Noord
389dae4daa
Created function CM.Cache.InitCache
2020-12-19 17:45:33 +01:00
Daniel van Noord
c6c54054ee
Added section to Cache.js
2020-12-19 17:37:01 +01:00
DanielNoord
2246e31bb5
Merge pull request #458 from DanielNoord/fix/buildingcolors ( #430 )
...
Fixed building colors not reverting (#430 )
2020-12-19 14:38:59 +01:00
Daniel van Noord
7cfdcc7662
Fixed building colors not reverting ( #430 )
2020-12-19 14:38:14 +01:00
DanielNoord
938e850e29
Merge pull request #457 from DanielNoord/cutoffscale ( #373 )
...
Made notation cutoff configurable
2020-12-19 10:50:06 +01:00
Daniel van Noord
d3a4eb936a
Made notation cutoff configurable
2020-12-19 10:49:17 +01:00
Daniel van Noord
c4295a1ed0
Updated Readme
2020-12-19 09:35:27 +01:00
DanielNoord
30c4617bde
Merge pull request #456 from DanielNoord/wrinklercps ( #301 , #254 )
...
Added cookie per click bonus to tooltip
2020-12-18 23:25:39 +01:00
Daniel van Noord
37b378ad08
Fixed spelling
2020-12-18 23:23:07 +01:00
Daniel van Noord
90a79dbc0c
Added cookie per click bonus to tooltip
2020-12-18 23:17:10 +01:00
DanielNoord
7164801156
Merge pull request #455 from DanielNoord/abrshortscale ( #268 )
...
Added Abbreviated short scale (#268 )
2020-12-18 20:48:15 +01:00
Daniel van Noord
c530bd1a4a
Added Abbreviated short scale ( #268 )
2020-12-18 20:47:03 +01:00
DanielNoord
7d7516bb21
Merge pull request #454 from DanielNoord/plantdrops (#206_
...
Added missing plant drops to stats page
2020-12-18 20:32:56 +01:00
Daniel van Noord
28fbb1e094
Added missing plant drops to stats page
2020-12-18 20:31:25 +01:00
DanielNoord
ff30cc2818
Merge pull request #453 from DanielNoord/splitwarning ( #243 )
...
Split the options for Lucky/LuckyFrenzy warning
2020-12-18 20:20:29 +01:00
Daniel van Noord
9542093f1b
Split the options for Lucky/LuckyFrenzy warning
2020-12-18 20:19:37 +01:00
DanielNoord
208c99baf5
Merge pull request #452 from DanielNoord/fix/beautify ( #450 )
...
Fixed small numbers for Beautify
2020-12-18 20:09:21 +01:00
Daniel van Noord
5e4471d929
Fixed small numbers for Beautify
2020-12-18 20:08:03 +01:00
DanielNoord
2a5fb05a2f
Merge pull request #451 from DanielNoord/savesettings ( #444 )
...
Save settings of headers and rewrite of Config.js
2020-12-18 18:11:56 +01:00
Daniel van Noord
8aa8a7c878
Fully annotated Config.js
2020-12-18 18:10:39 +01:00
Daniel van Noord
0ae29ce2e8
Missed some CM.Config's
2020-12-18 17:29:54 +01:00
Daniel van Noord
367702dc00
Changed CM.Config into CM.Options
2020-12-18 17:26:59 +01:00
Daniel van Noord
73ca07a0e9
Partial rewrite of Config.js
2020-12-18 17:17:54 +01:00
DanielNoord
bd59f7b4a9
Merge pull request #449 from DanielNoord/choceggtooltip ( #272 )
...
Choc egg tooltip shows cookies to be gained
2020-12-18 16:50:03 +01:00
Daniel van Noord
f6f2f99966
Choc egg tooltip shows cookies to be gained
2020-12-18 16:49:14 +01:00
DanielNoord
04714f22ac
Merge pull request #448 from DanielNoord/wrinklerinfo ( #196 )
...
Stats displays reward pop all normal wrinkler
2020-12-18 16:13:48 +01:00
Daniel van Noord
b65f31bee1
Stats displays reward pop all normal wrinkler
2020-12-18 16:12:33 +01:00
DanielNoord
7a094a8990
Merge pull request #446 from Aktanusa/issue-templates
...
Update issue templates
2020-12-18 15:46:41 +01:00
DanielNoord
e230a3c89e
Update README.md
2020-12-18 15:45:22 +01:00
DanielNoord
a8002f29e3
Update issue templates
2020-12-18 15:38:16 +01:00
DanielNoord
05e84d42d3
Merge pull request #443 from DanielNoord/fix/defaultconfig
...
Changed structure of Data.js
2020-12-17 18:19:58 +01:00
Daniel van Noord
556e71434d
Changed structure of Data.js
2020-12-17 18:18:58 +01:00
DanielNoord
101c309cec
Merge pull request #442 from DanielNoord/seperator ( #392 )
...
Separator is now changeable
2020-12-17 18:09:22 +01:00
Daniel van Noord
8037615659
Added functionality for ScaleSeparator
2020-12-17 18:07:34 +01:00
Daniel van Noord
fcadf1cc18
Added Config.ScaleSeparator
2020-12-17 17:41:25 +01:00
DanielNoord
671ff61830
Merge pull request #441 from DanielNoord/decimals ( #264 )
...
Make amount of decimals an option
2020-12-16 14:12:07 +01:00
Daniel van Noord
2fbbd39118
Added CM.Config.ScaleDecimals to CM.Disp.Beautify
2020-12-16 14:10:11 +01:00
Daniel van Noord
cff7377789
Created ScaleDecimals as option
2020-12-16 13:31:49 +01:00
DanielNoord
583501e01b
Merge pull request #440 from DanielNoord/volumeoption ( #26 )
...
Changed Volume-options into sliders
2020-12-15 15:20:29 +01:00
Daniel van Noord
10482dfd2d
Fixed lay-out issue
2020-12-15 15:19:50 +01:00
Daniel van Noord
08b30e9c62
Changed Volume-options into sliders
2020-12-15 15:17:49 +01:00
DanielNoord
6098a398f0
Merge pull request #439 from DanielNoord/fix/gamesound ( #437 )
...
Incorporated the general game volume in calculation of notifications volumes
2020-12-13 22:14:36 +01:00
Daniel van Noord
b80d2b63e8
Fixed bug with Sound of notifications
2020-12-13 22:12:53 +01:00
Daniel van Noord
a867d3d896
Incorporated Game volume settings
2020-12-13 22:10:06 +01:00
DanielNoord
f398aa9564
Merge pull request #438 from Aktanusa/dragoninfo ( #185 )
...
Added extra info to dragon aura selector display
2020-12-13 21:55:56 +01:00
Daniel van Noord
6a6a27680f
Annotated CM.Sim.CalculateChangeAura
2020-12-13 21:54:29 +01:00
Daniel van Noord
15b859e8b9
Changed display of DragonAuraInfo in options
2020-12-13 21:50:39 +01:00
Daniel van Noord
f13c9fb02d
Added Aura caching and changing
2020-12-13 21:50:04 +01:00
Daniel van Noord
f72e95301c
Fixed some annotations in Sim.js
2020-12-10 22:31:26 +01:00
Daniel van Noord
8ffc0a2664
Added CM.Disp.AddAuraInfo()
2020-12-10 22:30:07 +01:00
Daniel van Noord
f9c4f68bb8
Add config and replace-function for AuraInfo
2020-12-10 22:13:26 +01:00
DanielNoord
6bf81085ca
Merge pull request #435 from DanielNoord/dispstats
...
Final work on initial rewrite of Disp.js
2020-12-07 21:26:40 +01:00
Daniel van Noord
ea4776ae4b
Final rework of Disp.js
2020-12-07 21:25:02 +01:00
DanielNoord
efd4e9319d
Merge pull request #433 from Chorizorro/fix/gains
...
Fix Dragon's Fortune mult in CalculateGains sim
2020-12-07 10:18:04 +01:00
Chorizorro
f30ebd081e
Fix Dragon's Fortune mult in CalculateGains sim
2020-12-07 10:11:07 +01:00
DanielNoord
bf95af4e58
Merge pull request #432 from Aktanusa/master
...
Hotfix for #426
2020-12-07 10:06:29 +01:00
DanielNoord
2f761dfce8
Merge pull request #431 from Chorizorro/hotfix/gains ( Fixes #426 )
...
Hotfix Dragon's Fortune mult in CM.Sim.CalculateGains
2020-12-07 10:05:50 +01:00
Chorizorro
88792454c2
Fix Dragon's Fortune mult in CalculateGains sim
2020-12-07 09:52:39 +01:00
Daniel van Noord
8805eacb0e
Created CM.Disp.CreateStatsLuckySection
2020-12-06 20:51:04 +01:00
DanielNoord
8a709af86f
Merge pull request #429 from Aktanusa/master
...
Publish hot-fix for #416 to gh-pages
2020-12-06 19:44:04 +01:00
DanielNoord
62d05ea074
Merge pull request #428 from DanielNoord/fix/sellpricedev
...
Fix #416 on dev-branch
2020-12-06 19:38:49 +01:00
DanielNoord
759d665019
Merge pull request #427 from DanielNoord/fix/sellprice
...
Fix sell price being displayed #416
2020-12-06 19:38:10 +01:00
Daniel van Noord
b462ed2ced
Fix #416 on dev-branch
2020-12-06 19:37:34 +01:00
Daniel van Noord
eb7a710464
Fix sell price being displayed #416
2020-12-06 19:36:29 +01:00
DanielNoord
7c08431271
Merge pull request #423 from Chorizorro/fix/disp
...
Fix favicon not being reset with no GC left
2020-12-06 12:43:00 +01:00
DanielNoord
46c849ea9e
Merge pull request #425 from Aktanusa/master
...
Publish hot fix to gh-pages
2020-12-06 12:42:41 +01:00
DanielNoord
534e744532
Merge pull request #424 from Chorizorro/hotfix
...
Hotfix favicon not being reset with no GC left
2020-12-06 12:42:03 +01:00
Chorizorro
0d9f45a537
Fix favicon not being reset with no GC left
2020-12-06 09:01:05 +01:00
Daniel van Noord
e066c8c43b
Merge branch 'fix/cleanupdisp' of https://github.com/DanielNoord/CookieMonster into fix/cleanupdisp
2020-12-05 23:17:28 +01:00
Daniel van Noord
bbc2fdf29f
Fix for challenge mode
2020-12-05 23:17:15 +01:00
Daniel van Noord
b6370c1873
First version of stats page
2020-12-05 23:17:15 +01:00
DanielNoord
bf8e1922cb
Merge pull request #420 from Chorizorro/fix/disp
...
Move CM.Disp.Draw out of bottom bar section
2020-12-05 23:15:38 +01:00
Chorizorro
87a85bfc59
Fix favicon not being reset with no GC left
2020-12-05 23:14:12 +01:00
Daniel van Noord
7e101edf82
Fix for challenge mode
2020-12-05 23:13:53 +01:00
Daniel van Noord
36e64d3d90
First version of stats page
2020-12-05 23:13:28 +01:00
DanielNoord
49b8a8c6d7
Merge pull request #422 from Aktanusa/master
...
Hotfix for #414 to gh-pages
2020-12-05 23:10:12 +01:00
DanielNoord
6c5821593f
Merge pull request #421 from Aktanusa/fix/sellprice
...
Hotfix for #414
2020-12-05 23:09:28 +01:00
Daniel van Noord
1b88b70c72
Hotfix for #414
2020-12-05 23:05:43 +01:00
Chorizorro
15d467992d
Move CM.Disp.Draw out of bottom bar section
2020-12-05 22:31:40 +01:00
DanielNoord
15e4291489
Merge pull request #417 from Chorizorro/fix/disp
...
Enhance autosave timer refresh
2020-12-05 17:00:49 +01:00
Chorizorro
7cd62e1735
Enhance autosave timer refresh #375
2020-12-05 16:54:58 +01:00
DanielNoord
d0ad7c418d
Merge pull request #418 from DanielNoord/fix/cleanupdisp
...
Further revision of Disp.js
2020-12-05 16:24:14 +01:00
Daniel van Noord
77447cfca3
Further revision of Disp.js
2020-12-05 15:44:33 +01:00
DanielNoord
28b144ee70
Merge pull request #415 from DanielNoord/fix/cleanupdisp
...
Fixes to some of the new CM.Disp code
2020-12-05 14:28:42 +01:00
Daniel van Noord
b6cdc77064
Fixed Warning tooltips
2020-12-05 14:27:48 +01:00
Daniel van Noord
e0915bc307
Fix CM.Disp.Beautify failing when num=0
2020-12-05 14:10:42 +01:00
DanielNoord
7e935aab1a
Merge pull request #399 from DanielNoord/fix/cleanupdisp
...
Preliminary overhaul of CM.Disp and related code
2020-12-05 10:34:42 +01:00
Daniel van Noord
9dc95d760a
Almost done with updating Disp.js
2020-12-04 23:41:23 +01:00
DanielNoord
88b36becbb
Merge pull request #412 from Aktanusa/master
...
Hotfix v3 #405
2020-12-04 22:51:33 +01:00
Daniel van Noord
f3ea56f34d
Hotfix v3 #405
2020-12-04 22:50:41 +01:00
DanielNoord
e800159b1e
Merge pull request #411 from Aktanusa/master
...
Hotfix v2 for #405
2020-12-04 22:46:26 +01:00
Daniel van Noord
9ce42f2f3c
Hotfix for #405
2020-12-04 22:45:55 +01:00
Daniel van Noord
4baae5c9f7
Updated timer bar code
2020-12-04 22:38:14 +01:00
Daniel van Noord
02b31c8932
Fixed CM.Disp.Beautify
2020-12-04 21:14:17 +01:00
Daniel van Noord
343327a1b5
Fix CalculateGains
2020-12-04 21:06:23 +01:00
DanielNoord
da2902dd67
Merge pull request #410 from Aktanusa/master
...
Publish hotfixes to gh-pages
2020-12-04 20:58:05 +01:00
DanielNoord
3bca426eb1
Merge pull request #409 from DanielNoord/fix/hotfix
...
Hotfixes for v2.031.2
2020-12-04 20:57:14 +01:00
Daniel van Noord
5c736b7790
Fix GC no longer updating
2020-12-04 20:55:44 +01:00
Daniel van Noord
a22ab829ec
Fixed crash on selecting Sell mode #407
2020-12-04 20:52:51 +01:00
Daniel van Noord
f65749db50
Fixed negative PP #406
2020-12-04 20:50:20 +01:00
Daniel van Noord
a3f2fe5dab
Reworked Tooltip code v1
2020-12-04 20:23:58 +01:00
bitsandbytes1708
09cc7ca646
Merge pull request #396 from Aktanusa/master
...
Merge 'master' branch into 'gh-pages' branch v2.031.2
2020-12-04 07:07:54 -05:00
Daniel van Noord
ed814ef39a
FIx for floating numbers
2020-12-03 19:00:27 +01:00
Daniel van Noord
74b353d530
Fix CM.Sim.eff
2020-12-03 18:31:45 +01:00
Daniel van Noord
d6aca47698
Initial work on Tooltip section
2020-12-03 18:17:07 +01:00
Daniel van Noord
106331af85
Update state-checking code v2
2020-12-03 16:40:21 +01:00
Daniel van Noord
8a303c2d27
Update state-checking code
2020-12-03 16:36:19 +01:00
Daniel van Noord
cbaf06a76b
Updated GCTimer code
2020-12-03 16:06:25 +01:00
Daniel van Noord
e6f2c4c966
Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into dev
2020-12-03 15:46:49 +01:00
Daniel van Noord
08e005b9db
Reorgainzed src/Disp.js
2020-12-03 15:45:49 +01:00
Daniel van Noord
4067410397
Added annotations to CM.Disp.FormatTime
2020-12-03 15:44:16 +01:00
Daniel van Noord
e3861f1ffe
Cleaned CM.Disp.FormatTime
2020-12-03 15:44:16 +01:00
DanielNoord
e6d0774734
Merge pull request #402 from Chorizorro/fix/misc #400
...
Hotfix for numbers Engineering notation
2020-12-03 15:35:36 +01:00
Daniel van Noord
95f19fbfd7
Fixded CM.Disp.GetTimeColor
2020-12-03 15:28:38 +01:00
Daniel van Noord
63c3a493fa
Rewrote the code and data for the options-page
2020-12-03 15:23:12 +01:00
Chorizorro
17efc10568
Fix numbers Engineering notation #400
2020-12-03 13:32:01 +01:00
Daniel van Noord
9cad31da3e
Updated CM.Disp.GetTimeColor v2
2020-12-03 13:24:34 +01:00
Daniel van Noord
5b9d171bf4
Updated CM.Disp.GetTimeColor
2020-12-03 13:23:36 +01:00
Daniel van Noord
44f75247cd
Updated functions related to tab-bar v2
2020-12-03 13:05:43 +01:00
Daniel van Noord
06c7f59cd6
Updated functions related to tab-bar
2020-12-03 13:05:22 +01:00
Daniel van Noord
28ab2eab22
Annotated section on flashes/sound/notification
2020-12-03 12:33:21 +01:00
Daniel van Noord
854bec1519
Updated upgrade bar code
2020-12-03 12:17:00 +01:00
Daniel van Noord
243e43188f
Cleaned up bottom bar code
2020-12-03 11:40:05 +01:00
Daniel van Noord
391b70017a
Cleaned up CM.Disp.Beautify
2020-12-03 10:50:00 +01:00
DanielNoord
cd6f1ddaf4
Merge pull request #398 from DanielNoord/fix/cleanupdisp
...
Initial re-organization of src/Disp.js
2020-12-02 22:26:21 +01:00
Daniel van Noord
7efbd59062
Reorgainzed src/Disp.js
2020-12-02 22:23:17 +01:00
Daniel van Noord
e256d39101
Added annotations to CM.Disp.FormatTime
2020-12-02 21:55:57 +01:00
Daniel van Noord
0f5291b41c
Cleaned CM.Disp.FormatTime
2020-12-02 21:53:19 +01:00
DanielNoord
8bbec4c8a4
Merge dev-branch into master for v2.031.2
2020-12-02 14:02:11 +01:00
DanielNoord
e518f25f24
Pushed Dev-branch to version 2.031.2
2020-12-02 13:59:52 +01:00
Daniel van Noord
e644fcb49f
Pushed version to 2.031.2
2020-12-02 13:29:27 +01:00
DanielNoord
b9c7a0f154
Avoid crash on double-loading of the mod #252
2020-12-02 13:26:07 +01:00
Daniel van Noord
94745fb013
Avoid crash on double-loading
2020-12-02 13:24:56 +01:00
DanielNoord
a8e3691507
Adjust Lucky/Chain stats for Dragon's Fortune & Reality Bending #289
2020-12-02 12:36:54 +01:00
Chorizorro
cb8114ecfb
Adjust Lucky/Chain stats for Dragon's Fortune #289
...
Add a multiplier adjustment when Dragon's Fortune aura is set
(either via Dragon's Fortune itself or via Reality Bending) and use
it to adjust CPS with 1 golden cookie even if there are no golden
cookies currently on screen
2020-12-02 10:20:03 +01:00
DanielNoord
f864e60e87
Remove Cookes till achievement in tooltip if all are obtained #89
2020-12-01 17:47:57 +01:00
Daniel van Noord
53117009e7
Remove Cookes till achievement if all are got
2020-12-01 17:46:20 +01:00
DanielNoord
5f4dda4adb
Added warning for lagginess of "Missing Achievs" (see #386 )
2020-12-01 16:44:54 +01:00
Daniel van Noord
63e5ddf1ca
Added warning for lagginess of "Missing Achievs"
2020-12-01 16:43:23 +01:00
DanielNoord
8c5ea875bf
Fix: Changed CM.Sim.Has to HasAchiev in Building tooltip #384
...
Fix: Changed CM.Sim.Has to HasAchiev in Building tooltip
2020-12-01 16:28:06 +01:00
Daniel van Noord
af0f210c54
Changed CM.Sim.Has to HasAchiev
2020-12-01 16:26:11 +01:00
DanielNoord
31e701505e
Added cookies till achievement in building tooltip #89
2020-12-01 16:11:11 +01:00
Daniel van Noord
cb6b97a269
Added cookies till achievement in building tooltip
2020-12-01 16:10:12 +01:00
DanielNoord
0bebb12808
Fix stats for lucky/chain cookies #379
...
Fix stats for lucky/chain cookies
2020-12-01 15:10:17 +01:00
Chorizorro
8a3609092d
Handle lucky wrath cookies rewards ( #379 )
2020-12-01 14:40:15 +01:00
Chorizorro
8dc5d4b849
Fix golden and wrath cookies multipliers ( #379 )
2020-12-01 14:39:52 +01:00
DanielNoord
63a00a2ae1
Added cookies to be gained/lost to Conjure Baked Goods tooltip #130
...
Added cookies to be gained/lost to Conjure Baked Goods tooltip
2020-12-01 13:40:36 +01:00
Daniel van Noord
71a4407da8
Added cookies to be gained/lost to conjure tooltip
2020-12-01 13:38:49 +01:00
DanielNoord
7cf021ac5d
Fixed sorting when PP = Infinity #353
...
Fixed sorting when PP = Infinity
2020-12-01 12:44:58 +01:00
Daniel van Noord
810c5adfba
Fixed sorting when PP = Infinity
2020-12-01 12:44:13 +01:00
DanielNoord
26549a148a
Optional display of missing upgrades in stats menu #193
...
Optional display of missing upgrades in stats menu
2020-12-01 11:44:45 +01:00
Daniel van Noord
f810c42b73
Optional display of missing upgrades to stats
2020-12-01 11:37:03 +01:00
DanielNoord
e3c3c1b1fe
Re-base dev-branch to master-branch
...
Re-base dev-branch to master-branch
2020-12-01 08:48:42 +01:00
DanielNoord
9b87b1d5ad
Fixed PP calculation when CPS = 0 #368
...
Fixed PP calculation when CPS = 0
2020-12-01 08:45:47 +01:00
Daniel van Noord
baf21e888f
Fixed PP calculation when CPS = 0
2020-12-01 08:44:23 +01:00
DanielNoord
8a26fc3178
Removed console.log left from debugging
...
Removed console.log from debugging
2020-11-30 22:28:10 +01:00
Daniel van Noord
a30f07be77
Removed console.log from debugging
2020-11-30 22:27:00 +01:00
DanielNoord
428c000a5a
Added 'Seconds till autosave' to Misc. stats #287
2020-11-30 22:09:37 +01:00
Daniel van Noord
42960d9780
Added 'seconds till autosave' to Misc. tats
2020-11-30 22:07:47 +01:00
DanielNoord
27567b3cff
Fix building price displayed in sell mode (source code is incorrect) #359
...
Fix building price displayed in sell mode
2020-11-30 12:35:13 +01:00
Chorizorro
17f13239ca
Fix building price in store in sell mode ( #359 )
2020-11-30 11:42:36 +01:00
Chorizorro
d257830de8
Fix building tooltip in sell mode ( #359 )
2020-11-30 11:42:35 +01:00
DanielNoord
c87a9d47d0
Fixed notations bugging out #282
...
Fixed notations bugging out #282
2020-11-30 10:37:37 +01:00
Daniel van Noord
a11f82fce4
Fixed notations bugging out
2020-11-30 10:36:34 +01:00
DanielNoord
786ece6667
Added Game.runModHookOnValue in CalcGains #170
...
Added Game.runModHookOnValue in CalcGains #170
2020-11-30 08:49:06 +01:00
Daniel van Noord
0ac966a905
Added Game.runModHookOnValue in CalcGains
2020-11-30 08:47:29 +01:00
DanielNoord
0a29e2f4a0
Rewrote GCTimer Code #288
...
Rewrote GCTimer Code #288
2020-11-29 23:59:47 +01:00
Daniel van Noord
292a80b807
Rewrote GCTimer Code
2020-11-29 23:57:52 +01:00
DanielNoord
32b87738ee
Option sections are now collapsable #351
2020-11-29 16:43:47 +01:00
Daniel van Noord
b91d0e1195
Option sections are now collapsable
2020-11-29 16:42:14 +01:00
DanielNoord
5cc08170bc
Fixed pp-sort breaking for sell-mode ( #364 )
...
Fixed pp-sort breaking for sell-mode (#364 )
2020-11-29 14:59:06 +01:00
Daniel van Noord
f7192d1e90
Fixed pp-sort breaking for sell-mode
2020-11-29 14:57:48 +01:00
DanielNoord
7128df5d50
Simpler readme Userscript code in README
...
Simpler readme Userscript code
2020-11-28 16:49:04 +01:00
DanielNoord
1398b3fbaf
Incorporate effect of garden on Lucky and Chain payouts ( #187 )
...
Incorporate effect of garden on Lucky and Chain payouts (#187 )
2020-11-28 16:27:41 +01:00
Daniel van Noord
78888e784c
Fixed GC rewards not considering garden buffs
2020-11-28 16:20:44 +01:00
DanielNoord
a6863bc8e6
Fix accidentally erasing data if a new building/upgrade/achievement is found
...
Fix accidentally erasing data if a new building/upgrade/achievement is found
2020-11-28 15:43:42 +01:00
DanielNoord
b6f19737cb
Fixed some errors in CalculateGains and added some TODOs
...
Fixed some errors in CalculateGains and added some TODOs
2020-11-28 15:38:32 +01:00
Daniel van Noord
57cfdad215
Store minigame effects as Sim data
2020-11-28 15:36:41 +01:00
DanielNoord
8e46a55ee5
Fix Lucky/Chain cookies stats when CpS is zero
...
Fix Lucky/Chain cookies stats when CpS is zero
2020-11-28 14:39:02 +01:00
Daniel van Noord
d7883e7238
Cache gods and implement CM.Sim.hasGodI()
2020-11-28 13:46:39 +01:00
Chorizorro
c458d46d33
Fix Lucky/Chain cookies stats when CpS is zero
2020-11-28 13:37:47 +01:00
Daniel van Noord
9de7591531
Fixed CM.Sim.prestige not resetting
2020-11-28 12:44:32 +01:00
Daniel van Noord
564d136df3
Cleaned up CM.Sim.CalculateGains and added TODOs
2020-11-28 12:41:26 +01:00
DanielNoord
9714e00938
Added correct simulation for selling buildings for chocolate egg ( #355 )
...
Fix selling of buildings value in chocolate egg calculation
2020-11-28 10:50:05 +01:00
Chorizorro
44d532146b
Update ascension, heavenly chips and chocolate egg tooltips
...
Update ascension, heavenly chips and chocolate egg tooltips
2020-11-28 10:44:53 +01:00
Static Variable James
8f809cc093
Fix accidentally erasing data if a new building/upgrade/achievement is found.
2020-11-27 11:45:44 -06:00
Chorizorro
291ff1ae6a
Add sim for selling buildings for chocolate egg
...
Add a simulation for selling all buildings with Earth Shatterer +
Reality bending auras, and use it in chocolate egg value calculation
2020-11-27 18:20:56 +01:00
DanielNoord
744ee0dc5e
Bottom bar now changes depending on bulk-mode and has a height that fits all info ( #354 )
2020-11-26 18:56:34 +01:00
staticvariablejames
66ac922ae2
Compatibility with content mods ( #350 )
2020-11-26 18:01:06 +01:00
DanielNoord
3d965943c0
Optional Sound/Flash/Notif. for (Max) Wrinklers ( #349 )
2020-11-25 21:44:14 +01:00
Chorizorro
e05db88a72
Compute stock market in chocolate egg value ( #345 )
2020-11-25 14:06:55 +01:00
DanielNoord
8a98c6f4db
Option to colour PP values based on the selected buy mode ( #346 )
2020-11-25 12:46:47 +01:00
DanielNoord
272f17be71
Fixed warning tooltips not disappearing ( #344 )
2020-11-25 11:25:56 +01:00
DanielNoord
6922dd0465
Option for notifications for Golden/Fortunes/Season Cookies & full Magic Bar ( #341 )
2020-11-24 23:32:35 +01:00
DanielNoord
d40f90d233
Sort Building list based on PP of selected buy mode ( #340 )
2020-11-24 18:35:56 +01:00
DanielNoord
8ea9400a07
Fixed mistake with CopyData ( #338 )
2020-11-24 15:59:02 +01:00
DanielNoord
eda7514001
Option to play sound at full Grimoire Meter ( #337 )
2020-11-24 13:29:02 +01:00
DanielNoord
935ce42305
Support for Modded Objects/Upgrades/Achievs ( #335 )
2020-11-24 12:41:36 +01:00
DanielNoord
c68febd794
Added stats for Conjure Baked Goods ( #334 )
2020-11-24 11:23:52 +01:00
Daniel van Noord
3c28df38c8
Optional warning for Conjure Baked Goods
2020-11-23 23:20:48 +01:00
Daniel van Noord
f8c1dd9308
Updated warning tooltip code
2020-11-23 22:23:09 +01:00
Daniel van Noord
3721052cc3
Removed all mentiones of warn/caut
2020-11-23 21:46:18 +01:00
DanielNoord
e1d6defaf6
Merge of master into gh-pages
...
Publication of release 2.031.1
2020-11-23 18:21:22 +01:00
steven nguyen
dc6d643f7d
scoping of variables.
2020-07-05 10:58:17 -05:00
steven nguyen
706fb7231e
Window.eval()? Var?
2020-07-05 10:50:19 -05:00
Aktanusa
0c10027fa4
Merge branch 'master' into gh-pages
2019-10-10 22:25:59 -04:00
Aktanusa
0b3a12ce33
Merge branch 'master' into gh-pages
2019-10-06 23:00:37 -04:00
Aktanusa
0ea8719dbf
Merge branch 'master' into gh-pages
2019-04-01 13:34:41 -04:00
Aktanusa
8fc6d64219
Merge branch 'master' into gh-pages
2019-03-13 22:48:25 -04:00
Aktanusa
47988a3707
Updated beta to Version 2.016.1
2018-10-30 13:19:56 -04:00
Aktanusa
3d06ee6aec
Merge branch 'master' into gh-pages
2018-10-27 20:40:29 -04:00
Aktanusa
49c67bd86d
Merge branch 'master' into gh-pages
2018-08-08 11:40:57 -04:00
Aktanusa
2b1007f7af
Merge branch 'master' into gh-pages
2018-08-01 19:49:04 -04:00
Aktanusa
436a22f0c7
Merge branch 'master' into gh-pages
2018-04-24 20:44:38 -04:00
Aktanusa
e3fdc6854d
Merge branch 'master' into gh-pages
2018-03-05 21:28:18 -05:00
Aktanusa
62bc84920a
Merge branch 'master' into gh-pages
2017-09-12 17:22:24 -04:00
Aktanusa
7b67ea19d8
Updated beta to Version 2.0041.1
2017-08-11 09:36:54 -04:00
Aktanusa
aa93b6a6d2
Merge branch 'master' into gh-pages
2017-08-08 20:42:37 -04:00
Aktanusa
6fc807e3ce
Merge branch 'master' into gh-pages
2017-07-27 21:17:27 -04:00
Aktanusa
605927359d
Merge branch 'master' into gh-pages
2017-07-19 16:22:31 -04:00
Aktanusa
9f870572f4
Merge branch 'master' into gh-pages
2017-07-19 14:52:41 -04:00
Aktanusa
aec0583a89
Merge branch 'master' into gh-pages
2017-04-17 11:30:55 -04:00
Aktanusa
db95fe5147
Merge branch 'master' into gh-pages
2016-07-27 23:17:24 -04:00
Aktanusa
a21df99b0b
Merge branch 'master' into gh-pages
2016-07-25 21:10:31 -04:00
Aktanusa
79de5d09c7
Update beta version
2016-06-28 22:33:18 -04:00
Aktanusa
0d1265d533
Update beta version
2016-04-28 17:44:20 -04:00
Aktanusa
797a0ce498
Update beta version
2016-04-28 10:01:09 -04:00
Aktanusa
494673a371
Update beta version
2016-04-28 08:50:08 -04:00
Aktanusa
2299d0b89c
Updated beta version
2016-04-28 00:25:39 -04:00
Aktanusa
c5806799a4
Merge branch 'master' into gh-pages
2016-04-25 22:36:13 -04:00
Aktanusa
f44d03c4c7
Added get method to the queue helper JS
2016-03-27 22:59:43 -04:00
Aktanusa
b7666cca6d
Added helper JS queue.js
2016-03-27 19:49:33 -04:00
Aktanusa
3568799c32
Merge branch 'master' into gh-pages
2016-03-17 21:48:03 -04:00
Aktanusa
47a8427448
Merge branch 'master' into gh-pages
2016-03-05 10:33:55 -05:00
Aktanusa
2899291162
Rename Favicon for Golden Cookies
2016-02-19 23:25:44 -05:00
Aktanusa
a390734890
Added favicons for Golden and Wrath Cookies (thanks to @BlackenedGem for the files)
2016-02-19 20:30:41 -05:00
Aktanusa
6995e86752
Merge branch 'master' into gh-pages
2016-02-09 15:33:23 -05:00
Aktanusa
dbd2b0ae51
Merge branch 'master' into gh-pages
2016-02-08 20:22:04 -05:00
Aktanusa
f9141a7f4f
[Beta] Version change to 1.909.1
2016-02-08 09:54:04 -05:00
Aktanusa
15b80cf48f
[beta] Version change to 1.907.1 and fixed it to work with 1.907 beta (mostly)
2016-02-06 12:35:33 -05:00
Aktanusa
030a0a20da
[beta] Fixed Current Chain reward being calculated wrong, tooltips being buggy, and needing to click a little above santa/dragon icon
2016-02-05 23:39:20 -05:00
Aktanusa
a1f2e0f424
[beta] Fixed bug with Current Lucky reward was calculated wrong
2016-02-05 00:43:47 -05:00
Aktanusa
581db06f0f
Fixed to work with 1.903 beta (mostly)
2016-02-04 23:52:16 -05:00
Aktanusa
93ffc9d67b
[beta] Used a better fix on missing boxes on upgrades
2015-12-28 11:11:15 -05:00
Aktanusa
e6c1117a11
[beta] Fixed rare but bad tooltip bug and fixed some toggle upgrades graphical glitches
2015-12-27 21:47:12 -05:00
Aktanusa
dcf233e7c2
[beta] Fixed tooltip bugs, Upgrades display bug, and timer bar bug
2015-12-27 17:10:09 -05:00
Aktanusa
47437ce496
Update beta JS with 1 fix
2015-12-26 21:30:52 -05:00
Aktanusa
aeee5a2e9c
Fix to work with Version 1.9 beta mostly (Issue #45 )
2015-12-26 16:40:56 -05:00
Aktanusa
9b81c60f1e
Updated beta
2014-10-31 20:26:51 -04:00
Aktanusa
72e745c1f4
Merge branch 'master' into gh-pages
2014-10-31 20:23:48 -04:00
Aktanusa
3ffedc83fa
Forgot to revert other temp file, so updated temp file
2014-09-29 22:50:50 -04:00
Aktanusa
017096df73
Merge branch 'master' into gh-pages
2014-09-29 22:36:24 -04:00
Aktanusa
f3507c4046
Temp beta file
2014-08-30 01:49:05 -04:00