Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						f010af0c8e
					
				@ -23,6 +23,9 @@
 | 
				
			|||||||
                {"x":11, "y":0},
 | 
					                {"x":11, "y":0},
 | 
				
			||||||
                {"x":12, "y":0},
 | 
					                {"x":12, "y":0},
 | 
				
			||||||
                {"x":13, "y":0},
 | 
					                {"x":13, "y":0},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                {"x":0, "y":1},
 | 
				
			||||||
 | 
					                {"x":1, "y":1},
 | 
				
			||||||
                {"x":2, "y":1},
 | 
					                {"x":2, "y":1},
 | 
				
			||||||
                {"x":3, "y":1},
 | 
					                {"x":3, "y":1},
 | 
				
			||||||
                {"x":4, "y":1},
 | 
					                {"x":4, "y":1},
 | 
				
			||||||
@ -35,8 +38,9 @@
 | 
				
			|||||||
                {"x":11, "y":1},
 | 
					                {"x":11, "y":1},
 | 
				
			||||||
                {"x":12, "y":1},
 | 
					                {"x":12, "y":1},
 | 
				
			||||||
                {"x":13, "y":1},
 | 
					                {"x":13, "y":1},
 | 
				
			||||||
                {"x":0, "y":1},
 | 
					
 | 
				
			||||||
                {"x":1, "y":1},
 | 
					                {"x":0, "y":2},
 | 
				
			||||||
 | 
					                {"x":1, "y":2},
 | 
				
			||||||
                {"x":2, "y":2},
 | 
					                {"x":2, "y":2},
 | 
				
			||||||
                {"x":3, "y":2},
 | 
					                {"x":3, "y":2},
 | 
				
			||||||
                {"x":4, "y":2},
 | 
					                {"x":4, "y":2},
 | 
				
			||||||
@ -49,8 +53,7 @@
 | 
				
			|||||||
                {"x":11, "y":2},
 | 
					                {"x":11, "y":2},
 | 
				
			||||||
                {"x":12, "y":2},
 | 
					                {"x":12, "y":2},
 | 
				
			||||||
                {"x":13, "y":2},
 | 
					                {"x":13, "y":2},
 | 
				
			||||||
                {"x":0, "y":2},
 | 
					
 | 
				
			||||||
                {"x":1, "y":2},
 | 
					 | 
				
			||||||
                {"x":2, "y":3},
 | 
					                {"x":2, "y":3},
 | 
				
			||||||
                {"x":3, "y":3},
 | 
					                {"x":3, "y":3},
 | 
				
			||||||
                {"x":4, "y":3},
 | 
					                {"x":4, "y":3},
 | 
				
			||||||
@ -80,6 +83,9 @@
 | 
				
			|||||||
                {"x":11, "y":0},
 | 
					                {"x":11, "y":0},
 | 
				
			||||||
                {"x":12, "y":0},
 | 
					                {"x":12, "y":0},
 | 
				
			||||||
                {"x":13, "y":0},
 | 
					                {"x":13, "y":0},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                {"x":0, "y":1},
 | 
				
			||||||
 | 
					                {"x":1, "y":1},
 | 
				
			||||||
                {"x":2, "y":1},
 | 
					                {"x":2, "y":1},
 | 
				
			||||||
                {"x":3, "y":1},
 | 
					                {"x":3, "y":1},
 | 
				
			||||||
                {"x":4, "y":1},
 | 
					                {"x":4, "y":1},
 | 
				
			||||||
@ -92,8 +98,9 @@
 | 
				
			|||||||
                {"x":11, "y":1},
 | 
					                {"x":11, "y":1},
 | 
				
			||||||
                {"x":12, "y":1},
 | 
					                {"x":12, "y":1},
 | 
				
			||||||
                {"x":13, "y":1},
 | 
					                {"x":13, "y":1},
 | 
				
			||||||
                {"x":0, "y":1},
 | 
					
 | 
				
			||||||
                {"x":1, "y":1},
 | 
					                {"x":0, "y":2},
 | 
				
			||||||
 | 
					                {"x":1, "y":2},
 | 
				
			||||||
                {"x":2, "y":2},
 | 
					                {"x":2, "y":2},
 | 
				
			||||||
                {"x":3, "y":2},
 | 
					                {"x":3, "y":2},
 | 
				
			||||||
                {"x":4, "y":2},
 | 
					                {"x":4, "y":2},
 | 
				
			||||||
