diff --git a/ChipSolver/ChipSolver.cpp b/ChipSolver/ChipSolver.cpp
index 1a77985..37fdc36 100644
--- a/ChipSolver/ChipSolver.cpp
+++ b/ChipSolver/ChipSolver.cpp
@@ -67,6 +67,14 @@ ChipSolver::ChipSolver(QObject* parent):
 			squadConfig.maxValue.defbreakValue = maxValues["def_break"].toInt();
 			squadConfig.maxValue.hitValue = maxValues["hit"].toInt();
 			squadConfig.maxValue.reloadValue = maxValues["reload"].toInt();
+			if (maxBlocks.contains("free"))
+			{
+				squadConfig.maxValue.squad = maxBlocks["free"].toInt();
+			}
+			else
+			{
+				squadConfig.maxValue.squad = 0;
+			}
 			squadConfig.color = obj["color"].toInt();
 			squadConfig.palindrome = obj["palindrome"].toInt();
 			
diff --git a/ChipSolver/ChipSolver.qrc b/ChipSolver/ChipSolver.qrc
index 7e3da90..b26251e 100644
--- a/ChipSolver/ChipSolver.qrc
+++ b/ChipSolver/ChipSolver.qrc
@@ -25,5 +25,7 @@
         <file>Resources/PP-93-2-result.json</file>
         <file>Resources/PP-93-4-result.json</file>
         <file>Resources/PP-93-result.json</file>
+        <file>Resources/Mk-47.json</file>
+        <file>Resources/Mk-47-result.json</file>
     </qresource>
 </RCC>
