Han Qiang Qiang 4be189fb27 Merge branch 'Sic8ToSic6' into 整理机台兼容内容 ... # Conflicts: # Modules/Mainframe/Config/PM/PM1/interlockPM1.xml # Modules/Mainframe/Config/PM/PM2/interlockPM2.xml # SicRT/Properties/AssemblyInfo.cs # SicRT/ReleaseNotes.md # SicUI/Properties/AssemblyInfo.cs # 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		2023-11-28 15:47:31 +08:00
..
Account	C2H4修改为C3H8	2023-11-14 10:43:36 +08:00
DBModel.sql	1更新dll [027c078],添加Recipe快照压缩保存+历史数据选择对比	2023-11-27 16:28:33 +08:00
EventDefine.xml	更新多用户登录机制：	2023-10-06 09:50:11 +08:00
IoProviderConfig.xml	Mainframe工程更名为SicModules。	2023-04-13 15:35:13 +08:00
Menu.xml	更新dll [6a62465]，添加Recipe对比功能优化，	2023-10-26 15:06:02 +08:00
STEvents.xml	SignalTower配置文件STEvent.xml中增加使用说明注释。	2023-11-23 15:39:28 +08:00
SequenceFormat.xml	Add project files.	2023-03-03 15:42:13 +08:00
System.sccfg	Merge branch 'Sic8ToSic6' into 添加C2H4-C3H8可配置	2023-11-23 17:29:24 +08:00