Chris 5fe625b775 Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked ... # Conflicts: # Distribution/Restock/changelog.txt # Distribution/RestockPlus/changelog.txt		2021-01-06 22:21:54 -08:00
..
Assets	1.11 Light updates	2021-01-06 22:11:53 -08:00
Compatibility	Merge branch 'master' into develop	2020-08-02 08:04:56 -07:00
FX	Engine bugfixes	2020-04-21 15:44:22 -07:00
Localization	Merge pull request #922 from Chemical-Factory/patch-1	2021-01-05 16:06:50 -08:00
Patches	1.11 Light updates	2021-01-06 22:11:53 -08:00
PatchesLegacy	ModuleManager patch order change	2020-05-28 21:13:30 -07:00
PatchesMH	Fix duplicate variant name on Making History tubes	2020-10-27 20:26:46 -07:00
Plugins	1.11 Light updates	2021-01-06 22:11:53 -08:00
Props	Move Airlock IVA and props to RS	2020-05-17 02:50:20 -07:00
Sounds	Delete drill-start.wav	2019-06-29 13:43:56 -07:00
Spaces/Airlock	Move all usage of NFProps to a patch file	2020-05-17 17:07:55 -07:00
Versioning	1.11 Light updates	2021-01-06 22:11:53 -08:00
Restock.restockblacklist	1.11 Light updates	2021-01-06 22:11:53 -08:00
RestockPatchDisabler.cfg	ModuleManager patch order change	2020-05-28 21:13:30 -07:00