Merge branch 'main' of https://gitea.centraal.wbd-rd.nl/woutverheijen/EVOLV

test
2025-11-06 09:05:13 +01:00 · 2025-11-06 08:56:15 +01:00 · 2025-11-06 08:40:23 +01:00 · 2025-11-06 07:04:02 +00:00 · 2025-10-24 09:38:35 +02:00 · 2025-10-16 10:48:14 +02:00
10 changed files with 16 additions and 16 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "nodes/machineGroupControl"]
 	path = nodes/machineGroupControl
-	url = https://gitea.centraal.wbd-rd.nl/RnD/machineGroupControl.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/machineGroupControl.git
 [submodule "nodes/generalFunctions"]
 	path = nodes/generalFunctions
 	url = https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git
@@ -13,13 +13,13 @@
 	url = https://gitea.centraal.wbd-rd.nl/RnD/valve.git
 [submodule "nodes/rotatingMachine"]
 	path = nodes/rotatingMachine
-	url = https://gitea.centraal.wbd-rd.nl/RnD/rotatingMachine.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/rotatingMachine.git
 [submodule "nodes/monster"]
 	path = nodes/monster
 	url = https://gitea.centraal.wbd-rd.nl/RnD/monster.git
 [submodule "nodes/measurement"]
 	path = nodes/measurement
-	url = https://gitea.centraal.wbd-rd.nl/RnD/measurement.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/measurement.git
 [submodule "nodes/diffuser"]
 	path = nodes/diffuser
 	url = https://gitea.centraal.wbd-rd.nl/RnD/diffuser.git
--- a/nodes/generalFunctions
+++ b/nodes/generalFunctions
--- a/nodes/machineGroupControl
+++ b/nodes/machineGroupControl
--- a/nodes/measurement
+++ b/nodes/measurement
--- a/nodes/monster
+++ b/nodes/monster
--- a/nodes/reactor
+++ b/nodes/reactor
--- a/nodes/rotatingMachine
+++ b/nodes/rotatingMachine
--- a/nodes/settler
+++ b/nodes/settler
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
      "version": "1.0.41",
      "license": "SEE LICENSE",
      "dependencies": {
-        "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git",
+        "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions",
        "mathjs": "^13.2.0"
      }
    },
@@ -23,9 +23,9 @@
      }
    },
    "node_modules/complex.js": {
-      "version": "2.4.3",
+      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.4.3.tgz",
+      "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.4.2.tgz",
-      "integrity": "sha512-UrQVSUur14tNX6tiP4y8T4w4FeJAX3bi2cIv0pu/DTLFNxoq7z2Yh83Vfzztj6Px3X/lubqQ9IrPp7Bpn6p4MQ==",
+      "integrity": "sha512-qtx7HRhPGSCBtGiST4/WGHuW+zeaND/6Ld+db6PbrulIB1i2Ev/2UPiqcmpQNPSyfBKraC0EOvOKCB5dGZKt3g==",
      "license": "MIT",
      "engines": {
        "node": "*"
@@ -62,7 +62,7 @@
    },
    "node_modules/generalFunctions": {
      "version": "1.0.0",
-      "resolved": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git#858189d6dac4e5fddc6aa1740ec4c1b4802f170e",
+      "resolved": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions#2fb73e671341bea610aaf7ea6303b60d1415432c",
      "license": "SEE LICENSE"
    },
    "node_modules/javascript-natural-sort": {
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
  "author": "Rene De Ren, Pim Moerman, Janneke Tack, Sjoerd Fijnje, Dieke Gabriels, pieter van der wilt",
  "license": "SEE LICENSE",
  "dependencies": {
-    "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git",
+    "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions",
    "mathjs": "^13.2.0"
  }
 }
Author	SHA1	Message	Date
Woutverheijen	9f04b7e433	Merge branch 'main' of https://gitea.centraal.wbd-rd.nl/woutverheijen/EVOLV	2025-11-06 09:05:13 +01:00
Woutverheijen	0d13e1da40	test	2025-11-06 08:56:15 +01:00
Woutverheijen	1fcf6f8920	test	2025-11-06 08:40:23 +01:00
woutverheijen	e51062b290	merge upstream	2025-11-06 07:04:02 +00:00
Woutverheijen	05800cbef3	test	2025-10-24 09:38:35 +02:00
Woutverheijen	0c4419f952	Remove stale submodule nodes/heatExchanger	2025-10-16 10:48:14 +02:00