diff --git a/ChipSolver/Resources/Mk-47-result.json b/ChipSolver/Resources/Mk-47-result.json
new file mode 100644
index 0000000..7036001
--- /dev/null
+++ b/ChipSolver/Resources/Mk-47-result.json
@@ -0,0 +1 @@
+[[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":24,"rotate":1,"x":2,"y":5},{"ID":28,"rotate":2,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":29,"rotate":2,"x":4,"y":2}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":25,"rotate":3,"x":2,"y":5},{"ID":28,"rotate":2,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":29,"rotate":2,"x":4,"y":2}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":22,"rotate":1,"x":2,"y":4},{"ID":28,"rotate":2,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":28,"rotate":2,"x":1,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":23,"rotate":3,"x":2,"y":4},{"ID":29,"rotate":2,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":29,"rotate":2,"x":4,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":29,"rotate":2,"x":4,"y":2},{"ID":28,"rotate":0,"x":3,"y":4},{"ID":24,"rotate":0,"x":2,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":24,"rotate":0,"x":2,"y":2},{"ID":31,"rotate":1,"x":3,"y":4},{"ID":28,"rotate":2,"x":4,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":29,"rotate":2,"x":4,"y":2},{"ID":27,"rotate":1,"x":3,"y":4},{"ID":24,"rotate":0,"x":2,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":25,"rotate":1,"x":3,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":29,"rotate":2,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":25,"rotate":3,"x":3,"y":5},{"ID":24,"rotate":0,"x":2,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":31,"rotate":3,"x":3,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":25,"rotate":1,"x":3,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":26,"rotate":0,"x":3,"y":4}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":28,"rotate":2,"x":1,"y":2},{"ID":29,"rotate":0,"x":2,"y":4},{"ID":25,"rotate":0,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":28,"rotate":2,"x":1,"y":2},{"ID":27,"rotate":3,"x":2,"y":4},{"ID":25,"rotate":0,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":24,"rotate":3,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":28,"rotate":2,"x":2,"y":4}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":25,"rotate":0,"x":4,"y":2},{"ID":31,"rotate":2,"x":2,"y":4},{"ID":29,"rotate":2,"x":1,"y":2}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":24,"rotate":1,"x":1,"y":5},{"ID":25,"rotate":0,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":31,"rotate":0,"x":2,"y":2}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":24,"rotate":3,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":26,"rotate":0,"x":2,"y":4}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":31,"rotate":3,"x":0,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":28,"rotate":2,"x":4,"y":2},{"ID":28,"rotate":0,"x":3,"y":3}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":31,"rotate":0,"x":5,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":29,"rotate":2,"x":1,"y":2},{"ID":29,"rotate":0,"x":2,"y":3}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":22,"rotate":1,"x":1,"y":4},{"ID":31,"rotate":0,"x":5,"y":2},{"ID":27,"rotate":1,"x":2,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":23,"rotate":3,"x":3,"y":4},{"ID":31,"rotate":3,"x":0,"y":2},{"ID":27,"rotate":3,"x":3,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":23,"rotate":1,"x":2,"y":4},{"ID":21,"rotate":2,"x":0,"y":2},{"ID":25,"rotate":1,"x":3,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":22,"rotate":3,"x":2,"y":4},{"ID":21,"rotate":3,"x":5,"y":2},{"ID":24,"rotate":3,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":31,"rotate":0,"x":5,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":24,"rotate":3,"x":1,"y":2},{"ID":24,"rotate":1,"x":1,"y":4}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":31,"rotate":3,"x":0,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":25,"rotate":1,"x":3,"y":2},{"ID":25,"rotate":3,"x":3,"y":4}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":29,"rotate":2,"x":4,"y":2},{"ID":28,"rotate":0,"x":3,"y":4},{"ID":39,"rotate":0,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":28,"rotate":2,"x":1,"y":2},{"ID":29,"rotate":0,"x":2,"y":4},{"ID":39,"rotate":3,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":27,"rotate":3,"x":2,"y":4},{"ID":39,"rotate":3,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":28,"rotate":2,"x":1,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":31,"rotate":1,"x":3,"y":4},{"ID":28,"rotate":2,"x":4,"y":2},{"ID":39,"rotate":0,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":31,"rotate":2,"x":2,"y":4},{"ID":29,"rotate":2,"x":1,"y":2},{"ID":39,"rotate":3,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":27,"rotate":1,"x":3,"y":4},{"ID":39,"rotate":0,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":29,"rotate":2,"x":4,"y":2}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":24,"rotate":1,"x":1,"y":5},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":31,"rotate":0,"x":2,"y":2},{"ID":39,"rotate":3,"x":4,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":25,"rotate":3,"x":3,"y":5},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":31,"rotate":3,"x":3,"y":2},{"ID":39,"rotate":0,"x":1,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":29,"rotate":2,"x":1,"y":2},{"ID":32,"rotate":2,"x":2,"y":4},{"ID":28,"rotate":2,"x":4,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":28,"rotate":1,"x":3,"y":4},{"ID":28,"rotate":2,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":32,"rotate":1,"x":2,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":32,"rotate":1,"x":2,"y":2},{"ID":21,"rotate":0,"x":3,"y":4},{"ID":28,"rotate":2,"x":4,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":25,"rotate":1,"x":3,"y":4},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":29,"rotate":0,"x":3,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":24,"rotate":3,"x":3,"y":4},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":27,"rotate":3,"x":3,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":22,"rotate":3,"x":3,"y":4},{"ID":25,"rotate":1,"x":3,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":25,"rotate":1,"x":3,"y":4},{"ID":24,"rotate":0,"x":2,"y":2},{"ID":21,"rotate":2,"x":3,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":24,"rotate":3,"x":1,"y":4},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":28,"rotate":0,"x":2,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":29,"rotate":3,"x":2,"y":4},{"ID":29,"rotate":2,"x":1,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":32,"rotate":3,"x":4,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":32,"rotate":3,"x":4,"y":2},{"ID":21,"rotate":1,"x":2,"y":4},{"ID":29,"rotate":2,"x":1,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":23,"rotate":1,"x":1,"y":4},{"ID":24,"rotate":3,"x":1,"y":2}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":25,"rotate":1,"x":1,"y":4},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":27,"rotate":1,"x":2,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":24,"rotate":3,"x":1,"y":4},{"ID":25,"rotate":0,"x":4,"y":2},{"ID":21,"rotate":3,"x":2,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":24,"rotate":3,"x":1,"y":4},{"ID":23,"rotate":1,"x":3,"y":4},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":38,"rotate":0,"x":2,"y":2}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":22,"rotate":3,"x":1,"y":4},{"ID":25,"rotate":1,"x":3,"y":4},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":38,"rotate":0,"x":2,"y":2}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":24,"rotate":3,"x":1,"y":4},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":21,"rotate":3,"x":2,"y":2},{"ID":39,"rotate":3,"x":4,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":25,"rotate":1,"x":3,"y":4},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":21,"rotate":2,"x":3,"y":2},{"ID":39,"rotate":0,"x":1,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":28,"rotate":0,"x":2,"y":2},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":28,"rotate":0,"x":2,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":27,"rotate":1,"x":2,"y":2},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":28,"rotate":2,"x":2,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":21,"rotate":3,"x":2,"y":2},{"ID":25,"rotate":0,"x":4,"y":2},{"ID":28,"rotate":0,"x":2,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":29,"rotate":0,"x":3,"y":2},{"ID":29,"rotate":0,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":29,"rotate":2,"x":3,"y":4},{"ID":27,"rotate":3,"x":3,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":24,"rotate":0,"x":2,"y":2},{"ID":21,"rotate":2,"x":3,"y":2},{"ID":29,"rotate":0,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":27,"rotate":1,"x":2,"y":2},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":26,"rotate":0,"x":2,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":36,"rotate":2,"x":3,"y":4},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":27,"rotate":3,"x":3,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":33,"rotate":0,"x":3,"y":4},{"ID":28,"rotate":2,"x":1,"y":4},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":38,"rotate":0,"x":2,"y":2}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":21,"rotate":3,"x":5,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":24,"rotate":0,"x":2,"y":2},{"ID":29,"rotate":2,"x":3,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":21,"rotate":3,"x":5,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":27,"rotate":1,"x":2,"y":2},{"ID":22,"rotate":3,"x":2,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":21,"rotate":3,"x":2,"y":2},{"ID":28,"rotate":0,"x":2,"y":4},{"ID":39,"rotate":3,"x":4,"y":2}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":36,"rotate":0,"x":1,"y":4},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":27,"rotate":1,"x":2,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":21,"rotate":2,"x":0,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":25,"rotate":0,"x":4,"y":2},{"ID":28,"rotate":2,"x":2,"y":3}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":34,"rotate":0,"x":1,"y":4},{"ID":29,"rotate":2,"x":4,"y":4},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":38,"rotate":0,"x":2,"y":2}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":21,"rotate":2,"x":0,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":27,"rotate":3,"x":3,"y":2},{"ID":23,"rotate":1,"x":2,"y":4}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":21,"rotate":2,"x":3,"y":2},{"ID":29,"rotate":0,"x":3,"y":4},{"ID":39,"rotate":0,"x":1,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":38,"rotate":3,"x":2,"y":4},{"ID":38,"rotate":1,"x":4,"y":4},{"ID":29,"rotate":2,"x":1,"y":2},{"ID":28,"rotate":2,"x":4,"y":2},{"ID":30,"rotate":0,"x":3,"y":0}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":21,"rotate":2,"x":0,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":28,"rotate":2,"x":2,"y":3},{"ID":39,"rotate":3,"x":4,"y":2}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":21,"rotate":3,"x":5,"y":2},{"ID":30,"rotate":0,"x":3,"y":0},{"ID":29,"rotate":2,"x":3,"y":3},{"ID":39,"rotate":0,"x":1,"y":2}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":31,"rotate":3,"x":1,"y":3},{"ID":31,"rotate":0,"x":4,"y":3},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":29,"rotate":1,"x":4,"y":3},{"ID":31,"rotate":0,"x":2,"y":3},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":25,"rotate":2,"x":4,"y":0}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":31,"rotate":0,"x":4,"y":3},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":32,"rotate":3,"x":2,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":21,"rotate":3,"x":4,"y":3},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":31,"rotate":0,"x":2,"y":3}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":28,"rotate":3,"x":1,"y":3},{"ID":31,"rotate":3,"x":3,"y":3},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":25,"rotate":2,"x":4,"y":0}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":31,"rotate":3,"x":1,"y":3},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":32,"rotate":1,"x":4,"y":3}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":21,"rotate":2,"x":1,"y":3},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":25,"rotate":2,"x":4,"y":0},{"ID":31,"rotate":3,"x":3,"y":3}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":31,"rotate":3,"x":1,"y":3},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":25,"rotate":2,"x":4,"y":0},{"ID":32,"rotate":0,"x":4,"y":3}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":31,"rotate":0,"x":4,"y":3},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":32,"rotate":0,"x":0,"y":3}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":31,"rotate":3,"x":1,"y":3},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":25,"rotate":2,"x":4,"y":0},{"ID":33,"rotate":1,"x":4,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":31,"rotate":0,"x":4,"y":3},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":34,"rotate":1,"x":2,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":21,"rotate":3,"x":4,"y":1},{"ID":38,"rotate":1,"x":3,"y":0},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":29,"rotate":2,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":21,"rotate":3,"x":4,"y":1},{"ID":38,"rotate":1,"x":3,"y":0},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":26,"rotate":0,"x":3,"y":4}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":21,"rotate":2,"x":1,"y":1},{"ID":38,"rotate":3,"x":3,"y":0},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":28,"rotate":2,"x":2,"y":4}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":21,"rotate":2,"x":1,"y":1},{"ID":38,"rotate":3,"x":3,"y":0},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":26,"rotate":0,"x":2,"y":4}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":22,"rotate":1,"x":1,"y":4},{"ID":31,"rotate":0,"x":5,"y":2},{"ID":23,"rotate":0,"x":2,"y":1},{"ID":38,"rotate":3,"x":3,"y":0}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":23,"rotate":3,"x":3,"y":4},{"ID":31,"rotate":3,"x":0,"y":2},{"ID":22,"rotate":0,"x":4,"y":1},{"ID":38,"rotate":1,"x":3,"y":0}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":31,"rotate":2,"x":5,"y":4},{"ID":23,"rotate":1,"x":2,"y":4},{"ID":21,"rotate":2,"x":0,"y":2},{"ID":21,"rotate":3,"x":4,"y":1},{"ID":38,"rotate":1,"x":3,"y":0}],[{"ID":31,"rotate":1,"x":0,"y":4},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":22,"rotate":3,"x":2,"y":4},{"ID":21,"rotate":3,"x":5,"y":2},{"ID":21,"rotate":2,"x":1,"y":1},{"ID":38,"rotate":3,"x":3,"y":0}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":31,"rotate":0,"x":5,"y":2},{"ID":38,"rotate":3,"x":3,"y":0},{"ID":21,"rotate":2,"x":1,"y":1},{"ID":24,"rotate":1,"x":1,"y":4}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":31,"rotate":3,"x":0,"y":2},{"ID":38,"rotate":1,"x":3,"y":0},{"ID":21,"rotate":3,"x":4,"y":1},{"ID":25,"rotate":3,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":32,"rotate":0,"x":3,"y":4},{"ID":21,"rotate":0,"x":2,"y":3},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":32,"rotate":0,"x":1,"y":4},{"ID":21,"rotate":1,"x":3,"y":3},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":37,"rotate":0,"x":1,"y":5},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":32,"rotate":0,"x":2,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":24,"rotate":1,"x":2,"y":5},{"ID":32,"rotate":0,"x":2,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":25,"rotate":3,"x":2,"y":5},{"ID":32,"rotate":0,"x":2,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":24,"rotate":3,"x":3,"y":4},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":22,"rotate":0,"x":4,"y":1},{"ID":38,"rotate":1,"x":3,"y":0}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":27,"rotate":3,"x":5,"y":4},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":38,"rotate":1,"x":3,"y":0},{"ID":21,"rotate":3,"x":4,"y":1},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":22,"rotate":3,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":27,"rotate":0,"x":4,"y":3},{"ID":25,"rotate":2,"x":4,"y":0},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":39,"rotate":0,"x":2,"y":3}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":25,"rotate":1,"x":1,"y":4},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":23,"rotate":0,"x":2,"y":1},{"ID":38,"rotate":3,"x":3,"y":0}],[{"ID":27,"rotate":1,"x":0,"y":4},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":38,"rotate":3,"x":3,"y":0},{"ID":21,"rotate":2,"x":1,"y":1},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":23,"rotate":1,"x":1,"y":4}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":27,"rotate":0,"x":1,"y":3},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":39,"rotate":3,"x":3,"y":3}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":32,"rotate":0,"x":2,"y":6},{"ID":37,"rotate":0,"x":1,"y":5},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":38,"rotate":0,"x":2,"y":3},{"ID":25,"rotate":2,"x":4,"y":0}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":38,"rotate":3,"x":3,"y":0},{"ID":23,"rotate":0,"x":2,"y":1},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":28,"rotate":2,"x":2,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":38,"rotate":1,"x":3,"y":0},{"ID":22,"rotate":0,"x":4,"y":1},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":29,"rotate":2,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":38,"rotate":3,"x":3,"y":0},{"ID":23,"rotate":0,"x":2,"y":1},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":26,"rotate":0,"x":2,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":38,"rotate":1,"x":3,"y":0},{"ID":22,"rotate":0,"x":4,"y":1},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":26,"rotate":0,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":25,"rotate":2,"x":4,"y":0},{"ID":38,"rotate":0,"x":2,"y":3},{"ID":24,"rotate":1,"x":2,"y":5}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":25,"rotate":2,"x":4,"y":0},{"ID":38,"rotate":0,"x":2,"y":3},{"ID":25,"rotate":3,"x":2,"y":5}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":25,"rotate":2,"x":4,"y":0},{"ID":23,"rotate":2,"x":4,"y":3},{"ID":39,"rotate":0,"x":2,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":21,"rotate":0,"x":2,"y":3},{"ID":39,"rotate":2,"x":3,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":23,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":21,"rotate":1,"x":3,"y":3},{"ID":39,"rotate":1,"x":2,"y":4}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":22,"rotate":2,"x":4,"y":0},{"ID":22,"rotate":2,"x":2,"y":3},{"ID":39,"rotate":3,"x":3,"y":3}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":22,"rotate":0,"x":6,"y":3},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":36,"rotate":2,"x":3,"y":4},{"ID":25,"rotate":2,"x":2,"y":2},{"ID":22,"rotate":0,"x":4,"y":1},{"ID":38,"rotate":1,"x":3,"y":0}],[{"ID":33,"rotate":1,"x":0,"y":3},{"ID":38,"rotate":2,"x":4,"y":5},{"ID":24,"rotate":3,"x":2,"y":6},{"ID":21,"rotate":3,"x":5,"y":2},{"ID":38,"rotate":3,"x":3,"y":0},{"ID":23,"rotate":0,"x":2,"y":1},{"ID":22,"rotate":3,"x":2,"y":4}],[{"ID":23,"rotate":0,"x":0,"y":3},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":36,"rotate":0,"x":1,"y":4},{"ID":24,"rotate":2,"x":4,"y":2},{"ID":23,"rotate":0,"x":2,"y":1},{"ID":38,"rotate":3,"x":3,"y":0}],[{"ID":38,"rotate":2,"x":0,"y":5},{"ID":25,"rotate":1,"x":2,"y":6},{"ID":34,"rotate":1,"x":6,"y":3},{"ID":21,"rotate":2,"x":0,"y":2},{"ID":38,"rotate":1,"x":3,"y":0},{"ID":22,"rotate":0,"x":4,"y":1},{"ID":23,"rotate":1,"x":2,"y":4}]]
\ No newline at end of file
diff --git a/ChipSolver/Resources/Mk-47.json b/ChipSolver/Resources/Mk-47.json
new file mode 100644
index 0000000..65a7bed
--- /dev/null
+++ b/ChipSolver/Resources/Mk-47.json
@@ -0,0 +1,35 @@
+{
+    "name": "Mk-47",
+    "optional": {
+        "Mk-47" : 0
+    },
+    "width": 8,
+    "height": 8,
+    "blocks": 38,
+    "chips":[5061,5051],
+    "map": [
+        "11100111",
+        "11100111",
+        "11000011",
+        "10000001",
+        "00000000",
+        "00000000",
+        "01100110",
+        "11000011"
+    ],
+    "color": 2,
+    "palindrome": 0,
+    "MaxBlocks": {
+        "damage": 10,
+        "def_break": 5,
+        "hit": 7,
+        "reload": 14,
+        "free": 2
+    },
+    "MaxValues": {
+        "damage": 120,
+        "def_break": 142,
+        "hit": 131,
+        "reload": 209
+    }
+}
\ No newline at end of file
diff --git a/ChipSolver/Resources/PP-93.json b/ChipSolver/Resources/PP-93.json
index af5aba1..148fe30 100644
--- a/ChipSolver/Resources/PP-93.json
+++ b/ChipSolver/Resources/PP-93.json
@@ -24,7 +24,8 @@
         "damage": 16,
         "def_break": 2,
         "hit": 6,
-        "reload": 7
+        "reload": 7,
+        "free": 2
     },
     "MaxValues": {
         "damage": 169,
diff --git a/ChipSolver/Resources/squads.json b/ChipSolver/Resources/squads.json
index 88d6c47..9922fe7 100644
--- a/ChipSolver/Resources/squads.json
+++ b/ChipSolver/Resources/squads.json
@@ -29,5 +29,8 @@
         "填满": "PP-93-result.json",
         "最多空2格": "PP-93-2-result.json",
         "最多空4格": "PP-93-4-result.json"
+    },
+    "Mk-47": {
+        "Mk-47": "Mk-47-result.json"
     }
 }
