Skip to content

Commit

Permalink
Merge pull request #104 from aharwood2/development
Browse files Browse the repository at this point in the history 
Release v1.6
  • Loading branch information
@aharwood2
aharwood2 authored Apr 8, 2022
2 parents 04ad112 + 6c53212 commit 618264a
Show file tree
Hide file tree
Showing 94 changed files with 3,599 additions and 7,715 deletions.
13 changes: 12 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,18 @@ on the Wiki.
The current release has no known bugs, however testing has identified a number of limitations in the drafting procedures
which are recorded on the issue tracker where appropriate. Please add more issues to the tracker if you find any problems.

# Release Notes #
# Release Notes #
**Version 1.6**
Issue #7: Fixed armhole issue with new relational rule
Issue #78: Reduced text size on plots
Issue #82: Extended Bexier functions to take angle arguments
Issue #83: Rationalised methods in the block base class
Issue #89: Fixed missing measurements in sample input file
Issue #91: Made it possible to see measurements required for patterns
Issue #92: Added new trouser projection pattern
Issue #93: Reworked UI to make it more modular
Issue #97: Added popup to warn of a broken input file

**Version 1.5**
Issue #76: Add timestamp to pattern outputs.
Issue #74: Added Gill sweatshirt pattern.
Expand Down
3 changes: 1 addition & 2 deletions build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# Set your JDK path below
jdk.home.1.8=C\:/Program Files/Java/jdk1.8.0_221
jdk.home.14=C\:/Program Files/Java/jdk-14.0.1
javac2.instrumentation.includeJavaRuntime=false
180 changes: 118 additions & 62 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@


<property file="build.properties"/>
<!-- Uncomment the following property if no tests compilation is needed -->
<!--

<property name="skip.tests" value="true"/>
-->

<!-- Compiler options -->

Expand All @@ -15,7 +13,6 @@
<property name="compiler.args" value=""/>
<property name="compiler.max.memory" value="700m"/>
<patternset id="ignored.files">
<exclude name="**/*.hprof/**"/>
<exclude name="**/*.pyc/**"/>
<exclude name="**/*.pyo/**"/>
<exclude name="**/*.rbc/**"/>
Expand All @@ -32,14 +29,14 @@
<exclude name="**/vssver2.scc/**"/>
</patternset>
<patternset id="library.patterns">
<include name="*.egg"/>
<include name="*.zip"/>
<include name="*.war"/>
<include name="*.swc"/>
<include name="*.apk"/>
<include name="*.zip"/>
<include name="*.egg"/>
<include name="*.ane"/>
<include name="*.jar"/>
<include name="*.ear"/>
<include name="*.jar"/>
<include name="*.klib"/>
<include name="*.ane"/>
</patternset>
<patternset id="compiler.resources">
<exclude name="**/?*.java"/>
Expand All @@ -55,49 +52,111 @@

<!-- JDK definitions -->

