1452 Commits

Author	SHA1	Message	Date
Iain Powrie	2a19e24a82	Merge branch 'refractor/remove-bleach' into 'dev' ... Refractor/Replace bleach with nh3 See merge request crafty-controller/crafty-4!616	2023-09-02 14:06:26 +00:00
Wout Bouckaert	ad9042e88f	Replace bleach with nh3.	2023-08-12 21:53:26 -06:00
Andrew	2c4b90964d	Check for string response on server ping	2023-08-02 19:20:26 -04:00
Zedifus	aa0824630a	Merge branch 'dev' into refactor/in-file	2023-07-18 21:07:11 +01:00
Andrew	6396c3079e	Include self in method call	2023-07-04 15:02:47 -04:00
Andrew	45b0264499	Fix enabling schedules from schedule list	2023-07-04 12:10:59 -04:00
amcmanu3	a00ea06b9f	Merge branch 'dev' into refactor/in-file	2023-06-27 00:48:21 -04:00
Andrew	6f506eecbd	Add autofield to appease linter	2023-06-18 11:09:00 -04:00
Zedifus	1fd4a50828	Merge branch 'dev' into tweak/serverjars-bedrock	2023-06-18 14:04:10 +01:00
amcmanu3	73d2788aa0	Refactor all items using in_path for windows comp	2023-06-14 18:57:15 -04:00
Andrew	fd95abdf42	Remove bedrock servers in serverjars options	2023-06-06 20:44:59 -04:00
amcmanu3	88fe3146da	Remove seconds from date/time	2023-05-30 00:01:54 -04:00
amcmanu3	a04771df34	Use a cache for players instead of reading file	2023-05-29 19:34:40 -04:00
Andrew	178aba63dd	Send empty json for no banned/cached players	2023-05-23 18:21:04 -04:00
amcmanu3	fe2724d350	Set bedrock availablity to true always for now :)	2023-05-22 21:03:29 -04:00
amcmanu3	438564fe0a	Merge branch 'dev' into tweak/server-jars-credit	2023-05-22 21:02:36 -04:00
Silversthorn	e90d6e8091	Merge branch 'dev' into tweak/improve-display	2023-05-18 09:53:23 +02:00
amcmanu3	03db0c5850	Improve error notifications. ... Fix remove server jar logo on error	2023-05-17 12:51:45 -04:00
Iain Powrie	194228afbf	Merge branch 'tweak/restore-server-path' into 'dev' ... Retain pathing in execution command on restore. See merge request crafty-controller/crafty-4!578	2023-05-15 01:58:11 +00:00
Zedifus	ed6b0eb946	Fix check_address_status	2023-05-15 02:49:37 +01:00
Andrew	9aaf27ee6a	Merge branch 'dev' into tweak/restore-server-path	2023-05-14 21:36:16 -04:00
Zedifus	5ef78dc144	Merge branch 'dev' into tweak/server-api-warning	2023-05-14 22:33:44 +01:00
Zedifus	5ffc241e0a	Merge branch 'dev' into bugfix/project_root	2023-05-14 22:17:47 +01:00
Zedifus	33557c026b	Merge branch 'dev' into enhancement/mobile-app	2023-05-14 20:55:42 +01:00
Zedifus	d00b9fb4dd	Merge branch 'dev' into bugfix/loop-detection	2023-05-14 20:37:09 +01:00
Zedifus	061baadc0c	Merge branch 'dev' into bugfix/server-order	2023-05-14 20:21:14 +01:00
Andrew	3262b5fd15	Add grayscale warning over creation when api down	2023-05-14 14:23:06 -04:00
Andrew	984d4dbf94	Fix dom issue	2023-05-11 21:56:31 -04:00
Andrew	695b2d9d8c	Fix project root error on first start.	2023-05-08 20:11:15 -04:00
amcmanu3	a35cec9d6c	Retain pathing in execution command on restore.	2023-05-07 19:28:14 -04:00
amcmanu3	1ab409f5cb	Add check for parent in schedules	2023-05-07 13:51:12 -04:00
amcmanu3	f22a6e77da	Remove del task from ajax.	2023-05-07 13:50:26 -04:00
amcmanu3	fb543fb148	Merge branch 'dev' into refactor/remote-comms-api	2023-05-07 13:49:53 -04:00
Silversthorn	8119c97927	Merge branch 'dev' into tweak/improve-display	2023-04-15 21:00:24 +02:00
Silversthorn	a911791737	Fixing Black	2023-04-15 20:58:29 +02:00
Silversthorn	b5abc93a8e	Fixing Pipelines Issues	2023-04-15 20:55:46 +02:00
Silversthorn	84a09ad9be	Improve player display	2023-04-15 20:47:35 +02:00
amcmanu3	0992e6288c	Remove print comments	2023-04-12 13:04:57 -04:00
amcmanu3	3e8f04318c	Remove print statements	2023-04-12 13:04:18 -04:00
amcmanu3	5542f792c8	Fix role server calculation	2023-04-12 13:03:44 -04:00
amcmanu3	b7ef960cf1	Add print statements for running	2023-04-12 12:42:39 -04:00
amcmanu3	58b9dc615d	Major logic changes to fix this.	2023-04-12 12:14:37 -04:00
amcmanu3	146e9d7b60	Fix import loop detection.	2023-04-12 10:32:40 -04:00
amcmanu3	8eac424ab1	More debug data	2023-04-11 16:04:09 -04:00
amcmanu3	e321086f7f	Adding print statements	2023-04-10 15:19:15 -04:00
Andrew	cc092d6ecb	Fix type error comparrison	2023-04-09 16:10:53 -04:00
Andrew	7d8ade5d5e	Fix this for unloaded servers	2023-04-09 07:34:22 -04:00
Andrew	7d804afe20	Make this more efficient	2023-04-08 20:33:11 -04:00
Andrew	d65f2f7111	Fix traceback on user order	2023-04-08 20:16:11 -04:00
Zedifus	e0e631e1ec	Merge branch 'dev' into bug/motd-obfuscation	2023-04-01 14:57:16 +01:00