Merge repair and rearm anim traits into WithResupplyAnimation

This is the safest approach to avoid conflicts/visual glitches when the host is responsible for both resupply types.
The new trait will simply play a looping animation as long as the actor is resupplying in any form.

OpenRA.Mods.Common/UpdateRules/UpdatePath.cs

@@ -91,6 +91,7 @@ namespace OpenRA.Mods.Common.UpdateRules
 				// Bleed only changes here
 				new RenameEditorTilesetFilter(),
 				new DefineNotificationDefaults(),
+				new MergeRearmAndRepairAnimation(),
 			})
 		};