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,670 Commits 12 Branches 45 Tags 104 MiB
1b1c960cb6
Commit Graph

2670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Freddy 0
050f4efa54 Update file unraid.xml 2022-12-30 10:59:59 +00:00
Andrew
1daaecc790 Remove un-needed log messages 2022-12-29 19:05:55 -05:00
Makhuta
6f76ad653f Add Czech translation 2022-12-28 16:03:58 +00:00
amcmanu3
60e393d7cf Make qol changes to startup warning 2022-12-28 00:20:06 -05:00
Andrew
47e2635b20 Set a timeout on server launch to display warn 2022-12-27 09:45:39 -05:00
Andrew
ddaac25060 Run forge installer for all versions of forge 2022-12-23 20:14:41 -05:00
Andrew
88cd991b7e Fix bug where server_path variable was still used 
I'm dumb and I fixed a bug I created.
 2022-12-22 20:59:45 -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
Zedifus
3c0330de38 Merge branch 'dev' into refactor/config-json 2022-12-21 16:19:16 +00:00
Iain Powrie
af10353119 Merge branch 'tweak/server-port-explained' into 'dev' 
Add popover to server port to explain it's purpose

See merge request crafty-controller/crafty-4!514
 2022-12-21 16:15:54 +00:00
Zedifus
cf514788b3 Update changelog !514 2022-12-21 16:12:36 +00:00
Zedifus
2889c060e6 Merge branch 'dev' into tweak/server-port-explained 2022-12-21 16:11:13 +00:00
Iain Powrie
46c8c04490 Merge branch 'bug/windows-path-java-override' into 'dev' 
Fix window path escape on java override

See merge request crafty-controller/crafty-4!513
 2022-12-21 16:09:14 +00:00
Zedifus
6d97a09b62 Update changelog !513 2022-12-21 16:05:46 +00:00
Zedifus
5c10dd884f Merge branch 'dev' into bug/windows-path-java-override 2022-12-21 16:04:28 +00:00
Iain Powrie
0a84819405 Merge branch 'bug/mac-m1-stats' into 'dev' 
Fix stats error on mac M1 chips

See merge request crafty-controller/crafty-4!512
 2022-12-21 16:01:49 +00:00
Zedifus
15db119572 Update changelog !512 2022-12-21 15:57:34 +00:00
Zedifus
edfa147a8b Merge branch 'dev' into bug/mac-m1-stats 2022-12-21 15:56:05 +00:00
Iain Powrie
7823fbed85 Merge branch 'tweak/server-directories' into 'dev' 
Make server directories non-configurable

See merge request crafty-controller/crafty-4!511
 2022-12-21 15:54:47 +00:00
Zedifus
8b5cbad8ab Update changelog !511 2022-12-21 15:51:07 +00:00
Andrew
ec50a80e1f Add warning icon 2022-12-19 19:48:15 -05:00
Andrew
7f629d21e9 Update translation 
Make it so warning appears all the time
 2022-12-19 19:42:40 -05:00
Andrew
0bd4dd7e69 Add popover to server port to explain it's purpose 2022-12-19 18:42:05 -05:00
amcmanu3
262ec80db8 Remove print statement 2022-12-19 17:47:31 -05:00
amcmanu3
9004feff37 Fix windows slash escape java override 2022-12-19 17:44:04 -05:00
amcmanu3
fbc506f2fd Fix issues after merge conflicts 2022-12-19 17:15:26 -05:00
Andrew
3ab57f116c Merge branch 'dev' into 'refactor/config-json' 
# Conflicts:
#   app/classes/shared/helpers.py
 2022-12-19 22:13:10 +00:00
amcmanu3
76cedc9392 Fix stats error on mac M1 chips 2022-12-19 11:54:24 -05:00
Andrew
a1e8b7afe7 Make server directories non-configurable 2022-12-17 12:21:15 -05:00
Iain Powrie
37071a2d05 Merge branch 'bug/zip-server-upload' into 'dev' 
Fix root dir select in upload import

See merge request crafty-controller/crafty-4!508
 2022-12-17 00:25:44 +00:00
Zedifus
8a32d22f7e Update changelog !507 2022-12-17 00:10:04 +00:00
Zedifus
cffa58da3b Merge branch 'dev' into bug/zip-server-upload 2022-12-17 00:07:15 +00:00
Iain Powrie
f945bbe63a Merge branch 'bug/import-dir-check' into 'dev' 
Remove Pathlib from sub path check

See merge request crafty-controller/crafty-4!507
 2022-12-17 00:05:34 +00:00
Zedifus
0519105b45 Update changelog !508 2022-12-17 00:02:38 +00:00
Andrew
6572dc5e10 Appease the linter 2022-12-16 18:47:36 -05:00
Andrew
8c6bb38224 Fix location of loop check. 2022-12-15 18:58:10 -05:00
Andrew
c74aeb5dde Fix id mismatch zip upload import 2022-12-15 18:48:15 -05:00
Andrew
551020f738 Create our own check function 2022-12-14 14:54:52 -05:00
Andrew
9f939ae40e Trying one more thing 2022-12-14 12:24:00 -05:00
Andrew
6f510976f0 Attempting to add method for posixpath 2022-12-14 12:21:04 -05:00
Andrew
ac1b94d35b Change Path return PosixPath to purepath 2022-12-14 12:02:38 -05:00
Iain Powrie
95e21d9245 Merge branch 'bug/server-import-copy-loop' into 'dev' 
Be sure a user cannot server import crafty dir

See merge request crafty-controller/crafty-4!506
 2022-12-07 15:14:01 +00:00
Zedifus
1e9bb97bdc Update changelog !506 2022-12-07 14:33:47 +00:00
Zedifus
0bdd01f668 Merge branch 'dev' into bug/server-import-copy-loop 2022-12-07 14:32:03 +00:00
Iain Powrie
b007eb96a2 Merge branch 'bug/public-backgrounds' into 'dev' 
Fix background key not on public pages

See merge request crafty-controller/crafty-4!505
 2022-12-07 14:29:12 +00:00
Zedifus
9a5bafe489 Update changelog !505 2022-12-07 14:14:55 +00:00
Zedifus
94d7b9901c Merge branch 'dev' into bug/public-backgrounds 2022-12-07 14:09:30 +00:00