Merge pull request #11 from rm-dr/dev

Version bump to v1.1.5
Version bump
2025-11-03 15:04:25 -08:00 · 2023-09-28 13:38:21 -07:00 · 2023-09-28 13:32:34 -07:00 · 2023-09-28 13:30:08 -07:00 · 2023-09-28 13:29:23 -07:00 · 2023-09-28 14:35:16 -04:00
5 changed files with 7 additions and 7 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "daisycalc"
-version = "1.1.4"
+version = "1.1.5"
 dependencies = [
 "cfg-if",
 "num",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "daisycalc"
-version = "1.1.4"
+version = "1.1.5"
 edition = "2021"
 build = "buildscript/main.rs"
 license = "GPL-3.0-only"
--- a/5
+++ b/5
@ -14,5 +14,6 @@ publish:
 	cargo test
 	cargo publish

-docker:
-	docker build ./server -t git.betalupi.com/mark/daisy
+docker: wasm
+	docker build ./server -t git.betalupi.com/mark/daisy --no-cache
+	docker push git.betalupi.com/mark/daisy
--- a/TODO.md
+++ b/TODO.md
@ -12,7 +12,6 @@
 ## Pre-release
 - Tuple operations
 - we don't need vectors as arguments to operators
- - Fix linelocation when evaluating functions

 ## Parser
 - Should functions be operators?
--- a/buildscript/constants.toml
+++ b/buildscript/constants.toml
@ -49,7 +49,7 @@ value = "1.602176634e-19 C"
 enum_name = "ElectronMass"
 pretty_name = "Electron mass"
 strings = ["electronmass"]
-value = "9.1093837015-31 kg"
+value = "9.1093837015e-31 kg"

 [[constant]]
 enum_name = "ProtonMass"
Author	SHA1	Message	Date
Mark	a75f6197cd	Merge pull request #11 from rm-dr/dev Version bump to v1.1.5	2023-09-28 13:38:21 -07:00
Mark	2f2c005c86	Version bump	2023-09-28 13:32:34 -07:00
Mark	ffebcf2e15	Merge branch 'master' into dev	2023-09-28 13:30:08 -07:00
Mark	4e1df2399b	Merge pull request #10 from bojohnson5/testing fix electron mass	2023-09-28 13:29:23 -07:00
Johnson, Bo	5a921cfc7b	fix electron mass	2023-09-28 14:35:16 -04:00
Mark	2531524ffd	Updated makefile	2023-09-22 11:22:36 -07:00
Mark	e5525adcca	Updated todo	2023-09-22 11:05:58 -07:00
Mark	a61cbf29e5	Makefile edits	2023-09-22 11:05:30 -07:00
Mark	39ab47530e	Merge pull request #9 from rm-dr/dev Merge v1.1.4	2023-09-22 11:01:55 -07:00
Mark	be28669416	Sync with master	2023-09-22 11:00:28 -07:00
Mark	63d4a01095	Merge pull request #8 from rm-dr/dev Merge v1.1.3	2023-09-22 10:48:59 -07:00