ChrisAdderley 90437519e9 Merge branch '1-8-updates' into develop ... # Conflicts: # Distribution/Restock/changelog.txt		2019-10-19 15:54:09 -07:00
..
Assets	Merge branch '1-8-updates' into develop	2019-10-19 15:54:09 -07:00
FX	Move srb-tiny-core-1 fx into restock core for LES	2019-09-12 22:56:19 -07:00
Localization	Merge branch '1-8-updates' into develop	2019-10-19 15:54:09 -07:00
Parts	Add 2.5m engine colour variants	2019-10-19 15:48:19 -07:00
Patches	Merge branch 'ground' into develop	2019-10-09 17:52:33 -07:00
Versioning	Template out configs	2019-05-21 16:09:51 -07:00