mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-18 16:27:34 +01:00
Fixed some conflicts
This commit is contained in:
@@ -1,3 +1,79 @@
|
||||
UnitTimeSecondSymbol = "_s"
|
||||
UnitTimeSecondMilliSymbol = "_ms"
|
||||
UnitTimeSecondMicroSymbol = "_μs"
|
||||
UnitTimeSecondNanoSymbol = "_ns"
|
||||
UnitTimeMinuteSymbol = "_min"
|
||||
UnitTimeHourSymbol = "_h"
|
||||
UnitTimeDaySymbol = "_day"
|
||||
UnitTimeWeekSymbol = "_week"
|
||||
UnitTimeMonthSymbol = "_month"
|
||||
UnitTimeYearSymbol = "_year"
|
||||
UnitDistanceMeterKiloSymbol = "_km"
|
||||
UnitDistanceMeterSymbol = "_m"
|
||||
UnitDistanceMeterMilliSymbol = "_mm"
|
||||
UnitDistanceMeterMicroSymbol = "_μm"
|
||||
UnitDistanceMeterNanoSymbol = "_nm"
|
||||
UnitDistanceMeterPicoSymbol = "_pm"
|
||||
UnitDistanceAstronomicalUnitSymbol = "_au"
|
||||
UnitDistanceLightYearSymbol = "_ly"
|
||||
UnitDistanceParsecSymbol = "_pc"
|
||||
UnitMassGramKiloSymbol = "_kg"
|
||||
UnitMassGramSymbol = "_g"
|
||||
UnitMassGramMilliSymbol = "_mg"
|
||||
UnitMassGramMicroSymbol = "_μg"
|
||||
UnitMassGramNanoSymbol = "_ng"
|
||||
UnitMassTonneSymbol = "_t"
|
||||
UnitCurrentAmpereSymbol = "_A"
|
||||
UnitCurrentAmpereMilliSymbol = "_mA"
|
||||
UnitCurrentAmpereMicroSymbol = "_μA"
|
||||
UnitTemperatureKelvinSymbol = "_K"
|
||||
UnitAmountMoleSymbol = "_mol"
|
||||
UnitAmountMoleMilliSymbol = "_mmol"
|
||||
UnitAmountMoleMicroSymbol = "_μmol"
|
||||
UnitLuminousIntensityCandelaSymbol = "_cd"
|
||||
UnitFrequencyHertzGigaSymbol = "_GHz"
|
||||
UnitFrequencyHertzMegaSymbol = "_MHz"
|
||||
UnitFrequencyHertzKiloSymbol = "_kHz"
|
||||
UnitFrequencyHertzSymbol = "_Hz"
|
||||
UnitForceNewtonKiloSymbol = "_kN"
|
||||
UnitForceNewtonSymbol = "_N"
|
||||
UnitForceNewtonMilliSymbol = "_mN"
|
||||
UnitPressurePascalSymbol = "_Pa"
|
||||
UnitPressurePascalHectoSymbol = "_hPa"
|
||||
UnitPressureBarSymbol = "_bar"
|
||||
UnitPressureAtmSymbol = "_atm"
|
||||
UnitEnergyJouleKiloSymbol = "_kJ"
|
||||
UnitEnergyJouleSymbol = "_J"
|
||||
UnitEnergyJouleMilliSymbol = "_mJ"
|
||||
UnitEnergyElectronVoltMegaSymbol = "_MeV"
|
||||
UnitEnergyElectronVoltKiloSymbol = "_keV"
|
||||
UnitEnergyElectronVoltSymbol = "_eV"
|
||||
UnitEnergyElectronVoltMilliSymbol = "_meV"
|
||||
UnitPowerWattGigaSymbol = "_GW"
|
||||
UnitPowerWattMegaSymbol = "_MW"
|
||||
UnitPowerWattKiloSymbol = "_kW"
|
||||
UnitPowerWattSymbol = "_W"
|
||||
UnitPowerWattMilliSymbol = "_mW"
|
||||
UnitPowerWattMicroSymbol = "_μW"
|
||||
UnitChargeCoulombSymbol = "_C"
|
||||
UnitPotentialVoltKiloSymbol = "_kV"
|
||||
UnitPotentialVoltSymbol = "_V"
|
||||
UnitPotentialVoltMilliSymbol = "_mV"
|
||||
UnitPotentialVoltMicroSymbol = "_μV"
|
||||
UnitCapacitanceFaradSymbol = "_F"
|
||||
UnitCapacitanceFaradMilliSymbol = "_mF"
|
||||
UnitCapacitanceFaradMicroSymbol = "_μF"
|
||||
UnitResistanceOhmKiloSymbol = "_kΩ"
|
||||
UnitResistanceOhmSymbol = "_Ω"
|
||||
UnitConductanceSiemensSymbol = "_S"
|
||||
UnitConductanceSiemensMilliSymbol = "_mS"
|
||||
UnitMagneticFieldTeslaSymbol = "_T"
|
||||
UnitInductanceHenrySymbol = "_H"
|
||||
UnitSurfaceHectarSymbol = "_ha"
|
||||
UnitVolumeLiterSymbol = "_L"
|
||||
UnitVolumeLiterDeciSymbol = "_dL"
|
||||
UnitVolumeLiterCentiSymbol = "_cL"
|
||||
UnitVolumeLiterMilliSymbol = "_mL"
|
||||
A = "a"
|
||||
AbsCommandWithArg = "abs(x)"
|
||||
AcoshCommandWithArg = "acosh(x)"
|
||||
|
||||
Reference in New Issue
Block a user