\ No newline at end of file
diff --git a/CodeX/AboutDialog.cpp b/CodeX/AboutDialog.cpp
index cfcf0f8..fa1be78 100644
--- a/CodeX/AboutDialog.cpp
+++ b/CodeX/AboutDialog.cpp
@@ -4,7 +4,7 @@
 
 AboutDialog::AboutDialog(QWidget *parent)
 	: QDialog(parent),
-	version(2,4,3),
+	version(2,5,0),
 	ui(new Ui::AboutDialog()),
 	accessManager_(new QNetworkAccessManager(this))
 {
diff --git a/CodeX/SettingWindow.cpp b/CodeX/SettingWindow.cpp
index b26fe67..ed8541e 100644
--- a/CodeX/SettingWindow.cpp
+++ b/CodeX/SettingWindow.cpp
@@ -50,7 +50,7 @@ void SettingWindow::reset()
 		dynamic_cast<QSpinBox*>(this->ui->gridLayout->itemAtPosition(i + 1, 2)->widget())->setValue(value.defbreakBlock);
 		dynamic_cast<QSpinBox*>(this->ui->gridLayout->itemAtPosition(i + 1, 3)->widget())->setValue(value.hitBlock);
 		dynamic_cast<QSpinBox*>(this->ui->gridLayout->itemAtPosition(i + 1, 4)->widget())->setValue(value.reloadBlock);
-		dynamic_cast<QSpinBox*>(this->ui->gridLayout->itemAtPosition(i + 1, 5)->widget())->setValue(0);
+		dynamic_cast<QSpinBox*>(this->ui->gridLayout->itemAtPosition(i + 1, 5)->widget())->setValue(value.squad);
 	}
 	this->ui->numbersSpinBox->setValue(1000);
 	this->ui->maxSpinBox->setValue(10000);
