Go to file
Han Qiang Qiang 1382f61302 Merge branch 'develop' into feature/localization
# Conflicts:
#	SicUI/Models/Maintenances/TM/EFEMView.xaml
#	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
2024-02-22 10:16:49 +08:00
Modules/Mainframe Merge branch 'develop' into feature/localization 2024-02-22 10:16:49 +08:00
SicRT Merge branch 'develop' into feature/localization 2024-02-22 10:16:49 +08:00
SicSetup/Sic_Setup 修正安装文件中错误包含_AccountEx.xml的问题。 2024-01-18 09:06:07 +08:00
SicSimulator Merge branch 'develop' into feature/localization 2024-02-22 10:16:49 +08:00
SicUI Merge branch 'develop' into feature/localization 2024-02-22 10:16:49 +08:00
ThirdParty/MECF.Framework Merge branch 'develop' into feature/localization 2024-02-22 10:16:49 +08:00
.gitattributes Add .gitattributes and .gitignore. 2023-03-03 15:42:00 +08:00
.gitignore 移除PM Heater视图中配置PSU2输出限制的功能。 2023-08-04 16:08:55 +08:00
SicAutoGE.sln 解决方案更名为SicAutoGE,以标识此项目针对含EFEM的自动设备。 2023-07-03 16:07:32 +08:00