Commit Graph

Select branches

Hide Pull Requests

dependabot/npm_and_yarn/eslint-9.27.0

dependabot/npm_and_yarn/eslint-config-prettier-10.1.5

dependabot/npm_and_yarn/eslint/eslintrc-3.3.1

dependabot/npm_and_yarn/eslint/js-9.27.0

dependabot/npm_and_yarn/prettier-3.5.3

dev

gh-pages

master

pre-commit-ci-update-config

#100

#100/merge

#1000

#1001

#1006

#1007

#1008

#1009

#101

#1011

#1012

#1014

#1017

#1018

#1019

#1020

#1023

#1023/merge

#1024

#1025

#1026

#1028

#1029

#1032

#1033

#1034

#1035

#1036

#1037

#1044

#1045

#1046

#1047

#1048

#1050

#1051

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#1061

#1062

#1064

#1065

#1065/merge

#1066

#1067

#1068

#1069

#107

#107/merge

#1070

#1071

#1072

#1073

#1075

#1076

#1077

#1079

#108

#1080

#1081

#1082

#1084

#1086

#1087

#1088

#1089

#1090

#1091

#1092

#1093

#1094

#1095

#1098

#1099

#1100

#1103

#1106

#1108

#1109

#1111

#1112

#1114

#1116

#1117

#1121

#1122

#1123

#1124

#1125

#1127

#1128

#1131

#1132

#1134

#1135

#1136

#1138

#1139

#1141

#1142

#1143

#1144

#1146

#1147

#1148

#1149

#115

#1150

#1151

#1152

#1153

#1158

#116

#1161

#1163

#1164

#1169

#1179

#1180

#1181

#1182

#1183

#1184

#1185

#1188

#1189

#1190

#1191

#1192

#1192/merge

#1196

#1197

#1198

#1200

#1201

#1202

#1203

#1204

#1205

#1206

#1207

#1208

#1209

#1209/merge

#121

#121/merge

#1211

#1212

#1213

#1216

#1217

#1219

#1220

#1221

#1221/merge

#1223

#1224

#1225

#1226

#1227

#1228

#1229

#1230

#1231

#1232

#1232/merge

#1234

#1234/merge

#1235

#1235/merge

#1239

#1239/merge

#1240

#1241

#1243

#1244

#1245

#1248

#1250

#1253

#1253/merge

#133

#138

#138/merge

#142

#158

#158/merge

#159

#159/merge

#162

#162/merge

#163

#164

#166

#172

#178

#191

#191/merge

#192

#201

#211

#211/merge

#215

#216

#217

#219

#220

#220/merge

#221

#221/merge

#222

#233

#234

#250

#251

#253

#255

#258

#262

#280

#283

#285

#286

#300

#309

#311

#314

#316

#318

#319

#321

#323

#324

#325

#327

#329

#330

#331

#334

#335

#336

#337

#338

#340

#341

#343

#344

#345

#346

#349

#350

#354

#355

#356

#357

#360

#361

#362

#365

#366

#367

#368

#369

#370

#371

#372

#374

#376

#377

#378

#380

#381

#382

#383

#384

#385

#387

#390

#391

#393

#394

#395

#396

#398

#399

#402

#409

#410

#411

#412

#415

#417

#418

#420

#421

#422

#423

#424

#425

#427

#428

#429

#431

#432

#433

#435

#436

#438

#439

#440

#441

#442

#443

#446

#447

#448

#449

#451

#452

#453

#454

#455

#456

#457

#458

#459

#460

#461

#462

#464

#465

#466

#472

#475

#476

#477

#478

#479

#480

#481

#482

#483

#484

#489

#491

#492

#493

#503

#505

#506

#507

#508

#509

#510

#511

#512

#513

#516

#517

#518

#519

#520

#521

#522

#524

#525

#526

#527

#529

#53

#53/merge

#531

#532

#533

#534

#535

#536

#537

#538

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#550

#551

#552

#559

#561

#562

#564

#565

#566

#570

#571

#572

#573

#575

#576

#577

#578

#579

#581

#582

#583

#585

#586

#590

#591

#592

#594

#598

#601

#603

#604

#605

#606

#607