@ -106,8 +113,7 @@
 | 
				
			|||||||
                {"x":11, "y":2},
 | 
					                {"x":11, "y":2},
 | 
				
			||||||
                {"x":12, "y":2},
 | 
					                {"x":12, "y":2},
 | 
				
			||||||
                {"x":13, "y":2},
 | 
					                {"x":13, "y":2},
 | 
				
			||||||
                {"x":0, "y":2},
 | 
					
 | 
				
			||||||
                {"x":1, "y":2},
 | 
					 | 
				
			||||||
                {"x":2, "y":3},
 | 
					                {"x":2, "y":3},
 | 
				
			||||||
                {"x":3, "y":3},
 | 
					                {"x":3, "y":3},
 | 
				
			||||||
                {"x":4, "y":3},
 | 
					                {"x":4, "y":3},
 | 
				
			||||||
@ -136,6 +142,9 @@
 | 
				
			|||||||
                {"x":11, "y":0},
 | 
					                {"x":11, "y":0},
 | 
				
			||||||
                {"x":12, "y":0},
 | 
					                {"x":12, "y":0},
 | 
				
			||||||
                {"x":13, "y":0},
 | 
					                {"x":13, "y":0},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                {"x":0, "y":1},
 | 
				
			||||||
 | 
					                {"x":1, "y":1},
 | 
				
			||||||
                {"x":2, "y":1},
 | 
					                {"x":2, "y":1},
 | 
				
			||||||
                {"x":3, "y":1},
 | 
					                {"x":3, "y":1},
 | 
				
			||||||
                {"x":4, "y":1},
 | 
					                {"x":4, "y":1},
 | 
				
			||||||
@ -148,8 +157,9 @@
 | 
				
			|||||||
                {"x":11, "y":1},
 | 
					                {"x":11, "y":1},
 | 
				
			||||||
                {"x":12, "y":1},
 | 
					                {"x":12, "y":1},
 | 
				
			||||||
                {"x":13, "y":1},
 | 
					                {"x":13, "y":1},
 | 
				
			||||||
                {"x":0, "y":1},
 | 
					
 | 
				
			||||||
                {"x":1, "y":1},
 | 
					                {"x":0, "y":2},
 | 
				
			||||||
 | 
					                {"x":1, "y":2},
 | 
				
			||||||
                {"x":2, "y":2},
 | 
					                {"x":2, "y":2},
 | 
				
			||||||
                {"x":3, "y":2},
 | 
					                {"x":3, "y":2},
 | 
				
			||||||
                {"x":4, "y":2},
 | 
					                {"x":4, "y":2},
 | 
				
			||||||
@ -162,8 +172,7 @@
 | 
				
			|||||||
                {"x":11, "y":2},
 | 
					                {"x":11, "y":2},
 | 
				
			||||||
                {"x":12, "y":2},
 | 
					                {"x":12, "y":2},
 | 
				
			||||||
                {"x":13, "y":2},
 | 
					                {"x":13, "y":2},
 | 
				
			||||||
                {"x":0, "y":2},
 | 
					
 | 
				
			||||||
                {"x":1, "y":2},
 | 
					 | 
				
			||||||
                {"x":2, "y":3, "w":1.25},
 | 
					                {"x":2, "y":3, "w":1.25},
 | 
				
			||||||
                {"x":3.25, "y":3, "w":1.25},
 | 
					                {"x":3.25, "y":3, "w":1.25},
 | 
				
			||||||
                {"x":4.5, "y":3, "w":7},
 | 
					                {"x":4.5, "y":3, "w":7},
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user