diff --git a/build.gradle b/build.gradle index 7101a162d..7a1baf1e2 100644 --- a/build.gradle +++ b/build.gradle @@ -131,7 +131,7 @@ dependencies { // Other dependencies we're unable to resolve via standard repositories if (buildAccess == 'internal') { - preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.3.3', ext: 'zip' + preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.3.4', ext: 'zip' } else { preCompile group: 'com.nomagic', name: 'magicdraw', version: '185sp3', classifier: 'MagicDraw_185_sp3_no_install', ext: 'zip' diff --git a/gradle.properties b/gradle.properties index ddcb3591a..9f4df18db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=3.3.3 +version=3.3.4 group=org.openmbee.magicdraw.mdk descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk diff --git a/src/main/dist/profiles/SysML Extensions.mdxml b/src/main/dist/profiles/SysML Extensions.mdxml index 0d8450c88..3dbd5e48b 100644 --- a/src/main/dist/profiles/SysML Extensions.mdxml +++ b/src/main/dist/profiles/SysML Extensions.mdxml @@ -1,6 +1,6 @@ - + @@ -6522,7 +6522,7 @@ - + @@ -6776,7 +6776,7 @@ - + @@ -6817,7 +6817,7 @@ - + @@ -6850,7 +6850,7 @@ - + @@ -7177,7 +7177,7 @@ - + @@ -7388,7 +7388,7 @@ - + @@ -7430,7 +7430,7 @@ - + @@ -9022,7 +9022,7 @@ - + @@ -9486,7 +9486,7 @@ - + @@ -10478,7 +10478,7 @@ - + @@ -10510,7 +10510,7 @@ - + @@ -11557,7 +11557,7 @@ - + @@ -11770,7 +11770,7 @@ - + @@ -11898,7 +11898,7 @@ - + @@ -12809,6 +12809,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -12820,7 +12842,7 @@ - + @@ -13471,6 +13493,24 @@ + + + + + + diagramTypes + + + + + + + + + + + + @@ -13483,7 +13523,7 @@ - + @@ -13491,17 +13531,19 @@ - + - - include + + depth - + + include + @@ -13509,13 +13551,7 @@ - - - - - - diagramTypes - + @@ -13527,18 +13563,16 @@ - - associationType - + - + - - directionOut + + associationType @@ -13547,7 +13581,9 @@ - + + directionOut + @@ -13563,7 +13599,7 @@ - + @@ -13573,17 +13609,17 @@ - - - - metaclasses - + + + + + @@ -13591,15 +13627,11 @@ - - stereotypeProperties - + - - stereotypes - + @@ -13607,21 +13639,23 @@ - + + stereotypes + - + - - depth - + - + + stereotypeProperties + @@ -13643,13 +13677,13 @@ - - ignore - + - + + ignore + @@ -13661,6 +13695,10 @@ + + + + orderedList showTargets @@ -13669,10 +13707,6 @@ - - - - @@ -13687,24 +13721,24 @@ - - captions - showCaptions - + - - doNotShow - + - + + doNotShow + - + + captions + showCaptions + @@ -13720,13 +13754,7 @@ - - style - colwidths - transpose - hideHeaders - showIfEmpty - + @@ -13736,7 +13764,7 @@ - + @@ -13746,11 +13774,17 @@ - + - + + style + colwidths + transpose + hideHeaders + showIfEmpty + @@ -13768,16 +13802,16 @@ - - - - titles + + + + maxDepth topIncludeTypeName @@ -13792,12 +13826,13 @@ - + - - headers + + incomingStereotypedRelationships + outgoingStereotypedRelationships @@ -13806,9 +13841,8 @@ - - incomingStereotypedRelationships - outgoingStereotypedRelationships + + headers @@ -13821,13 +13855,17 @@ - - skipIfNoDoc - + - + + + + + + skipIfNoDoc + @@ -13848,7 +13886,7 @@ - + @@ -13862,10 +13900,6 @@ - - - - @@ -13899,11 +13933,17 @@ + + + + - + + title + @@ -13911,13 +13951,13 @@ - - caption + + loop - + @@ -13925,7 +13965,9 @@ - + + caption + @@ -13955,11 +13997,11 @@ - + - + @@ -13969,21 +14011,11 @@ - - - - - - - - - - - + - + @@ -13991,45 +14023,32 @@ - + - + - - loop - + - + - + - - - - - + + - - - - - - - - @@ -14046,34 +14065,54 @@ - - desiredAttribute - + - - desiredProperty - + + + + + + + + + + - + - + + + + + + + - - expression - iterate - + - + + + + + + + + + + + + + @@ -14081,16 +14120,23 @@ - + - + + desiredAttribute + - - reverse + + + + + + expression + iterate @@ -14099,13 +14145,11 @@ - - title - + - + @@ -14113,13 +14157,13 @@ - - validationReport + + reverse - + @@ -14141,10 +14185,14 @@ - - plotConfiguration - plotTitle - plotType + + validationReport + + + + + + editable @@ -14158,39 +14206,17 @@ - - editable + + plotConfiguration + plotTitle + plotType - - - - - - - - - - - - - - - - - - - - - - - - - - - + + desiredProperty + @@ -14198,15 +14224,11 @@ - - - - - + @@ -14217,7 +14239,13 @@ - + + + + + + 0 + @@ -14231,19 +14259,32 @@ - + + deprecateStereotypes + stereotypesForClassifiers + stereotypesForMisc + stereotypesForOperations + stereotypesForPackages + stereotypesForProperties + stereotypeMetaClassCheck + stereotypeSysMLGeneralizationCheck + stereotypesForDependencies + stereotypesForAssociations + profileGeneralizations + localGeneralizations + - + - + - + @@ -14259,11 +14300,19 @@ + + + + - + + + + + @@ -14279,11 +14328,11 @@ - + - + @@ -14291,10 +14340,6 @@ - - - - @@ -14310,7 +14355,7 @@ - + @@ -14318,42 +14363,25 @@ - - - - - - documentId - + - - deprecateStereotypes - stereotypesForClassifiers - stereotypesForMisc - stereotypesForOperations - stereotypesForPackages - stereotypesForProperties - stereotypeMetaClassCheck - stereotypeSysMLGeneralizationCheck - stereotypesForDependencies - stereotypesForAssociations - profileGeneralizations - localGeneralizations - + - + - + + documentId + - + @@ -14364,11 +14392,11 @@ - + - + @@ -14380,49 +14408,43 @@ - - 0 - - - - - + - + - + - + - + - + - + - + - + - + @@ -14430,59 +14452,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -14490,11 +14512,11 @@ - + - + @@ -14502,7 +14524,7 @@ - + @@ -14510,19 +14532,23 @@ - + - + - + - + + + + + @@ -14530,7 +14556,7 @@ - + @@ -14538,27 +14564,27 @@ - + - + - + - + - + - + @@ -14566,19 +14592,19 @@ - + - + - + - + @@ -14586,23 +14612,23 @@ - + - + - + - + - + @@ -14610,11 +14636,11 @@ - + - + @@ -14622,75 +14648,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -14702,7 +14728,7 @@ - + @@ -14710,6 +14736,10 @@ + + + + @@ -14722,19 +14752,19 @@ - + - + - + - + @@ -14750,19 +14780,19 @@ - + - + - + - + @@ -14774,7 +14804,7 @@ - + @@ -14782,59 +14812,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -14853,19 +14883,15 @@ - - - - - + - + @@ -14877,15 +14903,11 @@ - - - - - + @@ -14901,15 +14923,15 @@ - + - + - + @@ -14925,6 +14947,14 @@ + + + + + + + + @@ -14933,19 +14963,19 @@ - + - + - + - + @@ -14977,7 +15007,7 @@ - + @@ -14985,19 +15015,11 @@ - - - - - - - - - + @@ -15009,82 +15031,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - Document Type - JPL Document ID - Reference Documents - + - - - - + - + @@ -15098,10 +15113,21 @@ + + + + + + + + + + + @@ -15118,33 +15144,41 @@ - + + Document Type + JPL Document ID + Reference Documents + - + - - - + - + - + - + + + - + + + + + @@ -15154,29 +15188,27 @@ - + - + - + - + - + - - - + @@ -15188,38 +15220,37 @@ - + - + + + - + - + - + - + - - Component - Description - + - + @@ -15227,31 +15258,34 @@ - + + Component + Description + - + - + - + - + - + - + @@ -15262,10 +15296,6 @@ - - - - @@ -15278,15 +15308,11 @@ - - - - - + @@ -15299,35 +15325,33 @@ - - annotatedElement - body - source - - - - - + + + - + - + - + + annotatedElement + body + source + - + - + @@ -15335,7 +15359,7 @@ - + @@ -15347,61 +15371,55 @@ - + - - - + - + - + - + - + - + - + - + - + - + - - baselineTag - MMS URL - MMS Org - + - + @@ -15409,39 +15427,43 @@ - + - + - + - + - + - + - + + baselineTag + MMS URL + MMS Org + - + - + @@ -15449,19 +15471,19 @@ - + - + - + - + @@ -15469,27 +15491,27 @@ - + - + - + - + - + - + @@ -15665,13 +15687,7 @@ - - - - - - @@ -15730,64 +15746,16 @@ + + + + + - - - - - - - - SHOW_ATTRIBUTES_COMPARTMENT_NAME - ATTRIBUTES - SHOW_ATTRIBUTES_COMPARTMENT_NAME_DESCRIPTION - - - SHOW_RECEPTIONS_COMPARTMENT_NAME - RECEPTIONS - SHOW_RECEPTIONS_COMPARTMENT_NAME_DESCRIPTION - - - SHOW_OPERATIONS_COMPARTMENT_NAME - OPERATIONS - SHOW_OPERATIONS_COMPARTMENT_NAME_DESCRIPTION - - - SHOW_PORTS_COMPARTMENT_NAME - PORTS - SHOW_PORTS_COMPARTMENT_NAME_DESCRIPTION - - - 392, 350, 115, 61 - - - - - - - - 697, 250; 697, 371; 507, 371; - - - - - - - - 5, 5, 1223, 667 - - - - - - 637, 189, 136, 61 - - - - + SHOW_ATTRIBUTES_COMPARTMENT_NAME ATTRIBUTES SHOW_ATTRIBUTES_COMPARTMENT_NAME_DESCRIPTION SHOW_RECEPTIONS_COMPARTMENT_NAME RECEPTIONS SHOW_RECEPTIONS_COMPARTMENT_NAME_DESCRIPTION SHOW_OPERATIONS_COMPARTMENT_NAME OPERATIONS SHOW_OPERATIONS_COMPARTMENT_NAME_DESCRIPTION SHOW_PORTS_COMPARTMENT_NAME PORTS SHOW_PORTS_COMPARTMENT_NAME_DESCRIPTION 392, 350, 115, 61 697, 250; 697, 371; 507, 371; 5, 5, 1223, 667 637, 189, 136, 61 15, 105, 161, 66 _17_0_2_8c20286_1352155212390_691127_24013 _17_0_2_8c20286_1352155212390_357052_24014 86, 46, 18, 19 _17_0_2_8c20286_1352155212390_691127_24013 _17_0_2_8c20286_1352155212390_290127_24015 86, 211, 18, 19 _17_0_2_8c20286_1352155212390_691127_24013 _17_0_2_8c20286_1352155212390_247590_24016 95, 105; 95, 65; 95, 211; 95, 171; 5, 5, 496, 245 @@ -15800,7 +15768,7 @@ - H4sIAAAAAAAAAE2WTYuuORGG9+dXNMx2ckjluwZcOLhxoYi6cSWppDIKc+bAiPj3vdLaz3touunut0gq91fVd5+++8PXX95+5+tN5E3yD7X9EOvbn/7y17cUpX9aX798/uXrl/nTP9fn95/71/mfz//+8vPfv3zd/vPnf/1j/ur7f3/85sff//G3f/5byMn3GTuF1IaG4nkFMy/BVHIfO6tq/v7/tVSsJK2F1MVDGSsH6zOFkT3PI2fXsT5q41rWdp9hD02h6NzBdivhzNSTjTHE/KP2nFbr9hbyew9nxmDJU5hmaj1nL7l91O5UVq90uWY0ancPs5wY8l6z2bZzXrWm2aNJCnXqCaWYU9tq0DbTOqn1IU9tmaoSl4SZxwxlOf2eXkM6p+zS4zz9qeXmpLFSlmmkJOCa3T1kO1H2jKPp87ZhPUkqOawuO5TqFpQnhSmezVYV6+ejtsaaKeb1q3H4vG/rVsM4R9qIHC7Pud7THqn0oCfCRV6UlUIjOptakb21ftT23PspxqWwBMfFb5kGPz2uqdzp4+GYu23WgzAib6vjhDGp3TL9lJ59rAeH7JqqnhNi9B6KQd6Us+A4im9qo6bnbbXIMFQADfBWcwOHXYNnt6gz55YfnXkzs3ghqGmAQxzgoD2MvZe6d6TVH45rQiqAJPFcPawdVLqFDr9SwWzE59zYTm0aWxC52ukZzAZyLnIGGBytqTyYrekx2oIUVFvQyuVYQorJbfAV2/6oTXO5pCmhFUdne1kYMiv38ZCatRyxRw/5DFkLyrxyrtvh3DYCVpGyYtJR9cFhm2t1DYmHANzGlnXPYN5WrDtF3U8tH462eg9WUG2pBd6kKiJuVpfWsvPTw155RANf4X60DoPAeMJR/M39DgFP7TyjNujVpLeW3wxpAYvXfs01U37pd/Puk0NLCaJzl6C17bDc0n0kmn/wzTGSGPhtpXI5ngX9nh6qLkzi0Ud9esCIuV9Hdm0Ap6CnjpnNpunxRIcv/U7XMoqG6p0eugLXWjM4HXQvY3cprzxL+YA6B1UwE4i2STdnNxDbDc885+oB4LzIyb3BIVsLc0kO1dQ1bk8tp1c+qGXv+UoMX1zFWUkSZOeyU3ZPr9zxLaUBRqh8CotITBOv3JKQ6qmDt3zUSjvYesLAiJgjoYdJ3oWI/X2Xg5ceTbrTfFolNHfwxdLBBN5SxaJe+qarp9ZyVEExvgpva+hhFDQ5yZxEpnt89duBpu1b9n6ucy5ekECoV/NRIkc9fjtWvJPrhxjnXN42tpHrymjIdSadz7wQ0psk8kAo8zYnhDWBbz8jV+nAu5+cJIliI8Qhu+ELSajTqhNUp4xYk4z2cEzQndnqDVzSEW8ys8hRJHps9s33enjLBPB4T6Z2DWo0opvOu+peQ6C0PjhEsy6ZxEtYH19wg02x0GrKWKLsOZ6s1qKVnF3MlvaefRpGGh1qlpmAo+X5cFGIuuKRTBX6TatRC+UxrgPug1fI4/k4PFJC4k367XXzyquilSOjcDafz7nKhkDWwYCR5oWCMGtpoW6q3Y/k9PBma3deUcNWVFBWAoc8LhcMkW1l6zeYjTHrqoOJnerdHxJWIX81ard9CCl/ekiR0oFgmZhwfG5aDZJCTGSufPDuemWq7um9ISxEUW64T6ZNkNpxgeTIoHzV2oLkS2+5OODSuejhMPfJ363f+C1JrCfPTABh/KL0ALs7+PTh1uqEnldGVbSPj9mPwEwVz5dq/H9tVz6JEh89IKRDtMNAZaKcyLhilQhUlm7R2aSePFs23H2vwA5x54XcPUrG3W0apWTzy8cnsU4cqQGp08Nq6dLjYIb3YHBFf/QwoOcMkmmzi4EZ41VBlZBAjsd52yvPPPFHLnB8SP7Sbg/5XGFqLAQ1O8/jIVKJTQr7LGdkosEIDqwTbU1sTCdpPrXo/IyFWOATJRZmoRIMoTUvEknG/prHeVcnZUnHnW+WWMHHQhyXQUrnZUle2Ters6rcoYrE2LnIdUQQuGuwVNV6vtFkPiwbbQVAh4uFKCgw5pOqb65JLw8x7gZ3Ngi8/e7rIWVLQurEZPSYLL64KN1rJnXjujOgr6sMCzIW9jpwYy8ft4mlzt0E2vvsxiFjIufF2qOb8eb5m5wcffhiB8+RPDPw7XfnioUVRoR59tID69sY7Ducz9sqvM27deTdYurMIRaM521DDTKNJevuqcgAPWzW93wsDRa9deKn/wKvABINVQwAAA== + H4sIAAAAAAAAAE2WTYulOxHH9/MpGu7WDEnltS640J0LRVQQV5JKKt4LdxwYEb++v7T2c4amm3P61MlT+b9V/fDph7/6fvv9/PYW+1tqP2b5MZe3P/75L28S0/i0vn75/M+vX+Y/fl6f3//ub/M/n//95Ze/f/m6/ZfP//ppfvP9vze//u3v/vCbP/0tZPF9xpYgbWgonlcw8xJMU+5jZ1XNv/p/bVzL2u4z7KESis4dbLcSzpQuNsZI5h+1nLYktRakJw9lrBysTwkje54nnV3H+qg9p9W6vYX83sOZMZi4hGmm1nP2kttH7ZayeqXLNaNRu3uY5cSQ95rNtp3zqi1TNcWVwsxjhrKcfk+vQc4pu/Q4T39qTbNHSxLq1BNKMefcVoO2KetI6yM9tTxZNFaOzDRSBLhmdw/ZTkx7xtH0wcG77CGlBz0RHPKqYZTCF3Q2tZL21vpRO6xLkpLD6mmHUt2Ccv0wk2ezVZP181FbY80Ug9RqNDIvDt04/JzURqSR9PTQc++nGAeBPBwXv4/X4KfHNZVzfDy8cZ7NehBG5G51nDAmtTtNP6VnH+vBIbtK1XNCjN5DMcib6Sz0EJNvaqPK028taRiKAVp4q7lxt12DZ7eoM+eWH51ZFejnMimey/HaQVO30OEhVe424lPrzczihaDKAIc4wEF7GHsvde9Itj/6bac2jS2kdLXTM3ANJFrSGWBwtEp5MFvTY7QF0Ci8wP/lOAWJ4jb4iW1/1MpcnmSm0Iqjnb0sjDQrz6O5mrWcZA/H+Yy0FlLwyrluh3PbCNgqlRVFR9Xnbttcq2sQLg1wG1vWPYN5W7FuibqfWj4cbfUerKDwUgu8paoIvlldWsvOTw975RENzBLPxxcwCOQnHMWzPN8B9amdZ9QGvSp6a3llSBZYvPZrmCn5pcnNvU8OTQSic09Ba9thucm9JDp+8M0xkgJ4c0m5vM2CL04PVRfC9+ijPj1g2tyve7s2gFPQU8egZtP0uNDhS7/TtYyioXqnh67AtdYMTgfdy9g9lVdGST6gzkEVzBJE26SbsxuI7YZnnnP1AHBe5OTe4JCthblSDtXUNW6XluWVD2rZe74SwxdXcVYkhbRz2ZLd5ZUlvlNpgBEqn8IiElPhljsJUj11cJeP2tQOcTFhYEQEL+hhknchEiu+y8FLjybdaV5WCc0dfLF0sARvUrGol77p6qm1HDWhGF+FuzX0MAqanOSIkNMeX/12oGn7lr2f65yLF1JgAFTzUSJHPX47VryT64cY51zuNraR68oYyXWKzmcGJNKbJPJA0HI3J7BVwLefkWvqwLuf7COJYiOYIbvhiySo06oTVKeMWCWN9nBM0J3Z6g1RUhdvMofIRiR6bPbN73p4y4TqeE+mdg1qNKKbzrvqXiNBaX1w0KKV7FzMlvaeZxqGjA7cyyyBjeX54GDWUyYdhZjAQ3RjM1loVTL2KXuOJ6tLHB6LLBJv0kOvm86vMlaOjLfZfD7n6p36rYGqkdCFgjBraaFuqt1PyvLKkkIsFo9kdQIHWY1+kVKM68DnAJ30+G3tTmc1bEUFZQk45HG5YIhsK1u/w2yMWVcdTGypd38QrEJWa9Ru+xBS/vQrkdKBYJmYcHxuWg2SIllKc+WDd9crU3VP7w1hIYpyB8Fk2oRUOy5IOTL8XrW2IPnSWy5muHQuejjMcvJ363d+kxTryTMTQBi/KD3A7g4+fbi1OqHylVEV7eNj9iPwVcXzpRr/X9uVT2KKD8cI6RDtsFWZKCcyglg7ApWlW3Q2qSfPlg133yuwQ9x5ke5ulMbdbRqlZPPLx0dYJ06qAanTw2py6XEww3uwvaI/vA3oOYNk2uxXYMZ4VVAlJJDYce72yjMX3uQCx4fkL+32kM8VscZCULMfPR4ildiOsM9yRiZaieDAOtHWxMZ0IvOpxRNnLMQCn6i2MAuVYAiteUmRZOyv2Z13dVKWdNz5ZokVfJyI4zJI6bxM0qPfnA8LRFsBIMF3QTShbcwcVd98VV76ZfY6a80dwMiR/YwZgGACfQ2WqlrPS7+Mu8EzGwTefvf1m7IlIXViMnoUiy8uSveaSd247gzo6yrDQhoLKx64sUfr3ib2O3cTaO+zG4eMiZwXa49uxpvn73Jy9OGLHTxH8szAt9+dKxbWnZSYZy89sL6NwW7E+eBQ4W3erSPvFqUzh1gwnrsNNcg0lqy7pyID9LBZyfMxGSx668RP/wU63B0vVQwAAA== 15, 105, 161, 79 _17_0_2_8c20286_1352155212395_191900_24120 _17_0_2_8c20286_1352155212395_187129_24121 86, 46, 18, 19 _17_0_2_8c20286_1352155212395_191900_24120 _17_0_2_8c20286_1352155212395_296533_24122 86, 224, 18, 19 _17_0_2_8c20286_1352155212395_191900_24120 _17_0_2_8c20286_1352155212395_269391_24123 95, 105; 95, 65; 95, 224; 95, 184; 5, 5, 680, 258 @@ -15884,7 +15852,7 @@ _17_0_1_232f03dc_1320949754383_391608_12143 - + local:/PROJECT-ID_5_9_12_2_36_25_PM__3355cc91_137159f37b3__5c3b_sscae_cmr_137_78_160_100?resource=com.nomagic.magicdraw.uml_umodel.shared_umodel#_17_0_1_2_8c20286_1339022620435_958581_14857 @@ -16059,11 +16027,6 @@ - - - - - @@ -16124,6 +16087,11 @@ + + + + + @@ -16157,7 +16125,7 @@ - + @@ -16168,7 +16136,7 @@ - + @@ -16180,7 +16148,7 @@ - + @@ -16204,7 +16172,7 @@ - + @@ -16228,7 +16196,7 @@ - + @@ -16243,12 +16211,12 @@ - + - + @@ -16363,7 +16331,7 @@ 15, 105, 161, 66 _17_0_2_8c20286_1352155212393_562434_24077 _17_0_2_8c20286_1352155212393_796666_24078 86, 46, 18, 19 _17_0_2_8c20286_1352155212393_562434_24077 _17_0_2_8c20286_1352155212393_757798_24079 86, 211, 18, 19 _17_0_2_8c20286_1352155212393_562434_24077 _17_0_2_8c20286_1352155212393_725877_24080 95, 105; 95, 65; 95, 211; 95, 171; 5, 5, 348, 245 - H4sIAAAAAAAAAFPmUvbNz1NwSU1WMDRUMDS2MjWzMjBVCAgOUTAyMDTnAgCOHZhgIAAAAA== + H4sIAAAAAAAAAFPmUg5PTVHwTSxSMDBXMDSzMjayMjZRCAgOUTAyMLTgAgAUXNMAIAAAAA== 86, 46, 18, 19 _17_0_2_8c20286_1352155212389_559162_24001 _17_0_2_8c20286_1352155212389_240437_24002 86, 211, 18, 19 _17_0_2_8c20286_1352155212389_559162_24001 _17_0_2_8c20286_1352155212389_846920_24003 15, 105, 161, 66 _17_0_2_8c20286_1352155212389_559162_24001 _17_0_2_8c20286_1352155212389_319162_24004 95, 105; 95, 65; 95, 211; 95, 171; 5, 5, 464, 245 @@ -16380,6 +16348,66 @@ + + + + + + + + + + + + + <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> + + + + + + + + + + @@ -16445,66 +16473,6 @@ - - - - - - - - - - - - - <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> - - - - - - - - - - - - - - - - - - - - <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> - - - - - - - - - - - - - - - - - <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> - - - - - - - - - - @@ -16621,7 +16589,7 @@ - + @@ -16676,12 +16644,8 @@ - - - - - + @@ -16740,12 +16704,17 @@ + + + + + - + @@ -16757,7 +16726,7 @@ - + eee_1045467100313_135436_1 @@ -16871,7 +16840,7 @@ - + @@ -16882,7 +16851,7 @@ - + @@ -16904,7 +16873,7 @@ - + @@ -16916,7 +16885,7 @@ - + @@ -16928,7 +16897,7 @@ - + @@ -16940,15 +16909,16 @@ + - - + + - + @@ -17033,6 +17003,90 @@ + + + + + + + + + + + + + <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772478_585204_351"/> + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> + + + + + + + + + + @@ -17176,90 +17230,6 @@ - - - - - - - - - - - - - <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> - - - - - - - - - - - - - - - - - - - - <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772478_585204_351"/> - - - - - - <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> - - - - - - - - - - @@ -17345,254 +17315,254 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -17771,27 +17741,27 @@ - + - + - + - + - + @@ -17848,6 +17818,6 @@ 15, 105, 161, 79 _17_0_2_8c20286_1352155212393_955894_24069 _17_0_2_8c20286_1352155212393_92433_24070 86, 46, 18, 19 _17_0_2_8c20286_1352155212393_955894_24069 _17_0_2_8c20286_1352155212393_288082_24071 86, 224, 18, 19 _17_0_2_8c20286_1352155212393_955894_24069 _17_0_2_8c20286_1352155212393_946952_24072 95, 105; 95, 65; 95, 224; 95, 184; 5, 5, 692, 258 - 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 \ No newline at end of file