<property name="jdk.bin.1.8" value="${jdk.home.1.8}/bin"/>
<path id="jdk.classpath.1.8">
<fileset dir="${jdk.home.1.8}">
<include name="jre/lib/charsets.jar"/>
<include name="jre/lib/deploy.jar"/>
<include name="jre/lib/ext/access-bridge-64.jar"/>
<include name="jre/lib/ext/cldrdata.jar"/>
<include name="jre/lib/ext/dnsns.jar"/>
<include name="jre/lib/ext/jaccess.jar"/>
<include name="jre/lib/ext/jfxrt.jar"/>
<include name="jre/lib/ext/localedata.jar"/>
<include name="jre/lib/ext/nashorn.jar"/>
<include name="jre/lib/ext/sunec.jar"/>
<include name="jre/lib/ext/sunjce_provider.jar"/>
<include name="jre/lib/ext/sunmscapi.jar"/>
<include name="jre/lib/ext/sunpkcs11.jar"/>
<include name="jre/lib/ext/zipfs.jar"/>
<include name="jre/lib/javaws.jar"/>
<include name="jre/lib/jce.jar"/>
<include name="jre/lib/jfr.jar"/>
<include name="jre/lib/jfxswt.jar"/>
<include name="jre/lib/jsse.jar"/>
<include name="jre/lib/management-agent.jar"/>
<include name="jre/lib/plugin.jar"/>
<include name="jre/lib/resources.jar"/>
<include name="jre/lib/rt.jar"/>
<property name="jdk.bin.14" value="${jdk.home.14}/bin"/>
<path id="jdk.classpath.14">
<fileset dir="${jdk.home.14}">
<include name="../jdk-14.0.1!/java.base"/>
<include name="../jdk-14.0.1!/java.compiler"/>
<include name="../jdk-14.0.1!/java.datatransfer"/>
<include name="../jdk-14.0.1!/java.desktop"/>
<include name="../jdk-14.0.1!/java.instrument"/>
<include name="../jdk-14.0.1!/java.logging"/>
<include name="../jdk-14.0.1!/java.management"/>
<include name="../jdk-14.0.1!/java.management.rmi"/>
<include name="../jdk-14.0.1!/java.naming"/>
<include name="../jdk-14.0.1!/java.net.http"/>
<include name="../jdk-14.0.1!/java.prefs"/>
<include name="../jdk-14.0.1!/java.rmi"/>
<include name="../jdk-14.0.1!/java.scripting"/>
<include name="../jdk-14.0.1!/java.se"/>
<include name="../jdk-14.0.1!/java.security.jgss"/>
<include name="../jdk-14.0.1!/java.security.sasl"/>
<include name="../jdk-14.0.1!/java.smartcardio"/>
<include name="../jdk-14.0.1!/java.sql"/>
<include name="../jdk-14.0.1!/java.sql.rowset"/>
<include name="../jdk-14.0.1!/java.transaction.xa"/>
<include name="../jdk-14.0.1!/java.xml"/>
<include name="../jdk-14.0.1!/java.xml.crypto"/>
<include name="../jdk-14.0.1!/jdk.accessibility"/>
<include name="../jdk-14.0.1!/jdk.aot"/>
<include name="../jdk-14.0.1!/jdk.attach"/>
<include name="../jdk-14.0.1!/jdk.charsets"/>
<include name="../jdk-14.0.1!/jdk.compiler"/>
<include name="../jdk-14.0.1!/jdk.crypto.cryptoki"/>
<include name="../jdk-14.0.1!/jdk.crypto.ec"/>
<include name="../jdk-14.0.1!/jdk.crypto.mscapi"/>
<include name="../jdk-14.0.1!/jdk.dynalink"/>
<include name="../jdk-14.0.1!/jdk.editpad"/>
<include name="../jdk-14.0.1!/jdk.hotspot.agent"/>
<include name="../jdk-14.0.1!/jdk.httpserver"/>
<include name="../jdk-14.0.1!/jdk.incubator.foreign"/>
<include name="../jdk-14.0.1!/jdk.incubator.jpackage"/>
<include name="../jdk-14.0.1!/jdk.internal.ed"/>
<include name="../jdk-14.0.1!/jdk.internal.jvmstat"/>
<include name="../jdk-14.0.1!/jdk.internal.le"/>
<include name="../jdk-14.0.1!/jdk.internal.opt"/>
<include name="../jdk-14.0.1!/jdk.internal.vm.ci"/>
<include name="../jdk-14.0.1!/jdk.internal.vm.compiler"/>
<include name="../jdk-14.0.1!/jdk.internal.vm.compiler.management"/>
<include name="../jdk-14.0.1!/jdk.jartool"/>
<include name="../jdk-14.0.1!/jdk.javadoc"/>
<include name="../jdk-14.0.1!/jdk.jcmd"/>
<include name="../jdk-14.0.1!/jdk.jconsole"/>
<include name="../jdk-14.0.1!/jdk.jdeps"/>
<include name="../jdk-14.0.1!/jdk.jdi"/>
<include name="../jdk-14.0.1!/jdk.jdwp.agent"/>
<include name="../jdk-14.0.1!/jdk.jfr"/>
<include name="../jdk-14.0.1!/jdk.jlink"/>
<include name="../jdk-14.0.1!/jdk.jshell"/>
<include name="../jdk-14.0.1!/jdk.jsobject"/>
<include name="../jdk-14.0.1!/jdk.jstatd"/>
<include name="../jdk-14.0.1!/jdk.localedata"/>
<include name="../jdk-14.0.1!/jdk.management"/>
<include name="../jdk-14.0.1!/jdk.management.agent"/>
<include name="../jdk-14.0.1!/jdk.management.jfr"/>
<include name="../jdk-14.0.1!/jdk.naming.dns"/>
<include name="../jdk-14.0.1!/jdk.naming.rmi"/>
<include name="../jdk-14.0.1!/jdk.net"/>
<include name="../jdk-14.0.1!/jdk.nio.mapmode"/>
<include name="../jdk-14.0.1!/jdk.rmic"/>
<include name="../jdk-14.0.1!/jdk.scripting.nashorn"/>
<include name="../jdk-14.0.1!/jdk.scripting.nashorn.shell"/>
<include name="../jdk-14.0.1!/jdk.sctp"/>
<include name="../jdk-14.0.1!/jdk.security.auth"/>
<include name="../jdk-14.0.1!/jdk.security.jgss"/>
<include name="../jdk-14.0.1!/jdk.unsupported"/>
<include name="../jdk-14.0.1!/jdk.unsupported.desktop"/>
<include name="../jdk-14.0.1!/jdk.xml.dom"/>
<include name="../jdk-14.0.1!/jdk.zipfs"/>
</fileset>
</path>

