Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						d5598eb714
					
				@ -260,7 +260,7 @@
 | 
				
			|||||||
                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
					                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
					                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
					                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
 | 
					                {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5},
 | 
				
			||||||
                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
					                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
					                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
					                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
				
			||||||
@ -359,7 +359,7 @@
 | 
				
			|||||||
                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
					                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
					                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
					                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
 | 
					                {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5},
 | 
				
			||||||
                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
					                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
					                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
					                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
				
			||||||
@ -457,7 +457,7 @@
 | 
				
			|||||||
                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
					                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
					                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
					                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
 | 
					                {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5},
 | 
				
			||||||
                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
					                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
					                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
					                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
				
			||||||
@ -557,7 +557,7 @@
 | 
				
			|||||||
                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
					                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
					                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
					                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
 | 
					                {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5},
 | 
				
			||||||
                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
					                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
					                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
					                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
				
			||||||
@ -657,7 +657,7 @@
 | 
				
			|||||||
                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
					                {"matrix": [8, 4], "x": 13, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
					                {"matrix": [8, 5], "x": 14, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
					                {"matrix": [8, 6], "x": 15, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
 | 
					                {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5},
 | 
				
			||||||
                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
					                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
					                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
 | 
				
			||||||
                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
					                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user