Commit Graph

453 Commits

Author SHA1 Message Date
Brian Bowman
f260379fa2 Add formatting pre-commit hook 2022-07-19 20:47:11 -05:00
Brian Bowman
544c39168b Add prettier check to CI 2022-07-19 20:47:11 -05:00
Brian Bowman
eb9aa34323 Run prettier formatter 2022-07-19 20:47:11 -05:00
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
Brian Bowman
bf2ae51fb0 Add prettier formatter 2022-07-19 20:42:43 -05:00
SpikeHD
dc20fe5916 set proxy addr only when launching with proxy 2022-07-19 17:52:17 -07:00
SpikeHD
1a6ed38f8f only unpatch when game was patched automatically 2022-07-19 17:49:40 -07: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
SpikeHD
6ff1ef932c
Merge pull request #35 from ffauzan/patch-1
Fix toggle encryption
2022-07-19 09:11:59 -07:00
SpikeHD
9e29135376
Merge pull request #38 from ffauzan/patch-2
Fix patched metadata checking
2022-07-19 09:10:09 -07:00
ffauzan
109f98db66
Fix patched metadata checking
Issue: The function checked the wrong directory for global-metadata-patched.dat
2022-07-19 16:41:25 +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
75b79d0202 Merge branch 'Grasscutters-main' into patch-1 2022-07-19 11:04:03 +07:00
Ffauzan
6d9f1af134 Merge branch 'main' of https://github.com/Grasscutters/Cultivation into Grasscutters-main 2022-07-19 11:03:51 +07:00
SpikeHD
d38459bb8a
Merge pull request #37 from Seeker14491/patch-1
Fix lints, update deps, clean readme
2022-07-18 18:06:24 -07:00
ffauzan
c7954d2294
Update file_helpers.rs 2022-07-19 06:39:29 +07:00
Brian Bowman
adbb8e380d Clean up readme 2022-07-18 18:01:08 -05: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
bb1874d64a Merge branch 'main' of https://github.com/Grasscutters/Cultivation 2022-07-16 21:26:07 -07:00
SpikeHD
85c0e2473b 2.8 resources download 2022-07-16 21:26:00 -07:00
SpikeHD
9e3b584608
Update README.md 2022-07-16 21:23:28 -07:00
SpikeHD
5568183821
Update README.md 2022-07-16 21:20:56 -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
4b42d0f8b8 reorg 2022-07-16 16:42:20 -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
8faaba2849
Update README.md 2022-07-16 14:43:29 -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
bb74553bee
Update README.md 2022-07-15 12:43:32 -07:00