三号机6寸改8寸。
Go to file
LAPTOP-V3V5DP1T\Han Qiang Qiang d2c2a44682 Merge branch 'develop' into MfcCalculation
# Conflicts:
#	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-06-25 11:30:24 +08:00
Modules/Mainframe Merge branch 'MfcCalculation' into develop 2023-06-21 11:07:23 +08:00
SicRT Merge branch 'MfcCalculation' into develop 2023-06-21 11:07:23 +08:00
SicSetup/Sic_Setup 传盘压力参数一键设置 2023-04-26 11:27:40 +08:00
SicSimulator 更新库文件(Commit 95195e4) 2023-06-19 18:52:48 +08:00
SicUI 1修改界面控件显示不全问题 2023-06-21 11:25:07 +08:00
ThirdParty/MECF.Framework 使用库Develop[98ed05b]分支更新dll 2023-06-25 11:27:35 +08:00
.gitattributes Add .gitattributes and .gitignore. 2023-03-03 15:42:00 +08:00
.gitignore 更新忽略文件配置。 2023-05-16 14:54:50 +08:00
Sic08.sln Mainframe工程更名为SicModules。 2023-04-13 15:35:13 +08:00