#61

#61/merge

#614

#615

#616

#622

#623

#624

#634

#635

#639

#640

#641

#642

#643

#644

#645

#646

#649

#650

#652

#653

#654

#655

#656

#658

#659

#661

#662

#663

#664

#665

#666

#671

#672

#673

#674

#676

#678

#679

#680

#681

#682

#684

#685

#688

#689

#691

#692

#693

#704

#705

#706

#711

#712

#713

#717

#718

#719

#722

#723

#724

#725

#730

#733

#738

#740

#741

#742

#743

#744

#745

#746

#747

#748

#749

#751

#752

#755

#756

#757

#758

#759

#760

#765

#769

#770

#774

#776

#777

#778

#779

#781

#782

#783

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#803

#804

#807

#808

#809

#810

#811

#812

#813

#814

#815

#817

#818

#819

#820

#824

#825

#826

#827

#828

#829

#830

#835

#836

#837

#838

#839

#840

#841

#842

#847

#848

#849

#850

#851

#852

#853

#855

#856

#857

#858

#86

#860

#861

#862

#863

#864

#865

#866

#867

#868

#869

#870

#871

#872

#873

#874

#876

#877

#878

#879

#880

#881

#882

#883

#887

#894

#895

#896

#897

#898

#899

#900

#901

#902

#906

#907

#909

#910

#911

#912

#913

#916

#917

#923

#924

#925

#926

#927

#928

#929

#932

#933

#934

#935

#936

#937

#938

#94

#94/merge

#941

#942

#943

#944

#945

#947

#948

#949

#95

#953

#954

#955

#956

#957

#962

#963

#970

#971

#972

#975

#977

#979

#980

#981

#990

#991

#992

#994

1.0465.10

1.0465.11

1.0465.12

1.0465.13

1.0465.2

1.0465.3

1.0465.4

1.0465.5

1.0465.6

1.0465.7

1.0465.8

1.0465.9

1.0466.1

2.002.1

2.002.2

2.0034.1

2.0034.2

2.0034.3

2.0042.1

2.0042.2

2.0045.1

2.0106.1

2.0109.1

2.012.1

2.016.1

2.018.1

2.019.1

2.021.1

2.021.2

2.031.1

2.031.10

2.031.2

2.031.3

2.031.4

2.031.5

2.031.6

2.031.7

2.031.8

2.031.9

2.1

2.2

2.3

2.4

2.5

Mono Color