diff --git a/CodeX/SettingWindow.ui b/CodeX/SettingWindow.ui
index 18b0b4e..482e2cb 100644
--- a/CodeX/SettingWindow.ui
+++ b/CodeX/SettingWindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>527</width>
-    <height>677</height>
+    <height>711</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -41,21 +41,8 @@
       <property name="spacing">
        <number>9</number>
       </property>
-      <item row="1" column="1">
-       <widget class="QSpinBox" name="spinBox">
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-        <property name="maximum">
-         <number>20</number>
-        </property>
-        <property name="value">
-         <number>16</number>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="2">
-       <widget class="QSpinBox" name="spinBox_22">
+      <item row="3" column="4">
+       <widget class="QSpinBox" name="spinBox_12">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -63,12 +50,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>5</number>
+         <number>6</number>
         </property>
        </widget>
       </item>
-      <item row="2" column="5">
-       <widget class="QSpinBox" name="spinBox_26">
+      <item row="3" column="5">
+       <widget class="QSpinBox" name="spinBox_27">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -80,8 +67,8 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="label_2">
+      <item row="0" column="3">
+       <widget class="QLabel" name="label_4">
         <property name="frameShape">
          <enum>QFrame::Box</enum>
         </property>
@@ -89,7 +76,7 @@
          <enum>QFrame::Sunken</enum>
         </property>
         <property name="text">
