Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-12 23:24:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
450 Commits 20 Branches 35 Tags
e9df0f17db4ea58ca20edb3613a8cfd33e1485a4
Commit Graph

211 Commits

Author SHA1 Message Date
Brian Bowman
e9df0f17db Tweak .editorconfig and line endings 
- Use `lf` line endings everywhere. This works fine even on Windows, and is more common for git repos. It also matches prettier's default.

For .editorconfig:

- Remove `insert_final_newline = false`: Omitting the final newline isn't supported by prettier or rustfmt.
- Remove `trim_trailing_whitespace = false`: The formatters will remove trailing whitespace anyways. I can't think of a good reason to want to keep trailing whitespace.
- Remove other redundant options.
 2022-07-19 20:42:43 -05:00
SpikeHD
d23d5e3806 version bump! 2022-07-19 17:45:13 -07:00
SpikeHD
365a4f2888 spanish translation 2022-07-19 17:43:31 -07:00
SpikeHD
e270c886db 3dm support that doesn't actually work I just don't wanna fix it 2022-07-19 17:40:22 -07:00
SpikeHD
18a1b0e94c Merge branch 'main' of github.com:Grasscutters/Cultivation 2022-07-19 17:14:59 -07:00
SpikeHD
3799ec648d make proxy optional 2022-07-19 17:14:55 -07:00
SpikeHD
8ff06f6d29 make metadata optional 2022-07-19 17:07:10 -07:00
ffauzan
69201bc8b1 Update file_helpers.rs 2022-07-19 11:52:12 +07:00
ffauzan
656fa2cfe3 Revert "fix conflict" 
This reverts commit 1588bee5a3, reversing
changes made to 75b79d0202.
 2022-07-19 11:47:38 +07:00
Ffauzan
1588bee5a3 fix conflict 2022-07-19 11:27:28 +07:00
Ffauzan
6d9f1af134 Merge branch 'main' of https://github.com/Grasscutters/Cultivation into Grasscutters-main 2022-07-19 11:03:51 +07:00
ffauzan
c7954d2294 Update file_helpers.rs 2022-07-19 06:39:29 +07:00
Brian Bowman
4ff9e88185 Update dependencies 2022-07-18 18:01:08 -05:00
Brian Bowman
27a10c58ca Fix lints 2022-07-18 18:01:08 -05:00
ffauzan
44b148f2a4 Fix toggle encryption 
Open the config file in write mode so the toggle encryption button is actually working
 2022-07-18 22:03:01 +07:00
SpikeHD
6434814d1d fix decryption 2022-07-17 00:08:31 -07:00
SpikeHD
043f3e7ce4 simplify metadata processes 2022-07-16 23:34:55 -07:00
SpikeHD
61ac332cee Log paths on copy error 2022-07-16 22:56:01 -07:00
SpikeHD
a1284cc2ff path_bufs for file helpers 2022-07-16 22:06:26 -07:00
SpikeHD
cf82e9e892 use path bufs for copying files 2022-07-16 22:02:21 -07:00
SpikeHD
d64186777f Merge pull request #31 from Grasscutters/patching 
CLIENT PATCHING LETS GOOOOOOO
 2022-07-16 21:16:01 -07:00
SpikeHD
f2d45d2359 version bump (omg what could this mean) 2022-07-16 21:13:34 -07:00
SpikeHD
d46a2bdc44 Merge branch 'main' into patching 2022-07-16 17:03:36 -07:00
SpikeHD
bb383c5c0a manual proxy cert install 2022-07-16 16:59:16 -07:00
SpikeHD
3d0f8a3ff6 remove unused fs 2022-07-16 16:39:26 -07:00
SpikeHD
56b0c78661 Merge branch 'main' into patching 2022-07-16 16:38:54 -07:00
SpikeHD
ffc37cc203 read and write server config via backend 2022-07-16 16:36:05 -07:00
SpikeHD
9d86d9c9ff lint 2022-07-15 21:27:50 -07:00
SpikeHD
8ff1a47fff Merge branch 'main' into patching 2022-07-15 21:14:16 -07:00
SpikeHD
12da09596d Merge pull request #23 from Seeker14491/ci 
Set up GitHub Actions lints and checks
 2022-07-15 21:11:06 -07:00
SpikeHD
bd54a78e4b emergency metadata recovery 2022-07-15 19:35:57 -07:00
SpikeHD
a1b0fec871 Merge branch 'main' into patching 2022-07-14 20:54:02 -07:00
SpikeHD
88a1740b91 normal feature 2022-07-14 18:49:49 -07:00
SpikeHD
7cbb600a7f always unpatch game on close 2022-07-13 18:55:06 -07:00
SpikeHD
33c733ce97 Merge branch 'main' into patching 2022-07-13 18:49:24 -07:00
SpikeHD
abafc94379 rework process watcher to be not terrible 2022-07-13 18:49:06 -07:00
SpikeHD
411e11dd8d Merge branch 'main' into patching 2022-07-13 18:26:17 -07:00
SpikeHD
b2453e7c4d fix crash on denying UAC prompt 2022-07-13 18:26:06 -07:00
SpikeHD
30476a86ad Merge main 2022-07-13 18:22:10 -07:00
SpikeHD
b903c27a22 BIG FAT CLEANUP PART ONE 2022-07-13 18:10:41 -07:00
Brian Bowman
e41a89b26c Configure and run rustfmt 2022-07-12 20:10:05 -05:00
Brian Bowman
51d00add22 Set up CI for backend 2022-07-12 20:10:05 -05:00
SpikeHD
4fc90ee333 cleanup and yarn update 2022-07-12 17:21:03 -07:00
SpikeHD
0ec8782f48 use thread properly lol 2022-07-12 17:15:32 -07:00
SpikeHD
33c67eef06 re-threadify program launching 2022-07-12 12:28:31 -07:00
Benj
a703843eed Move things to file_helpers 
These were meant to be here anyway but I didn't put it here because other similar methods were in system_helpers
 2022-07-12 14:28:08 +08:00
Benj
ba2a8b7fec Merge tag 'v1.0.2-alpha' into patcher-2.0 
# Conflicts:
#	src-tauri/Cargo.lock
#	src-tauri/src/file_helpers.rs
#	src-tauri/src/main.rs
 2022-07-12 13:37:44 +08:00
SpikeHD
4c9dad49c4 version bump 2022-07-09 23:14:48 -07:00
SpikeHD
960fcae647 Merge branch 'main' of https://github.com/Grasscutters/Cultivation 2022-07-09 22:52:04 -07:00
SpikeHD
4172ee9106 move copy_file to file_helpers 2022-07-09 22:50:41 -07:00