david/CookieMonster
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,230 Commits 9 Branches 44 Tags
59217317b37aad15a26a4608ec833d62a0e03b73
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Daniël van Noord ee0ed81aba Merge pull request #851 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.1 
Bump prettier from 2.3.0 to 2.3.1
 2021-06-07 10:31:54 +02:00
Daniël van Noord f69fb191d1 Merge pull request #852 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.28.0 
Bump eslint from 7.27.0 to 7.28.0
 2021-06-07 10:31:42 +02:00
Daniël van Noord c0e93f316f Merge pull request #850 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.26.0 
Bump @typescript-eslint/parser from 4.25.0 to 4.26.0
 2021-06-07 10:30:35 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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