Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						4a8bed844d
					
				
					 4 changed files with 0 additions and 217 deletions
				
			
		| 
						 | 
					@ -13,7 +13,6 @@
 | 
				
			||||||
        "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
 | 
					        "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
 | 
				
			||||||
        "rows": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7"]
 | 
					        "rows": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7"]
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "url": "",
 | 
					 | 
				
			||||||
    "layouts": {
 | 
					    "layouts": {
 | 
				
			||||||
        "LAYOUT": {
 | 
					        "LAYOUT": {
 | 
				
			||||||
            "layout": [
 | 
					            "layout": [
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -358,78 +358,6 @@
 | 
				
			||||||
                {"x":12.5, "y":4},
 | 
					                {"x":12.5, "y":4},
 | 
				
			||||||
                {"x":13.5, "y":4, "w":1.5}
 | 
					                {"x":13.5, "y":4, "w":1.5}
 | 
				
			||||||
            ]
 | 
					            ]
 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        "LAYOUT_60_iso_split_bs_rshift": {
 | 
					 | 
				
			||||||
            "layout": [
 | 
					 | 
				
			||||||
                {"x":0, "y":0},
 | 
					 | 
				
			||||||
                {"x":1, "y":0},
 | 
					 | 
				
			||||||
                {"x":2, "y":0},
 | 
					 | 
				
			||||||
                {"x":3, "y":0},
 | 
					 | 
				
			||||||
                {"x":4, "y":0},
 | 
					 | 
				
			||||||
                {"x":5, "y":0},
 | 
					 | 
				
			||||||
                {"x":6, "y":0},
 | 
					 | 
				
			||||||
                {"x":7, "y":0},
 | 
					 | 
				
			||||||
                {"x":8, "y":0},
 | 
					 | 
				
			||||||
                {"x":9, "y":0},
 | 
					 | 
				
			||||||
                {"x":10, "y":0},
 | 
					 | 
				
			||||||
                {"x":11, "y":0},
 | 
					 | 
				
			||||||
                {"x":12, "y":0},
 | 
					 | 
				
			||||||
                {"x":13, "y":0},
 | 
					 | 
				
			||||||
                {"x":14, "y":0},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":1, "w":1.5},
 | 
					 | 
				
			||||||
                {"x":1.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":2.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":3.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":4.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":5.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":6.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":7.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":8.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":9.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":10.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":11.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":12.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":13.5, "y":1, "w":1.5},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":2, "w":1.75},
 | 
					 | 
				
			||||||
                {"x":1.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":2.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":3.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":4.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":5.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":6.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":7.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":8.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":9.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":10.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":11.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":12.75, "y":2, "w":2.25},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":3, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":1.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":2.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":3.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":4.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":5.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":6.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":7.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":8.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":9.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":10.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":11.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":12.25, "y":3, "w":1.75},
 | 
					 | 
				
			||||||
                {"x":14, "y":3},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":1.25, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":2.5, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":3.75, "y":4, "w":6.25},
 | 
					 | 
				
			||||||
                {"x":10, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":11.25, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":12.5, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":13.75, "y":4, "w":1.25}
 | 
					 | 
				
			||||||
            ]
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -359,78 +359,6 @@
 | 
				
			||||||
                {"x":13.5, "y":4, "w":1.5}
 | 
					                {"x":13.5, "y":4, "w":1.5}
 | 
				
			||||||
            ]
 | 
					            ]
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "LAYOUT_60_iso_split_bs_rshift": {
 | 
					 | 
				
			||||||
            "layout": [
 | 
					 | 
				
			||||||
                {"x":0, "y":0},
 | 
					 | 
				
			||||||
                {"x":1, "y":0},
 | 
					 | 
				
			||||||
                {"x":2, "y":0},
 | 
					 | 
				
			||||||
                {"x":3, "y":0},
 | 
					 | 
				
			||||||
                {"x":4, "y":0},
 | 
					 | 
				
			||||||
                {"x":5, "y":0},
 | 
					 | 
				
			||||||
                {"x":6, "y":0},
 | 
					 | 
				
			||||||
                {"x":7, "y":0},
 | 
					 | 
				
			||||||
                {"x":8, "y":0},
 | 
					 | 
				
			||||||
                {"x":9, "y":0},
 | 
					 | 
				
			||||||
                {"x":10, "y":0},
 | 
					 | 
				
			||||||
                {"x":11, "y":0},
 | 
					 | 
				
			||||||
                {"x":12, "y":0},
 | 
					 | 
				
			||||||
                {"x":13, "y":0},
 | 
					 | 
				
			||||||
                {"x":14, "y":0},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":1, "w":1.5},
 | 
					 | 
				
			||||||
                {"x":1.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":2.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":3.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":4.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":5.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":6.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":7.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":8.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":9.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":10.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":11.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":12.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":13.5, "y":1, "w":1.5},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":2, "w":1.75},
 | 
					 | 
				
			||||||
                {"x":1.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":2.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":3.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":4.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":5.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":6.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":7.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":8.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":9.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":10.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":11.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":12.75, "y":2, "w":2.25},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":3, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":1.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":2.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":3.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":4.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":5.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":6.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":7.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":8.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":9.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":10.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":11.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":12.25, "y":3, "w":1.75},
 | 
					 | 
				
			||||||
                {"x":14, "y":3},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":1.25, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":2.5, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":3.75, "y":4, "w":6.25},
 | 
					 | 
				
			||||||
                {"x":10, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":11.25, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":12.5, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":13.75, "y":4, "w":1.25}
 | 
					 | 
				
			||||||
            ]
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        "LAYOUT_all": {
 | 
					        "LAYOUT_all": {
 | 
				
			||||||
            "layout": [
 | 
					            "layout": [
 | 
				
			||||||
                {"x":0, "y":0},
 | 
					                {"x":0, "y":0},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -359,78 +359,6 @@
 | 
				
			||||||
                {"x":13.5, "y":4, "w":1.5}
 | 
					                {"x":13.5, "y":4, "w":1.5}
 | 
				
			||||||
            ]
 | 
					            ]
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "LAYOUT_60_iso_split_bs_rshift": {
 | 
					 | 
				
			||||||
            "layout": [
 | 
					 | 
				
			||||||
                {"x":0, "y":0},
 | 
					 | 
				
			||||||
                {"x":1, "y":0},
 | 
					 | 
				
			||||||
                {"x":2, "y":0},
 | 
					 | 
				
			||||||
                {"x":3, "y":0},
 | 
					 | 
				
			||||||
                {"x":4, "y":0},
 | 
					 | 
				
			||||||
                {"x":5, "y":0},
 | 
					 | 
				
			||||||
                {"x":6, "y":0},
 | 
					 | 
				
			||||||
                {"x":7, "y":0},
 | 
					 | 
				
			||||||
                {"x":8, "y":0},
 | 
					 | 
				
			||||||
                {"x":9, "y":0},
 | 
					 | 
				
			||||||
                {"x":10, "y":0},
 | 
					 | 
				
			||||||
                {"x":11, "y":0},
 | 
					 | 
				
			||||||
                {"x":12, "y":0},
 | 
					 | 
				
			||||||
                {"x":13, "y":0},
 | 
					 | 
				
			||||||
                {"x":14, "y":0},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":1, "w":1.5},
 | 
					 | 
				
			||||||
                {"x":1.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":2.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":3.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":4.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":5.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":6.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":7.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":8.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":9.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":10.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":11.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":12.5, "y":1},
 | 
					 | 
				
			||||||
                {"x":13.5, "y":1, "w":1.5},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":2, "w":1.75},
 | 
					 | 
				
			||||||
                {"x":1.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":2.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":3.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":4.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":5.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":6.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":7.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":8.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":9.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":10.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":11.75, "y":2},
 | 
					 | 
				
			||||||
                {"x":12.75, "y":2, "w":2.25},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":3, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":1.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":2.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":3.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":4.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":5.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":6.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":7.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":8.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":9.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":10.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":11.25, "y":3},
 | 
					 | 
				
			||||||
                {"x":12.25, "y":3, "w":1.75},
 | 
					 | 
				
			||||||
                {"x":14, "y":3},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                {"x":0, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":1.25, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":2.5, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":3.75, "y":4, "w":6.25},
 | 
					 | 
				
			||||||
                {"x":10, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":11.25, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":12.5, "y":4, "w":1.25},
 | 
					 | 
				
			||||||
                {"x":13.75, "y":4, "w":1.25}
 | 
					 | 
				
			||||||
            ]
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        "LAYOUT_all": {
 | 
					        "LAYOUT_all": {
 | 
				
			||||||
            "layout": [
 | 
					            "layout": [
 | 
				
			||||||
                {"x":0, "y":0},
 | 
					                {"x":0, "y":0},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue