hanqiangqiang bd0f61a11f Merge branch 'develop' into Sic02/Develop ... # Conflicts: # SicSimulator/Config/_ioDefinePM.xml # SicUI/Properties/AssemblyInfo.cs # ThirdParty/MECF.Framework/KXGEM.dll # ThirdParty/MECF.Framework/MECF.Framework.Common.dll # ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll # ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll # ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll # ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll # ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll # ThirdParty/MECF.Framework/Sicentury.Core.dll # ThirdParty/MECF.Framework/Sicentury.Localization.dll # ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll		2024-06-12 13:13:06 +08:00
..
Robots	…
SMIFs/BrooksSMIF	…
SimulatorItems	…
VCE	…
en	…
zh	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
Autofac.dll	…
CommandLine.dll	…
CustomDataGrid.dll	…
DocumentFormat.OpenXml.dll	…
DotNetZip.dll	…
EPPlus.dll	…
FabConnect.dll	…
KXGEM.dll	…
MECF.Framework.Common.dll	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
MECF.Framework.RT.Core.dll	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
MECF.Framework.RT.EquipmentLibrary.dll	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
MECF.Framework.Simulator.Core.dll	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
MECF.Framework.Simulator.Core.dll.config	…
MECF.Framework.UI.Client.dll	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
MECF.Framework.UI.Client.dll.config	…
MECF.Framework.UI.Core.dll	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
MarkdownDeep.dll	…
MaterialDesignColors.dll	…
MaterialDesignThemes.Wpf.dll	…
Microsoft.DwayneNeed.Win32.dll	…
Microsoft.DwayneNeed.dll	…
Mono.Security.dll	…
Newtonsoft.Json.dll	…
Npgsql.dll	…
OpenSEMI.Ctrlib.dll	…
RTCSDK.dll	…
RTOverEthernetDevelopmentKit.dll	…
SciChart.Charting.dll	…
SciChart.Core.dll	…
SciChart.Data.dll	…
SciChart.Drawing.dll	…
Sicentury.Core.dll	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
Sicentury.Localization.dll	Merge branch 'develop' into Sic02/Develop	2024-06-12 13:13:06 +08:00
SnmpSharpNet.dll	…
SuperSocket.Common.dll	…
System.Windows.Interactivity.dll	…
WPFLocalizeExtension.dll	…
WPFToolkit.Extended.dll	…
WPFToolkit.dll	…
XAMLMarkupExtensions.dll	…
Xceed.Wpf.AvalonDock.dll	…
Xceed.Wpf.DataGrid.dll	…
Xceed.Wpf.Toolkit.dll	…
log4net.dll	…
shortid.dll	…