diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
index 384a6dc..e64a46d 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Text;
using System.Windows.Forms;
@@ -7,6 +8,7 @@ using ICSharpCode.Core;
using Mesnac.Action.Base;
using Mesnac.Action.ChemicalWeighing.Entity;
using Mesnac.Basic;
+using Mesnac.Codd.Session;
using Mesnac.Controls.Base;
using Mesnac.Controls.Default;
@@ -17,6 +19,20 @@ namespace Mesnac.Action.ChemicalWeighing.Test
public void Run(RuntimeParameter runtime)
{
base.RunIni(runtime); //必须调用
+
+
+ string sql = "insert into ActionCode values (13,'test','',1) select @@IDENTITY";
+
+ DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
+ if (dbHelper == null)
+ {
+ throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError);
+ }
+ dbHelper.ClearParameter();
+ dbHelper.CommandType = CommandType.Text;
+ dbHelper.CommandText = sql;
+
+ dbHelper.ExecuteNonQuery();
//ParametersWithPc.B1.FirstWord 256 768
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.Designer.cs b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.Designer.cs
new file mode 100644
index 0000000..598894a
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.Designer.cs
@@ -0,0 +1,63 @@
+namespace Mesnac.Controls.ChemicalWeighing
+{
+ partial class FenChaXian
+ {
+ ///
+ /// 必需的设计器变量。
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// 清理所有正在使用的资源。
+ ///
+ /// 如果应释放托管资源，为 true；否则为 false。
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region 组件设计器生成的代码
+
+ ///
+ /// 设计器支持所需的方法 - 不要修改
+ /// 使用代码编辑器修改此方法的内容。
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FenChaXian));
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(118, 150);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ //
+ // FenChaXian
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.pictureBox1);
+ this.Name = "FenChaXian";
+ this.Size = new System.Drawing.Size(118, 150);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.PictureBox pictureBox1;
+ }
+}
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.cs b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.cs
new file mode 100644
index 0000000..156f122
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Controls.ChemicalWeighing
+{
+ public partial class FenChaXian : UserControl
+ {
+ public FenChaXian()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.resx b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.resx
new file mode 100644
index 0000000..db0d553
--- /dev/null
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.resx
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAHsAAAD9CAYAAACcLgi6AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAuTSURBVHhe7d15qH1VHQXwZpuosDKbKbE5K5AsySgqM1MrIiotErJ5UNIGLKWUiMKKRkyDoiz/
+ aHAqtFIRCSwSNB/NA81RaQNZ2vjru3p7/9zvvnXfOe++fc49e90lfMDfOuf33r1n/d67d99z9j4327Vr
+ 18pYW1uDXQndRxkNVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMpl
+ k1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU
+ 5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVbls
+ Eqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4Sq
+ XDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdN
+ QlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CV
+ yyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJ
+ qMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy
+ 2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJ
+ VblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUum4SqXDYJVblsEqpy2SRU5bJJqMplk1CVyyahKpdNQlUu
+ m4SqZsteNfSgqEpPenXLZqG4XPbdi2wl0FAYCs5ln5mylUFDYR8Nuez/hP0D208SDUU9IvwrOSOg8CvC
+ zQPbXw4NRX01oOAPhjuGX6U/vySw/eXQUNARAcVeF+6asiNT9ttwp5RJo6GYW4cfBhT7+pQBfn1fHpCf
+ ljJpNBTzhoBCvxdQfLnt0eHf4Z/hISmTRUMhGGr9KaDsZ6RsVn6H/pUik0RDIbnIC4tsFl7Drw3Y79kp
+ k0RDEeVQ66Epm+dVAWX/NNw2ZXJoKKIcarHtpVuGqwL2PyllcmgogA21uhwU/hv+Fu6fMik0bNy8oVYf
+ nwn4e+cUmQwaNq4cat0qZX3dO/w14O8fnDIZNGxYn6FWl7eE/I9ldlzeNBo2rM9Qq8seIb8MHJ8yCTRs
+ 1HaGWl2eGVD2X8LeKWseDRv1tYCC+gy1+vhSwNf7ZJE1jYYNykMtfBLWd6jVZd9wY8Bw7HEpaxoNG7OT
+ oVaXdwV83W+FW6SsWTRszE6GWl3KixyOSVmzaNiQGkOtLvkih9+Hu6SsSTRsSI2hVpfyIocPpKxJNGwE
+ hlq48KDGUKtLvsgB3wvfl+0zeTRsRO2hVpf8W+TSImsKDRswxFCrS3mRw/NS1hQaTtyQQ60u+SKHn4fb
+ p6wZNJy4IYdaXcqLHE5JWTNoOGF7hqGHWl3yRQ43hPumrAk0nDCckcqvmw9P2djuEzBP7O/hzilrAg0n
+ DicmUPYbi2xM+CQN3x8nStj2yaLhxB0VcLC/WGRj+kTA939dkTWBhhOHD1BwsHHZL9s+tPwGrbkzYTSc
+ OLwDx8HGp1ls+9Dye4axxvfV0LABfw444GPPvsRpTrwTxxu05uZ107ABvwkoe+xLhvBBCr4vri1n2yeN
+ hg3AwcZBv12RjeUfAd8bw0C2fbJoOHH4IAMH+9dFNiZ8cofv/5giawINJ+7lAQd7WbM2PhXw/d9UZE2g
+ 4YThDdKVAQcbV5CwfYaWLzP+fmhqEgENJ+zVAQca14Ut4/UaMPT7ScDjeGvKmkDDCbpbeFvA1SI4yM8J
+ bL+x4KcbQzB4Z7hnYPtNCg1HhHVMMMXm7IDrvK4O+Kkp4UI/FAw4uG8O7GuN7YSAx5MfG6YHzz72a8LX
+ w+fCiWGpb+poOIInhXwRXx84w/Tl8OTAvt6yPD7gjeL1gT1uBv+gl7KcBw0HdJuAKzTzTwQ+esQaolh4
+ 7gnhkeGBM/YKU79AH5+m4aVm9rHj4sQDwwvDh0K+Bh3w22zUTwBpOBAUfW7AE8W0GrwG3yGwfVXhGLwy
+ YMIgjgOW0xztnDgNB5JXNfhDeGzKVtU+4ccBx+OygMud2H5V0XAA+YQ/VjXANdhsn1WDK15+GXBcRrme
+ jYaV4dcU3qniSb04ZbbugJAnH2DWKNunGhpW9o6AooecotOyjwUcn88W2SBoWBHepf4s4Mng3TbbZ9Xh
+ 13lePxVXz7J9qqBhRfgQAUX/IjR3sn9ElwQcJwzR2PYqaFjRSwOexKeLzDbDZ+w4Tu8vsupoWBE+N8aT
+ wJiabbd1zw04Tl8osupoWFGe+Yg5Umy7rXtqwHG6uMiqo2FFHwl4Ejg1ybbbuqcHHCcsrsu2V0HDik4N
+ eBInF5lt9vyA4/T5IquOhhW9LOBJ+A3a1vIbtPcUWXU0rAifgeNJ/KjIbDNMZcJxekGRVUfDinCWJ1/2
+ e6+U2UY4CZI/Th70GNGwsvMDnojfkXNPCzg+3y2yQdCwshcFPJlvFpnd5KyA4/P2IhsEDSv7cMCTuajI
+ 7Ca4ggXHZ9BhF9CwoocFnL4D/D/bZ9VhNugfAwo/LGWDoGFFOK2JJ4Gfbrbd1h0bcJwGnXhAw0qwwA2e
+ ABa8wcV4bB9bh4LzHLLjUlYdDSvArAm8u8SDx1JWbB/bKE8rwg/HIBP9aVjBawMeOBana2o+1JLhfqA4
+ boO87NFwh7BMc16K4lkps36w3Fd+Q1t96S8a7tD7AorG1Rdsu20tD1Wr3/WXhjvwoIBrqXBN1aNSZtuD
+ 1+u8iuOhKauChjtwXsCDxJQett36wTtyHMeqN5Kj4YKeEvAAMbXlHimzxaDgHwQcz2orL9NwAThz8+2A
+ BzeVKbWtOzzgeG7nTsFbouEC8jon0jcbX4Lt3AO8Ew23CdNOfxfwoJpcYX/Cat5yskrZ7w4oGpPr2Xbb
+ mWp3OKLhNjwgYK41lnfcP2VWV7V7l9FwG3A1JB6EzM1JJyrfKgPnGxa+VQYNe3piwAPAnGvcUZ7tY3Vg
+ KJZvgrPwOuc07KFcfO6klNmwyttbLTTbk4Y9HB3wjZu85VHDMD0Ix32h20TSsAPuPJuXgMYtHNg+Ngys
+ JpXncmMNObbPXDTskKf0fCN4zvX4Tg84/lgXjm2fi4ZbuF/AAnRYx0zibvENwlAs30kBEwLZPhQNt4B1
+ P/BNBl//w7aEJUDRw3dC76EYDefATzJ+ovGTjZ9wto+NA3cxyEOx16SsEw0JvDbjNRpfHK/ZbB8bF9Y/
+ RR8YivW6Yz8NiXzjNNyqAe/G2T42vrzwTq+1WGg4A+NojKfxRTG+ZvvYcuwX8lDswSmbi4Yz8AkZisYn
+ ZlNfHXgVnRHQzwVFRtGwgM+881ra+Cyc7WPLhSW68yrHB6eMomEh39EWK+Gz7TYNuOMwesJ/c4diNExw
+ fhrnqXG+Guet2T42DRiK5SWt565MRcOAoVa+rQOuRGH72LTgJjnoC/dUoUOxTUGCa8nwF3Ft2dg3N7XF
+ XRrQ23uLbLdNQcDVobhKFH8JV42yfWyasHB/HoptWr98wx8SXPeNonEd+Ci3M7CqMBsH/WF2zoZtG/4Q
+ MJMjv43HDI/Z7TZ9ZYdYE3X3tnInmPuvwpqCm8KiR/y3+7dzuQNmXebf95iNWW6ztmAolt93vSJlG8rO
+ H6pjfnWZW5vyGuYYiv3/3mF5A1ZIwIbep8usCbhnGHo9DX9GgPVF84lwrIUy+xesXbhHS/4UdF8EVWYb
+ 2GR9PKDfc/AHrDyISWOHhNkdrX17hyvW1tYO+R/vtZM0QOwQIwAAAABJRU5ErkJggg==
+
+
+
\ No newline at end of file
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
index 69b9b2f..786ef82 100644
--- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
@@ -83,6 +83,12 @@
Dou.cs
+
+ UserControl
+
+
+ FenChaXian.cs
+
UserControl
@@ -305,6 +311,9 @@
Dou.cs
+
+ FenChaXian.cs
+
GanHunJi.cs
@@ -494,6 +503,7 @@
+
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/fenchaxian.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/fenchaxian.png
new file mode 100644
index 0000000..0e06b2e
Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/fenchaxian.png differ
diff --git a/Main/MCEdit/Data/ComponentEvent.xml b/Main/MCEdit/Data/ComponentEvent.xml
index 804232d..166e327 100644
--- a/Main/MCEdit/Data/ComponentEvent.xml
+++ b/Main/MCEdit/Data/ComponentEvent.xml
@@ -139,5 +139,7 @@
+
+
diff --git a/Main/MCEdit/Data/ComponentProperty.xml b/Main/MCEdit/Data/ComponentProperty.xml
index 9efe8b2..4016793 100644
--- a/Main/MCEdit/Data/ComponentProperty.xml
+++ b/Main/MCEdit/Data/ComponentProperty.xml
@@ -1644,5 +1644,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
index 96a059b..1cce276 100644
--- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
+++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
@@ -30,6 +30,7 @@
+
diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml
index 08833b9..ff1bcdb 100644
--- a/Main/MCEdit/Data/MCProject/nodeDevice.xml
+++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml
@@ -6524,6 +6524,1804 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
index 0816a02..5ac97d6 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
@@ -1,6 +1,21 @@