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

• 63139933ce Clean up Daniel van Noord 2021-01-30 01:10:08 +01:00
• 0547381845 Changed the settings for colours Daniel van Noord 2021-01-30 01:07:09 +01:00
• 455e99e2ab Updated jscolor to 2.4.5 Daniel van Noord 2021-01-29 20:53:04 +01:00
• b2ae7c71cf Merge pull request #532 from Aktanusa/revert-531-jscolor DanielNoord 2021-01-29 18:46:03 +01:00
• eee663f414 Revert "Update JSColor to 2.4.5" DanielNoord 2021-01-29 18:45:53 +01:00
• 3dd2e65092 Merge pull request #531 from DanielNoord/jscolor DanielNoord 2021-01-29 18:23:22 +01:00
• 16ad8f78dc Update JSColor to 2.4.5 Daniel van Noord 2021-01-29 18:22:57 +01:00
• ce5b7940e4 Merge pull request #529 from DanielNoord/fixsound DanielNoord 2021-01-28 22:01:41 +01:00
• 7b8e29e346 Notify's don't occur when loading the mod #495 Daniel van Noord 2021-01-28 22:01:01 +01:00
• 5e5e8f5e22 set Missing Achievements OFF to the first label PneuJai 2021-01-28 13:36:50 +08:00
• d228967fe7 set Missing Achievements OFF to the first label PneuJai 2021-01-28 13:34:19 +08:00
• b3757c452a Merge pull request #527 from DanielNoord/harvestalltooltip DanielNoord 2021-01-27 22:13:29 +01:00
• 6c852e2c50 Tooltip for harvest all button #227 Daniel van Noord 2021-01-27 22:12:37 +01:00
• 5abdc77e30 Added data on possible effects Daniel van Noord 2021-01-27 21:43:24 +01:00
• 5af7be93e3 Merge pull request #526 from DanielNoord/fix/gardentooltip DanielNoord 2021-01-27 21:31:29 +01:00
• 0171732e70 Made Grimoire tooltip always launch Daniel van Noord 2021-01-27 21:30:50 +01:00
• 00c513798a Make Garden tooltip load on LoadMinigames Daniel van Noord 2021-01-27 21:20:22 +01:00
• 235900c826 rename labels of MissingAchievements PneuJai 2021-01-27 15:12:17 +08:00
• abc7dce047 Delete .github/workflows directory DanielNoord 2021-01-27 00:05:42 +01:00
• 61fc4aaaef Update main.yml DanielNoord 2021-01-27 00:00:29 +01:00
• 4649ab87c6 Update main.yml DanielNoord 2021-01-26 23:58:53 +01:00
• 7186be028b Update main.yml DanielNoord 2021-01-26 23:54:49 +01:00
• e6728157b3 Update main.yml DanielNoord 2021-01-26 23:52:25 +01:00
• 843bb00f34 Update main.yml DanielNoord 2021-01-26 23:50:52 +01:00
• 1a73fb8a2d Update main.yml DanielNoord 2021-01-26 23:50:02 +01:00
• 1aa6d3797b Update main.yml DanielNoord 2021-01-26 23:48:51 +01:00
• 31ea583edb Update main.yml DanielNoord 2021-01-26 23:47:49 +01:00
• b4cb0fee52 Update main.yml DanielNoord 2021-01-26 23:43:08 +01:00
• 6dd4022a80 Update main.yml DanielNoord 2021-01-26 23:39:01 +01:00
• d30a064c69 Update main.yml DanielNoord 2021-01-26 23:38:03 +01:00
• cb91c91321 Update main.yml DanielNoord 2021-01-26 23:33:42 +01:00
• 93e50181fe Update main.yml DanielNoord 2021-01-26 23:31:49 +01:00
• 3b137aa882 Update main.yml DanielNoord 2021-01-26 23:30:01 +01:00
• 1d51a36ccd Update main.yml DanielNoord 2021-01-26 23:28:24 +01:00
• 30f6ecf8f2 Update main.yml DanielNoord 2021-01-26 23:23:05 +01:00
• 1d639a9721 Update main.yml DanielNoord 2021-01-26 23:20:39 +01:00
• 19260f9361 Merge pull request #525 from Aktanusa/action-1 DanielNoord 2021-01-26 23:18:42 +01:00
• 94ba7487b1 Create main.yml DanielNoord 2021-01-26 23:17:59 +01:00
• cd3a9caab5 Merge pull request #524 from DanielNoord/gardentooltip DanielNoord 2021-01-26 22:32:24 +01:00
• 45c3df2d4b Fixed plant tooltips Daniel van Noord 2021-01-26 22:30:27 +01:00
• 80e3ac746a Fixed CM.Options.TooltipBuildUpgrade #523 Daniel van Noord 2021-01-26 22:26:46 +01:00
• 52cfd9ddc2 Renamed ToolWrink to TooltipWrink Daniel van Noord 2021-01-26 22:22:32 +01:00
• ffa664c476 Added option foor plot tooltip Daniel van Noord 2021-01-26 22:21:17 +01:00
• a9dfcaab75 Tooltip with curr/max reward for plants #183 Daniel van Noord 2021-01-26 22:18:21 +01:00
• 91a2edf348 Fixed typos of ReplaceCrateTooltipAchievements PneuJai 2021-01-26 23:27:31 +08:00
• f450ae98ae Fixed the default value for MissingAchievements PneuJai 2021-01-26 23:26:35 +08:00
• cd90b15fa3 Adapt to new option MissingAchievements PneuJai 2021-01-26 22:39:17 +08:00
• 8a3eac78d4 Merge MissingShadowAchievements and MissingAchievements PneuJai 2021-01-26 22:35:00 +08:00
• cdfb35aa1b rename ShowMysteriousAchievements to MissingAchievements PneuJai 2021-01-26 22:23:06 +08:00
• 23f19b4d62 Created (empty) tooltip for garden plots Daniel van Noord 2021-01-26 14:57:59 +01:00
• ab08bc60e7 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip Daniel van Noord 2021-01-26 13:56:49 +01:00
• b48834e416 Merge pull request #522 from Aktanusa/master DanielNoord 2021-01-26 13:56:26 +01:00
• 3f20fac752 Merge pull request #521 from Aktanusa/master DanielNoord 2021-01-26 13:56:09 +01:00
• 2f12f9839a Merge pull request #520 from DanielNoord/hotfix DanielNoord 2021-01-26 13:55:43 +01:00
• c62b514f0a Fix tooltips Daniel van Noord 2021-01-26 13:55:14 +01:00
• 125113133a Added CM.Disp.ReplaceCrateTooltipAchievements() into init PneuJai 2021-01-26 20:45:37 +08:00
• e5bd08c0c4 Added CM.Disp.ReplaceCrateTooltipAchievements PneuJai 2021-01-26 20:44:48 +08:00
• abfeabf08f Added default values for those two options PneuJai 2021-01-26 20:42:17 +08:00
• d958fc08bf Added two options PneuJai 2021-01-26 20:41:22 +08:00
• 1372942705 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip Daniel van Noord 2021-01-26 13:37:55 +01:00
• e64e41e523 Merge pull request #518 from Aktanusa/master DanielNoord 2021-01-26 13:37:03 +01:00
• f916008a3b Merge pull request #517 from Aktanusa/master DanielNoord 2021-01-26 13:36:18 +01:00
• fda6e65176 Merge pull request #516 from DanielNoord/fixes DanielNoord 2021-01-26 13:35:53 +01:00
• 7795aa79a5 Fix building sorting #515 Daniel van Noord 2021-01-26 13:31:01 +01:00
• 1a94c4cb7c Merge pull request #513 from Aktanusa/master DanielNoord 2021-01-25 23:43:58 +01:00
• b6069e2358 Merge pull request #512 from Aktanusa/dev DanielNoord 2021-01-25 23:43:36 +01:00
• a7af602aa3 Merge pull request #511 from Aktanusa/master DanielNoord 2021-01-25 23:43:10 +01:00
• 937fa23569 Merge pull request #510 from Aktanusa/master DanielNoord 2021-01-25 23:42:18 +01:00
• f36dcf012a Merge pull request #509 from Aktanusa/dev DanielNoord 2021-01-25 23:41:46 +01:00
• 5a64ed45be Merge pull request #508 from DanielNoord/fixes DanielNoord 2021-01-25 23:40:41 +01:00
• e5b24b393e Fixed decimal notation #500 Daniel van Noord 2021-01-25 23:37:41 +01:00
• 92c28b092b Timer bar now adjusts height correctly #499 Daniel van Noord 2021-01-25 23:29:21 +01:00
• d5c5a5f62e Show tooltip warnings when extra info is off #496 Daniel van Noord 2021-01-25 23:24:25 +01:00
• 867249e8cb Missing upgrades no longer shows debug #497 Daniel van Noord 2021-01-25 23:00:30 +01:00
• 28e28fd5a0 Single fattest wrinkler now excludes shiny #498 Daniel van Noord 2021-01-25 22:55:57 +01:00
• 5f93186e7d Fixed bug with display of missing upgrades Daniel van Noord 2021-01-25 22:46:08 +01:00
• 0a57450815 Fix colour settings not displaying #504 Daniel van Noord 2021-01-25 22:39:03 +01:00
• c08cefd1a6 Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip Daniel van Noord 2021-01-25 22:32:53 +01:00
• 51ab15f2ec Fix in Disp.js and combine Zohnannor 2021-01-25 22:20:59 +03:00
• 8505b1621d Update CM.Disp.FormatTime Zohnannor 2021-01-25 19:02:24 +03:00
• be1ecf306a Merge pull request #505 from Aktanusa/master (Hotfix for #502) DanielNoord 2021-01-25 20:30:14 +01:00
• 901bc7c61f Merge pull request #503 from Zohnannor/patch-1 DanielNoord 2021-01-25 20:29:05 +01:00
• 192c5d105c Fix in Disp.js and combine Zohnannor 2021-01-25 22:20:59 +03:00
• 519e67dce9 Create CONTRIBUTING.md DanielNoord 2021-01-25 18:07:55 +01:00
• c184d8b7a7 Update CM.Disp.FormatTime Zohnannor 2021-01-25 19:02:24 +03:00
• 55c6b5db8b Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip Daniel van Noord 2021-01-23 23:03:24 +01:00
• 6df4abf945 Merge pull request #493 from Aktanusa/master DanielNoord 2021-01-23 23:02:21 +01:00
• 8ebb2f85ed Merge pull request #492 from Aktanusa/master DanielNoord 2021-01-23 23:01:01 +01:00
• 242c6ba754 Merge pull request #491 from Aktanusa/fix/hasGod DanielNoord 2021-01-23 23:00:21 +01:00
• 00f79cb073 Fixed hasGod #490 Daniel van Noord 2021-01-23 22:59:46 +01:00
• c64f42bcfa Start work on Garden Tooltip Daniel van Noord 2021-01-23 22:55:39 +01:00
• 29ba1c66cf Moved most replace tooltip funcs to Main.js Daniel van Noord 2021-01-23 22:36:26 +01:00
• 1875423a7b Merge pull request #489 from DanielNoord/enhance/warnings DanielNoord 2021-01-23 22:11:21 +01:00
• 62f8e1fe82 Base warnings on new income instead of curr #488 Daniel van Noord 2021-01-23 22:10:06 +01:00
• f257243b38 Optional warning for Conjure with Frenzy (#487) Daniel van Noord 2021-01-23 22:02:21 +01:00
• d71c197ec9 Added Conjure Frenzy to stats Daniel van Noord 2021-01-23 21:53:36 +01:00
• 116679a5c9 Merge pull request #484 from Aktanusa/master (Release version 2.031.3) DanielNoord 2021-01-23 21:35:38 +01:00
• 0ccd16577f Merge pull request #436 from Aktanusa/dev (Version 2.031.3) 2.031.3 DanielNoord 2020-12-28 14:10:06 +01:00
• 7c9d6f570d Merge branch 'master' into dev DanielNoord 2020-12-28 14:08:13 +01:00
• 2648af3095 Merge pull request #483 from DanielNoord/version, Bump to version 2.031.3 (#397) DanielNoord 2020-12-28 14:01:53 +01:00