<property name="project.jdk.home" value="${jdk.home.1.8}"/>
<property name="project.jdk.bin" value="${jdk.bin.1.8}"/>
<property name="project.jdk.classpath" value="jdk.classpath.1.8"/>
<property name="idea.home" value="./intellij"/>
<property name="project.jdk.home" value="${jdk.home.14}"/>
<property name="project.jdk.bin" value="${jdk.bin.14}"/>
<property name="project.jdk.classpath" value="jdk.classpath.14"/>


<!-- Project Libraries -->

<path id="library.forms_rt.classpath">
<pathelement location="${idea.home}/lib/forms_rt.jar"/>
</path>

<path id="library.javac2.classpath">
<pathelement location="${idea.home}/lib/javac2.jar"/>
<path id="library.lib.classpath">
<pathelement location="${basedir}/intellij/lib/asm-all.jar"/>
<pathelement location="${basedir}/intellij/lib/bootstrapfx-core-0.4.0.jar"/>
<pathelement location="${basedir}/intellij/lib/controlsfx-11.1.0.jar"/>
<pathelement location="${basedir}/intellij/lib/forms-1.1-preview.jar"/>
<pathelement location="${basedir}/intellij/lib/forms_rt.jar"/>
<pathelement location="${basedir}/intellij/lib/formsfx-core-11.3.2.jar"/>
<pathelement location="${basedir}/intellij/lib/ikonli-core-12.2.0.jar"/>
<pathelement location="${basedir}/intellij/lib/ikonli-javafx-12.2.0.jar"/>
<pathelement location="${basedir}/intellij/lib/javac2.jar"/>
<pathelement location="${basedir}/intellij/lib/javafx-base-14.0.2.1-win.jar"/>
<pathelement location="${basedir}/intellij/lib/javafx-controls-14.0.2.1-win.jar"/>
<pathelement location="${basedir}/intellij/lib/javafx-fxml-14.0.2.1-win.jar"/>
<pathelement location="${basedir}/intellij/lib/javafx-graphics-14.0.2.1-win.jar"/>
<pathelement location="${basedir}/intellij/lib/javafx-media-11-win.jar"/>
<pathelement location="${basedir}/intellij/lib/javafx-web-11-win.jar"/>
<pathelement location="${basedir}/intellij/lib/jdom.jar"/>
<pathelement location="${basedir}/intellij/lib/jmetro-11.6.15.jar"/>
</path>

<!-- Register Custom Compiler Taskdefs -->
Expand All @@ -108,7 +167,7 @@
<include name="jdom.jar"/>
<include name="asm-all*.jar"/>
<include name="forms-*.jar"/>
<include name="forms_*.jar"/>
<include name="forms_rt.jar"/>
</fileset>
</path>

Expand All @@ -128,19 +187,9 @@
<property name="module.jdk.bin.jblockcreator" value="${project.jdk.bin}"/>
<property name="module.jdk.classpath.jblockcreator" value="${project.jdk.classpath}"/>

<property name="compiler.args.jblockcreator" value="-encoding UTF-8 -source 8 -target 8 ${compiler.args}"/>
<property name="compiler.args.jblockcreator" value="-encoding UTF-8 -source 14 -target 14 ${compiler.args}"/>

