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	Fixes	2020-08-10 15:52:07 -07:00
FX	Compress nert parts to dds	2019-10-20 13:23:21 -07:00
Localization	Added French translation for Restock+ (#911)	2020-09-13 13:42:02 +01:00
Parts	Fix typo.	2021-01-03 07:56:38 -08:00
Patches	Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked	2021-01-06 22:21:54 -08:00
Spaces	Move Airlock IVA and props to RS	2020-05-17 02:50:20 -07:00
Versioning	1.11 Light updates	2021-01-06 22:11:53 -08:00