-         <string>杀伤</string>
+         <string>精度</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -109,8 +96,8 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="4">
-       <widget class="QSpinBox" name="spinBox_12">
+      <item row="7" column="5">
+       <widget class="QSpinBox" name="spinBox_35">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -118,12 +105,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>6</number>
+         <number>0</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="5">
-       <widget class="QSpinBox" name="spinBox_25">
+      <item row="4" column="3">
+       <widget class="QSpinBox" name="spinBox_15">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -131,12 +118,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>0</number>
+         <number>5</number>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_10">
+      <item row="0" column="2">
+       <widget class="QLabel" name="label_3">
         <property name="frameShape">
          <enum>QFrame::Box</enum>
         </property>
@@ -144,28 +131,47 @@
          <enum>QFrame::Sunken</enum>
         </property>
         <property name="text">
-         <string>AT4</string>
+         <string>破防</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
-       <widget class="QSpinBox" name="spinBox_13">
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="text">
+         <string>2B-14</string>
+        </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
-        <property name="maximum">
-         <number>20</number>
+       </widget>
+      </item>
+      <item row="0" column="5">
+       <widget class="QLabel" name="label_13">
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
         </property>
-        <property name="value">
-         <number>18</number>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="text">
+         <string>自由</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QSpinBox" name="spinBox_2">
+      <item row="5" column="5">
+       <widget class="QSpinBox" name="spinBox_29">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -173,12 +179,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>10</number>
+         <number>0</number>
         </property>
        </widget>
       </item>