<property name="jblockcreator.output.dir" value="${module.jblockcreator.basedir}/out/production/JBlockCreator"/>

<path id="jblockcreator.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>

<path id="jblockcreator.module.production.classpath">
<path refid="${module.jdk.classpath.jblockcreator}"/>
<path refid="library.forms_rt.classpath"/>
<path refid="library.javac2.classpath"/>
</path>
<property name="jblockcreator.output.dir" value="${module.jblockcreator.basedir}/out/production/JBlockCreator"/>

<patternset id="excluded.from.module.jblockcreator">
<patternset refid="ignored.files"/>
Expand All @@ -164,8 +213,7 @@

<javac2 destdir="${jblockcreator.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.jblockcreator}/javac">
<compilerarg line="${compiler.args.jblockcreator}"/>
<bootclasspath refid="jblockcreator.module.bootclasspath"/>
<classpath refid="jblockcreator.module.production.classpath"/>
<modulepath refid="library.lib.classpath"/>
<src refid="jblockcreator.module.sourcepath"/>
<patternset refid="excluded.from.compilation.jblockcreator"/>
</javac2>
Expand All @@ -179,7 +227,7 @@
</target>

<target name="clean.module.jblockcreator" description="cleanup module">
<delete includeemptydirs="true">
<delete includeemptydirs="true" failonerror="false">
<fileset dir="${jblockcreator.output.dir}">
<include name="**/*"/>
<exclude name="**/com/**"/>
Expand All @@ -200,6 +248,7 @@
<target name="init.artifacts">
<property name="artifacts.temp.dir" value="${basedir}/__artifacts_temp"/>
<property name="artifact.output.jblockcreator:jar" value="${basedir}/bin"/>
<property name="img.dir" value="${basedir}/images"/>
<mkdir dir="${artifacts.temp.dir}"/>
<property name="temp.jar.path.JBlockCreator.jar" value="${artifacts.temp.dir}/JBlockCreator.jar"/>
</target>
Expand All @@ -212,25 +261,32 @@
<zipfileset dir="${module.jblockcreator.basedir}/intellij"/>
<zipfileset file="${basedir}/META-INF/MANIFEST.MF" prefix="META-INF"/>
<manifest>
<attribute name="Main-Class" value="jblockmain.JBlockCreator" />
<attribute name="Main-Class" value="jblockmain.JBlockCreatorApp" />
</manifest>
</jar>
<copy file="${temp.jar.path.JBlockCreator.jar}" tofile="${artifact.temp.output.jblockcreator:jar}/JBlockCreator.jar"/>
</target>

<target name="build.all.artifacts" depends="artifact.jblockcreator:jar" description="Build all artifacts">
<mkdir dir="${artifact.output.jblockcreator:jar}"/>
<mkdir dir="${artifact.output.jblockcreator:jar}/images"/>
<copy todir="${artifact.output.jblockcreator:jar}">
<fileset dir="${artifact.temp.output.jblockcreator:jar}"/>
</copy>
<copy todir="${artifact.output.jblockcreator:jar}/images">
<fileset dir="${img.dir}"/>
</copy>

<!-- Delete temporary files -->
<delete dir="${artifacts.temp.dir}"/>
</target>

<!-- Run Target -->
<target name="run" depends="all">
<java jar="${artifact.output.jblockcreator:jar}/JBlockCreator.jar" fork="true"/>
<java jar="${artifact.output.jblockcreator:jar}/JBlockCreator.jar" fork="true">
<jvmarg line="--module-path ${idea.home}/lib"/>
<jvmarg line="--add-modules javafx.controls,javafx.fxml,org.jfxtras.styles.jmetro"/>
</java>
</target>

