Commit Graph

  • a620efe44a Merge pull request #858 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-cli-4.7.2 Daniël van Noord 2021-06-14 08:52:31 +02:00
  • 26b08c77ce Bump webpack-cli from 4.7.0 to 4.7.2 dependabot[bot] 2021-06-14 06:49:43 +00:00
  • 3e53ba7c6d Bump @typescript-eslint/parser from 4.26.0 to 4.26.1 dependabot[bot] 2021-06-14 06:49:27 +00:00
  • 0bff74bddd [Automated] Merge dev into gh-pages github-actions[bot] 2021-06-08 06:57:48 +00:00
  • 9252d10f23 Merge pull request #848 from tsr488/achievementsort Daniël van Noord 2021-06-08 08:57:33 +02:00
  • 0278162dce Update sort to handle the case where the source data is out of order Tom 2021-06-07 19:36:04 -04:00
  • ad146f9a43 [Automated] Merge dev into gh-pages github-actions[bot] 2021-06-07 08:31:57 +00:00
  • ee0ed81aba Merge pull request #851 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.1 Daniël van Noord 2021-06-07 10:31:54 +02:00
  • f69fb191d1 Merge pull request #852 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.28.0 Daniël van Noord 2021-06-07 10:31:42 +02:00
  • aba1b88eac [Automated] Merge dev into gh-pages github-actions[bot] 2021-06-07 08:30:49 +00:00
  • c0e93f316f Merge pull request #850 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.26.0 Daniël van Noord 2021-06-07 10:30:35 +02:00
  • 058555b148 Bump prettier from 2.3.0 to 2.3.1 dependabot[bot] 2021-06-07 08:28:11 +00:00
  • dd2c4e56b4 Bump @typescript-eslint/parser from 4.25.0 to 4.26.0 dependabot[bot] 2021-06-07 08:27:48 +00:00
  • be569ee218 Bump eslint from 7.27.0 to 7.28.0 dependabot[bot] 2021-06-07 08:27:32 +00:00
  • af547ee2c4 [Automated] Merge dev into gh-pages github-actions[bot] 2021-06-07 07:00:47 +00:00
  • c0e27f3c52 Merge pull request #853 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.26.0 Daniël van Noord 2021-06-07 09:00:32 +02:00
  • d694e82b02 Bump @typescript-eslint/eslint-plugin from 4.25.0 to 4.26.0 dependabot[bot] 2021-06-07 06:59:16 +00:00
  • 6344c454a6 [Automated] Merge dev into gh-pages github-actions[bot] 2021-06-07 06:59:13 +00:00
  • ca796c0b48 Merge pull request #849 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.3 Daniël van Noord 2021-06-07 08:58:55 +02:00
  • 6c95e341f5 Bump ts-loader from 9.2.2 to 9.2.3 dependabot[bot] 2021-06-07 06:57:58 +00:00
  • 65cec9da50 [Automated] Merge dev into gh-pages github-actions[bot] 2021-06-07 06:57:40 +00:00
  • f84f6fc348 Merge pull request #847 from tsr488/automerge Daniël van Noord 2021-06-07 08:57:25 +02:00
  • be245da05f Update publish-dev.yml Daniël van Noord 2021-06-07 08:56:27 +02:00
  • 977c25e77a Update and rename merge-branch.yml to publish-dev.yml Daniël van Noord 2021-06-07 08:55:16 +02:00
  • 6ab791d762 Adding option to sort buildings by price until next achievement Tom 2021-06-06 17:32:37 -04:00
  • 962a709489 Adding auto branch merge Tom 2021-06-06 14:15:34 -04:00
  • 4fb58719d3 Merge pull request #839 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.25.0 Daniël van Noord 2021-05-31 11:41:24 +02:00
  • eaff9ef93d Bump @typescript-eslint/parser from 4.24.0 to 4.25.0 dependabot[bot] 2021-05-31 09:40:38 +00:00
  • f403f89c20 Merge pull request #840 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.4 Daniël van Noord 2021-05-31 11:39:39 +02:00
  • 100745946e Bump eslint-plugin-import from 2.23.3 to 2.23.4 dependabot[bot] 2021-05-31 09:38:37 +00:00
  • 18b151d7c0 Merge pull request #841 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.25.0 Daniël van Noord 2021-05-31 11:38:06 +02:00
  • 2febfb4cbe Bump @typescript-eslint/eslint-plugin from 4.24.0 to 4.25.0 dependabot[bot] 2021-05-31 09:37:15 +00:00
  • 73b9ebce7f Merge pull request #838 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.38.1 Daniël van Noord 2021-05-31 11:16:21 +02:00
  • 39744d52b3 Bump webpack from 5.37.1 to 5.38.1 dependabot[bot] 2021-05-31 08:26:49 +00:00
  • 97624bd4da Merge pull request #842 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-4.3.2 Daniël van Noord 2021-05-31 09:23:51 +02:00
  • 66549c5c96 Bump typescript from 4.2.4 to 4.3.2 dependabot[bot] 2021-05-31 07:05:57 +00:00
  • df152fd302 Merge pull request #837 from DanielNoord/autosavetimer Daniël van Noord 2021-05-30 16:38:46 +02:00
  • ff31c45a4a Add option for autosave timer bar #799 Daniël van Noord 2021-05-30 16:37:26 +02:00
  • 9ba81afae1 Update README.md Daniël van Noord 2021-05-30 11:51:27 +02:00
  • 66e906e878 Merge pull request #836 from DanielNoord/tillnextachiev Daniël van Noord 2021-05-30 11:47:27 +02:00
  • 865fc3b227 Make current season green in Stats section #821 Daniël van Noord 2021-05-30 11:45:51 +02:00
  • 47ebed0925 Merge pull request #835 from DanielNoord/tillnextachiev Daniël van Noord 2021-05-30 10:57:32 +02:00
  • 734f3c38c2 Optimize & fix LeftTillNext calculation #805 #832 Daniël van Noord 2021-05-30 10:55:42 +02:00
  • fcbf1b2377 Simple refactor of calculation Daniël van Noord 2021-05-30 10:35:33 +02:00
  • 4c6dfbba69 Merge pull request #828 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.2.2 Daniël van Noord 2021-05-24 11:03:57 +02:00
  • 3edcb0300b Bump ts-loader from 9.1.2 to 9.2.2 dependabot[bot] 2021-05-24 09:03:07 +00:00
  • 49e9711b7c Merge pull request #830 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.27.0 Daniël van Noord 2021-05-24 11:02:43 +02:00
  • a48ad37b7f Merge pull request #829 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.37.1 Daniël van Noord 2021-05-24 11:02:19 +02:00
  • ace1c9f6a9 Bump eslint from 7.26.0 to 7.27.0 dependabot[bot] 2021-05-24 08:14:17 +00:00
  • fa942ff81d Bump webpack from 5.37.0 to 5.37.1 dependabot[bot] 2021-05-24 08:13:57 +00:00
  • 974b948583 Merge pull request #827 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.24.0 Daniël van Noord 2021-05-24 09:21:50 +02:00
  • e1e4327173 Bump @typescript-eslint/eslint-plugin from 4.23.0 to 4.24.0 dependabot[bot] 2021-05-24 07:20:17 +00:00
  • d054b55ddc Merge pull request #826 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.24.0 Daniël van Noord 2021-05-24 09:19:11 +02:00
  • 6e0add10fb Bump @typescript-eslint/parser from 4.23.0 to 4.24.0 dependabot[bot] 2021-05-24 07:16:40 +00:00
  • f431d2b6be Merge pull request #825 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.3 Daniël van Noord 2021-05-24 09:15:01 +02:00
  • 68ad398b27 Merge pull request #824 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-node-10.0.0 Daniël van Noord 2021-05-24 09:13:26 +02:00
  • 68d7295bbc Bump eslint-plugin-import from 2.23.2 to 2.23.3 dependabot[bot] 2021-05-24 07:00:20 +00:00
  • 2be4e2de57 Bump ts-node from 9.1.1 to 10.0.0 dependabot[bot] 2021-05-24 07:00:03 +00:00
  • ae6db8f330 Merge pull request #820 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.23.0 Daniël van Noord 2021-05-17 13:28:38 +02:00
  • 5715274d1a Bump @typescript-eslint/parser from 4.22.1 to 4.23.0 dependabot[bot] 2021-05-17 11:18:35 +00:00
  • 74cdb613ca Merge pull request #819 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.23.0 Daniël van Noord 2021-05-17 13:17:43 +02:00
  • 4eae4598a7 Merge pull request #818 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-plugin-import-2.23.2 Daniël van Noord 2021-05-17 13:17:21 +02:00
  • d9ef469980 Merge pull request #817 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.37.0 Daniël van Noord 2021-05-17 13:16:24 +02:00
  • 5532e4d0ba Bump @typescript-eslint/eslint-plugin from 4.22.1 to 4.23.0 dependabot[bot] 2021-05-17 06:43:28 +00:00
  • e78703130e Bump eslint-plugin-import from 2.22.1 to 2.23.2 dependabot[bot] 2021-05-17 06:43:09 +00:00
  • 63240b01bc Bump webpack from 5.36.2 to 5.37.0 dependabot[bot] 2021-05-17 06:42:54 +00:00
  • 1a520b4d52 Merge pull request #814 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/parser-4.22.1 Daniël van Noord 2021-05-10 14:06:06 +02:00
  • c7fd910a26 Bump @typescript-eslint/parser from 4.22.0 to 4.22.1 dependabot[bot] 2021-05-10 12:05:01 +00:00
  • a3ad66a058 Merge pull request #815 from CookieMonsterTeam/dependabot/npm_and_yarn/prettier-2.3.0 Daniël van Noord 2021-05-10 14:03:33 +02:00
  • ee3aac59ce Merge pull request #812 from CookieMonsterTeam/dependabot/npm_and_yarn/mocha-8.4.0 Daniël van Noord 2021-05-10 14:03:01 +02:00
  • 598a36493f Merge pull request #813 from CookieMonsterTeam/dependabot/npm_and_yarn/eslint-7.26.0 Daniël van Noord 2021-05-10 13:37:11 +02:00
  • 507e168e24 Bump prettier from 2.2.1 to 2.3.0 dependabot[bot] 2021-05-10 11:35:32 +00:00
  • 35bd55f884 Bump eslint from 7.25.0 to 7.26.0 dependabot[bot] 2021-05-10 11:35:11 +00:00
  • 7202f0122d Bump mocha from 8.3.2 to 8.4.0 dependabot[bot] 2021-05-10 11:32:17 +00:00
  • 19edf86751 Merge pull request #808 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-cli-4.7.0 Daniël van Noord 2021-05-10 13:02:08 +02:00
  • 28857220f3 Merge pull request #811 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.1.2 Daniël van Noord 2021-05-10 13:01:14 +02:00
  • 8d1d9697c1 Merge pull request #809 from CookieMonsterTeam/dependabot/npm_and_yarn/types/chai-4.2.18 Daniël van Noord 2021-05-10 12:17:41 +02:00
  • 6eb2b76d9f Merge pull request #810 from CookieMonsterTeam/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.22.1 Daniël van Noord 2021-05-10 11:27:32 +02:00
  • b674376433 Bump ts-loader from 9.1.1 to 9.1.2 dependabot[bot] 2021-05-10 08:35:34 +00:00
  • 9c24deb5aa Bump @typescript-eslint/eslint-plugin from 4.22.0 to 4.22.1 dependabot[bot] 2021-05-10 08:35:18 +00:00
  • 88a6fc31a1 Bump @types/chai from 4.2.17 to 4.2.18 dependabot[bot] 2021-05-10 08:34:56 +00:00
  • f791d47845 Bump webpack-cli from 4.6.0 to 4.7.0 dependabot[bot] 2021-05-10 08:34:45 +00:00
  • d6b0284da1 Merge pull request #807 from tsr488/patch-1 Daniël van Noord 2021-05-08 10:48:19 +02:00
  • 0f2bd0a10e Small optimization when creating temp array for sorting buildings Tom 2021-05-08 04:45:08 -04:00
  • 41c28c21df Sorting fixes Tom 2021-05-08 03:51:47 -04:00
  • 67d3562659 Update Upgrades.js Tom Rogan 2021-05-08 02:13:27 -04:00
  • 770b238f70 Merge pull request #804 from DanielNoord/bugfixes Daniël van Noord 2021-05-06 21:54:52 +02:00
  • 305454b802 Fix issues with "till next achievement" Daniël van Noord 2021-05-06 21:45:58 +02:00
  • 18ace33231 Merge pull request #803 from DanielNoord/exposedata Daniël van Noord 2021-05-06 21:14:38 +02:00
  • af803b4ead Fix link to old repo Daniël van Noord 2021-05-06 21:03:39 +02:00
  • 210f4d4aee Colour column of green option #773 Daniël van Noord 2021-05-06 21:02:26 +02:00
  • 5a045e7ac4 Expose building and upgrade data to global scope Daniël van Noord 2021-05-06 20:27:17 +02:00
  • cc2a754425 Run tests before build Daniël van Noord 2021-05-06 20:19:09 +02:00
  • e44e39bc2c Stop making report minified Daniël van Noord 2021-05-06 20:17:32 +02:00
  • 48c1d12d86 Update to new repo location Daniël van Noord 2021-05-06 19:41:32 +02:00
  • 195d7335f8 Merge pull request #796 from DanielNoord/eslint Daniël van Noord 2021-05-02 11:45:43 +02:00
  • 941ccfeb79 Updated ESLint to 7.25.0 Daniël van Noord 2021-05-02 11:44:27 +02:00
  • eb71fd9bd2 Merge pull request #792 from CookieMonsterTeam/dependabot/npm_and_yarn/ts-loader-9.1.1 Daniël van Noord 2021-05-02 11:01:02 +02:00
  • 039155a607 Bump ts-loader from 8.1.0 to 9.1.1 dependabot[bot] 2021-05-02 09:00:07 +00:00
  • 9fe2e8b9b9 Merge pull request #795 from CookieMonsterTeam/dependabot/npm_and_yarn/webpack-5.36.2 Daniël van Noord 2021-05-02 10:59:38 +02:00