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,570 Commits 12 Branches 45 Tags 104 MiB
f582c29542
Commit Graph

718 Commits

Author SHA1 Message Date
Andrew
52ef76e15b Replace google ping for ntp for usability in china 2023-01-03 10:14:10 -08:00
Zedifus
205d111251 Merge branch 'dev' into bug/unzip-logic 2023-01-02 22:48:42 +00:00
Zedifus
aaffe69cb3 Merge branch 'dev' into bug/nested-reaction 2023-01-02 22:10:22 +00:00
Zedifus
c80d357f13 Fix CodeQuality, line length 2023-01-02 20:59:29 +00:00
Andrew
4922998b14 Remove extra task definition 2023-01-02 14:34:08 -05:00
Andrew
985178b993 Update zip import status 2023-01-02 14:26:42 -05:00
Andrew
872489d125 Remove useless block in unzip method 
This was causing an error.
 2023-01-02 12:20:18 -05:00
Andrew
9ebdbbf5af Fix bug where nested reaction tasks would stack 2023-01-01 23:13:07 -05:00
Silversthorn
9dac0b5d85 Adding Forge Installer Compaptibility with old versions 2022-12-22 19:32:56 +01:00
Andrew
d5cc4529b0 Add try/except for not finding run file 2022-12-21 21:55:21 -05:00
Andrew
6572dc5e10 Appease the linter 2022-12-16 18:47:36 -05:00
Andrew
551020f738 Create our own check function 2022-12-14 14:54:52 -05:00
Zedifus
4543fcd03f Merge branch 'dev' into feature/custom-login-background 2022-11-30 21:08:53 +00:00
Andrew
e8564566ed Appease the linter 2022-11-19 18:21:10 -05: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
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
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Zedifus
1f842574c4 Merge branch 'dev' into tweak/stats-clients 2022-10-22 20:26:18 +01:00
Andrew
23b3e642a0 Only collect server stats when clients 2022-10-20 15:33:51 -04:00
Andrew
c2f5daf8e9 Remove feature for modded servers 2022-10-20 15:05:58 -04:00
Andrew
2d5d263852 Automatically set update url for server creation 2022-10-20 14:58:43 -04:00
Zedifus
0721c0d7d4 Strip meta from sem version 2022-10-08 18:34:38 +01:00
Zedifus
fbb6dad524 Merge branch 'dev' into tweak/themes 2022-10-08 18:12:37 +01:00
Zedifus
c1374b5c7f Merge branch 'dev' into bug/port-constraint 2022-10-05 22:12:14 +01:00
Zedifus
522adb765c Appease lint 
Major - R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it
 2022-10-05 22:02:17 +01:00
amcmanu3
3681f52856 Fix scheduled task disable 2022-10-04 16:07:08 -04:00
Andrew
2e212cc788 Add port constraint for all server creation & api 2022-10-04 15:55:52 -04:00
Andrew
f558388a0f Update themes to include all colors 2022-10-04 13:31:37 -04:00
Andrew
352a3e12e7 Fix minor bugs with uploads import 2022-10-02 15:54:13 -04:00
Andrew
5f8c0dab4c Merge branch 'dev' into 'feature/upload-import' 
# Conflicts:
#   app/frontend/templates/server/wizard.html
 2022-10-02 19:10:05 +00:00
Andrew
a21bb36f7c Make it so a user cannot upload anything but zip 
TODO add better feedback than "error"
 2022-09-27 23:07:44 -04:00
Andrew
f090bf8c6f Add task to check for old files every 12 hours 2022-09-27 22:57:24 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
amcmanu3
63347f956b Fix logical issues surrounding Gravatar fetch 2022-09-19 20:00:15 -04:00
Zedifus
0829331534 Appease Minor and Major lint issues in !464 2022-09-19 23:49:16 +01:00
Zedifus
532409a08d Merge branch 'dev' into bug/start-nonetype 2022-09-19 22:57:42 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Andrew
f5cdd9f573 Check to "which java" doesn't return none 2022-09-19 11:13:35 -04:00
Andrew
67d465b94c Add debug logging 2022-09-12 15:36:13 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
Andrew
6a6376ea8a appease the linter 2022-09-07 16:52:27 -04:00
Andrew
d45e32013b Fix backup exclusion issue 2022-09-07 16:51:41 -04:00
Andrew
296a5a46de Add comments. Debug logging 2022-09-07 16:01:42 -04:00
amcmanu3
011b66e1df Fix server startup after update 2022-09-04 19:06:07 -04:00
amcmanu3
76a499f5a4 Fix start server after updates 
Fix update notifs
 2022-09-04 17:50:08 -04:00
Zedifus
385ceb9655 Merge branch 'dev' into tweak/password-reset 2022-09-04 21:41:27 +01:00
Zedifus
7f95f7085d Merge branch 'dev' into feature/bedrock-creation 2022-09-04 21:12:47 +01:00