Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

August 1 2020 Catchup to Master #24

Merged
merged 359 commits into from
Aug 1, 2020
Merged

August 1 2020 Catchup to Master #24

Changes from all commits
Commits
Show all changes
359 commits
Select commit Hold shift + click to select a range
e257428
[ Aftershock ] Professions to base game scenarios (#42369)
Maleclypse Jul 22, 2020
e388000
Merge pull request #42371 from Maleclypse/wheelbarrow
Rivet-the-Zombie Jul 22, 2020
fe8ac5d
Use acetylene torch to open all locked safes
jiornojiovanni Jul 22, 2020
8ba3cc4
Move box and rectangle to a new header
jbytheway Jul 22, 2020
97aaaa0
Make Thorazine use Thorazine effect instead of Prozac effect
zachary-kaelan Jul 22, 2020
0270d2e
box -> cuboid
jbytheway Jul 22, 2020
5b4caa0
Fix uninitialized variable causing compiler warning with LTO=1.
linewriter1024 Jul 22, 2020
f831b0b
Fix Typo Of Immortality
Jul 22, 2020
7ccfbaa
Make fridge tanks work
anothersimulacrum Jul 22, 2020
2ba6746
Merge pull request #42383 from Fris0uman/justDIE
ZhilkinSerg Jul 22, 2020
778c209
Merge pull request #42382 from shacknetisp/dev-42217-fix-uninitialized
ZhilkinSerg Jul 22, 2020
8b3ab8b
Colored Font that fixes the colored issue (#42378)
Maryionet Jul 22, 2020
a1c5d92
Merge pull request #42379 from zachary-kaelan/patch-3
ZhilkinSerg Jul 22, 2020
3d3a9ef
Merge pull request #42370 from andrei8l/fix-talker-crash
ZhilkinSerg Jul 22, 2020
56ebb81
Workshop toolbox group and boxcutter knife (#42327)
Maleclypse Jul 22, 2020
53398a7
Small fix to Aftershock mapgen
casswedson Jul 22, 2020
70c739d
Fix toggling favorite in inventory UI
Qrox Jul 19, 2020
561f51f
Remove hack used to refresh inventory UI after favoriting items
Qrox Jul 22, 2020
33f071a
Only sort once in one inventory UI session
Qrox Jul 22, 2020
f9f2c0b
Put favorite items in the front of each category
Qrox Jul 22, 2020
8987f14
Move cursor to the exact previously selected item when reopening cons…
Qrox Jul 22, 2020
334c816
Fix cursor placement when columns are merged
Qrox Jul 22, 2020
761b6ea
Merge pull request #42385 from cass-wedson/patch-1
ZhilkinSerg Jul 23, 2020
3fab7d5
Remove current location helpers from game. (#42263)
kevingranade Jul 23, 2020
18cf056
Fix proficiency tab crash, frame disassemble time
anothersimulacrum Jul 23, 2020
17c289a
Fix typos in advanced_inv.cpp
Qrox Jul 23, 2020
a82b06f
Merge pull request #42402 from Qrox/fix-typo
ZhilkinSerg Jul 23, 2020
8718a82
Merge pull request #42384 from anothersimulacrum/fridgetank
ZhilkinSerg Jul 23, 2020
706ffde
Merge pull request #42380 from jbytheway/box_rectangle_revamp
ZhilkinSerg Jul 23, 2020
d9703a2
itemgroups can spawn procedurally generated artifacts (#42345)
KorGgenT Jul 23, 2020
1928a06
add chance to start a fire
jiornojiovanni Jul 23, 2020
be44876
Add plural forms to some JSON strings
Qrox Jul 23, 2020
4a10e38
Replace assertion with debug message
Qrox Jul 23, 2020
079c110
Remove useless loop
Qrox Jul 23, 2020
f1d344c
Add slot for sling mod
DialoMalison Jul 23, 2020
bda19aa
Merge branch 'master' into input
Qrox Jul 23, 2020
8b3f7e6
Merge pull request #42314 from feinorgh/audit_223_guns
Rivet-the-Zombie Jul 23, 2020
1117a78
Two minor edits of map_field.cpp
AMurkin Jul 23, 2020
d7a1dac
Check parent containers when inserting into items (#42320)
mqrause Jul 23, 2020
0af34c3
Merge branch 'master' into no_insert_filled_bucket
Jul 23, 2020
77af52b
Revert "Remove open containers from insert selection"
Jul 23, 2020
2092d49
Merge pull request #42403 from Qrox/plural
ZhilkinSerg Jul 23, 2020
e8d26c1
Merge pull request #42408 from AMurkin/map_field-edits
ZhilkinSerg Jul 23, 2020
ec349c9
Build speedup (#42399)
kevingranade Jul 23, 2020
5a512e6
Use preset to hide filled buckets from insert menu
Jul 23, 2020
a17dba9
Genericise rectangle and cuboid
jbytheway Jul 22, 2020
aecf8fb
Fix crafting with debug hammerspace
Qrox Jul 23, 2020
98b04bf
Add new Scenario - Anomalous Materials (#42326)
HotCupOfJava Jul 23, 2020
83ce24e
Merge pull request #42412 from Qrox/fix-debug-crafting
ZhilkinSerg Jul 23, 2020
7e1b898
Update JSON_INHERITANCE.md
Jerimee Jul 23, 2020
9a61b9b
Update JSON_INHERITANCE.md
Jerimee Jul 23, 2020
2d5c270
Update nether.json
HotCupOfJava Jul 24, 2020
77c2de4
activity_actor: check before manipulating charges
andrei8l Jul 24, 2020
1ac8ab0
Merge pull request #42419 from Jerimee/patch-8
Rivet-the-Zombie Jul 24, 2020
dcb3aa4
Fix wet typos
Jul 24, 2020
84a3922
Dry character even if they're not sad about it
Jul 24, 2020
f729db8
Move update_body_wetness from player to character
Jul 24, 2020
ef75d31
simplify formula
Jul 24, 2020
a7dd572
revert unnecessary change
Jul 24, 2020
c8cce4d
Remove unused monsters
Jul 24, 2020
32823eb
pass tests?
Jul 24, 2020
e9e523a
Update nether.json
HotCupOfJava Jul 24, 2020
ea9b62d
Merge pull request #42423 from HotCupOfJava/dogfix
Rivet-the-Zombie Jul 25, 2020
e865876
Query before dropping liquid (#42411)
Qrox Jul 25, 2020
ba94b2a
Re-implement a form of hand-made rebar railgun into Aftershock (#42395)
HotCupOfJava Jul 25, 2020
19062a3
split vandalized and non-vandalized shelter starts into two scenarios…
esotericist Jul 25, 2020
c76e7f4
Remove "1 variant" from starting location selection (#42418)
mqrause Jul 25, 2020
e092a04
Merge pull request #42409 from jbytheway/genericise_rectangle
ZhilkinSerg Jul 25, 2020
5fc6f6b
Double space in your face
LyleSY Jul 25, 2020
bbe90b7
Fix dino reward
LyleSY Jul 25, 2020
7ca3036
Redo finale
LyleSY Jul 25, 2020
ed5388f
Remove bonus loot
LyleSY Jul 25, 2020
d88c69f
Refridgerated Tank Fix (#40235)
Maleclypse Jul 26, 2020
8642d8c
spilling avoids the container it spills from
Jul 13, 2020
cdfbee7
Mutate mutants (#42143)
LyleSY Jul 26, 2020
1df50d7
Fix toggling favorite and display favorite items in the front of inve…
kevingranade Jul 26, 2020
65080dc
Make feral humans sometimes drop their weapons on death. (#42295)
Jul 26, 2020
6d91564
consumption: fix eating fuel for CBMs (#42311)
kevingranade Jul 26, 2020
ce098cc
TALK_OLD_GUARD_RED
LyleSY Jul 26, 2020
939ec83
Double guards
LyleSY Jul 26, 2020
c104b87
Merge pull request #42341 from mqrause/no_insert_filled_bucket
kevingranade Jul 26, 2020
caab259
Swamper guards
LyleSY Jul 26, 2020
461ded3
TALK_OLD_GUARD_RED some more
LyleSY Jul 26, 2020
5d408da
Fix UPS armors again (#42354)
andrei8l Jul 26, 2020
97b975a
update butchery to use requirements (#42372)
KorGgenT Jul 26, 2020
7a41b21
Use acetylene torch to open all locked safes (#42376)
kevingranade Jul 26, 2020
1e95339
Antifungal drugs work over time (#42388)
nexusmrsep Jul 26, 2020
62eee22
Fix spawned items having one less charge than it could contain
Qrox Jul 25, 2020
cf7ae6f
Merge pull request #42406 from DialoMalison/Crossbow_fix
Rivet-the-Zombie Jul 26, 2020
885976d
Fix compiling with gcc5
ZhilkinSerg Jul 26, 2020
4bbea6b
Merge pull request #42464 from ZhilkinSerg/fix-clamp-2020-07-26
ZhilkinSerg Jul 26, 2020
e1cf4ab
m add hole punch to item spawn (#42421)
Jerimee Jul 26, 2020
4a2297c
SUS junk drawer variants (#42437)
Jerimee Jul 26, 2020
19b6fc5
Irradiated effect displays as "Weakness" (#42461)
Night-Pryanik Jul 26, 2020
84c5309
Extract position getter and setters to a facet (#42291)
kevingranade Jul 26, 2020
6770062
Added ability for autodoc to check radiation level and administer rad…
Night-Pryanik Jul 26, 2020
ff49e99
[DinoMod] Diplodocus Corythosaurus Edmontosaurus (#42438)
LyleSY Jul 26, 2020
e6db6e2
Sealed container fixes (#42442)
Qrox Jul 26, 2020
19aec8d
Merge pull request #42444 from Qrox/fix-one-off-spawn-charges
ZhilkinSerg Jul 26, 2020
b00f303
density fixes (#42434)
Zukulini Jul 26, 2020
5b83793
Merge pull request #42431 from Fris0uman/mon_cleanup
ZhilkinSerg Jul 26, 2020
6cd9f70
Warn player before pulping acidic corpses (#42424)
VarrenKrytor Jul 26, 2020
e55c3fc
activity_actor: check before manipulating charges (#42427)
ZhilkinSerg Jul 26, 2020
6f0192f
Geometry renderer (#42227)
barsoosayque Jul 26, 2020
0c03257
Merge pull request #42073 from olanti-p/fix-bashfield
ZhilkinSerg Jul 26, 2020
f7d2788
Remove doc change, not so sure this was right
LyleSY Jul 27, 2020
033346c
Routine i18n updates on 26 Jul 2020
BrettDong Jul 27, 2020
02af314
Document the "using" field, explain requirements
wapcaplet Jul 26, 2020
92af4ff
Merge pull request #42472 from BrettDong/i18n
Rivet-the-Zombie Jul 27, 2020
5f075a9
Nerf zombull
Night-Pryanik Jul 26, 2020
144f6b5
Adjust the affects of adrenaline to better fit how it acts in real li…
HotCupOfJava Jul 27, 2020
8339b8c
Mainline urbdev hospital (#42467)
curstwist Jul 27, 2020
d6ca719
Merge pull request #42471 from wapcaplet/you-sing
ZhilkinSerg Jul 27, 2020
344d6de
Hub 01 Side Mission: Iron Safari (#42440)
John-Candlebury Jul 27, 2020
076a545
visitable: find charges in tools with pockets too
andrei8l Jul 27, 2020
9eb25d5
item: return valid ammo type when UPS modded
andrei8l Jul 26, 2020
ed4d7d9
activity: show UPS charges in repair menu
andrei8l Jul 26, 2020
be74484
item_action: use UPS charges for UPS modded tools
andrei8l Jul 26, 2020
1251fc8
Fix robot dazzle message
ZhilkinSerg Jul 27, 2020
aaba674
Fix gunslinger profession
DialoMalison Jul 27, 2020
ec44486
vehicles: Update doc/JSON_INFO.md for all fields in vehicle_part
mlangsdorf Jul 27, 2020
cac7075
fix towel test
Jul 27, 2020
ad21945
move zombie upgrades
I-am-Erk Jul 27, 2020
8a3f44e
brute evo audit
I-am-Erk Jul 27, 2020
db20994
on the spot documentation
I-am-Erk Jul 27, 2020
8cf46cd
m FILTHY flag for items (#42435)
Jerimee Jul 28, 2020
612f358
Add density to chemicals
Qrox Jul 28, 2020
e91d678
Merge pull request #42498 from Qrox/chem-density
ZhilkinSerg Jul 28, 2020
6672569
remove overly abbreviated foot crank recipe (#42497)
kevingranade Jul 28, 2020
a032279
Merge pull request #42484 from DialoMalison/Gunslinger_fix
ZhilkinSerg Jul 28, 2020
bcc0b83
Merge pull request #41477 from LyleSY/patch-3
ZhilkinSerg Jul 28, 2020
0ae7066
Merge pull request #42430 from Fris0uman/wetcap
ZhilkinSerg Jul 28, 2020
98d4c3a
Merge pull request #42469 from andrei8l/fix-ups-repair
ZhilkinSerg Jul 28, 2020
7babcc1
Merge pull request #42478 from andrei8l/fix-ups-more
ZhilkinSerg Jul 28, 2020
b2b0381
Merge pull request #42483 from mlangsdorf/veh_doc_fix
ZhilkinSerg Jul 28, 2020
9ffd58c
Audit guns in .30-06 for width, volume, and longest_side (#42466)
feinorgh Jul 28, 2020
b82b0cb
[Magiclysm] Implement spell components (#42265)
KorGgenT Jul 28, 2020
5818f6b
Fix Rifleman achievements
feinorgh Jul 28, 2020
8a6de5b
Merge pull request #42479 from CleverRaven/fix-robot-dazzle-message
Rivet-the-Zombie Jul 28, 2020
7e17b10
Merge pull request #41866 from Qrox/input
ZhilkinSerg Jul 28, 2020
42991d1
Make necroboomer revive corpses like necromancer
feinorgh Jul 28, 2020
eb83022
Merge pull request #42502 from feinorgh/achievements_fix_#42492
ZhilkinSerg Jul 28, 2020
4929efe
Experiment with a GitHub build matrix
jbytheway Jul 23, 2020
b90ad09
Have fewer package installs
jbytheway Jul 23, 2020
cc072bb
Experiment with sanitizer builds
jbytheway Jul 23, 2020
5b672be
Don't cmake when CMAKE = 0
jbytheway Jul 23, 2020
abfae6d
Don't use sanitizer on CMake builds
jbytheway Jul 23, 2020
a30fb4e
Always print random seed in tests
jbytheway Jul 23, 2020
9a8d346
Initialize relic_procgen_data::was_loaded
jbytheway Jul 23, 2020
0515792
Stop passing false to item::process
jbytheway Jul 24, 2020
71fce7f
Remove overriding members
jbytheway Jul 27, 2020
881f45a
Initialize more bools
jbytheway Jul 24, 2020
bc63799
Removed dead code
ZhilkinSerg Jul 27, 2020
2c892cf
Removed unreachable code
ZhilkinSerg Jul 27, 2020
bd3a152
Removed empty statements
ZhilkinSerg Jul 27, 2020
98592d7
Removed unused declarators
ZhilkinSerg Jul 27, 2020
201a6df
Removed redundant whitespaces
ZhilkinSerg Jul 27, 2020
f6b5d44
Removed redundant empty lines
ZhilkinSerg Jul 27, 2020
6902c2f
Removed redundant member initializers
ZhilkinSerg Jul 27, 2020
ac5cf5e
Enable performance-inefficient-algorithm in clang-tidy
ZhilkinSerg Jul 27, 2020
6a96a7f
Get rid of autos (+ constify)
ZhilkinSerg Jul 27, 2020
eea09a9
fix acid soldier upgrades and names
I-am-Erk Jul 28, 2020
96c7156
CP Error/lint
I-am-Erk Jul 28, 2020
efbac19
reduce kevlar harvest
I-am-Erk Jul 28, 2020
7737700
Use F literal for floats
ZhilkinSerg Jul 28, 2020
74913e8
add sorted creature type count to location summary of game state screen
esotericist Jul 28, 2020
8159b28
Add "Nevermind" option when asking NPC to travel with you (#42510)
LcsTen Jul 28, 2020
8dae589
Merge pull request #42393 from jbytheway/generalize_github_actions
ZhilkinSerg Jul 28, 2020
5962689
Add two new professions / Add the Combat Medic prof to military scena…
Fallout48 Jul 28, 2020
12c0a40
Remove sealed data that do not make sense (#42446)
Qrox Jul 28, 2020
6d1841a
Precompiled Catch2 header (#42453)
kevingranade Jul 28, 2020
725f62a
Merge pull request #41485 from FeepingCreature/fix/load-item-with-inv…
ZhilkinSerg Jul 28, 2020
4e2d1da
Merge pull request #41354 from DeeUnderscore/legacy-fixes
ZhilkinSerg Jul 28, 2020
311d387
Update flail sheath capability and length (#42516)
matt32106 Jul 28, 2020
ec6b9aa
Merge pull request #41752 from hexagonrecursion/patch-1
ZhilkinSerg Jul 28, 2020
4cd16fd
Add new effects: Nightmares and Incorporeal (#41956)
Ramza13 Jul 28, 2020
49c6c59
Add portions for helmets and some masks (#42188)
meladath Jul 28, 2020
2418ef5
Add smart controller UI (#42110)
Aivean Jul 28, 2020
531498f
DIY yeast recipe (home-isolated from wild yeast). (#42116)
Tamiore Jul 28, 2020
0a08f44
Aftershock: cam-spy rovers to spy on zombies. (#42281)
John-Candlebury Jul 28, 2020
ec3b4ca
Merge pull request #42504 from feinorgh/necro_boomer_nerf
ZhilkinSerg Jul 28, 2020
4653f9a
Merge pull request #42514 from esotericist/debug_creature_count
ZhilkinSerg Jul 28, 2020
56b9cfd
Jsonify blood analysis CBM results (#42515)
Night-Pryanik Jul 28, 2020
a3b10e9
Fix Torso appearing as broken in mending menu (#42512)
Fris0uman Jul 28, 2020
91981fb
player: fix problems in sort_armor (#42513)
andrei8l Jul 28, 2020
f6dec42
Fix preprocessor directive
ZhilkinSerg Jul 28, 2020
b3a77a0
Merge pull request #42486 from I-am-Erk/soldier-evo
Rivet-the-Zombie Jul 29, 2020
69d1bde
Jsonize dazzling effect
ZhilkinSerg May 12, 2020
e64c70b
Jsonize legacy rubble field
ZhilkinSerg May 12, 2020
b577c38
Remove unused field types
ZhilkinSerg May 12, 2020
c1d5240
Unhardcode moppable field checks
ZhilkinSerg Jul 29, 2020
fac69d9
Apply suggestions from code review
ZhilkinSerg Jul 29, 2020
cc4b8ee
Fix mininuke timer which wasn't saved
LcsTen Jul 29, 2020
160b7a7
Remove Travis sanitizer CI runs (#42540)
jbytheway Jul 29, 2020
4654765
Precompiled header fallout (#42544)
jbytheway Jul 29, 2020
0055389
Update looks_like for corpses (#42522)
I-am-Erk Jul 29, 2020
bc3aee1
Check for zero weight items (#42509)
jbytheway Jul 29, 2020
21ab34b
Supress clang-tidy warning
kevingranade Jul 29, 2020
f128070
Fix clang warning (2020-07-29) (#42534)
ZhilkinSerg Jul 29, 2020
2684dcb
Merge pull request #42480 from ZhilkinSerg/sa-2020-06-29
kevingranade Jul 29, 2020
2e67aed
Update name.h
Jerimee Jul 30, 2020
a5b97a8
Manual IWYU - generic_factory.h
anothersimulacrum Jul 29, 2020
0525483
Add option to disable WIP key code input mode
Qrox Jul 29, 2020
5c118cd
Merge pull request #42360 from ZhilkinSerg/titles-2020-07-22
Rivet-the-Zombie Jul 30, 2020
812752c
Allow autodriving in boats under bridges
ZhilkinSerg Jul 29, 2020
28592a0
Merge pull request #42532 from ZhilkinSerg/jsonize-field-effects-2020…
kevingranade Jul 30, 2020
1cbb194
Merge pull request #42539 from LcsTen/mininuke-timer-save
kevingranade Jul 30, 2020
4fc22a4
items: remove ups_based_armor
andrei8l Jul 22, 2020
45a81b3
Rename num_bp bp_null
Jul 29, 2020
ec90ed2
Merge pull request #42537 from Qrox/input-2
ZhilkinSerg Jul 30, 2020
2996053
Merge pull request #42554 from Jerimee/doxygenHelloWorld
ZhilkinSerg Jul 30, 2020
9ceadc6
Support `id` for identifier member names
ZhilkinSerg Jul 28, 2020
9bcb391
Use `id` for identifier member names
ZhilkinSerg Jul 28, 2020
2a84ea8
Huge wasp description fix
LyleSY Jul 30, 2020
65f25a5
Use correct headers to fix Windows builds (#42564)
ZhilkinSerg Jul 30, 2020
d67a65f
Merge pull request #42565 from LyleSY/patch-8
ZhilkinSerg Jul 30, 2020
8528491
Make memorial test inclusive (#42558)
kevingranade Jul 30, 2020
30ffa2a
Audit 300BLK/.300 AAC Blackout firearms for weight, volume, and longe…
feinorgh Jul 30, 2020
1c358ed
Give correct make command for json_formatter
wapcaplet Jul 30, 2020
fa1bb07
Allow bionics to teach proficiencies
anothersimulacrum Jul 30, 2020
20f1a52
Create cooking_components.json
LyleSY Jul 31, 2020
3bab920
Delete duplicate recipes
LyleSY Jul 31, 2020
9bdb5cc
clarify description, abstract unrolling mats (#42553)
FuelType-Memes Jul 31, 2020
eef9d95
Merge pull request #42583 from LyleSY/patch-8
Rivet-the-Zombie Jul 31, 2020
afa58f5
Merge pull request #42582 from anothersimulacrum/implantme
ZhilkinSerg Jul 31, 2020
8f77d92
doxygen comments to character.h (#42579)
Jerimee Jul 31, 2020
d5104d1
Add key code mode support to popups (#42566)
Qrox Jul 31, 2020
e1895d3
Prevent causing effects when value 0 (#42548)
Ramza13 Jul 31, 2020
45152c9
Routine i18n updates on 31 Jul 2020
BrettDong Jul 31, 2020
254ea40
map: add nullptr checks for all get_submap calls
andrei8l Jul 31, 2020
9bdcde5
map_field: add nullptr checks for all get_submap calls
andrei8l Jul 31, 2020
b31fb27
(abandoned) makefile: improve use of precompiled headers (#42535)
andrei8l Jul 31, 2020
189cc34
Add missing translation for debug menu
Aloxaf Jul 31, 2020
56bb7e9
mapgen: add nullptr checks for all get_submap calls
andrei8l Jul 31, 2020
5f0fef4
lightmap: add nullptr checks for all get_submap calls
andrei8l Jul 31, 2020
fa199bb
editmap: add nullptr checks for all get_submap calls
andrei8l Jul 31, 2020
8aefea1
astyle
andrei8l Jul 31, 2020
79b007d
Fix trait-less characters not mending broken limbs.
moxian Jul 31, 2020
c62d78c
Merge pull request #42590 from BrettDong/i18n
ZhilkinSerg Jul 31, 2020
94c5604
Merge pull request #42594 from moxian/master
ZhilkinSerg Jul 31, 2020
fc884d0
Merge pull request #42593 from Aloxaf/fix_trans
ZhilkinSerg Jul 31, 2020
468dd1e
Merge pull request #42577 from wapcaplet/json-formatter-docfix
ZhilkinSerg Jul 31, 2020
eae846a
Removes acid from regional and weather settings and json (#42575)
Ramza13 Jul 31, 2020
36d06eb
[DinoMod] Dino bio-operator and lab and harvest overhauls (#42474)
LyleSY Jul 31, 2020
f62a31f
Merge pull request #39332 from ZhilkinSerg/idents-ids
kevingranade Jul 31, 2020
7ac88f5
Merge pull request #42591 from andrei8l/map-nullptr-checks
kevingranade Jul 31, 2020
f3d424f
Give the RM103A automagnum it's intended magazine well
VarrenKrytor Jul 31, 2020
7dafd23
compose.py: allow default sized tilesheets to specify offsets
mlangsdorf Jul 31, 2020
853fa2a
Allow stripping unclosed color tags (#42549)
ZhilkinSerg Jul 31, 2020
1d4ea08
Added length to "mop"
Nhatorama Jul 31, 2020

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.