drewcassidy e37cf03f7b Merge branch 'main' into feature-multiProject ... # Conflicts: # GameData/ConformalDecals/Plugins/ConformalDecals.dll # Source/ConformalDecals/ModuleConformalDecal.cs # Source/ConformalDecals/ModuleConformalText.cs		2020-11-30 00:46:03 -08:00
..
Assets	Move decal bounds to transparent FX layer	2020-06-29 19:14:16 -07:00
Flags	add CI configuration and reorganize	2020-06-16 20:50:43 -07:00
Icons	add CI configuration and reorganize	2020-06-16 20:50:43 -07:00
Localization	Allow toggling multiprojection in editor	2020-10-05 23:30:22 -07:00
Parts	Lower text decal default size	2020-11-16 15:39:41 -08:00
Patches	Fix MM patch	2020-11-13 03:20:51 -08:00
Plugins	Quick bugfix	2020-11-29 16:31:41 -08:00
Resources	Revert "Add fallbacks to all fonts, even squad ones"	2020-11-13 01:55:42 -08:00
Versioning	Quick bugfix	2020-11-29 16:31:41 -08:00