1325 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mikayla Fischler	1c0f61b3e0	changed config defaults to use theme enums	2024-03-12 21:09:37 -04:00
Mikayla Fischler	ecd3575643	Merge branch 'color-update' into devel	2024-03-12 13:35:39 -04:00
Mikayla Fischler	9dc3a09f4d	bumped up pocket version for configurator change	2024-03-12 13:35:15 -04:00
Mikayla	7a5d14d67f	Merge pull request #448 from MikaylaFischler/color-update ... Colorblind Modes	2024-03-12 13:25:36 -04:00
Mikayla Fischler	d6175e5cec	switched to using LEDPair elements for colorblind mode network lights	2024-03-12 13:23:39 -04:00
Mikayla Fischler	a00a824a7f	cleanup and fixes	2024-03-12 13:15:28 -04:00
Mikayla Fischler	9393632428	removed unused value specifiers	2024-03-12 12:54:31 -04:00
Mikayla Fischler	886bd0d5d5	luacheck fixes	2024-03-12 12:49:33 -04:00
Mikayla Fischler	9c1d83fdfc	Merge branch 'devel' into color-update	2024-03-12 12:46:17 -04:00
Mikayla Fischler	bd88244681	#439 remind user to configure peripherals and redstone, and provide buttons to do so	2024-03-12 12:45:47 -04:00
Mikayla	8dae632b25	simplified checks for colorblind mode	2024-03-12 16:24:32 +00:00
Mikayla Fischler	89d56d3101	moved main UI palettes to themes.lua and set configurators to use it	2024-03-11 23:54:03 -04:00
Mikayla Fischler	1f451ff92a	#340 coordinator colorblind support	2024-03-11 23:31:31 -04:00
Mikayla Fischler	9d08b51f84	#340 restored softer blue for deuteranopia/protanopia basalt theme	2024-03-11 21:43:11 -04:00
Mikayla Fischler	047ff5c203	Merge branch 'devel' into color-update	2024-03-11 21:26:23 -04:00
Mikayla Fischler	895f768e58	Merge branch 'color-update' of github.com:MikaylaFischler/cc-mek-scada into color-update	2024-03-11 21:25:55 -04:00
Mikayla Fischler	b3f29566ea	#340 colorblind modes for rtu, reactor-plc, and supervisor	2024-03-11 21:25:34 -04:00
Mikayla	c0a5c8d504	Merge pull request #447 from MikaylaFischler/color-update ... Dark Mode Themes	2024-03-11 12:38:22 -04:00
Mikayla	bbe7b52662	bugfixes and cleanup	2024-03-11 16:35:06 +00:00
Mikayla Fischler	d5b166dcc6	Merge branch 'devel' into color-update	2024-03-09 18:51:21 -05:00
Mikayla	b0aa6d54ac	Merge pull request #446 from MikaylaFischler/devel ... 2024.03.09 Beta Hotfix	2024-03-09 18:14:02 -05:00
Mikayla Fischler	ad240ae44c	#445 increment common version	2024-03-09 17:54:04 -05:00
Mikayla Fischler	79c93f1562	#445 fixed PPM undefined field logic and improved RTU unit fault handling	2024-03-09 13:24:06 -05:00
Mikayla Fischler	5d760a0524	#405 helper functions, enums, and name tables added to themes.lua	2024-03-09 12:41:45 -05:00
Mikayla Fischler	6c89b3134c	#405 make pu fallback selector visible	2024-03-09 12:39:37 -05:00
Mikayla	3c7fff28c9	Merge pull request #443 from MikaylaFischler/devel ... 2024.03.08 Release	2024-03-08 22:40:28 -05:00
Mikayla Fischler	814043bf04	#405 basalt theme color adjustments	2024-03-07 20:46:10 -05:00
Mikayla Fischler	fc7896ebd3	#405 #340 rtu and supervisor configurator control of theme and color mode	2024-03-07 19:23:46 -05:00
Mikayla Fischler	48a8eadc55	#405 #340 reactor plc configurator control of theme and color mode	2024-03-07 18:00:33 -05:00
Mikayla	f0f2aadf53	#200 work on pocket comms	2024-03-07 17:27:25 +00:00
Mikayla	ce37a672a3	Merge branch 'devel' into pocket-alpha-dev	2024-03-07 16:21:37 +00:00
Mikayla Fischler	510995b04f	#405 #340 coordinator configurator control of theme and color mode	2024-03-06 23:35:30 -05:00
Mikayla Fischler	560061d4ad	removed latest shield and added missing common version shield	2024-03-06 20:51:23 -05:00
Mikayla Fischler	d87e3893f0	#405 plc and rtu front panel themes	2024-03-06 12:18:50 -05:00
Mikayla Fischler	fc198cd9d2	#405 supervisor and coordinator front panel themes	2024-03-06 11:43:31 -05:00
Mikayla Fischler	c714e49ad8	Merge branch 'devel' into color-update	2024-03-05 22:03:24 -05:00
Mikayla Fischler	d1e4ea586e	supervisor comment cleanup	2024-03-05 21:47:14 -05:00
Mikayla Fischler	4e789ab92d	cleanup and refactors	2024-03-05 21:24:17 -05:00
Mikayla Fischler	0892a57d35	#442 return rather than assert on configuration error	2024-03-05 20:17:52 -05:00
Mikayla Fischler	1bc4828010	#438 use reported polonium rate rather than an estimate	2024-03-05 19:35:54 -05:00
Mikayla Fischler	fb5a9d5d9e	#432 fixes and enhancements to coordinator waiting on chunk loads	2024-03-05 17:16:35 -05:00
Mikayla Fischler	adbf1f2f78	#441 #431 bugfixes to the bugfixes	2024-03-05 17:12:12 -05:00
Mikayla Fischler	2f99aaeedb	#431 handle ppm mount of unformed reactor race condition	2024-03-05 10:56:27 -05:00
Mikayla Fischler	a318ffb283	#405 styling improvements to PLC front panel	2024-03-05 10:51:18 -05:00
Mikayla Fischler	a677e994d6	Merge branch 'devel' into color-update	2024-02-26 14:44:47 -05:00
Mikayla Fischler	f9917b786c	#432 wait 20s on computer power on before assuming monitor configuration problem	2024-02-25 18:02:13 -05:00
Mikayla Fischler	dbc1f41c5d	#406 bounds check all controls	2024-02-25 15:53:14 -05:00
Mikayla Fischler	d6185e0183	#433 use os.clock instead of util.time_s for coordinator connection timeout to supervisor	2024-02-25 13:13:36 -05:00
Mikayla Fischler	6ef049baa1	#405 reverted yellow, desaturated orange	2024-02-25 13:09:30 -05:00
Mikayla Fischler	a4214e8a4f	#405 fixed waste line still always being black and removed colormap test	2024-02-24 19:34:43 -05:00