Merge branch 'GSP' of http://36.129.163.148:30080/gogsadmin/OTS into GSP

OTSPartA_STDEditor/Form_Main.cs

@@ -1394,7 +1394,7 @@ namespace OTSPartA_STDEditor
                     OtsDatabaseCommand.ExecuteNonQuery();
                     OtsDatabaseCommand.CommandText = "CREATE TABLE STDMinerals (id INTEGER,SPEC BLOB)";
                     OtsDatabaseCommand.ExecuteNonQuery();
-                    OtsDatabaseCommand.CommandText = "CREATE TABLE ZeroElementRules (ZeroElement TEXT,UsingElementList TEXT, UsingImgPropertyList TEXT,Expression TEXT)";
+                    OtsDatabaseCommand.CommandText = "CREATE TABLE ZeroElementRules (ZeroElement TEXT,UsingElementList TEXT, UsingImgPropertyList TEXT,UsingOtherPropertyList TEXT,Expression TEXT)";
                     OtsDatabaseCommand.ExecuteNonQuery();
                     System.Data.Common.DbTransaction trans = m_OtsDatabaseConnection.BeginTransaction();
                     trans.Commit();