-      <item row="6" column="1">
-       <widget class="QSpinBox" name="spinBox_21">
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="spinBox_5">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -190,24 +196,34 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="label_15">
-        <property name="frameShape">
-         <enum>QFrame::Box</enum>
+      <item row="5" column="4">
+       <widget class="QSpinBox" name="spinBox_20">
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
         </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
+        <property name="maximum">
+         <number>20</number>
         </property>
-        <property name="text">
-         <string>Mk-153</string>
+        <property name="value">
+         <number>5</number>
         </property>
+       </widget>
+      </item>
+      <item row="5" column="3">
+       <widget class="QSpinBox" name="spinBox_19">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
+        <property name="maximum">
+         <number>20</number>
+        </property>
+        <property name="value">
+         <number>9</number>
+        </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_8">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_7">
         <property name="frameShape">
          <enum>QFrame::Box</enum>
         </property>
@@ -215,15 +231,15 @@
          <enum>QFrame::Sunken</enum>
         </property>
         <property name="text">
-         <string>2B-14</string>
+         <string>AGS-30</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="6" column="5">
-       <widget class="QSpinBox" name="spinBox_30">
+      <item row="5" column="2">
+       <widget class="QSpinBox" name="spinBox_18">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -231,12 +247,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>0</number>
+         <number>8</number>
         </property>
        </widget>
       </item>
-      <item row="5" column="2">
-       <widget class="QSpinBox" name="spinBox_18">
+      <item row="8" column="5">
+       <widget class="QSpinBox" name="spinBox_40">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -244,12 +260,25 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>8</number>
+         <number>2</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="4">
-       <widget class="QLabel" name="label_5">
+      <item row="8" column="2">
+       <widget class="QSpinBox" name="spinBox_37">
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="maximum">
+         <number>20</number>
+        </property>
+        <property name="value">
+         <number>2</number>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <widget class="QLabel" name="label_15">
         <property name="frameShape">
          <enum>QFrame::Box</enum>
         </property>
@@ -257,15 +286,15 @@
          <enum>QFrame::Sunken</enum>
         </property>
         <property name="text">
-         <string>装填</string>
+         <string>Mk-153</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="7" column="3">
-       <widget class="QSpinBox" name="spinBox_33">
+      <item row="2" column="4">
+       <widget class="QSpinBox" name="spinBox_8">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -273,44 +302,51 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>9</number>
+         <number>16</number>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="frameShape">
-         <enum>QFrame::Box</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
-        </property>
-        <property name="text">
-         <string>M2</string>
-        </property>
+      <item row="4" column="4">
+       <widget class="QSpinBox" name="spinBox_16">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
+        <property name="maximum">
+         <number>20</number>
+        </property>
+        <property name="value">
+         <number>10</number>
+        </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="frameShape">
-         <enum>QFrame::Box</enum>
+      <item row="1" column="5">
+       <widget class="QSpinBox" name="spinBox_25">
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
         </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
