yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dep_deliver' of http://175.27.215.92:3000/yangw/lj_plc into dep_deliver

Browse Source 
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
dep_deliver
wangsr 10 months ago
parent 3b308271c1 4d8402cc9e
commit b9af0a90c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
Unescape Escape View File

@ -1162,7 +1162,7 @@
</Object> </Object>
<Property name="Location">354, 717</Property> <Property name="Location">354, 717</Property>
<Property name="Name">MCPanelBlack3</Property> <Property name="Name">MCPanelBlack3</Property>
<Property name="Size">217, 83</Property> <Property name="Size">206, 83</Property>
</Object> </Object>
<Object type="Mesnac.Controls.Default.MCPanelBlack, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCPanelBlack2" children="Controls"> <Object type="Mesnac.Controls.Default.MCPanelBlack, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCPanelBlack2" children="Controls">
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel282" children="Controls"> <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel282" children="Controls">
@ -1419,7 +1419,7 @@
</Object> </Object>
<Property name="Location">354, 455</Property> <Property name="Location">354, 455</Property>
<Property name="Name">MCPanelBlack2</Property> <Property name="Name">MCPanelBlack2</Property>
<Property name="Size">217, 83</Property> <Property name="Size">203, 83</Property>
</Object> </Object>
<Object type="Mesnac.Controls.Default.MCPanelBlack, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCPanelBlack1" children="Controls"> <Object type="Mesnac.Controls.Default.MCPanelBlack, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCPanelBlack1" children="Controls">
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel281" children="Controls"> <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel281" children="Controls">
@ -4667,14 +4667,14 @@
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="BU3DBT04" children="Controls"> <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="BU3DBT04" children="Controls">
<Property name="AlarmName" /> <Property name="AlarmName" />
<Property name="SetName" /> <Property name="SetName" />
<Property name="Location">285, 711</Property> <Property name="Location">284, 716</Property>
<Property name="Name">BU3DBT04</Property> <Property name="Name">BU3DBT04</Property>
<Property name="Size">14, 12</Property> <Property name="Size">14, 12</Property>
</Object> </Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="BU3DBT03" children="Controls"> <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="BU3DBT03" children="Controls">
<Property name="AlarmName" /> <Property name="AlarmName" />
<Property name="SetName" /> <Property name="SetName" />
<Property name="Location">218, 711</Property> <Property name="Location">218, 716</Property>
<Property name="Name">BU3DBT03</Property> <Property name="Name">BU3DBT03</Property>
<Property name="Size">14, 12</Property> <Property name="Size">14, 12</Property>
</Object> </Object>
@ -5035,7 +5035,7 @@
<Property name="Size">1, 48</Property> <Property name="Size">1, 48</Property>
</Object> </Object>
<Object type="Mesnac.Controls.ChemicalWeighing.Trucks, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Trucks21" children="Controls"> <Object type="Mesnac.Controls.ChemicalWeighing.Trucks, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Trucks21" children="Controls">
<Property name="Location">169, 604</Property> <Property name="Location">169, 595</Property>
<Property name="Name">Trucks21</Property> <Property name="Name">Trucks21</Property>
<Property name="Size">113, 37</Property> <Property name="Size">113, 37</Property>
</Object> </Object>

Write Preview
Loading…
Cancel
Save