diff --git a/Assets/script/AtomeInformation.cs b/Assets/script/AtomeInformation.cs index a099530..b46f215 100644 --- a/Assets/script/AtomeInformation.cs +++ b/Assets/script/AtomeInformation.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System; [System.Serializable] -public class Properties { +public class AtomeProps { public string yeardiscovered; public string atomicmass; public string standardstate; @@ -25,7 +25,7 @@ public class AtomeInformation public string name; public int protons; public int neutrons; - public Properties properties; + public AtomeProps properties; public Representation representation; } diff --git a/Assets/script/atomes.json b/Assets/script/atomes.json index c833ea7..4433825 100644 --- a/Assets/script/atomes.json +++ b/Assets/script/atomes.json @@ -15,7 +15,7 @@ "named_by": "Antoine Lavoisier" }, "representation": { - "color": "##ffffff" + "color": "#ffffff" } }, { @@ -33,7 +33,7 @@ "named_by": null }, "representation": { - "color": "##d9ebf7" + "color": "#d9ebf7" } }, { @@ -51,7 +51,7 @@ "named_by": null }, "representation": { - "color": "##cc80ff" + "color": "#cc80ff" } }, { @@ -69,7 +69,7 @@ "named_by": null }, "representation": { - "color": "##d9ffb3" + "color": "#d9ffb3" } }, { @@ -87,7 +87,7 @@ "named_by": null }, "representation": { - "color": "##ff6666" + "color": "#ff6666" } }, { @@ -105,7 +105,7 @@ "named_by": null }, "representation": { - "color": "##666666" + "color": "#666666" } }, { @@ -123,7 +123,7 @@ "named_by": null }, "representation": { - "color": "##4d4dff" + "color": "#4d4dff" } }, { @@ -141,7 +141,7 @@ "named_by": null }, "representation": { - "color": "##ff4d4d" + "color": "#ff4d4d" } }, { @@ -159,7 +159,7 @@ "named_by": null }, "representation": { - "color": "##99ffcc" + "color": "#99ffcc" } }, { @@ -177,7 +177,7 @@ "named_by": null }, "representation": { - "color": "##b3b3cc" + "color": "#b3b3cc" } }, { @@ -195,7 +195,7 @@ "named_by": null }, "representation": { - "color": "##ffcc99" + "color": "#ffcc99" } }, { @@ -213,7 +213,7 @@ "named_by": null }, "representation": { - "color": "##b3b3cc" + "color": "#b3b3cc" } }, { @@ -231,7 +231,7 @@ "named_by": null }, "representation": { - "color": "##999999" + "color": "#999999" } }, { @@ -249,7 +249,7 @@ "named_by": "Thomas Thomson" }, "representation": { - "color": "##ffcc66" + "color": "#ffcc66" } }, { @@ -267,7 +267,7 @@ "named_by": null }, "representation": { - "color": "##cc6666" + "color": "#cc6666" } }, { @@ -285,7 +285,7 @@ "named_by": null }, "representation": { - "color": "##d9ff66" + "color": "#d9ff66" } }, { @@ -303,7 +303,7 @@ "named_by": null }, "representation": { - "color": "##66ff66" + "color": "#66ff66" } }, { @@ -321,7 +321,7 @@ "named_by": null }, "representation": { - "color": "##b3b3cc" + "color": "#b3b3cc" } }, { @@ -339,7 +339,7 @@ "named_by": null }, "representation": { - "color": "##ff9966" + "color": "#ff9966" } }, { @@ -357,7 +357,7 @@ "named_by": null }, "representation": { - "color": "##99ccff" + "color": "#99ccff" } }, { @@ -375,7 +375,7 @@ "named_by": null }, "representation": { - "color": "##e6e6e6" + "color": "#e6e6e6" } }, { @@ -393,7 +393,7 @@ "named_by": "Martin Heinrich Klaproth" }, "representation": { - "color": "##b3b3cc" + "color": "#b3b3cc" } }, { @@ -411,7 +411,7 @@ "named_by": "Nils Gabriel Sefström" }, "representation": { - "color": "##99ffcc" + "color": "#99ffcc" } }, { diff --git a/QCAR/somedata16 b/QCAR/somedata16 index 21c51d6..891ff05 100644 --- a/QCAR/somedata16 +++ b/QCAR/somedata16 @@ -1 +1 @@ -AAABmQWapYRGu7Loo2wvgwZUGzXNOVLSaix1jbBp7+6hM1WFhjBkddUoLqWxkauNc7gcguqgEle3Gl3JhXdUv8TOSygVCeRnuokmoncR2/5V78p0F0Cfn5gBebVC39W8GQ6XkVyp75Y8d30EG+W8VKPfuse2cfavkxXpI2Nl3LSy0VRONL0XNPimQXCFL0ahAeUkOc37yrfYL9FrG7wg4Rw+k4YLs++CGJhpcKysknksOgQGrDLh9Hj9lfoKw+YWYwvTA55r6X388fA3hXuRGNehejMd4orrTqM65do7Uf0KR4eC/KXr5cmkSwN4FwRxWaGm16G0tXit+hD29lyZbT/XJ64= +AAABmY7g9UmlfucNZM2mK1+zBTca7O7gdAXUc9FcH4yUbYfsFOfH72rVb0qPESQq/9HBlqfD04SyJF6jtD6oQDsZxFAYgmMCBkOzNr/C/s4mdV37Qw5Nm9GqecPYpccvAWOqH/VAtFBp5ksgnAnVhuHUqh0NmvpixXq82Meo/bg7usPAWSDsQt/6kR89nttLOknq/Rt+SN8E91Txj6nsYZH8gsxrgC9MYPO0koHuIvfeLk0wcqrMzxZawaNLp6CNWgUYDXWIWW1AtB9dY5p56nnk/Yd4MyRevYDtcWdXCdiam48zdO470AuA8DkAFHOttVURidwRkVKq4z40E6J+5V3NqDg= \ No newline at end of file