+        <property name="maximum">
+         <number>20</number>
         </property>
-        <property name="text">
-         <string>AGS-30</string>
+        <property name="value">
+         <number>0</number>
         </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QSpinBox" name="spinBox_3">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
+        <property name="maximum">
+         <number>20</number>
+        </property>
+        <property name="value">
+         <number>7</number>
+        </property>
        </widget>
       </item>
-      <item row="0" column="3">
-       <widget class="QLabel" name="label_4">
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_11">
         <property name="frameShape">
          <enum>QFrame::Box</enum>
         </property>
@@ -318,15 +354,15 @@
          <enum>QFrame::Sunken</enum>
         </property>
         <property name="text">
-         <string>精度</string>
+         <string>QLZ-04</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="4" column="5">
-       <widget class="QSpinBox" name="spinBox_28">
+      <item row="2" column="2">
+       <widget class="QSpinBox" name="spinBox_6">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -334,12 +370,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>0</number>
+         <number>5</number>
         </property>
        </widget>
       </item>
-      <item row="7" column="5">
-       <widget class="QSpinBox" name="spinBox_35">
+      <item row="6" column="2">
+       <widget class="QSpinBox" name="spinBox_22">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -347,12 +383,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>0</number>
+         <number>5</number>
         </property>
        </widget>
       </item>
-      <item row="5" column="3">
-       <widget class="QSpinBox" name="spinBox_19">
+      <item row="7" column="1">
+       <widget class="QSpinBox" name="spinBox_31">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -360,12 +396,28 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>9</number>
+         <number>16</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="4">
-       <widget class="QSpinBox" name="spinBox_4">
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_10">
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="text">
+         <string>AT4</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="spinBox">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -373,12 +425,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>3</number>
+         <number>16</number>
         </property>
        </widget>
       </item>
-      <item row="6" column="4">
-       <widget class="QSpinBox" name="spinBox_24">
+      <item row="7" column="4">
+       <widget class="QSpinBox" name="spinBox_34">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -386,19 +438,41 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>16</number>
+         <number>5</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_12">
+      <item row="4" column="2">
+       <widget class="QSpinBox" name="spinBox_14">
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="maximum">
+         <number>20</number>
+        </property>
+        <property name="value">
+         <number>2</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="QLabel" name="label_5">
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
         <property name="text">
-         <string/>
+         <string>装填</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QSpinBox" name="spinBox_6">
+      <item row="3" column="2">
+       <widget class="QSpinBox" name="spinBox_10">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -406,7 +480,7 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>5</number>
+         <number>2</number>
         </property>
        </widget>
       </item>
@@ -423,8 +497,8 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="4">
-       <widget class="QSpinBox" name="spinBox_34">
+      <item row="2" column="3">
+       <widget class="QSpinBox" name="spinBox_7">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -432,25 +506,28 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>5</number>
+         <number>7</number>
         </property>
        </widget>
       </item>
-      <item row="7" column="1">
-       <widget class="QSpinBox" name="spinBox_31">
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label_2">
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
         </property>
-        <property name="maximum">
-         <number>20</number>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
         </property>
-        <property name="value">
-         <number>16</number>
+        <property name="text">
+         <string>杀伤</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="3" column="5">
-       <widget class="QSpinBox" name="spinBox_27">
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="spinBox_9">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -458,12 +535,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>0</number>
+         <number>20</number>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QSpinBox" name="spinBox_9">
+      <item row="6" column="4">
+       <widget class="QSpinBox" name="spinBox_24">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -471,12 +548,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>20</number>
+         <number>16</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QLabel" name="label_3">
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_9">
         <property name="frameShape">
          <enum>QFrame::Box</enum>
         </property>
@@ -484,15 +561,31 @@
          <enum>QFrame::Sunken</enum>
         </property>
         <property name="text">
-         <string>破防</string>
+         <string>M2</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="2" column="4">
-       <widget class="QSpinBox" name="spinBox_8">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="text">
+         <string>BGM-71</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="1">
+       <widget class="QSpinBox" name="spinBox_36">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -504,8 +597,8 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="2">
-       <widget class="QSpinBox" name="spinBox_14">
+      <item row="8" column="4">
+       <widget class="QSpinBox" name="spinBox_39">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -513,7 +606,7 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>2</number>
+         <number>7</number>
         </property>
        </widget>
       </item>
@@ -530,8 +623,8 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="3">
-       <widget class="QSpinBox" name="spinBox_15">
+      <item row="8" column="3">
+       <widget class="QSpinBox" name="spinBox_38">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -539,12 +632,19 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>5</number>
+         <number>6</number>
         </property>
        </widget>
       </item>
