Commit Graph

7 Commits (baea38c619b62ff082208ea9118502b45f61fad3)

Author SHA1 Message Date
nodyang dfe261ff96 Merge branch 'dep' into dep1011
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
#	Main/MCEdit/MCEdit.csproj
nodyang ef86b96e76 修复一个版本
wangsr 804e322945 add - hsl通讯展示界面 性能待优化
wangsr ef46dce828 add - 手动控制等待引入PLC
wangsr 4bfc54b494 测试提交
nodyang e1342383fb 0915 替换plc
nodyang 8a021e197c 采用胡工 替换西门子