Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,841 Commits 12 Branches 45 Tags 104 MiB
0e60480a8f
Commit Graph

2841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew
b2182919ff Fix dir does not exist. 2022-11-30 15:51:12 -05:00
Iain Powrie
a7fa91b225 Merge branch 'feature/forge-install' into 'dev' 
Automated forge install

See merge request crafty-controller/crafty-4!495
 2022-11-30 20:50:13 +00:00
Zedifus
7ef28777c7 Update changelog !495 2022-11-30 19:54:59 +00:00
Zedifus
1addde000c Merge branch 'dev' into feature/forge-install 2022-11-30 19:53:16 +00:00
Iain Powrie
7fc0bb123d Merge branch 'bug/bedrock-creation' into 'dev' 
Fix no port on bedrock server creation

See merge request crafty-controller/crafty-4!493
 2022-11-30 19:51:26 +00:00
Zedifus
9801266a9c Update changelog !493 2022-11-30 19:47:25 +00:00
Andrew
2782e927d7 Add port tooltip over status on dash 2022-11-28 19:45:53 -05:00
Andrew
e8564566ed Appease the linter 2022-11-19 18:21:10 -05:00
Silversthorn
671a5188c2 Adding French Translations 2022-11-19 23:28:57 +01:00
Silversthorn
b4dca8b27f Merge branch 'feature/forge-install' of gitlab.com:crafty-controller/crafty-4 into feature/forge-install 2022-11-19 23:20:26 +01:00
Silversthorn
004049f6da Using Regex to Extract Infos from Forge Scripts 2022-11-19 23:20:21 +01:00
Andrew
32cdde0616 Fix failed imports 2022-11-19 16:13:44 -05:00
Andrew
4e17c1ea5e Add installing status 2022-11-19 15:45:29 -05:00
Andrew
b95d71bfbc Appease the linter 2022-11-19 14:45:24 -05:00
Andrew
e42af36103 Make sure import status persists through install 2022-11-19 14:41:15 -05:00
Andrew
ad4603aafb Add automated forge server creation installs 2022-11-19 13:45:18 -05:00
amcmanu3
46740f7cbf Fix type error on delete 2022-11-09 14:20:37 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Andrew
a66b95e607 Fix no port on bedrock server creation 2022-10-28 22:16:10 -04:00
Zedifus
48b8b9d084 Merge branch 'dev' into refactor/config-json 2022-10-23 21:30:41 +01:00
Zedifus
d165cdf223 Merge branch 'dev' into feature/steamcmd 2022-10-23 21:29:51 +01:00
Zedifus
cd93b468b3 Prepare 4.0.17 release base 
Also remove badges from README, as gitlab already handles this in a different section
 2022-10-23 21:24:10 +01:00
Zedifus
8c4c8ba995 Repair prod docker build pipe cache reference 
Aswell as another attempt at pushing multiple tags
 2022-10-23 20:24:38 +01:00
Zedifus
c3c8bc178c Repair prod docker build pipe 2022-10-23 19:54:25 +01:00
Iain Powrie
352c6eec61 Merge branch 'dev' into 'master' 
v4.0.16

See merge request crafty-controller/crafty-4!492
 2022-10-23 18:32:05 +00:00
Zedifus
1cbfb6eb10 Update changelog with commit a6aa0f8 
Also change console colour for path display
 2022-10-23 19:02:24 +01:00
Zedifus
a6aa0f8679 Fix pyinstaller pathing 2022-10-23 18:48:23 +01:00
Iain Powrie
2293257f89 Merge branch 'bug/win-root-path' into 'dev' 
Change the way we declare root by pyinstaller docs

See merge request crafty-controller/crafty-4!491
 2022-10-22 19:59:44 +00:00
Zedifus
a85c44989d Update changelog !491 2022-10-22 20:56:49 +01:00
Zedifus
52a1988d3b Merge branch 'dev' into bug/win-root-path 2022-10-22 20:54:13 +01:00
Iain Powrie
695f9dc0a8 Merge branch 'feature/log-filter' into 'dev' 
Add log filtering

See merge request crafty-controller/crafty-4!484
 2022-10-22 19:50:37 +00:00
Zedifus
b8900ab0ea Update changelog !484 2022-10-22 20:47:47 +01:00
Zedifus
5a2dc555f8 Merge branch 'dev' into feature/log-filter 2022-10-22 20:45:24 +01:00
Iain Powrie
bd4a1858c9 Merge branch 'bug/backup-refresh' into 'dev' 
Fix "cannot render after finish" from backup_now

See merge request crafty-controller/crafty-4!489
 2022-10-22 19:44:03 +00:00
Zedifus
1a5728ccf1 Update changelog !489 2022-10-22 20:40:15 +01:00
Zedifus
ba968cfd71 Merge branch 'dev' into bug/backup-refresh 2022-10-22 20:39:05 +01:00
Iain Powrie
eaa1896350 Merge branch 'tweak/stats-clients' into 'dev' 
Only send realtime stats when clients connected

See merge request crafty-controller/crafty-4!488
 2022-10-22 19:30:45 +00:00
Zedifus
b3d28b149e Update changelog !488 2022-10-22 20:26:34 +01:00
Zedifus
1f842574c4 Merge branch 'dev' into tweak/stats-clients 2022-10-22 20:26:18 +01:00
Iain Powrie
4cdbb99166 Merge branch 'feature/update-url-autoset' into 'dev' 
Automatically set update url for server creation

See merge request crafty-controller/crafty-4!487
 2022-10-22 19:21:01 +00:00
Zedifus
4923a18359 Update changelog !487 2022-10-22 20:17:03 +01:00
Zedifus
eb617bb292 Merge branch 'dev' into feature/update-url-autoset 2022-10-22 20:14:41 +01:00
Andrew
ea11863e35 Change the way we declare root by pyinstaller docs 2022-10-22 15:12:02 -04:00
Iain Powrie
6f9a68d2cf Merge branch 'dev-FixStatsFilesDeletion' into 'dev' 
Fix server_stats db file when deleting server

See merge request crafty-controller/crafty-4!486
 2022-10-22 19:09:27 +00:00
Zedifus
bffe1807a8 Update changelog !486 2022-10-22 20:06:08 +01:00
Zedifus
1f2ff2345d Rename functions for readability 2022-10-22 19:43:59 +01:00
Zedifus
2599658321 Fix word list display on page load 
Whoopsie
 2022-10-22 19:37:16 +01:00
Zedifus
cb6e034f30 Guard against duplicate filters 
This protects against adding multiple filters of the same thing
 2022-10-22 19:28:13 +01:00
Zedifus
f3e41861d2 Remove guard on whitspace 
We can just trim instead
 2022-10-22 19:24:06 +01:00
Zedifus
a2a8b6449f Tidy comments and declaration order 
Declare functions before the function that uses it
 2022-10-22 19:04:57 +01:00