diff --git a/devcon-api/data/vectors/devcon-7.json b/devcon-api/data/vectors/devcon-7.json index 97ace6afb..f4f582a9d 100644 --- a/devcon-api/data/vectors/devcon-7.json +++ b/devcon-api/data/vectors/devcon-7.json @@ -11,27 +11,24 @@ "audience": "Engineering", "featured": false, "doNotRecord": false, - "tags": [ - "" - ], "keywords": [ "Programmable Cryptography", "Panel", "0xPARC" ], - "duration": 120, + "tags": [], "language": "en", - "sources_swarmHash": "swarmHash", - "sources_youtubeId": "youtubeId", - "sources_ipfsHash": "ipfsTestHash", - "sources_livepeerId": "lp01Id", + "speakers": [ + "janmajaya-mall", + "veronica-zheng", + "eduard-sanou", + "0xparc" + ], "eventId": "devcon-7", "slot_start": 1731661200000, "slot_end": 1731664800000, "slot_roomId": "main-stage", - "resources_presentation": "https://docs.google.com/presentation/d/15PuLJuxsNX_SplHtSilFiq69bAFCp-tGDBM9VNXWwm4", - "resources_slides": null, - "speakers": [] + "resources_presentation": "https://docs.google.com/presentation/d/15PuLJuxsNX_SplHtSilFiq69bAFCp-tGDBM9VNXWwm4" }, "vector": [ 6, @@ -51,6 +48,10 @@ 0, 0, 0, + 4, + 4, + 4, + 4, 0, 0, 0, @@ -639,10 +640,6 @@ 0, 0, 0, - 6, - 0, - 0, - 0, 0, 0, 0, @@ -1257,12 +1254,12 @@ 0, 0, 0, - 4, - 4, 0, 0, 0, 0, + 4, + 4, 0, 0, 0, @@ -2470,11 +2467,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -3683,12 +3680,12 @@ 0, 0, 0, - 4, - 4, 0, 0, 0, 0, + 4, + 4, 0, 0, 0, @@ -4898,11 +4895,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -6109,12 +6106,12 @@ 0, 0, 0, - 4, - 4, 0, 0, 0, 0, + 4, + 4, 0, 0, 0, @@ -6709,7 +6706,7 @@ 0, 0, 6, - 2, + 6, 2, 2, 0, @@ -7328,11 +7325,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -8540,11 +8537,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -9751,11 +9748,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -10963,11 +10960,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -12174,11 +12171,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -13385,11 +13382,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -14598,12 +14595,12 @@ 0, 0, 0, - 4, - 4, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -15811,11 +15808,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -17023,11 +17020,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -18253,11 +18250,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -19465,11 +19462,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -20671,11 +20668,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -21881,11 +21878,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -23093,11 +23090,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -24305,11 +24302,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -24888,7 +24885,7 @@ 0, 0, 0, - 2, + 6, 2, 0, 0, @@ -25509,11 +25506,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -26721,11 +26718,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -27928,11 +27925,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -29138,11 +29135,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -30345,12 +30342,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -30923,7 +30920,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -31556,11 +31553,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -32765,11 +32762,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -33972,11 +33969,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -35179,11 +35176,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -36393,11 +36390,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -37606,11 +37603,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -38813,11 +38810,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -40026,12 +40023,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -41242,12 +41239,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -41809,7 +41806,7 @@ 0, 0, 0, - 2, + 6, 2, 0, 0, @@ -42457,11 +42454,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -43664,11 +43661,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -44877,11 +44874,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -46089,11 +46086,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -47307,13 +47304,13 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, 0, 0, 0, @@ -48522,11 +48519,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -49751,11 +49748,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -50960,11 +50957,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -52174,11 +52171,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -53387,12 +53384,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -54595,11 +54592,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -55806,12 +55803,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -57020,13 +57017,13 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, 0, 0, 0, @@ -58234,11 +58231,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -59446,11 +59443,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -60658,11 +60655,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -61870,12 +61867,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -63082,11 +63079,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -64256,11 +64253,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -65459,11 +65456,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -66662,11 +66659,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -67905,11 +67902,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -69082,11 +69079,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -70325,11 +70322,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -71535,11 +71532,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -72746,14 +72743,14 @@ 0, 0, 0, - 6, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, + 6, 0, 0, 0, @@ -73960,11 +73957,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -75172,11 +75169,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -76385,11 +76382,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -77597,11 +77594,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -78806,11 +78803,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -80018,13 +80015,13 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, 0, 0, 0, @@ -81230,11 +81227,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -82443,12 +82440,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -83651,11 +83648,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -84864,11 +84861,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -86069,11 +86066,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -87281,14 +87278,14 @@ 0, 0, 0, - 6, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, + 6, 0, 0, 0, @@ -88500,14 +88497,14 @@ 0, 0, 0, - 6, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, + 6, 0, 0, 0, @@ -89716,11 +89713,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -90928,11 +90925,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -92141,11 +92138,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -93352,11 +93349,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -94565,11 +94562,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -95073,7 +95070,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -95777,11 +95774,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -96989,11 +96986,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -98201,11 +98198,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -99413,11 +99410,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -100625,11 +100622,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -101838,14 +101835,14 @@ 0, 0, 0, - 6, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, + 6, 0, 0, 0, @@ -103053,11 +103050,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -104267,6 +104264,10 @@ 0, 0, 0, + 0, + 0, + 0, + 0, 6, 6, 6, @@ -104765,10 +104766,6 @@ 0, 0, 0, - 0, - 0, - 0, - 0, 2, 0, 0, @@ -105481,11 +105478,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -105975,7 +105972,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -106693,11 +106690,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -107186,7 +107183,7 @@ 0, 0, 0, - 2, + 6, 2, 0, 0, @@ -107904,11 +107901,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -109118,11 +109115,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -110330,12 +110327,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -111537,11 +111534,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -113943,11 +113940,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -115153,11 +115150,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -116365,12 +116362,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -117580,11 +117577,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -118787,11 +118784,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -119997,11 +119994,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -121209,11 +121206,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -122384,11 +122381,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -122423,11 +122420,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -123635,11 +123632,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -124845,11 +124842,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -126057,11 +126054,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -127260,12 +127257,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -128472,11 +128469,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -129639,11 +129636,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -130889,11 +130886,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -132100,11 +132097,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -133311,11 +133308,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -134521,11 +134518,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -135733,11 +135730,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -136946,12 +136943,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -138155,11 +138152,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -139368,12 +139365,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -140582,11 +140579,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -141792,11 +141789,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -143004,14 +143001,14 @@ 0, 0, 0, - 6, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, + 6, 0, 0, 0, @@ -144096,11 +144093,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -145427,11 +145424,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -146633,11 +146630,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -147837,11 +147834,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -149049,11 +149046,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -150261,11 +150258,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -151472,12 +151469,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -152687,12 +152684,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -153895,11 +153892,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -155101,11 +155098,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -156317,14 +156314,14 @@ 0, 0, 0, - 6, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, + 6, 0, 0, 0, @@ -157526,11 +157523,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -158749,6 +158746,10 @@ 0, 0, 0, + 0, + 0, + 0, + 0, 6, 6, 6, @@ -159169,10 +159170,6 @@ 0, 0, 0, - 0, - 0, - 0, - 0, 6, 0, 0, @@ -159959,11 +159956,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -161176,11 +161173,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -162382,11 +162379,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -163592,11 +163589,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -164806,12 +164803,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -166024,12 +166021,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -167235,12 +167232,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -168449,12 +168446,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -168874,7 +168871,7 @@ 0, 0, 6, - 2, + 6, 2, 0, 0, @@ -169662,11 +169659,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -170880,14 +170877,14 @@ 0, 0, 0, - 6, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, + 6, 0, 0, 0, @@ -172090,11 +172087,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -173302,13 +173299,13 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, 0, 0, 0, @@ -174515,11 +174512,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -175725,11 +175722,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -176937,11 +176934,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -178151,11 +178148,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -179363,11 +179360,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -180577,11 +180574,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -181785,11 +181782,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -183002,12 +182999,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -184215,11 +184212,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -185425,11 +185422,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -186639,11 +186636,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -187854,13 +187851,13 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, 0, 0, 0, @@ -189059,11 +189056,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -190268,11 +190265,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -191476,11 +191473,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -192684,13 +192681,13 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, 0, 0, 0, @@ -193899,11 +193896,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -195109,11 +195106,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -196322,12 +196319,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -196713,7 +196710,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -197534,12 +197531,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -198740,11 +198737,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -199127,7 +199124,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -199950,11 +199947,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -201162,11 +201159,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -202375,11 +202372,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -203579,11 +203576,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -204792,11 +204789,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -206004,11 +206001,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -207215,11 +207212,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -208424,11 +208421,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -209630,11 +209627,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -210837,12 +210834,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -212042,11 +212039,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -213018,11 +213015,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -214324,11 +214321,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -215645,11 +215642,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -216868,11 +216865,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -217937,11 +217934,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -217976,11 +217973,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -219171,6 +219168,10 @@ 0, 0, 0, + 0, + 0, + 0, + 0, 6, 0, 0, @@ -219655,10 +219656,6 @@ 0, 0, 0, - 0, - 0, - 0, - 0, 6, 0, 0, @@ -220511,11 +220508,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -221723,12 +221720,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -222936,11 +222933,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -224153,11 +224150,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -225362,11 +225359,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -226574,11 +226571,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -227781,11 +227778,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -228989,11 +228986,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -230206,14 +230203,14 @@ 0, 0, 0, - 6, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, + 6, 0, 0, 0, @@ -231419,11 +231416,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -232631,11 +232628,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -233840,11 +233837,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -235052,11 +235049,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -236260,11 +236257,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -237470,11 +237467,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -238599,11 +238596,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -238621,11 +238618,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -238688,12 +238685,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -239898,11 +239895,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -241087,11 +241084,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -242315,11 +242312,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -244582,11 +244579,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -244727,13 +244724,13 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, 0, 0, 0, @@ -245940,11 +245937,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -247152,11 +247149,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -248176,11 +248173,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -248705,7 +248702,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -249574,11 +249571,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -250786,11 +250783,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -251994,11 +251991,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -253206,12 +253203,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -254418,11 +254415,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -255626,11 +255623,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -256832,11 +256829,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -258045,11 +258042,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -258378,7 +258375,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -259256,11 +259253,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -260469,11 +260466,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -261679,11 +261676,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -262887,11 +262884,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -264096,11 +264093,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -265315,11 +265312,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -266526,12 +266523,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -267731,11 +267728,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -268942,11 +268939,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -270151,11 +270148,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -271365,13 +271362,13 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 6, 0, 0, 0, @@ -272581,11 +272578,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -273793,11 +273790,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -275005,11 +275002,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -276219,11 +276216,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -277428,11 +277425,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -278445,11 +278442,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -278609,11 +278606,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -279852,11 +279849,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -281063,11 +281060,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -282276,11 +282273,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -283488,11 +283485,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -284703,11 +284700,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -285909,11 +285906,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -286887,11 +286884,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -288332,11 +288329,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -289545,11 +289542,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -290757,11 +290754,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -291970,11 +291967,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -293179,12 +293176,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -294366,6 +294363,10 @@ 0, 0, 0, + 0, + 0, + 0, + 0, 6, 0, 0, @@ -294707,10 +294708,6 @@ 0, 0, 0, - 0, - 0, - 0, - 0, 2, 0, 0, @@ -295607,11 +295604,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -296817,11 +296814,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -298033,11 +298030,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -299245,11 +299242,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -300387,11 +300384,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -301666,11 +301663,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -302878,11 +302875,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -304084,11 +304081,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -305296,11 +305293,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -306507,11 +306504,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -307719,12 +307716,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -308929,11 +308926,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -310074,11 +310071,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -310138,12 +310135,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -311030,11 +311027,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -311629,7 +311626,7 @@ 0, 0, 6, - 2, + 6, 0, 0, 0, @@ -312561,11 +312558,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -313767,11 +313764,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -314971,11 +314968,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -316187,11 +316184,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -317399,12 +317396,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -318612,11 +318609,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -319823,11 +319820,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -321041,11 +321038,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -322244,11 +322241,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -323454,11 +323451,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -324664,11 +324661,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -325864,11 +325861,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -327080,11 +327077,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -328292,11 +328289,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -329502,11 +329499,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -330716,11 +330713,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -331925,12 +331922,12 @@ 0, 0, 0, - 6, - 0, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -332187,7 +332184,7 @@ 0, 0, 0, - 2, + 6, 2, 0, 0, @@ -333132,11 +333129,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -334346,11 +334343,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -335558,11 +335555,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -336769,11 +336766,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -337977,11 +337974,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -339190,12 +339187,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -340403,11 +340400,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -341613,11 +341610,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -342823,11 +342820,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -344034,11 +344031,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -345242,11 +345239,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -346454,11 +346451,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -347408,11 +347405,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -348872,11 +348869,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -350086,11 +350083,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -351297,12 +351294,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -352506,11 +352503,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -353716,11 +353713,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -354928,12 +354925,12 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, 0, 0, 0, @@ -356139,11 +356136,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -357349,11 +357346,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -358557,11 +358554,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -359466,11 +359463,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -360979,11 +360976,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -361815,6 +361812,9 @@ 0, 0, 0, + 4, + 4, + 4, 0, 0, 0, @@ -362185,9 +362185,6 @@ 0, 0, 0, - 6, - 6, - 6, 0, 0, 0, @@ -363394,8 +363391,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -364613,8 +364610,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -365825,8 +365822,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -367037,8 +367034,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -368249,6 +368246,7 @@ 0, 0, 0, + 0, 6, 6, 6, @@ -368492,7 +368490,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -369115,11 +369112,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -369721,7 +369719,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -370671,8 +370668,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -371879,8 +371876,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -372984,11 +372981,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -374291,8 +374288,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -374513,7 +374510,7 @@ 0, 0, 0, - 2, + 6, 2, 0, 0, @@ -375309,11 +375306,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -376713,8 +376710,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -377921,8 +377918,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -380334,8 +380331,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -381546,8 +381543,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -382757,6 +382754,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -383028,7 +383026,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -383965,8 +383962,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -385172,8 +385169,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -386317,11 +386314,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -386587,7 +386585,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -387593,8 +387590,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -388801,8 +388798,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -390005,8 +390002,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -391217,8 +391214,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -392428,8 +392425,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -392635,7 +392632,7 @@ 0, 0, 0, - 2, + 6, 2, 0, 0, @@ -393637,8 +393634,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -394843,8 +394840,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -396069,8 +396066,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -396273,7 +396270,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -397286,6 +397283,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -397493,7 +397491,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -398498,8 +398495,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -399704,8 +399701,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -400914,8 +400911,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -402016,11 +402013,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -402032,10 +402030,10 @@ 0, 0, 0, - 6, 0, 0, 0, + 6, 0, 0, 0, @@ -402854,7 +402852,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -403157,11 +403154,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -404376,11 +404373,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -405747,8 +405744,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -406956,8 +406953,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -408164,8 +408161,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -409376,8 +409373,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -410591,8 +410588,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -410783,7 +410780,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -411804,6 +411801,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -411983,7 +411981,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -413016,6 +413013,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -413198,7 +413196,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -414228,6 +414225,7 @@ 0, 0, 0, + 0, 6, 6, 6, @@ -414405,7 +414403,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -415445,6 +415442,7 @@ 0, 0, 0, + 0, 6, 6, 6, @@ -415700,7 +415698,6 @@ 0, 0, 0, - 0, 2, 2, 0, @@ -416659,8 +416656,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -417873,8 +417870,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -419083,8 +419080,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -420295,8 +420292,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -421505,8 +421502,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -422716,8 +422713,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -423923,6 +423920,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -424079,7 +424077,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -425137,8 +425134,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -425978,11 +425975,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -426521,8 +426519,7 @@ 0, 0, 0, - 0, - 2, + 6, 0, 0, 0, @@ -427569,8 +427566,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -428777,8 +428774,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -429985,8 +429982,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -431063,11 +431060,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -432402,6 +432399,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -432772,7 +432770,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -433614,6 +433611,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -433761,7 +433759,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -434828,6 +434825,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -434995,7 +434993,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -435893,11 +435890,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -436799,6 +436796,7 @@ 0, 0, 0, + 4, 0, 0, 0, @@ -437171,7 +437169,6 @@ 0, 0, 0, - 6, 0, 0, 0, @@ -438454,8 +438451,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -439666,8 +439663,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -440873,8 +440870,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -443180,11 +443177,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -444241,11 +444238,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -445712,8 +445709,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -446925,8 +446922,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -447081,7 +447078,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -448129,8 +448126,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -449338,6 +449335,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -449480,7 +449478,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -450549,8 +450546,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -451765,8 +451762,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -452971,8 +452968,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -454181,8 +454178,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -454331,7 +454328,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -455396,8 +455393,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -456604,8 +456601,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -457813,8 +457810,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -459024,8 +459021,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -460238,8 +460235,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -461451,8 +461448,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -462661,8 +462658,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -463867,8 +463864,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -465077,8 +465074,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -466290,8 +466287,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -467504,6 +467501,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -467664,7 +467662,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -468715,8 +468712,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -469923,8 +469920,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -471134,8 +471131,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -472344,8 +472341,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -473112,11 +473109,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -473766,7 +473764,6 @@ 0, 0, 0, - 0, 2, 0, 2, @@ -474670,8 +474667,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -475714,11 +475711,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -476101,7 +476099,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -476840,11 +476837,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -478406,8 +478403,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -479616,8 +479613,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -480833,8 +480830,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -482043,8 +482040,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -483254,8 +483251,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -484467,8 +484464,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -485679,8 +485676,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -486892,8 +486889,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -488102,8 +488099,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -489320,8 +489317,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -490528,8 +490525,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -491736,8 +491733,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -492945,8 +492942,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -494155,8 +494152,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -495184,11 +495181,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -496578,8 +496575,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -497663,11 +497660,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -497901,7 +497898,7 @@ 0, 0, 0, - 2, + 6, 2, 0, 0, @@ -498994,6 +498991,7 @@ 0, 0, 0, + 0, 6, 6, 6, @@ -499581,7 +499579,6 @@ 0, 0, 0, - 0, 2, 2, 0, @@ -500203,8 +500200,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -501413,8 +501410,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -502369,11 +502366,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -503831,8 +503828,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -505034,8 +505031,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -506240,8 +506237,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -507224,11 +507221,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -507571,7 +507569,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -508670,8 +508667,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -509880,8 +509877,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -510875,11 +510872,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -512302,8 +512299,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -513505,8 +513502,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -514714,8 +514711,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -515926,8 +515923,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -517136,8 +517133,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -518349,8 +518346,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -519563,8 +519560,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -519659,7 +519656,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -520739,8 +520736,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -521470,11 +521467,11 @@ 0, 0, 0, - 4, 0, 0, 0, 0, + 4, 0, 0, 0, @@ -523187,8 +523184,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -524398,8 +524395,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -524492,7 +524489,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -525567,8 +525564,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -526819,8 +526816,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -528031,8 +528028,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -528960,11 +528957,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -530437,8 +530434,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -531658,8 +531655,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -532868,8 +532865,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -534080,8 +534077,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -535307,8 +535304,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -536511,8 +536508,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -537721,8 +537718,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -538936,6 +538933,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -539006,7 +539004,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -540040,8 +540037,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -541359,8 +541356,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -542568,6 +542565,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -542649,8 +542647,7 @@ 0, 0, 0, - 0, - 2, + 6, 0, 0, 0, @@ -543424,11 +543421,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -543598,11 +543595,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -544859,6 +544856,7 @@ 0, 0, 0, + 0, 6, 0, 0, @@ -545077,7 +545075,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -546206,8 +546203,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -547416,8 +547413,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -548624,8 +548621,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -549843,8 +549840,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -550603,11 +550600,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -552263,8 +552260,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -553475,8 +553472,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -554262,11 +554259,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -555029,7 +555027,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -555893,6 +555890,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -556039,7 +556037,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -557101,6 +557098,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -557272,7 +557270,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -558189,6 +558186,7 @@ 0, 0, 0, + 0, 6, 0, 0, @@ -558420,7 +558418,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -559529,8 +559526,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -560738,8 +560735,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -561931,6 +561928,7 @@ 0, 0, 0, + 0, 6, 0, 0, @@ -562079,7 +562077,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -563169,6 +563166,7 @@ 0, 0, 0, + 0, 6, 6, 6, @@ -563221,7 +563219,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -564377,8 +564374,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -565589,8 +565586,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -566802,6 +566799,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -566861,7 +566859,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -568737,11 +568734,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -568782,12 +568779,13 @@ 0, 0, 0, - 6, - 6, 0, 0, 0, 0, + 6, + 6, + 0, 0, 0, 0, @@ -569348,7 +569346,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -570432,6 +570429,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -570998,7 +570996,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -571641,8 +571638,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -572853,8 +572850,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -574064,6 +574061,7 @@ 0, 0, 0, + 0, 6, 6, 6, @@ -574414,7 +574412,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -575275,8 +575272,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -576488,8 +576485,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -577704,6 +577701,7 @@ 0, 0, 0, + 0, 6, 6, 6, @@ -577780,7 +577778,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -580116,8 +580113,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -581331,6 +581328,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -581358,7 +581356,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -582073,11 +582070,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -583748,8 +583745,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -584957,8 +584954,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -586164,8 +586161,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -587380,8 +587377,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -588588,6 +588585,7 @@ 0, 0, 0, + 0, 6, 6, 0, @@ -588734,7 +588732,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -589798,8 +589795,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -590571,11 +590568,12 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, + 0, 0, 0, 0, @@ -591561,7 +591559,6 @@ 0, 0, 0, - 0, 2, 2, 0, @@ -592215,8 +592212,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -593044,11 +593041,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -594632,8 +594629,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -595760,8 +595757,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -597051,8 +597048,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -598255,8 +598252,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -599469,8 +599466,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -600483,6 +600480,7 @@ 0, 0, 0, + 0, 6, 0, 0, @@ -600754,7 +600752,6 @@ 0, 0, 0, - 0, 2, 0, 0, @@ -601430,11 +601427,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -603045,6 +603042,7 @@ 0, 0, 0, + 0, 6, 0, 0, @@ -603107,7 +603105,6 @@ 0, 0, 0, - 0, 6, 0, 0, @@ -604302,8 +604299,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, @@ -605144,11 +605141,11 @@ 0, 0, 0, - 6, 0, 0, 0, 0, + 6, 0, 0, 0, @@ -605535,7 +605532,7 @@ 0, 0, 0, - 2, + 6, 0, 0, 0, @@ -606723,8 +606720,8 @@ 0, 0, 0, - 6, 0, + 6, 0, 0, 0, diff --git a/devcon-api/data/vectors/dictionary.json b/devcon-api/data/vectors/dictionary.json index 8c8012ca7..051324696 100644 --- a/devcon-api/data/vectors/dictionary.json +++ b/devcon-api/data/vectors/dictionary.json @@ -1,7 +1,6 @@ { "tracks": [ "Real World Ethereum", - "Applied Cryptography", "Coordination", "Security", "Core Protocol", @@ -10,21 +9,20 @@ "Cypherpunk & Privacy", "Layer 2", "Usability", + "Applied Cryptography", "[CLS] Learn How To Build On Ethereum & Capture the Flag Game, by BuidlGuidl", "[CLS] MUD Community-Led Session, by 0xParc", - "[CLS] POD and Cryptographic Gadgets, by 0xParc", "", "[CLS] Infinite Endgames by Ethereum Magicians", "[CLS] Formal Verification Hangout, FV Team", - "[CLS] \"Web of roots\" (Use Cases Day)", - "Experiences" + "Experiences", + "[CLS] \"Web of roots\" (Use Cases Day)" ], "speakers": [ "janmajaya-mall", "veronica-zheng", "eduard-sanou", "0xparc", - "cperezz", "venkatesh-rao", "tim-beiko", "qi-su", @@ -33,11 +31,14 @@ "roozbeh-sarenche", "ahmad", "andrew-twyman", + "hsyodyssey", "mf", "palina-tolmach", "clement-lesaege", "michael-moser", "conor-mcmenamin", + "yiannis-psaras", + "dennis-trautwein", "mislav-javor", "henri-stern", "joshua-cheong", @@ -47,6 +48,7 @@ "migalabs", "atheartengineer", "patricio-worthalter", + "hridam-basu", "toni-wahrstatter", "patrick-mccorry", "joe-andrews", @@ -63,6 +65,7 @@ "azam-soleimanian", "bogdan-ursu", "maryam-bahrani", + "gideon-kaempfer", "sasha-shilina", "daniel-lehrner", "rumee-singh", @@ -81,6 +84,7 @@ "evan-griffiths", "peter-jung", "ray-jacobson", + "julien-niset", "franck-royer", "saleel", "yanis", @@ -96,6 +100,8 @@ "oren-katz", "farhad-asgarov", "lukas-rosario", + "aisling-connolly", + "richard", "andrew-lu", "gnana-lakshmi", "chuxin-huang", @@ -113,6 +119,8 @@ "rachel-brissenden", "wbnns", "auryn-macmillan", + "jonah-burian", + "thanh-hai-tran", "lisa-akselrod", "derek-chiang", "konrad-urban", @@ -136,8 +144,6 @@ "wanseob-lim", "puja-ohlhaver", "eric-alston", - "kaseth", - "professor-robin-hanson", "sxysun", "christoph-schlegel", "dr-john-fletcher-phd", @@ -146,6 +152,7 @@ "elia-anzuoni", "nalin-b", "josef-je", + "kelvin-fichter", "minh-ho", "simona-pop", "aya-miyaguchi", @@ -157,6 +164,7 @@ "sarah-allen", "chris", "davide-rezzoli", + "lisa-jy-tan", "andrew-davis", "sam-calder-mason", "aellison-cassimiro", @@ -169,6 +177,7 @@ "kolby-moroz-liebl", "joe-lubin", "anna-stone", + "andreas", "mikhail-kalinin", "alex-vlasov", "heidi-wilder", @@ -193,6 +202,8 @@ "ahmad-bitar", "launamu", "sejal-rekhan", + "kaseth", + "robin-hanson", "pierre-daix-moreux", "arnaucube", "mateusz-radomski", @@ -204,6 +215,7 @@ "tincho", "matta", "saucecri", + "jota-carpanelli", "kevin-owocki", "james-morgan", "arnakorn-baimongkol", @@ -213,14 +225,17 @@ "hudson-jameson", "pooja-ranjan", "youssef-el-housni", + "hubert-ritzdorf", "elaine-hu", + "stefan-kobrc", + "stereum-team", + "david-muhlbacher", "diego-losada", "marc-harvey-hill", - "mikko-ohtamaa", "small-brain", "tim", "sun-haochen", - "fudong", + "fudong-wu", "alexander-urbelis", "vincenzo-furcillo", "jordi-baylina", @@ -244,18 +259,20 @@ "peter-szilagyi", "phil-ngo", "marek-moraczynski", - "nixo-rokish", + "nixo", "richard-moore", "justin-glibert", "hilmar-petursson", - "kelvin-fichter", "ngweihaneth", "dominic-bruetsch", "danno-ferrin", "alex-murashkin", + "rodiazet", "ohm", "mario-vega", + "danceratopz", "dimitry-kh", + "spencer-taylor-brown", "terence", "yoav-weiss", "mounir-benchemled", @@ -269,8 +286,8 @@ "david-pearce", "igor-konnov", "zoe-p", + "mario-havel", "luca-donno", - "aisling-connolly", "leo-jeong", "sid-chakravarthy", "phuc-thai", @@ -283,7 +300,9 @@ "jacek-glen", "marekm25", "felipe-argento", + "christopher-fabian", "peter-van-valkenburgh", + "tanisha-katara", "hulk", "maade", "phoomparin-mano", @@ -297,9 +316,7 @@ "wodann", "dominik-teiml", "dapplion", - "thanh-hai-tran", "tarun-chitra", - "rob-knight", "nicolas-garcia", "nick-almond", "laurence-day", @@ -308,7 +325,6 @@ "hart-montgomery", "storm-slivkoff", "bartosz-barwikowski", - "jota-carpanelli", "jsvisa", "justin-banon", "jason-potts", @@ -328,7 +344,7 @@ "panjamapong-sermsawatsri", "ryan-smith", "audrey-tang", - "cortze", + "mikel-cortes-cortze", "pascal", "marshall-vyletel-jr", "wei-dai", @@ -336,14 +352,17 @@ "kaan", "grant", "diego-kingston", + "enrico-bottazzi", "caspar-schwarz-schilling", "holke-brammer", "bitbeckers", "peter-garamvolgyi", "krzysztof-urbanski", + "daniel-marz", "ansgar-dietrichs", "ben-fisch", "jcp", + "tbd", "akaki-mamageishvili", "james-waugh", "mudit-gupta", @@ -370,11 +389,13 @@ "leo-lara", "ya-wen-jeng", "moven-tsai", + "cperezz", "rasul-ibragimov", "vanishree-rao", "johannes-rude-jensen", "nuno-loureiro", "jeff-emmett", + "alex-forshtat", "eva-wong", "ariah-klages-mundt", "tammy-yang", @@ -395,7 +416,6 @@ "gary-thung", "giacomo-barbieri", "nicolas-bacca", - "noah-yeh", "ryan-berckmans", "jose-pedro-cabrita", "sasha", @@ -410,10 +430,8 @@ "shouki-tsuda", "albert-ni", "vitalik-buterin", - "danceratopz", "noturhandle", "trent-van-epps", - "jonah-burian", "jochen-hoenicke", "abhimanyu-shekhawat", "diego-fernandez", @@ -429,6 +447,7 @@ "hazel-devjani", "gen", "yvonne", + "everton-fraga", "dev-lewis", "georgios-konstantopoulos", "will-villanueva", @@ -459,28 +478,30 @@ "pedro-gomes", "paul-brody", "manualzuru", - "vishwa-mehta", "vectorized", + "vishwa-mehta", "qianchen-q-yu", "sunny-aggarwal", "adrian-brink", "emily", - "onebalance-daniel-w", + "ankit-chiplunkar", "edwin-aoki", "gerben-kijne", + "aavegotch1eth", + "haurog", "henri", "julian-ma", "james-prestwich", "jeff-lau", "fatemeh-fannizadeh", "amal-ibraymi", - "daniel-marz", "fernando-collado", "atsushi-hayashi", "parithosh-jayanthi", "jean-philippe-bossuat", "ann-brody", "jack-sanford", + "daniel-yanev", "sandeep-nailwal", "andy", "niha", @@ -489,6 +510,7 @@ "giacomo", "joshua-tan", "gabriel-coutinho-de-paula", + "mikko-ohtamaa", "alex-towle", "merlin-egalite", "lucas-manuel", @@ -521,14 +543,14 @@ "arb", "brad-bachu", "cody-born", + "sinu", "jason-chaskin", "gajinder-singh", - "lisa-jy-tan", "jesus", "sina-mahmoodi", "kim-persson", + "noah-yeh", "kate-eldaly", - "richard", "spencer-graham", "rob-stupay", "joan-baylina", @@ -549,7 +571,7 @@ "charles-st-louis", "nebojsa-urosevic", "pavle-drobnjak", - "hiroyuki-hiroism007", + "hiroyuki-tachibana", "nico", "hector-masip-ardevol", "felicia-barcelo", @@ -559,7 +581,6 @@ "mario-behling", "brianna-chang", "mishari-muqbil", - "tanisha-katara", "vijay-mohan", "medha-kothari", "lukas-schor", @@ -579,16 +600,16 @@ "toghrul-maharramov", "shuyao-kong", "kain-warwick", + "vaibhav-chellani", "pratyush-ranjan-tiwari", + "alexandre-belling", "bruno-macaes", "jason-vranek", + "simon-emanuel-schmid", "uma-roy", "andrei-maiboroda" ], "tags": [ - "Homomorphic Encryption", - "Use cases of cryptography", - "exploration", "adoption", "Security", "Fuzzing", @@ -609,8 +630,16 @@ "Zero-Knowledge", "Cryptography", "zupass", + "Core Protocol", + "Light Clients", + "Tooling", + "DePIN", + "Mobile", + "mobile-based", + "light", "Anonymity", "Free Speech", + "Use cases of cryptography", "cracking", "DevEx", "Best Practices", @@ -628,6 +657,9 @@ "Fragmentation", "Tokenomics", "based", + "Protocol Design", + "Network State", + "gossipsub", "Developer Infrastructure", "Account Abstraction", "Intents", @@ -637,7 +669,6 @@ "UI/UX", "Accessibility", "application", - "Core Protocol", "Architecture", "EIP4844", "Blobs", @@ -663,8 +694,11 @@ "User Research", "network", "MPC", + "Homomorphic Encryption", "education", "startup", + "Identity", + "noir", "penalties", "DAO", "Governance", @@ -674,17 +708,13 @@ "Privacy", "debunking", "Frameworks", - "Network State", "Political systems", "Regulation", "Open Source Software", "Public good", - "Tooling", "Values", "sequencer", "pre-confirmations", - "Identity", - "Mobile", "proving", "practice", "Live Coding", @@ -693,6 +723,8 @@ "provable", "fee", "multidimensional", + "starknet", + "recursion", "Solarpunk", "Ethereum for Good", "intellectual", @@ -725,6 +757,7 @@ "e/acc", "Sufficient decentralization", "mass", + "integrations", "resiliency", "zk-identity", "erc-4337", @@ -739,22 +772,23 @@ "DevRel", "developer", "community", - "starknet", "next-gen", "zkproofs", "hardware", "Social", "key", "session", - "pod", "real-world", "Layer 3s", "metrics", "10x", "experiments", "adaptability", - "Protocol Design", "system", + "Consensus Mechanisms", + "execution", + "tickets", + "Formal Verification", "privacy-preserving", "blockchain", "Cross-L2", @@ -772,12 +806,10 @@ "gpu", "buses", "plurality", - "Formal Verification", "yul", "lean", "itp", "client-side", - "Consensus Mechanisms", "slashing", "commitment", "DeSci", @@ -789,6 +821,7 @@ "compilers", "Digital Sovereignty", "cryptonative", + "explainer", "parallel", "Vision", "culture", @@ -798,6 +831,7 @@ "cybernetics", "dark", "fairness", + "macro/micro economics", "Testing", "observability", "debugging", @@ -808,6 +842,8 @@ "Regenerative Applications", "hypercerts", "emerging", + "mutual", + "aid", "Hacks", "Event monitoring", "threat", @@ -818,7 +854,6 @@ "Bounties", "smart", "contracts", - "DePIN", "communication", "real", "rtc", @@ -833,6 +868,8 @@ "discovery", "redistribution", "phishing", + "Bug", + "contest", "mainstream", "luxury", "management", @@ -848,11 +885,12 @@ "processes", "elliptic", "curves", + "eof", "cross-domain", "arbitrage", + "access", "encryption", "mempool", - "fatf", "p2p", "user", "safety", @@ -873,7 +911,6 @@ "api", "eve", "online", - "explainer", "Verkle trees", "state", "expiry", @@ -893,12 +930,13 @@ "TEE", "farcaster", "FOSS", - "Bug", "Politics", "Hardware wallets", "arduino", "mechanism", "theorem", + "self", + "hosting", "Challenge period", "fraud", "confidentiality", @@ -914,11 +952,11 @@ "agriculture", "metamorphic", "infrastructure", - "execution", "layer", "Appchains", "metering", "Mixers", + "voting", "android", "Art", "solidity", @@ -929,7 +967,6 @@ "apalache", "Restaking", "proof-of", - "web", "Languages", "language", "citizens", @@ -939,7 +976,6 @@ "development", "bandwidth", "exploits", - "contest", "service", "level", "web3", @@ -954,13 +990,14 @@ "economy", "simulation", "interoperability", + "pod", "reed-solomon", + "finance", "precompile", "EVM-equivalent", "defi", "programming", "dynamic", - "macro/micro economics", "global", "lazarus", "gkr", @@ -970,7 +1007,6 @@ "l10n", "indexing", "lunarpunk", - "voting", "messaging", "agorism", "composability", @@ -979,6 +1015,7 @@ "Marketing", "memes", "merkle", + "exploration", "mpc101", "onchain", "mmev", @@ -1010,7 +1047,6 @@ "verification", "programmable", "theory", - "tickets", "Reentrancy", "invariants", "Validiums", @@ -1054,6 +1090,7 @@ "apps", "devops", "audit", + "specialisation", "selective", "disclosure", "decolonial", @@ -1061,11 +1098,11 @@ "Optimistic", "rollups", "digital", + "fatf", "history", "fixed", "rate", "arbitrum", - "Light Clients", "capital", "mixnet", "cryptoanarchy", @@ -1111,16 +1148,23 @@ "choice", "hard", "bft", + "intent", "censorship", "resistance", + "polynomial-iop", "shared", "agglayer", + "onboarding", "lightclient", "type1", - "starks", - "eof" + "starks" + ], + "expertise": [ + "Beginner", + "Intermediate", + "Expert", + "" ], - "expertise": ["Beginner", "Intermediate", "Expert", ""], "audiences": [ "Engineering", "Community", @@ -1137,4 +1181,4 @@ "Local/SEA", "Hobby" ] -} +} \ No newline at end of file diff --git a/devcon-api/src/db/devcon.db b/devcon-api/src/db/devcon.db index 3a3368c50..06b261404 100644 Binary files a/devcon-api/src/db/devcon.db and b/devcon-api/src/db/devcon.db differ diff --git a/devcon-api/src/swagger/definition.json b/devcon-api/src/swagger/definition.json index 0145e7eb0..cd9af7fdf 100644 --- a/devcon-api/src/swagger/definition.json +++ b/devcon-api/src/swagger/definition.json @@ -62,36 +62,6 @@ } } }, - "/account/import/{id}": { - "get": { - "tags": [ - "Account" - ], - "description": "", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "type": "string" - } - ], - "responses": { - "200": { - "description": "OK" - }, - "400": { - "description": "Bad Request" - }, - "404": { - "description": "Not Found" - }, - "500": { - "description": "Internal Server Error" - } - } - } - }, "/account/{id}": { "put": { "tags": [ diff --git a/devcon-app/src/pages/index.tsx b/devcon-app/src/pages/index.tsx index f7457e80b..26478b8cf 100644 --- a/devcon-app/src/pages/index.tsx +++ b/devcon-app/src/pages/index.tsx @@ -30,6 +30,9 @@ const Index = (props: any) => { } }, []) + // TODO: Temporary test launch + return <> + return ( diff --git a/devcon-app/src/pages/schedule.tsx b/devcon-app/src/pages/schedule.tsx index 191532a7a..48d30fca4 100644 --- a/devcon-app/src/pages/schedule.tsx +++ b/devcon-app/src/pages/schedule.tsx @@ -33,8 +33,10 @@ export default pageHOC((props: any) => { // console.log(sessions, 'sessions?') // console.log(props.event, 'event?') + // console.log(props.rooms) - console.log(props.rooms) + // TODO: Temporary test launch + return <> return ( diff --git a/devcon-app/src/pages/schedule/[id].tsx b/devcon-app/src/pages/schedule/[id].tsx index 26fddab72..207a187d6 100644 --- a/devcon-app/src/pages/schedule/[id].tsx +++ b/devcon-app/src/pages/schedule/[id].tsx @@ -23,6 +23,9 @@ export default (props: any) => { if (!props.session) return null + // TODO: Temporary test launch + return <> + return ( <> @@ -42,13 +45,13 @@ export default (props: any) => { } export async function getStaticPaths() { - const sessions = await fetchSessions() - const paths = sessions.map(i => { - return { params: { id: i.sourceId } } - }) + // const sessions = await fetchSessions() + // const paths = sessions.map(i => { + // return { params: { id: i.sourceId } } + // }) return { - paths, + paths: [], // TODO: Temporary test launch fallback: 'blocking', } } diff --git a/devcon-app/src/pages/speakers.tsx b/devcon-app/src/pages/speakers.tsx index 726f9c06d..eaf5af691 100644 --- a/devcon-app/src/pages/speakers.tsx +++ b/devcon-app/src/pages/speakers.tsx @@ -42,6 +42,9 @@ export default pageHOC((props: any) => { // } // }, [selectedSpeaker]) + // TODO: Temporary test launch + return <> + return ( diff --git a/devcon-app/src/pages/speakers/[id].tsx b/devcon-app/src/pages/speakers/[id].tsx index c66079fb1..8feff0bb7 100644 --- a/devcon-app/src/pages/speakers/[id].tsx +++ b/devcon-app/src/pages/speakers/[id].tsx @@ -23,6 +23,9 @@ export default (props: any) => { if (!props.speaker) return null + // TODO: Temporary test launch + return <> + return ( <> @@ -45,13 +48,13 @@ export default (props: any) => { } export async function getStaticPaths() { - const speakers = await fetchSpeakers() - const paths = speakers.map(i => { - return { params: { id: i.sourceId } } - }) + // const speakers = await fetchSpeakers() + // const paths = speakers.map(i => { + // return { params: { id: i.sourceId } } + // }) return { - paths, + paths: [], fallback: 'blocking', } }