Skip to content
Merged
Changes from all commits
Commits
Show all changes
249 commits
Select commit Hold shift + click to select a range
86dafca
Internet returned, QOL change for G menu and neptune nerf
TaitKaito Oct 2, 2024
86bf604
fixed tigtone parallax and make tumult slightly more visible
Th3-spook Oct 8, 2024
923635f
fixed the fix lol
Th3-spook Oct 8, 2024
a7df2a6
removed old Particle
Th3-spook Oct 8, 2024
450d2df
rm worlds
InvalidArgument3 Oct 8, 2024
d1ef7e6
end this
InvalidArgument3 Oct 8, 2024
c4437ec
Revert "end this"
InvalidArgument3 Oct 8, 2024
684ec90
Reapply "end this"
InvalidArgument3 Oct 8, 2024
eec8955
Merge pull request #1720 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 8, 2024
adc6768
Revert "Reapply "end this""
InvalidArgument3 Oct 8, 2024
53fe217
Merge pull request #1721 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 8, 2024
00cc03a
Reapply "Reapply "end this""
InvalidArgument3 Oct 8, 2024
d733879
Merge pull request #1722 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 8, 2024
cae3879
Revert "Merge pull request #1722 from InvalidArgument3/road-to-4.9-na…
InvalidArgument3 Oct 8, 2024
e5a245b
please just fucking stop rate limiting
InvalidArgument3 Oct 8, 2024
b1d958d
efgawe
InvalidArgument3 Oct 8, 2024
e8bad72
Merge pull request #1723 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 8, 2024
7265609
blockrestrictions unique find and replace
InvalidArgument3 Oct 8, 2024
691766c
blockrestrictions unique find and replace
InvalidArgument3 Oct 8, 2024
6d953f3
Merge pull request #1724 from StarCoreSE/blockrestrictions-attempt
InvalidArgument3 Oct 8, 2024
ed72e52
blockrestrictions uniqueifying attempt #2
InvalidArgument3 Oct 8, 2024
3459b57
Merge pull request #1725 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 8, 2024
fc7ee8d
Delete Utility Mods/Stable/SC_BlockRestrictions/test.txt
InvalidArgument3 Oct 8, 2024
da149a0
Merge pull request #1719 from Th3-spook/Changes-chimp
InvalidArgument3 Oct 8, 2024
60af5bf
A few stashed changes from a hot minute ago, and some clean up
TaitKaito Oct 9, 2024
975da7c
points reee
TaitKaito Oct 9, 2024
42477b3
please
TaitKaito Oct 9, 2024
7f0e207
Merge branch 'main' into AddFletcher
TaitKaito Oct 9, 2024
b57025d
Point sheet please
TaitKaito Oct 9, 2024
eacff7d
Merge branch 'AddFletcher' of https://github.com/TaitKaito/SCModRepos…
TaitKaito Oct 9, 2024
bcb2d53
Merge pull request #1726 from TaitKaito/AddFletcher
InvalidArgument3 Oct 12, 2024
129ed05
Adjust mod categories (#1727)
ari-steas Oct 15, 2024
995592f
Major file cleanup, unused stuff be gone for now
TaitKaito Oct 15, 2024
3cf05d7
Merge pull request #1731 from TaitKaito/AddFletcher
InvalidArgument3 Oct 15, 2024
223d4dd
test fix fake door definitions
InvalidArgument3 Oct 20, 2024
77fa064
Merge remote-tracking branch 'upstream/main' into road-to-4.9-narrowing
InvalidArgument3 Oct 20, 2024
13a1031
Merge pull request #1732 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 20, 2024
ccddaa0
maybe terminal blocks?
InvalidArgument3 Oct 20, 2024
2d79dfa
Merge pull request #1733 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 20, 2024
9d0995b
Clean up mods. (#1728)
ari-steas Oct 22, 2024
01ed5b4
Adjust mod categories and transfer the bounce zone to SUGMA (#1735)
ari-steas Oct 22, 2024
d14a4ef
Created Crossed Climbing Cost Groups (#1734)
ari-steas Oct 22, 2024
6754d9e
Commit from GitHub Actions (Aristeas NewUniversalUpload)
ari-steas Oct 22, 2024
1db7913
Patch Possible Null (#1737)
CommodoreChet Oct 22, 2024
a1c91c3
whoopsie daisies (#1738)
ari-steas Oct 22, 2024
f3115ca
Create forceupload
ari-steas Oct 22, 2024
9623f0c
Reapply "Update NHI_Cubeblocks.sbc"
CommodoreChet Oct 22, 2024
3d45b2f
Hide ShareTrack label for your currently occupied grid (#1739)
ari-steas Oct 23, 2024
25b1ee8
Don't try to autobalance into Factorum and Unknown (#1740)
ari-steas Oct 23, 2024
e35bd0e
Create forcepush
ari-steas Oct 23, 2024
d9c944e
less shit rts defaults
InvalidArgument3 Oct 23, 2024
b82f456
unload foxes (?)
InvalidArgument3 Oct 23, 2024
5fa4f0f
Merge pull request #1744 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 23, 2024
25c9a94
Update MA_Laser_T3_Ammo.cs
BadM0dder Oct 23, 2024
265b31e
Merge pull request #1745 from BadM0dder/patch-17
InvalidArgument3 Oct 23, 2024
bbe13eb
Create forceupload
ari-steas Oct 24, 2024
a14b9ed
Double Heimdall AOE Size and AMS Damage (#1747)
CommodoreChet Oct 24, 2024
df1c508
maybe fix incorrect scaling on shield HP (#1748)
ari-steas Oct 24, 2024
6317d04
Fix RealFake Blocks (#1751)
ari-steas Oct 26, 2024
5a99d2b
remoe the xsi things from things that are now just terminal block types
InvalidArgument3 Oct 26, 2024
470ff04
Merge pull request #1753 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 26, 2024
4ef1d7c
rm realfake
InvalidArgument3 Oct 26, 2024
2a1d979
rm realfake except for the antenna
InvalidArgument3 Oct 26, 2024
ec8da4f
Merge pull request #1754 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 26, 2024
de48e02
Revert "rm realfake except for antenna "
InvalidArgument3 Oct 26, 2024
f4b3106
Merge pull request #1755 from StarCoreSE/revert-1754-road-to-4.9-narr…
InvalidArgument3 Oct 26, 2024
3a5acd9
Revert "Revert "rm realfake except for antenna ""
InvalidArgument3 Oct 26, 2024
65837b9
Merge pull request #1756 from StarCoreSE/revert-1755-revert-1754-road…
InvalidArgument3 Oct 26, 2024
ddf55f2
Revert "Update MA_Laser_T3_Ammo.cs"
InvalidArgument3 Oct 26, 2024
905424a
Merge pull request #1758 from StarCoreSE/revert-1745-patch-17
InvalidArgument3 Oct 26, 2024
c9657ca
Halved T3 and Gladius Damage (#1760)
ari-steas Oct 26, 2024
8ca240e
Try reverting recent SI commits (#1761)
ari-steas Oct 26, 2024
dbf4aaf
temporarily convert to basic ResistBlock (#1762)
ari-steas Oct 26, 2024
20a5da0
Gyroscopic Gunsight Mod (#1766)
ari-steas Oct 29, 2024
1e0a979
SOL Tweaks
FP-Anomaly Oct 30, 2024
3680bc1
SOL Tweaks (#1768)
FP-Anomaly Oct 30, 2024
cbd8023
fieldgen proper graft pt1
InvalidArgument3 Oct 31, 2024
e603adb
Update FieldGenerator_Core.cs
InvalidArgument3 Oct 31, 2024
1a2a75c
what is it with serializing. also remove old stuff
InvalidArgument3 Oct 31, 2024
aa434ad
a
InvalidArgument3 Oct 31, 2024
03f9cf5
now we're getting somewhere
InvalidArgument3 Oct 31, 2024
f3046df
finally
InvalidArgument3 Oct 31, 2024
f7e80c8
Merge pull request #1770 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 31, 2024
d276269
fix missing damage handler
InvalidArgument3 Oct 31, 2024
e21eaaa
Merge pull request #1771 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 31, 2024
0368608
ugh
InvalidArgument3 Oct 31, 2024
7c72f0d
getting close
InvalidArgument3 Oct 31, 2024
d20ebdf
almost, just a bit of power calc on repaste
InvalidArgument3 Oct 31, 2024
ce49037
Update FieldGenerator_Core.cs
InvalidArgument3 Oct 31, 2024
da2b4c5
Merge pull request #1772 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 31, 2024
7dd467a
make sure those settings are real
InvalidArgument3 Oct 31, 2024
58048bf
Update FieldGenerator_Core.cs
InvalidArgument3 Oct 31, 2024
7dcaab1
Merge pull request #1773 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 31, 2024
819e0dd
Delete minified_output.txt
InvalidArgument3 Oct 31, 2024
03f2c46
Merge pull request #1774 from InvalidArgument3/road-to-4.9-narrowing
InvalidArgument3 Oct 31, 2024
ef31e92
Fletcher tweaks (#1775)
TaitKaito Oct 31, 2024
81e27fd
Add pause and clearboard commands (#1776)
ari-steas Nov 1, 2024
15d8e57
I will, however, half the cost of PBs. (#1780)
ari-steas Nov 1, 2024
1972ed7
Convert ShareTrack IsFunctional check to TotalPowerBlocks (#1781)
ari-steas Nov 2, 2024
7545c81
Update Nariman_Turret_Ammo.cs
FP-Anomaly Nov 2, 2024
9f14831
Merge branch 'main' into Anomaly-SOL
FP-Anomaly Nov 2, 2024
042deb2
Nariman health halved (#1782)
FP-Anomaly Nov 2, 2024
7fee186
Fusion Thrust Refresh (#1783)
ari-steas Nov 2, 2024
a4a0ff0
SOL Tweakage
FP-Anomaly Nov 8, 2024
c903ccb
Add ClearLCD feature (#1784)
ari-steas Nov 8, 2024
3842dff
Anomaly sol (#1785)
FP-Anomaly Nov 8, 2024
f55a866
Update Heavy_MAC_Ammo.cs
FP-Anomaly Nov 8, 2024
5d738da
Hercules Ammo health rolled back (#1786)
FP-Anomaly Nov 8, 2024
8fc4663
Add Sharetrack World Config (#1788)
ari-steas Nov 9, 2024
066b4c5
Reorder Domination Zones to make more sense in the HUD (#1790)
ari-steas Nov 10, 2024
351af93
Survival-Ready Fusion (#1791)
ari-steas Nov 13, 2024
6a2c0d6
Drastically Reduce Heimdall Dispersion (#1792)
CommodoreChet Nov 13, 2024
3b21995
Onyx Changes (#1793)
CommodoreChet Nov 13, 2024
559f50a
workshop release (#1795)
ari-steas Nov 13, 2024
97b6115
Painless Changes (#1796)
CommodoreChet Nov 14, 2024
de60699
Commit from GitHub Actions (Aristeas NewUniversalUpload)
ari-steas Nov 15, 2024
5994dc9
properly fix
CommodoreChet Nov 16, 2024
b5d7e8c
Apply Field Gen Fixes, Prototype HUD (#1797)
CommodoreChet Nov 16, 2024
22928df
Patch #1 (#1798)
CommodoreChet Nov 17, 2024
07d199a
Delete schizomuzzs4.txt
ari-steas Nov 17, 2024
aeac09d
Herc Ammo Rework
FP-Anomaly Nov 17, 2024
2cec6b4
Merge branch 'main' into Anomaly-SOL
FP-Anomaly Nov 17, 2024
dd56ea2
Hercules Ammo Rework - now with more shotgun (#1799)
FP-Anomaly Nov 17, 2024
3246fcb
Adjust Settings, accidentally contained a fix too i guess (#1800)
CommodoreChet Nov 19, 2024
1ff3f6f
spray foam for match timer desync (#1801)
ari-steas Nov 20, 2024
3ebc085
MID FLW UPDATE (#1802)
BadM0dder Nov 20, 2024
96383a3
Update Heavy_MAC_Ammo.cs
FP-Anomaly Nov 21, 2024
3483099
Merge branch 'main' into Anomaly-SOL
FP-Anomaly Nov 21, 2024
73b9cea
Anomaly sol (#1803)
FP-Anomaly Nov 21, 2024
a18b45a
Update TeamBalancer.cs (#1804)
ari-steas Nov 21, 2024
05f0b2b
Update Heavy_MAC_Ammo.cs
FP-Anomaly Nov 21, 2024
1b40dd0
Merge branch 'Anomaly-SOL' of https://github.com/FP-Anomaly/SCModRepo…
FP-Anomaly Nov 21, 2024
c948794
Anomaly sol (#1805)
FP-Anomaly Nov 21, 2024
6faf23d
Remove IsSerialized (#1806)
CommodoreChet Nov 21, 2024
751df4d
Update Heavy_MAC_Ammo.cs
FP-Anomaly Nov 21, 2024
c37cdb8
Merge branch 'main' into Anomaly-SOL
FP-Anomaly Nov 21, 2024
f65afd8
Frag and Slug Damage nerfs (#1807)
FP-Anomaly Nov 21, 2024
b02731a
Serpent Arms Changes (#1809)
CommodoreChet Nov 21, 2024
2262df5
Improved Random Autobalance (#1810)
ari-steas Nov 21, 2024
7028742
Merge remote-tracking branch 'upstream/main' into Anomaly-SOL
FP-Anomaly Nov 22, 2024
95ecb73
Update Heavy_MAC_Ammo.cs
FP-Anomaly Nov 22, 2024
5214e47
Update Heavy_MAC_Ammo.cs
FP-Anomaly Nov 22, 2024
7846696
Update Heavy_MAC_Ammo.cs
FP-Anomaly Nov 22, 2024
3c90771
Anomaly sol (#1811)
FP-Anomaly Nov 22, 2024
647f65c
Merge remote-tracking branch 'upstream/main' into Anomaly-SOL
FP-Anomaly Nov 23, 2024
c6523c3
Revert Heavy_MAC.cs
ari-steas Nov 23, 2024
5c17f43
Revert Heavy_MAC_Ammo.cs
ari-steas Nov 23, 2024
f1d87b0
alright so i;m a bit stupid
ari-steas Nov 23, 2024
d9a7fe6
Woops
CommodoreChet Nov 23, 2024
ad586b8
Merge pull request #1814 from StarCoreSE/CommodoreChet-patch-5
CommodoreChet Nov 23, 2024
8bd1a09
Disable autotrack config checking (#1815)
ari-steas Nov 23, 2024
c10d514
Fix broken reactor integrity counter (#1816)
ari-steas Nov 23, 2024
52464d3
Bug Fixes (#1818)
CommodoreChet Nov 24, 2024
96d374f
Merge remote-tracking branch 'upstream/main' into Anomaly-SOL
FP-Anomaly Nov 24, 2024
846d416
Resistance is Futile
FP-Anomaly Nov 25, 2024
93e97cc
Zipped Folders
FP-Anomaly Nov 25, 2024
bc3334e
Revert "Zipped Folders"
InvalidArgument3 Nov 25, 2024
50ad1a1
Merge pull request #1819 from FP-Anomaly/Anomaly-SOL
InvalidArgument3 Nov 25, 2024
bc81272
Revert "Merge pull request #1819 from FP-Anomaly/Anomaly-SOL"
InvalidArgument3 Nov 26, 2024
b696de7
Merge pull request #1820 from InvalidArgument3/GT4
InvalidArgument3 Nov 26, 2024
149fcba
hate
InvalidArgument3 Nov 26, 2024
fd7490e
Merge pull request #1821 from InvalidArgument3/GT4
InvalidArgument3 Nov 26, 2024
0050790
Update Aristeas NewUniversalUpload.yml
ari-steas Nov 26, 2024
6eb7d59
Update Aristeas NewUniversalUpload.yml
ari-steas Nov 26, 2024
f50819c
Update Aristeas NewUniversalUpload.yml
ari-steas Nov 26, 2024
e2ee362
Update Aristeas NewUniversalUpload.yml
ari-steas Nov 26, 2024
f6180f9
Update Aristeas NewUniversalUpload.yml
ari-steas Nov 26, 2024
ba74477
Update Aristeas NewUniversalUpload.yml
ari-steas Nov 26, 2024
9a0161d
Delete Gamemode Mods/Stable/Starcore_Sharetrack/hate.txt
ari-steas Nov 26, 2024
e071752
Update Aristeas NewUniversalUpload.yml
ari-steas Nov 26, 2024
8ca37d6
Delete Weapon Mods/Stable/StarCore MagicWeps/upload.txt
ari-steas Nov 26, 2024
9522ede
kick workflow
InvalidArgument3 Nov 27, 2024
32b191b
Merge pull request #1823 from InvalidArgument3/GT4
InvalidArgument3 Nov 27, 2024
bb20012
Create swift kick to the pants
ari-steas Nov 27, 2024
3e0a2e2
Automatic faction setting for /sc clearboard (#1825)
ari-steas Nov 27, 2024
cf350ea
Unlimit tdm (#1826)
ari-steas Nov 27, 2024
be001a3
Update Power Draw to 150MW
CommodoreChet Nov 28, 2024
a878cbe
Half Reload
CommodoreChet Nov 28, 2024
ab15cdb
Boost Range by 2KM
CommodoreChet Nov 28, 2024
21c484e
parabola points
InvalidArgument3 Nov 28, 2024
34dde5a
Merge pull request #1827 from InvalidArgument3/GT4
InvalidArgument3 Nov 28, 2024
43f864f
Update Deimos.cs
CommodoreChet Nov 28, 2024
f645d33
Merge pull request #1828 from StarCoreSE/CommodoreChet-patch-5
InvalidArgument3 Nov 28, 2024
054dedd
This Just In: This (#1829)
CommodoreChet Nov 29, 2024
1da9f89
This Just In 2: This Again (#1830)
CommodoreChet Nov 29, 2024
a5042ae
This Just In 3: This Again, Again (#1832)
CommodoreChet Dec 1, 2024
f6b8b86
Final Patch. If still too good, strike it. (#1833)
CommodoreChet Dec 4, 2024
de2936c
Zone position configs (#1835)
ari-steas Dec 7, 2024
d6aadd6
Me When Possible [Excessively Minor]Memory Leak
CommodoreChet Dec 8, 2024
03c0fb2
Merge pull request #1836 from StarCoreSE/CommodoreChet-patch-1
InvalidArgument3 Dec 8, 2024
62ab17c
Remove CHP mod category (#1837)
ari-steas Dec 8, 2024
eec3b81
Add files via upload
CommodoreChet Dec 9, 2024
e82e544
Update CubeBlock_FieldGen.sbc
CommodoreChet Dec 9, 2024
4478b9f
Merge pull request #1838 from StarCoreSE/CommodoreChet-patch-1
InvalidArgument3 Dec 9, 2024
741cdc5
Update PointAdditions.cs
ari-steas Dec 10, 2024
d999452
Reworked HudPointsList getter (#1844)
ari-steas Dec 13, 2024
feec244
Fix SysHighlight Crash on Grid Close (#1845)
CommodoreChet Dec 13, 2024
2bcbdd6
Update Caster_Reactor.mwm (#1846)
ari-steas Dec 14, 2024
d5165f6
render new dlc cryo inert
InvalidArgument3 Dec 14, 2024
e86b6b9
for real this time
InvalidArgument3 Dec 14, 2024
f059cba
Merge pull request #1848 from InvalidArgument3/GT4
InvalidArgument3 Dec 14, 2024
7ad580c
we're just gonna have to accept cryos cant be realfaked
InvalidArgument3 Dec 14, 2024
13e2140
Merge pull request #1849 from InvalidArgument3/GT4
InvalidArgument3 Dec 14, 2024
9383abd
Update TrackingManager.cs (#1850)
ari-steas Dec 14, 2024
c8d315c
Autotransfer grids (#1851)
ari-steas Dec 14, 2024
540f8d3
Update TrackingManager.cs (#1852)
ari-steas Dec 14, 2024
e780a0b
Update TrackingManager.cs (#1854)
ari-steas Dec 15, 2024
e6ac751
Modify ClearBoard (#1855)
ari-steas Dec 15, 2024
bd17077
Update BlockCategories.sbc (#1857)
ari-steas Dec 17, 2024
5476285
Create XmlValidator.yml
ari-steas Dec 22, 2024
0f1f5c2
Update XmlValidator.yml
ari-steas Dec 22, 2024
b3f8775
Update XmlValidator.yml
ari-steas Dec 22, 2024
46c9773
Update XmlValidator.yml
ari-steas Dec 22, 2024
8283752
Update XmlValidator.yml
ari-steas Dec 22, 2024
41cbb28
Update XmlValidator.yml
ari-steas Dec 22, 2024
7aa6744
Update XmlValidator.yml
ari-steas Dec 22, 2024
7974be2
Create broken.sbc
ari-steas Dec 22, 2024
d1aa079
Update XmlValidator.yml
ari-steas Dec 22, 2024
7572def
Update XmlValidator.yml
ari-steas Dec 22, 2024
de3476c
Delete Weapon Mods/Stable/broken.sbc
ari-steas Dec 22, 2024
3eda02a
getting silly with it (#1860)
ari-steas Dec 26, 2024
f8f26cb
Fix accidentally halved fusion power output
ari-steas Dec 27, 2024
8a87de3
Merge branch 'dev_new' of https://github.com/CommodoreChet/SCModRepos…
CommodoreChet Dec 28, 2024
391ac74
Fix Missing Image + API Thyself
CommodoreChet Dec 29, 2024
8d88286
Merge pull request #1861 from CommodoreChet/dev_new
CommodoreChet Dec 29, 2024
7e14b30
Impliment ShareTrack Siege Indicator
CommodoreChet Dec 30, 2024
fb9952f
Merge branch 'main' into dev_new
CommodoreChet Dec 30, 2024
96fd91f
Additional
CommodoreChet Dec 30, 2024
3d00cb0
Merge branch 'dev_new' of https://github.com/CommodoreChet/SCModRepos…
CommodoreChet Dec 30, 2024
25ccfff
Revert "Additional"
CommodoreChet Dec 30, 2024
defb0ed
Additional
CommodoreChet Dec 30, 2024
0f88f4c
FieldGenerator Config (#1863)
CommodoreChet Dec 31, 2024
540aabd
Impliment ShareTrack Siege Indicator (#1862)
CommodoreChet Dec 31, 2024
be93b01
Carthage Patch
CommodoreChet Jan 2, 2025
80c747c
Merge branch 'dev_new' of https://github.com/CommodoreChet/SCModRepos…
CommodoreChet Jan 2, 2025
e236964
Merge pull request #1864 from CommodoreChet/dev_new
CommodoreChet Jan 2, 2025
899f7aa
update api (#1865)
ari-steas Jan 12, 2025
738ae1c
Fusion update (#1866)
ari-steas Jan 12, 2025
56a47f0
Create Aristeas_BuildScripts.yml
ari-steas Jan 12, 2025
ba93eb6
Update Aristeas_BuildScripts.yml
ari-steas Jan 12, 2025
35ea166
Update Aristeas_BuildScripts.yml
ari-steas Jan 12, 2025
6baa58c
testing for build checks (#1867)
ari-steas Jan 13, 2025
d321f49
Update Aristeas NewUniversalUpload.yml
ari-steas Jan 14, 2025
610ccab
Update Aristeas_BuildScripts.yml
ari-steas Jan 14, 2025
ea94825
Update forceUploadAll.yml
ari-steas Jan 14, 2025
4b9e10e
Restructure files (#1868)
ari-steas Jan 19, 2025
f7293a5
Update forceUploadAll.yml
ari-steas Jan 19, 2025
81339d5
Update Aristeas_BuildScripts.yml
ari-steas Jan 19, 2025
a6be847
Update XmlValidator.yml
ari-steas Jan 19, 2025

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.