<target name="all" depends="build.modules, build.all.artifacts" description="build all"/>
Expand Down
7 changes: 7 additions & 0 deletions input/SampleInputFile.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
,[A01] Chest/Bust Circum Tape Measure,[A02] Opt Small of back Waist Tape Measure,[A03] Hip Circum Tape Measure,[A04] Half Back Centre Tape Measure,[A05] Neck Circumference,[A06] Scye Depth,[A07] Side Neck to Bust Length Right,[A08] Side Neck to Bust to Waist R,[A09] Across Back Tape Measurement,[A10] Across Chest Arm to Arm Length,[A11] Shoulder Length Right,[A12] Bust Width,[A13] Upper Hip SOB -10cm,[A14] Waist to Knee Length,[A15] Waist to Hip Length,[A16] Skirt Length,[A17] Thigh Circ R,[A18] Knee Circ R,[A19] Ankle Circ R,[A20] Waist to Crotch Length (Body Rise),[A21] Waist to Ankle (Outside Leg),[A22] Crotch to Ankle (Inside Leg),[A23] Sleeve Lenght R,[A24] Bicep Circ,[A25] Shoulder to Elbow,[A26] Fr Waist Arc,[A27] Bk Waist Arc,[A28] Fr Abdomen Arc,[A29] Bk Abdomen Arc,[A30] Bk Seat Arc,[A31] Fr Hip Arc,[A32] Bk Hip Arc,[A33] Waist to Abdomen,[A34] Waist to Seat,[A35] Depth of Sleevehead 1,[A36] Depth of Sleevehead 2,[A37] R Hip to Waist Vert Arc,[A38] Body Rise,[A39] Seat Depth,[A40] Hip Depth,[A41] Ankle C R Height,[A42] Knee C R Height,[A43] Crotch Height,[A44] Hip C Height,[A45] Seat C Height,[A46] Fr Seat Arc,[A47] Crotch Z,[A48] Hip Fr Z,[A49] Hip Bk Z,[A50] Seat Fr Z,[A51] Seat Bk Z,[A52] Waist Fr Z,[A53] Waist Bk Z,[A54] Fr Crotch Length,[A55] Bk Crotch Length,[A56] Fr Bust Arc,[A57] Bk Bust Arc,[A58] Mid Thigh Width,[A59] Waist Width,[A60] Hip Width,[A61] Abdomen Fr Z,[A62] Crotch Length Full,[A63] Mid Neck Base Width,[A64] Bk Shldr Width Horz,[A65] L Shldr Drop [Mid Nck],[A66] R Shldr Drop [Mid Nck],[A67] Arm Length L,[A68] Arm Length R,[A69] Wrist Circ L,[A70] Wrist Circ R,[A71] Fr Nk Arc,[A72] Bk Nk Arc,[A73] Fr Nk Diagonal Length,[A74] Bk Nk Diagonal Length,[A77] Seat C + 5,[A78] Seat C + 10,[A79] Seat C + 15,[A80] Seat C + 20,[A81] Seat C + 25,[A82] Seat Width,[A83] Waist Depth,[A84] Abdomen Depth,[A85] Seat Depth,[A86] Hip Depth,[A87] Mid Thigh Circ R,[A88] Mid Thigh Circ R Height,[A89] Min Lower Leg Circ R,[A90] Min Lower Leg Circ R Height,[A91] Crotch Circ - 1cm down,[A92] Thigh Circ R Height
Person 1,89.99,72.25,98.61,39.37,36.77,22.2,25.75,39.06,33.31,30.47,14.61,22.4,87.68,64.92,24.18,71.72,56.47,34.24,23.5,30.99,102.45,71.46,52.95,29.9,33.26,36.67,35.53,42.14,45.68,53.32,45.24,53.32,10.42,20.46,17.24,13.6,0.79,30.99,23.94,22.48,5.63,43.16,77.1,83.9,87.63,44.22,-5.3,5,-17.48,5.9,-18.05,6.39,-12.32,37.71,38.09,51.36,38.57,18.36,25.95,35.94,7.1,75.8,12.17,44.09,5.67,4.9,54.73,52.95,18.14,17.73,17.82,18.95,9.1,1.78,94.37,88.38,79.05,72.25,74.22,35.24,18.71,22.33,23.94,22.48,44.92,57.59,21,8,58.62,72.38
Person 2,98.99,79.48,108.47,43.31,40.45,24.42,28.33,42.97,36.64,33.52,16.07,24.64,96.45,71.41,26.6,78.89,62.12,37.66,25.85,34.09,112.7,78.61,58.25,32.89,36.59,40.34,39.08,46.35,50.25,58.65,49.76,58.65,11.46,22.51,18.96,14.96,0.87,34.09,26.33,24.73,6.19,47.48,84.81,92.29,96.39,48.64,-5.83,5.5,-19.23,6.49,-19.86,7.03,-13.55,41.48,41.9,56.5,42.43,20.2,28.55,39.53,7.81,83.38,13.39,48.5,6.24,5.39,60.2,58.25,19.95,19.5,19.6,20.85,10.01,1.96,103.81,97.22,86.96,79.48,81.64,38.76,20.58,24.56,26.33,24.73,49.41,63.35,23.09,8.79,64.48,79.61
Person 3,85.41,67.51,94.29,39.5,35.65,21.23,26.11,40.75,32.12,29.78,13.4,21.4,83.27,63.9,26.63,70.7,54.26,32.61,23.39,29.92,101.47,71.56,53.09,28.25,33.05,33.83,33.61,39.71,43.14,49.51,46,48.24,10.06,20.91,17.02,13.19,0.68,29.93,22.04,20.05,5.58,43.16,77.15,80.43,86.16,43.6,-2.09,7.39,-12.66,7.62,-14.41,8.49,-8.57,35.87,37.43,47.34,38.01,17.86,24.73,34.94,9.09,73.29,12.16,42.82,5.47,5.27,54.24,53.09,16.55,15.93,18.7,16.96,7.91,2.6,90.38,84.64,76.09,67.66,69.11,34.12,17.07,20.53,22.04,20.05,43.18,57.61,20.18,7.68,56.8,70.13
Person 4,95.37,77.29,103.79,38.71,38.23,21.78,27.07,40.21,35.04,32.49,14.63,23.8,92.34,65.22,24.22,72.02,58.17,34.58,23.81,31.03,103.03,72,53.83,30.41,33.83,39.79,37.44,44.69,49.48,56.49,47.25,56.49,11.58,19.74,17.79,14.04,0.74,31.05,25.28,23.71,5.63,43.44,77.65,84.44,88.93,45.9,-4.83,5.86,-17.85,6.73,-18.55,7.59,-12.46,38.12,39.23,55.32,39.98,18.83,27.75,37.57,8.05,77.35,13.09,45.93,5.66,5.01,54.97,53.83,18.39,16.27,18.83,19.4,9.03,2.17,98.69,91.92,81.89,77.28,79.34,36.77,20.05,23.97,25.28,23.71,45.71,57.99,21.36,8.13,60.48,74.67
Person 5,123.43,106.11,130.57,40.88,42.09,25.92,32.19,44.63,46.58,39.89,12.32,29.1,125.63,62.22,15.92,69.02,70.89,44.72,28.99,33.17,102.21,69.04,61.79,37.29,35.52,58.46,47.59,65.56,64.09,66.02,63.87,66.66,14.47,19.31,19.21,16.37,0.96,33.19,35.36,36.49,5.85,45.85,74.91,92.14,88.78,64.07,-1.52,17.35,-19.15,15.92,-19.44,18.12,-11.68,43.58,45.35,70.07,53.31,22.87,35.56,45.17,17.78,88.93,14.4,42.9,2.97,4.67,63.92,61.79,18.8,18.5,21.84,20.26,8.33,4.16,130.14,124.35,111.62,105.98,109.32,45.81,29.8,35.89,35.36,36.49,57.34,57.83,26.8,10.2,76.04,93.88
Person 6,86.37,73.94,96.63,37.95,35.22,18.64,24.98,40.27,34.3,30.29,14.16,19.8,81.92,63.4,24.5,70.2,51.62,32.54,22.91,30.82,99.44,68.62,54.9,26.77,34.05,38.98,34.9,41.54,40.03,50.14,46.43,50.14,10.12,19.66,16.23,12.34,0.5,30.82,22.84,22.41,5.47,41.51,74.1,80.41,85.25,44.04,-4.57,5.98,-16.43,5.85,-16.98,7.46,-11.72,36.91,37.07,48.87,37.44,18.27,27.05,34.86,7.22,73.98,11.64,43.55,5.6,4.79,55.44,54.9,18.09,17.06,18.67,16.54,8.7,2.45,87.65,81.59,76.62,73.84,74,33.96,19.18,20.96,22.84,22.41,42.78,55.26,19.99,7.61,55.04,67.95
Loading

0 comments on commit 618264a

Please sign in to comment.