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

• dd66674169 Bump typescript from 4.7.2 to 4.7.3 dependabot[bot] 2022-06-06 20:05:19 +00:00
• 4b16c896f1 [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-06 20:04:29 +00:00
• cfca658703 Bump webpack from 5.72.1 to 5.73.0 dependabot[bot] 2022-06-06 20:02:59 +00:00
• 33c463b15a [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-06 20:03:12 +00:00
• a607842fdd Bump chai from 4.3.4 to 4.3.6 dependabot[bot] 2022-06-06 02:07:07 +00:00
• 5b982cf9cf [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-06 20:02:32 +00:00
• 501b2df220 Bump eslint-config-prettier from 8.3.0 to 8.5.0 dependabot[bot] 2022-06-06 02:07:14 +00:00
• e0ef8d7b11 [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-04 08:42:32 +00:00
• 1027d48b51 Resolve conjured baked goods tooltip miscalculation #1074 (#1087) domoddball 2022-06-04 04:42:18 -04:00
• 38f33e2478 [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-03 10:19:21 +00:00
• fdcbbd7ab2 Add support for unshackled upgrades (#1086) domoddball 2022-06-03 06:19:06 -04:00
• 9bc392a0c5 [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-02 06:26:18 +00:00
• 9bfb8a44f9 Resolve Grimoire magic bar text rendering bug #1083 (#1084) domoddball 2022-06-02 02:26:04 -04:00
• 50d4e3e215 [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-01 17:10:31 +00:00
• fec312df1c Updates for cookieclicker v2.048 #1049 (#1079) domoddballandDaniël van Noord 2022-06-01 13:10:16 -04:00
• 17ac30177c [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-01 08:59:35 +00:00
• 1f23e58984 Bump ts-loader from 9.2.5 to 9.3.0 dependabot[bot] 2022-06-01 08:55:02 +00:00
• b1812afa2f Bump webpack from 5.72.0 to 5.72.1 dependabot[bot] 2022-06-01 08:55:09 +00:00
• ef6585b9af [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-01 08:53:46 +00:00
• 22b8c8a61c Bump ts-node from 10.2.1 to 10.8.0 dependabot[bot] 2022-06-01 08:52:44 +00:00
• a89f440809 [Automated] Merge dev into gh-pages github-actions[bot] 2022-06-01 08:51:42 +00:00
• 25838daede Bump webpack-cli from 4.8.0 to 4.9.2 dependabot[bot] 2022-04-25 02:57:50 +00:00
• 21c0042c24 Bump typescript from 4.4.3 to 4.7.2 dependabot[bot] 2022-05-30 02:09:37 +00:00
• e928c0227e [Automated] Merge dev into gh-pages github-actions[bot] 2022-04-20 19:02:18 +00:00
• b12fd5db72 Bump @typescript-eslint/eslint-plugin from 4.31.1 to 4.33.0 dependabot[bot] 2022-04-20 18:57:21 +00:00
• c20abff9f4 [Automated] Merge dev into gh-pages github-actions[bot] 2022-04-20 18:56:46 +00:00
• ef7d46b6dc Bump @typescript-eslint/parser from 4.31.1 to 4.33.0 dependabot[bot] 2022-04-20 18:53:50 +00:00
• 26672fe57b [Automated] Merge dev into gh-pages github-actions[bot] 2022-04-20 18:56:35 +00:00
• ff8fe0644a Bump eslint-plugin-import from 2.24.2 to 2.26.0 dependabot[bot] 2022-04-20 18:54:07 +00:00
• 6779133dd8 Bump ansi-regex from 3.0.0 to 3.0.1 dependabot[bot] 2022-04-20 18:53:41 +00:00
• f59b041e96 [Automated] Merge dev into gh-pages github-actions[bot] 2022-04-20 18:54:10 +00:00
• 097ccd2048 Bump minimist from 1.2.5 to 1.2.6 dependabot[bot] 2022-03-29 08:43:44 +00:00
• 89c94ea934 [Automated] Merge dev into gh-pages github-actions[bot] 2022-04-20 18:53:41 +00:00
• c45a630286 Bump prettier from 2.3.2 to 2.6.2 dependabot[bot] 2022-04-04 02:06:06 +00:00
• 3e525da15c [Automated] Merge dev into gh-pages github-actions[bot] 2022-04-20 18:53:31 +00:00
• 30809c7b45 Bump @types/chai from 4.2.21 to 4.3.1 dependabot[bot] 2022-04-18 02:11:00 +00:00
• db8d722479 Bump webpack from 5.52.1 to 5.72.0 dependabot[bot] 2022-04-11 02:09:12 +00:00
• c498574a77 [Automated] Merge dev into gh-pages github-actions[bot] 2022-04-20 18:52:10 +00:00
• 79f8079228 Re-order Garden max rewards by amount of cookies Build CookieMonsterDev.js and .js.map Ran npm build-dev humdogm 2022-03-06 01:33:39 -06:00
• 0a6113cf72 [Automated] Merge dev into gh-pages github-actions[bot] 2021-12-30 08:28:30 +00:00
• 9d101ddfd4 Merge pull request #1037 from dsf3449/dev Daniël van Noord 2021-12-30 09:28:16 +01:00
• 0e69ac39dc Remove no longer needed Beautify call dsf3449 2021-12-30 01:03:53 -06:00
• 248be6d9ce [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-29 21:03:57 +00:00
• f0757d2490 Bump cookiemonsterframework to 0.2.3 Daniël van Noord 2021-09-29 23:03:37 +02:00
• a0b4d5eecb [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-29 19:10:49 +00:00
• 65754bc29d Fix jumping of options screen Daniël van Noord 2021-09-29 21:10:25 +02:00
• aa2e866cc5 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-22 10:34:56 +00:00
• 1d26217f80 Merge pull request #994 from benblank/cmd-cache Daniël van Noord 2021-09-22 12:34:39 +02:00
• c0751438b6 Rebuild after updating dependencies. Ben Blank 2021-09-16 16:52:20 -07:00
• 53ed8fe167 Fix handling of undefined in FillCMDCache. Ben Blank 2021-09-15 12:12:40 -07:00
• 74e7c64ca2 Export caches via CookieMonsterData. Ben Blank 2021-09-13 18:15:21 -07:00
• 46202be466 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-14 19:15:52 +00:00
• 809bd4d35d Update dependencies Daniël van Noord 2021-09-14 21:15:35 +02:00
• b2fcbcdb81 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-14 19:07:52 +00:00
• 348ba4b9fd Rebuild CM.js Daniël van Noord 2021-09-14 21:07:36 +02:00
• 386dae3830 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-14 19:06:41 +00:00
• 9e783cc3d7 Bump cookiemonsterframework to 0.2.2 Daniël van Noord 2021-09-14 21:06:19 +02:00
• 5ac33725b7 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 08:14:55 +00:00
• 6766c05091 Use issue forms instead of issue templates Daniël van Noord 2021-09-10 10:14:16 +02:00
• 96fa090f0d [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:47:13 +00:00
• e4143126a0 Update bug-report.yml Daniël van Noord 2021-09-10 09:46:59 +02:00
• c8a5a3c34f [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:46:51 +00:00
• 0616887d28 Update bug-report.yml Daniël van Noord 2021-09-10 09:46:40 +02:00
• 196a911e2d [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:46:26 +00:00
• 2695fdb140 Create bug-report.yml Daniël van Noord 2021-09-10 09:46:15 +02:00
• 11b1be5c71 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:45:52 +00:00
• bf4f910cee Update bug-report.yml Daniël van Noord 2021-09-10 09:45:40 +02:00
• b0ad9b9786 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:45:26 +00:00
• eb0861c5d7 Update bug-report.yml Daniël van Noord 2021-09-10 09:45:12 +02:00
• 4ebc2d597e [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:43:49 +00:00
• 4a76fa9f95 Update bug-report.yml Daniël van Noord 2021-09-10 09:43:37 +02:00
• 3b8adb7b9f [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:42:57 +00:00
• 9c28ef5411 Rename bug_report.yml to bug-report.yml Daniël van Noord 2021-09-10 09:42:44 +02:00
• b1ba7f02f7 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:42:20 +00:00
• c78b06b16a Delete feature_request.md Daniël van Noord 2021-09-10 09:42:17 +02:00
• ea1d288c39 Create feature-request.yml Daniël van Noord 2021-09-10 09:42:07 +02:00
• d69e249d58 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:39:32 +00:00
• a2db049b71 Update bug_report.yml Daniël van Noord 2021-09-10 09:39:21 +02:00
• beb894557b [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:36:16 +00:00
• 6d9f6d61f4 Delete bug_report.md Daniël van Noord 2021-09-10 09:36:04 +02:00
• 0dd3f2594b [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-10 07:35:55 +00:00
• 75b59fdaa8 Create bug_report.yml Daniël van Noord 2021-09-10 09:35:40 +02:00
• 627fcb7b52 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-06 13:46:51 +00:00
• 1f6ca9ebe6 Merge pull request #981 from DanielNoord/dev Daniël van Noord 2021-09-06 15:46:38 +02:00
• bbf31fe96f Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into dev Daniël van Noord 2021-09-06 15:44:24 +02:00
• 4be3942af3 Fix Krumblor on Steam Daniël van Noord 2021-09-06 15:43:41 +02:00
• 1cde6308fa [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-05 18:15:24 +00:00
• 488233c8dd Merge pull request #979 from Pidgeot/dev Daniël van Noord 2021-09-05 20:15:11 +02:00
• a89f1eed1a Update src/Main/ReplaceGameElements/NativeGrimoire.js Daniël van Noord 2021-09-05 20:13:58 +02:00
• 790cf411c3 Set grimoire bar width to 75% Michael Madsen 2021-09-05 20:10:27 +02:00
• 46853f711a Disable automatic sizing on grimoire bar to allow text to fit Michael Madsen 2021-09-05 19:33:44 +02:00
• fa49f84262 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-05 15:35:05 +00:00
• 60121c0be5 Merge pull request #977 from dmytrokyrychuk/short-time-format Daniël van Noord 2021-09-05 17:34:51 +02:00
• c7d9144dd2 Rebuild CookieMonster files Daniël van Noord 2021-09-05 17:33:49 +02:00
• aa5cad663b Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into short-time-format Daniël van Noord 2021-09-05 17:33:29 +02:00
• 2b174fe323 [Automated] Merge dev into gh-pages github-actions[bot] 2021-09-05 15:31:42 +00:00
• b191d9a434 Fix Grimoire bar on Steam Daniël van Noord 2021-09-05 17:31:23 +02:00
• 1842c40c01 Rebuild CookieMonster files Daniël van Noord 2021-09-05 17:28:59 +02:00
• 9c005b2f2f Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into short-time-format Daniël van Noord 2021-09-05 17:23:37 +02:00
• e6d89fa0c7 Add short time format Dmytro Kyrychuk 2021-09-05 17:51:03 +03:00