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
#1000
#1001
#1006
#1007
#1008
#1009
#101
#1011
#1012
#1014
#1017
#1018
#1019
#1020
#1023
#1023
#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
#1066
#1067
#1068
#1069
#107
#107
#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
#1196
#1197
#1198
#1200
#1201
#1202
#1203
#1204
#1205
#1206
#1207
#1208
#1209
#1209
#121
#121
#1211
#1212
#1213
#1216
#1217
#1219
#1220
#1221
#1221
#1223
#1224
#1225
#1226
#1227
#1228
#1229
#1230
#1231
#1232
#1232
#1234
#1234
#1235
#1235
#1239
#1239
#1240
#1241
#1243
#1244
#1245
#1248
#1250
#1253
#1253
#133
#138
#138
#142
#158
#158
#159
#159
#162
#162
#163
#164
#166
#172
#178
#191
#191
#192
#201
#211
#211
#215
#216
#217
#219
#220
#220
#221
#221
#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
#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
#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
#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
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
#1000
#1001
#1006
#1007
#1008
#1009
#101
#1011
#1012
#1014
#1017
#1018
#1019
#1020
#1023
#1023
#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
#1066
#1067
#1068
#1069
#107
#107
#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
#1196
#1197
#1198
#1200
#1201
#1202
#1203
#1204
#1205
#1206
#1207
#1208
#1209
#1209
#121
#121
#1211
#1212
#1213
#1216
#1217
#1219
#1220
#1221
#1221
#1223
#1224
#1225
#1226
#1227
#1228
#1229
#1230
#1231
#1232
#1232
#1234
#1234
#1235
#1235
#1239
#1239
#1240
#1241
#1243
#1244
#1245
#1248
#1250
#1253
#1253
#133
#138
#138
#142
#158
#158
#159
#159
#162
#162
#163
#164
#166
#172
#178
#191
#191
#192
#201
#211
#211
#215
#216
#217
#219
#220
#220
#221
#221
#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
#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
#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
#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
-
d3aa2c30db
Small naming fixes
Daniël van Noord
2021-02-19 20:59:29 +01:00 -
1e92ff6b92
Merge pull request #579 from DanielNoord/annotate
Daniël van Noord
2021-02-19 00:00:12 +01:00 -
ebbb552100
Merge branch 'dev'
Daniël van Noord
2021-02-18 23:57:27 +01:00 -
67535eaa4c
Annotated Cache.js and solved issues #555
Daniël van Noord
2021-02-18 23:53:51 +01:00 -
ca46c10c55
Fixes to chain cookies stats
Daniël van Noord
2021-02-18 22:57:26 +01:00 -
cfb7659c1f
Merge pull request #577 from DanielNoord/hotfix/dev
Daniël van Noord
2021-02-18 21:34:07 +01:00 -
1ebc8cacc6
Fix missing upgrades display on dev branch
Daniël van Noord
2021-02-18 21:32:58 +01:00 -
0310d23eb4
Merge pull request #576 from Aktanusa/master
Daniël van Noord
2021-02-18 21:31:09 +01:00 -
e9ced31639
Merge pull request #575 from DanielNoord/hotfix
Daniël van Noord
2021-02-18 21:30:43 +01:00 -
c4c95eaa31
Fix missing upgrades display #574
Daniël van Noord
2021-02-18 21:29:14 +01:00 -
b7c47bbe6c
Merge pull request #571 from DanielNoord/fix/missinupgrades
Daniël van Noord
2021-02-17 22:49:26 +01:00 -
392c473839
Merge pull request #573 from Aktanusa/master
Daniël van Noord
2021-02-17 22:47:35 +01:00 -
f5ea276a63
Merge pull request #572 from DanielNoord/hotfix/missingupgrades
Daniël van Noord
2021-02-17 22:47:08 +01:00 -
9357e16dec
Fix crash with no upgrades #528
Daniël van Noord
2021-02-17 22:45:39 +01:00 -
1aecb8a8e1
Fixed crash with no upgrades purchased #528
Daniël van Noord
2021-02-17 22:42:21 +01:00 -
eb99ba1b78
Changed all "==" to "==="
Daniël van Noord
2021-02-16 23:47:44 +01:00 -
6f67c171f4
Merge pull request #570 from DanielNoord/fix/sound
Daniël van Noord
2021-02-16 23:43:58 +01:00 -
88b58f209f
Allow decoupling of base game and mod volume #567
Daniël van Noord
2021-02-16 23:41:22 +01:00 -
25250e8c46
Fix sounds playing during mod initialization #558
Daniël van Noord
2021-02-16 23:40:34 +01:00 -
84502bff4a
Merge pull request #566 from Aktanusa/master
Daniël van Noord
2021-02-11 23:09:54 +01:00 -
cfa32ef295
Merge pull request #565 from DanielNoord/hotfixmain
Daniël van Noord
2021-02-11 23:09:31 +01:00 -
1de5dd27dd
Fix #563
Daniël van Noord
2021-02-11 23:08:52 +01:00 -
1c4e988e90
Merge pull request #564 from DanielNoord/hotfix
Daniël van Noord
2021-02-11 23:05:46 +01:00 -
e3f58e2e73
Fixed Title option not showing #563
Daniël van Noord
2021-02-11 23:04:36 +01:00 -
e85a775468
Merge pull request #562 from DanielNoord/cache
Daniël van Noord
2021-02-10 20:39:22 +01:00 -
7af043bc55
Correctly build CookieMonster.js
Daniël van Noord
2021-02-10 20:38:24 +01:00 -
2b28cd64b1
Merge branch 'cache' into dev
Daniël van Noord
2021-02-10 20:34:35 +01:00 -
a24c666993
Resolved additional conflicts
Daniël van Noord
2021-02-10 20:32:54 +01:00 -
39b1ec6db4
Resolve conflicts
Daniël van Noord
2021-02-10 20:30:50 +01:00 -
11732b10aa
Updated mail address of Aktanusa
Daniël van Noord
2021-02-10 20:23:12 +01:00 -
346bf2b353
Merge pull request #561 from Aktanusa/npm
DanielNoord
2021-02-10 00:09:56 +01:00 -
e2ad102bb4
Added final newline
Daniel van Noord
2021-02-10 00:09:11 +01:00 -
975650fad6
Make terser run from npx
Daniel van Noord
2021-02-10 00:07:30 +01:00 -
e864dee788
Update name of CheckMainFile action
Daniel van Noord
2021-02-10 00:04:19 +01:00 -
76718f8c74
Fix CheckMainFile action
Daniel van Noord
2021-02-10 00:01:34 +01:00 -
66e61614dd
Updated README
Daniel van Noord
2021-02-10 00:00:11 +01:00 -
c061ed5b9e
Updated actions
Daniel van Noord
2021-02-09 23:51:13 +01:00 -
4c009df819
Changed Header.js to use const
Daniel van Noord
2021-02-09 23:51:03 +01:00 -
d1336efb90
Added NPM and created Build script
Daniel van Noord
2021-02-09 23:46:39 +01:00 -
fec72bbf91
Changed variable names
Daniel van Noord
2021-02-09 23:13:42 +01:00 -
1cd430f814
Update README.md
DanielNoord
2021-02-08 09:14:13 +01:00 -
a025fe51d7
Small fixes here and there
Daniel van Noord
2021-02-07 10:32:30 +01:00 -
df8957338b
Started annotating Cache.js
Daniel van Noord
2021-02-07 10:32:23 +01:00 -
4d0b5097fd
Annotated Header.js
Daniel van Noord
2021-02-06 23:25:05 +01:00 -
8ceef4cf2d
Updated Cache to use Objects1
Daniel van Noord
2021-02-06 22:07:25 +01:00 -
bc6e6eb110
Add Userscript variable to ESLint settings
Daniel van Noord
2021-02-06 21:51:41 +01:00 -
f3e84d0920
Merge pull request #552 from mason1920/dev
DanielNoord
2021-02-03 08:05:52 +01:00 -
e9d7fc800f
Rename cookie-monster.user.js to CookieMonster.user.js
DanielNoord
2021-02-03 08:04:47 +01:00 -
f6461642e9
Update README.md with instruction for userscript
DanielNoord
2021-02-03 08:03:28 +01:00 -
769f7f18dd
Make a Userscript and Refer the README to It
mason1920
2021-02-02 05:25:42 -05:00 -
9e21fc8586
Merge pull request #551 from Aktanusa/DanielNoord-patch-2
DanielNoord
2021-01-31 23:50:08 +01:00 -
5f9b990854
Fixed some debugging left overs
DanielNoord
2021-01-31 23:49:36 +01:00 -
8724a2a334
Merge pull request #550 from Aktanusa/revert-519-dev
DanielNoord
2021-01-31 23:46:25 +01:00 -
a801e79790
Revert "Added a feature to show mysterious achievements"
DanielNoord
2021-01-31 23:43:59 +01:00 -
0cd64198ed
Merge pull request #549 from DanielNoord/todos
DanielNoord
2021-01-31 21:43:20 +01:00 -
60859a774e
Test aciton
Daniel van Noord
2021-01-31 21:36:44 +01:00 -
cdff551384
Update CheckMainFile.yml
DanielNoord
2021-01-31 21:36:23 +01:00 -
a200763a6e
Small check 2
Daniel van Noord
2021-01-31 21:33:14 +01:00 -
e5d8aabb66
Small action test
Daniel van Noord
2021-01-31 21:32:27 +01:00 -
e2afebe1c8
Update CheckMainFile.yml
DanielNoord
2021-01-31 21:31:03 +01:00 -
3e4b9a0dd3
Update CheckMainFile.yml
DanielNoord
2021-01-31 21:15:22 +01:00 -
fd02f172dc
Update CheckMainFile.yml
DanielNoord
2021-01-31 21:12:21 +01:00 -
59061a5af0
Update CheckMainFile.yml
DanielNoord
2021-01-31 21:08:40 +01:00 -
5f35ccc76b
Update CheckMainFile.yml
DanielNoord
2021-01-31 21:00:56 +01:00 -
7e1597dae2
Merge branch 'dev' into dev
DanielNoord
2021-01-31 20:51:54 +01:00 -
968353d3fa
Update CheckMainFile.yml
DanielNoord
2021-01-31 20:46:08 +01:00 -
d29096bf72
Update CheckMainFile.yml
DanielNoord
2021-01-31 20:41:31 +01:00 -
9e696cafb1
Create CheckMainFile.yml
DanielNoord
2021-01-31 20:37:44 +01:00 -
545a1a3102
Fixed number of TODOs
Daniel van Noord
2021-01-31 20:32:15 +01:00 -
c602ea5f45
Merge pull request #544 from DanielNoord/modapi
DanielNoord
2021-01-31 19:46:08 +01:00 -
bbdbbfb667
Added Loop to hook of modding api #468
Daniel van Noord
2021-01-31 19:44:00 +01:00 -
d9e0e46e64
Added Loop to hook of modding api #468
Daniel van Noord
2021-01-31 18:28:14 +01:00 -
2608ff9149
Merge pull request #543 from DanielNoord/bulkbuy
DanielNoord
2021-01-31 18:19:18 +01:00 -
0e7880816e
Implement blocking of Bulk buying #143
Daniel van Noord
2021-01-31 18:15:42 +01:00 -
4e238e800c
Added BulkBuyBlock to settings
Daniel van Noord
2021-01-31 17:37:02 +01:00 -
8c6de64ac9
Spelling error in TimeFormat
Daniel van Noord
2021-01-31 17:33:41 +01:00 -
ca676c3b6a
Final test ESLint successful
DanielNoord
2021-01-31 14:12:46 +01:00 -
425d640592
Final test ESLint Action
DanielNoord
2021-01-31 14:11:17 +01:00 -
9c61d62a8f
Update README.md
DanielNoord
2021-01-31 14:10:17 +01:00 -
f4becd6a91
Create ESLint.yml
DanielNoord
2021-01-31 14:08:07 +01:00 -
d07964cfc5
Merge pull request #542 from DanielNoord/jshint
DanielNoord
2021-01-31 14:07:35 +01:00 -
6519497ffc
Fixed ESLint install
Daniel van Noord
2021-01-31 13:55:47 +01:00 -
4dd640ef4b
Installed ESLint
Daniel van Noord
2021-01-31 13:54:31 +01:00 -
2d9af222c1
ESLint compliant
Daniel van Noord
2021-01-31 13:33:34 +01:00 -
416637bac3
Cache.js, Config.js & Data.js compy with JSHint
Daniel van Noord
2021-01-30 16:12:09 +01:00 -
f7de9831e5
Semicolons and easy fixes for all documents
Daniel van Noord
2021-01-30 15:25:19 +01:00 -
e4113d21e1
Semicolons and var declarations in Cache.js
Daniel van Noord
2021-01-30 14:50:40 +01:00 -
f4711c74da
Merge pull request #541 from DanielNoord/timerdisplay
DanielNoord
2021-01-30 13:57:46 +01:00 -
33d0478ca9
Make overlays of timers toggleable #494
Daniel van Noord
2021-01-30 13:57:15 +01:00 -
ac457ed8dc
Fixed TimerBarOverlay
Daniel van Noord
2021-01-30 13:44:31 +01:00 -
efcaccfb26
Added TimerBarOverlay option
Daniel van Noord
2021-01-30 13:43:28 +01:00 -
63a38e564c
Merge pull request #540 from DanielNoord/jscolorfix
DanielNoord
2021-01-30 11:36:00 +01:00 -
2491f7a7cc
Fixed JSColor display not updating #539
Daniel van Noord
2021-01-30 11:35:28 +01:00 -
8deb0c435d
Merge pull request #538 from Aktanusa/master
DanielNoord
2021-01-30 01:18:23 +01:00 -
b42daead36
Merge pull request #537 from Aktanusa/master
DanielNoord
2021-01-30 01:17:57 +01:00 -
6ed19f23e6
Merge pull request #536 from Aktanusa/jscolor
DanielNoord
2021-01-30 01:17:33 +01:00 -
13e1233e0f
Hot fix for jscolor
Daniel van Noord
2021-01-30 01:16:18 +01:00 -
d3af77e2c8
Merge pull request #535 from Aktanusa/master (JSColor update)
DanielNoord
2021-01-30 01:13:26 +01:00 -
314efc87f6
Merge pull request #534 from Aktanusa/master
DanielNoord
2021-01-30 01:12:45 +01:00 -
b628d20363
Merge pull request #533 from Aktanusa/jscolor
DanielNoord
2021-01-30 01:12:15 +01:00