Merge branch 'develop' into enhancement/remove-pandac-pandamodules

This commit is contained in:
Little Cat 2022-12-19 21:07:51 -04:00
commit 1822d89450

View file

@ -1592,7 +1592,7 @@ DG = 5
BR = 6 BR = 6
OZ = 7 OZ = 7
DL = 8 DL = 8
DefaultWantNewsPageSetting = 1 DefaultWantNewsPageSetting = 0
gmMagicWordList = ['restock', gmMagicWordList = ['restock',
'restockUber', 'restockUber',
'autoRestock', 'autoRestock',