-      <item row="5" column="5">
-       <widget class="QSpinBox" name="spinBox_29">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_12">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="2">
+       <widget class="QSpinBox" name="spinBox_32">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -552,12 +652,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>0</number>
+         <number>8</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
-       <widget class="QSpinBox" name="spinBox_3">
+      <item row="7" column="3">
+       <widget class="QSpinBox" name="spinBox_33">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -565,12 +665,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>7</number>
+         <number>9</number>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QSpinBox" name="spinBox_5">
+      <item row="4" column="1">
+       <widget class="QSpinBox" name="spinBox_13">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -578,44 +678,25 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>10</number>
+         <number>18</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="frameShape">
-         <enum>QFrame::Box</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
-        </property>
-        <property name="text">
-         <string>BGM-71</string>
-        </property>
+      <item row="6" column="5">
+       <widget class="QSpinBox" name="spinBox_30">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="5">
-       <widget class="QLabel" name="label_13">
-        <property name="frameShape">
-         <enum>QFrame::Box</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
-        </property>
-        <property name="text">
-         <string>自由</string>
+        <property name="maximum">
+         <number>20</number>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
+        <property name="value">
+         <number>0</number>
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
-       <widget class="QSpinBox" name="spinBox_10">
+      <item row="1" column="2">
+       <widget class="QSpinBox" name="spinBox_2">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -623,12 +704,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>2</number>
+         <number>10</number>
         </property>
        </widget>
       </item>
-      <item row="7" column="2">
-       <widget class="QSpinBox" name="spinBox_32">
+      <item row="6" column="1">
+       <widget class="QSpinBox" name="spinBox_21">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -636,12 +717,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>8</number>
+         <number>10</number>
         </property>
        </widget>
       </item>
-      <item row="4" column="4">
-       <widget class="QSpinBox" name="spinBox_16">
+      <item row="2" column="5">
+       <widget class="QSpinBox" name="spinBox_26">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -649,12 +730,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>10</number>
+         <number>0</number>
         </property>
        </widget>
       </item>
-      <item row="5" column="4">
-       <widget class="QSpinBox" name="spinBox_20">
+      <item row="1" column="4">
+       <widget class="QSpinBox" name="spinBox_4">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -662,12 +743,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>5</number>
+         <number>3</number>
         </property>
        </widget>
       </item>
-      <item row="2" column="3">
-       <widget class="QSpinBox" name="spinBox_7">
+      <item row="4" column="5">
+       <widget class="QSpinBox" name="spinBox_28">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -675,12 +756,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>7</number>
+         <number>0</number>
         </property>
        </widget>
       </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_11">
+      <item row="8" column="0">
+       <widget class="QLabel" name="label_19">
         <property name="frameShape">
          <enum>QFrame::Box</enum>
         </property>
@@ -688,15 +769,15 @@
          <enum>QFrame::Sunken</enum>
         </property>
         <property name="text">
-         <string>QLZ-04</string>
+         <string>PP-93</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="label_19">
+      <item row="9" column="0">
+       <widget class="QLabel" name="label_20">
         <property name="frameShape">
          <enum>QFrame::Box</enum>
         </property>
@@ -704,15 +785,15 @@
          <enum>QFrame::Sunken</enum>
         </property>
         <property name="text">
-         <string>PP-93</string>
+         <string>Mk-47</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="8" column="1">
-       <widget class="QSpinBox" name="spinBox_36">
+      <item row="9" column="1">
+       <widget class="QSpinBox" name="spinBox_41">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -720,12 +801,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>16</number>
+         <number>10</number>
         </property>
        </widget>
       </item>
-      <item row="8" column="2">
-       <widget class="QSpinBox" name="spinBox_37">
+      <item row="9" column="2">
+       <widget class="QSpinBox" name="spinBox_42">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -733,12 +814,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>2</number>
+         <number>5</number>
         </property>
        </widget>
       </item>
-      <item row="8" column="3">
-       <widget class="QSpinBox" name="spinBox_38">
+      <item row="9" column="3">
+       <widget class="QSpinBox" name="spinBox_43">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -746,12 +827,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>6</number>
+         <number>7</number>
         </property>
        </widget>
       </item>
-      <item row="8" column="4">
-       <widget class="QSpinBox" name="spinBox_39">
+      <item row="9" column="4">
+       <widget class="QSpinBox" name="spinBox_44">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -759,12 +840,12 @@
          <number>20</number>
         </property>
         <property name="value">
-         <number>7</number>
+         <number>14</number>
         </property>
        </widget>
       </item>
-      <item row="8" column="5">
-       <widget class="QSpinBox" name="spinBox_40">
+      <item row="9" column="5">
+       <widget class="QSpinBox" name="spinBox_45">
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>