• 1bb6ae7e9f Merge branch 'patch-1' of https://github.com/florensie/CookieMonster into florensie-patch-1 Aktanusa 2019-03-13 17:49:43 -04:00
• 1f366430cf Fixed for Version 2.018 of Cookie Clicker (Issue #239 and #241) Aktanusa 2019-03-13 17:44:18 -04:00
• 77421c11c0 Change to Version 2.018.1 Aktanusa 2019-03-12 20:38:30 -04:00
• 7d5e3ee437 Add https inclusion to userscript florensie 2019-02-20 11:24:39 +01:00
• ab7f35e6d9 Change vanilla favicon URLs to https. Scott Crunkleton 2019-02-20 01:15:54 -07:00
• 9f2a7cda78 Added notification on garden tick (based on @doorajar code) (Issue #180) and minor code formatting cleanup Aktanusa 2018-12-14 17:50:27 -05:00
• 963f950039 Separate the configuration for flash/sound for Golden Cookies and Season Special, rearrange the option menu a little bit, and some code cleanup/formatting Aktanusa 2018-12-12 10:50:58 -05:00
• 0255afd75d Change to Version 2.016.2 Aktanusa 2018-11-28 13:02:06 -05:00
• 47988a3707 Updated beta to Version 2.016.1 Aktanusa 2018-10-30 13:19:56 -04:00
• 254d1ad34b Merge pull request #2 from Aktanusa/master BONNe 2018-10-29 18:51:43 +02:00
• 3d06ee6aec Merge branch 'master' into gh-pages Aktanusa 2018-10-27 20:40:29 -04:00
• 4a8c59a3e6 Fixed to work with Version 2.016 of Cookie Clicker (Issue #224 & #225) 2.016.1 Aktanusa 2018-10-27 20:37:27 -04:00
• cd3061f2c4 Change to Version 2.016.1 Aktanusa 2018-10-26 11:33:57 -04:00
• 937cb34920 Changed how editing sound URLs to be better (aka you don't need to change the URL and save within the 10 second refresh window anymore) Aktanusa 2018-10-26 11:31:04 -04:00
• ac015ab5a8 added stats Jeff Shepler 2018-09-19 20:36:27 -04:00
• ea817e3eed Merge branch 'dev' into lump BONNe 2018-08-28 13:02:13 +03:00
• 5b9d3636db Add possibility to disable Sugar Lump tooltip. BONNe1704 2018-08-28 13:00:50 +03:00
• 7cfba6f80a Improve Sugar lump Tooltip. BONNe 2018-08-28 11:59:30 +03:00
• 2f862ac687 Fix bug with timer bar displacing wrinkler detection area (Issue #213) and use game detection instead of copying code plus a minor code formatting change Aktanusa 2018-08-17 15:50:31 -04:00
• 6895719759 Version change to 2.012.2 and added option for turning off the timer in Grimoire magic meter Aktanusa 2018-08-09 17:01:43 -04:00
• 49c67bd86d Merge branch 'master' into gh-pages Aktanusa 2018-08-08 11:40:57 -04:00
• 1a1877e15c Fixed to work with Version 2.012 of Cookie Clicker 2.012.1 Aktanusa 2018-08-08 11:37:35 -04:00
• 3af0dd81e5 Change to Version 2.012.1 Aktanusa 2018-08-08 11:01:22 -04:00
• 2b1007f7af Merge branch 'master' into gh-pages Aktanusa 2018-08-01 19:49:04 -04:00
• 909806b0f9 Fix to work with Version 2.0109 of CC (Issue #208) 2.0109.1 Aktanusa 2018-08-01 19:43:10 -04:00
• a393c73eec Change to Version 2.0109.1 Aktanusa 2018-08-01 11:34:27 -04:00
• 1c8a9d6bb3 Split the tooltip options Aktanusa 2018-08-01 11:28:15 -04:00
• 62dae65606 Fix calculation error due to timing being off by a little bit (happens more often on slower computers) (Issue #200) Aktanusa 2018-07-21 08:30:52 -04:00
• 7310905ae2 Fixed Scientific Notation and Engineering Notation to be more correct Aktanusa 2018-07-19 21:27:34 -04:00
• cd1ea8269b Fixed silly bug with Scientific Notation Aktanusa 2018-07-13 00:01:35 -04:00
• 22ae4ebc4c Renamed previous Scientific Notation to Engineering Notation and added real Scientific Notation (Issue #110) Aktanusa 2018-07-12 23:05:18 -04:00
• b5f6fef9ae Expand the number labels since now the game hits even higher numbers! (Issue #197) Aktanusa 2018-07-10 22:37:00 -04:00
• 9becf9b9ac Added the options 10s, 15s, 30s to average CPS (Issue #198) Aktanusa 2018-07-10 21:04:17 -04:00
• eb62576e5f Run Combine.sh Pedro Angelo 2018-06-06 01:50:55 -03:00
• 78ec726f4a Change UpBarColor to allow for colors but no bar Pedro Angelo 2018-06-06 01:46:11 -03:00
• e4de9c124e Fix Prestige stats not taking account of extra buildings from Spontaneous Edifice (Issue #175) Aktanusa 2018-04-25 19:24:07 -04:00
• 5ef7486646 Change to Version 2.0106.2 Aktanusa 2018-04-25 18:47:52 -04:00
• 436a22f0c7 Merge branch 'master' into gh-pages Aktanusa 2018-04-24 20:44:38 -04:00
• 902c866f18 Changed 'Pop All' button to pop only normal Wrinklers (Issue #140 & #171) 2.0106.1 Aktanusa 2018-04-24 20:39:58 -04:00
• f6164a9b85 Fixed to work with Version 2.0106 of CC (Issue #179 and #181) Aktanusa 2018-04-24 18:58:18 -04:00
• 07253531ef Change to Version 2.0106.1 Aktanusa 2018-04-21 17:30:36 -04:00
• e3fdc6854d Merge branch 'master' into gh-pages Aktanusa 2018-03-05 21:28:18 -05:00
• 5689ffb36e Revert tableLayout since it cuts off information 2.0045.1 Aktanusa 2018-03-05 21:08:26 -05:00
• 3ec7b67c24 Fix brainfart undo https Aktanusa 2018-03-05 16:11:41 -05:00
• 23abe72564 Undo some of the merge changes that was unwanted Aktanusa 2018-03-05 16:09:58 -05:00
• 5266d8e4dc Merge branch 'redthefed-dev' into dev Aktanusa 2018-03-05 15:59:23 -05:00
• ebd0e929e2 Merge branch 'dev' of https://github.com/redthefed/CookieMonster into redthefed-dev Aktanusa 2018-03-05 15:58:38 -05:00
• fcd4d9e0fc Format the line better and also fixed the source file that was fixed in Issue #166 Aktanusa 2018-03-05 15:08:03 -05:00
• 41cd7688ea Merge branch 'ThexXTURBOXx-patch-1' into dev Aktanusa 2018-03-05 14:52:35 -05:00
• 00e0b179a3 Fixed typo, which ended in a bug Nico 2018-03-05 16:44:10 +01:00
• 2600ec040b Fix for Version 2.0045 of Cookie Clicker (Issue #161) Aktanusa 2018-03-04 19:15:27 -05:00
• 3190d18d23 Forgot CookieMonster.js again... Aktanusa 2018-03-04 18:31:48 -05:00
• 38b3c503fc Change to Version 2.0045.1 Aktanusa 2018-03-04 18:28:44 -05:00
• 71388411b5 Fixed Issues #153 and #158. Thanks to @Pantalaim0n and @CrackedP0t for the suggestion with the use of unsafeWindow but I rather use @cpeter256 version with window.eval instead. Aktanusa 2018-03-04 18:15:32 -05:00
• 67eac9fde2 Merge branch 'sigv-https-load' into dev Aktanusa 2018-03-04 13:38:06 -05:00
• bd0cd9900d Fixed a few spelling errors and whitespace (#3) redthefed 2018-02-28 23:51:21 -06:00
• 4ad6cc9fe0 Update README to use HTTPS instead of HTTP Valters Jansons 2018-02-25 12:24:31 +02:00
• e59b69e3f2 Add TLS to HTTP links Valters Jansons 2018-02-25 12:31:36 +02:00
• 78df5491a0 Merge branch 'master' of github.com:redthefed/CookieMonster redthefed 2018-02-17 21:22:39 -06:00
• de0d148dd0 changed combine.sh to reflect file order defined in combine.bat redthefed 2018-02-17 21:19:07 -06:00
• f9b4dd4ada Merge pull request #2 from redthefed/custom redthefed 2018-02-16 18:59:01 -06:00
• 0f8b5b7da7 commit redthefed 2018-02-16 18:53:56 -06:00
• 7295e0ea76 Merge pull request #1 from lgeorget/master redthefed 2018-02-12 05:49:56 -06:00
• 010e065dd7 Add the time left to the 'next multiple' information in buildings' tooltip Laurent Georget 2017-03-09 15:47:14 +01:00
• 816c566442 Add the 'next multiple of 50' information to buildings' tooltip Laurent Georget 2017-03-09 15:21:51 +01:00
• f32b1d5685 Fix tooltip toggle description Aktanusa 2017-09-13 09:35:10 -04:00
• 9df807a4ae Version change to 2.0042.3 Aktanusa 2017-09-13 09:32:44 -04:00
• 62bc84920a Merge branch 'master' into gh-pages Aktanusa 2017-09-12 17:22:24 -04:00
• bd2b59efde Added timer to Grimoire spells (Issue #136) with the help from @Hoten pull request (Issue #138) and fixed a very minor tooltip bug 2.0042.2 Aktanusa 2017-09-12 17:09:24 -04:00
• 04549b5e21 Fix Wrinklers typo in description (forgot the source file also) (Issue #142) Aktanusa 2017-09-09 15:17:04 -04:00
• e5039b588b Merge branch 'tayrayb-patch-1' into dev Aktanusa 2017-09-09 15:14:43 -04:00
• 5a9dc8b9fe Merge branch 'patch-1' of https://github.com/tayrayb/CookieMonster into tayrayb-patch-1 Aktanusa 2017-09-09 15:14:24 -04:00
• f773a9595a Fix Wrinklers Typo in Description Tayray 2017-08-25 13:14:45 +10:00
• 362e87610e Changed average CPS to ignore some outliers Aktanusa 2017-08-18 12:28:07 -04:00
• b16510c6ed Optimize reset bonus calculation Aktanusa 2017-08-18 08:04:52 -04:00
• 92ff50d3a3 Fix reset bonus stat to sometimes show the wrong number before 100% of potential is unlocked (hopefully) Aktanusa 2017-08-18 00:40:23 -04:00
• 1633dfb283 Fixed tooltip placement in minigames Aktanusa 2017-08-17 17:55:47 -04:00
• 80bb731f17 Changed default for average CPS/clicks to be 1m/1s since people kept getting confused Aktanusa 2017-08-17 17:28:34 -04:00
• ba387bddc6 Fixed max prestige not always max with fixes to tooltip description also (Issue #131) Aktanusa 2017-08-17 17:24:04 -04:00
• 197fceaddc Version change to 2.0042.2 Aktanusa 2017-08-17 16:39:55 -04:00
• 7b67ea19d8 Updated beta to Version 2.0041.1 Aktanusa 2017-08-11 09:36:54 -04:00
• aa93b6a6d2 Merge branch 'master' into gh-pages Aktanusa 2017-08-08 20:42:37 -04:00
• cad42578a9 Fixed to work with Version 2.0042 (Mostly) (Issue #134) 2.0042.1 Aktanusa 2017-08-08 20:40:52 -04:00
• 446f1e767c Version change to 2.0042.1 Aktanusa 2017-08-08 16:22:06 -04:00
• 6ac602a067 Fixed very minor bug in average CPS with Chocolate Egg and fixed negative average CPS (maybe?) Aktanusa 2017-08-03 23:31:54 -04:00
• 37107ae621 Version change to 2.0034.4 Aktanusa 2017-08-03 23:18:33 -04:00
• 6fc807e3ce Merge branch 'master' into gh-pages Aktanusa 2017-07-27 21:17:27 -04:00
• 687cb9a4c9 Fix heavenly chips multiplier (Issue #129) 2.0034.3 Aktanusa 2017-07-27 21:13:35 -04:00
• 2176b9b436 Change the default of calculate with Wrinkler to be off (Issue #91) Aktanusa 2017-07-27 21:02:02 -04:00
• e061caa2e4 Version changed to 2.0034.3 and changed to a faster method of getting current time Aktanusa 2017-07-19 17:33:54 -04:00
• 605927359d Merge branch 'master' into gh-pages Aktanusa 2017-07-19 16:22:31 -04:00
• b4157cdbc5 Fixed current date issue (Issue #124) 2.0034.2 Aktanusa 2017-07-19 16:21:20 -04:00
• 9f870572f4 Merge branch 'master' into gh-pages Aktanusa 2017-07-19 14:52:41 -04:00
• c0cd967cc7 Fixed to work with Version 2.0034 (mostly) (Issue #119, #120, and #121) 2.0034.1 Aktanusa 2017-07-19 14:45:54 -04:00
• c32a364d82 Version change to 2.0034.1 Aktanusa 2017-07-18 22:08:07 -04:00
• aec0583a89 Merge branch 'master' into gh-pages Aktanusa 2017-04-17 11:30:55 -04:00
• d82f782f4b Merge branch 'bryant1410-master' Aktanusa 2017-04-16 21:06:27 -04:00
• 22a00ceef0 Fix broken Markdown headings Santiago Castro 2017-04-16 20:50:48 -03:00
• db95fe5147 Merge branch 'master' into gh-pages Aktanusa 2016-07-27 23:17:24 -04:00
• b4c0c8de2b Fixed Century Egg Stat was wrong (Issue #102 and #103) and Version change 2.002.2 Aktanusa 2016-07-27 23:08:28 -04:00