Minor fixes and changes
Small stuff.
Merge request reports
Activity
The changes so far were all done automatically and I haven't actually looked through all of the changes to see if anything breaks - I'll do that tomorrow.
Edited by brickode- Resolved by brickode
I noticed that - was that intentional? If so, why?
added 4 commits
-
fe663b59...75f7427d - 2 commits from branch
pregmodfan:pregmod-master
- 8e331a53 - More cleaning
- da9ae07a - Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into hotfixes
-
fe663b59...75f7427d - 2 commits from branch
@Pregmodder Unrelated to this merge, but do you think "Threaten slave" is ready to be brought out of cheatmode now?
Would it be too much to ask for a moratorium on these massive ESLinting merges? Especially since the changes are, in fact, automatic, and not manual. Past merges of this type had a habit of causing bugs. And just glancing over the changes in this merge, it's screwed with the formatting and tabbing on the art files so badly, that I can't decipher what's going on anymore.
I'm restoring the formatting that was there originally (at least for the most part). I'm not sure where exactly all the formatting got so wonky, but it makes reading the code more difficult than it needs to be. Besides, formatting changes shouldn't break anything - if they do, the codes's bad. I'll look over all of my changes to be safe, though.
About 90% of the changes are turning
} else if {
and the like into
} else if {
s, and adding{}
around statements that need them and don't have them.Edited by brickodeadded 44 commits
-
25868835...7f2e3760 - 42 commits from branch
pregmodfan:pregmod-master
- 65c8e4bc - Master merge
- 1b2a9547 - Master merge missed file
-
25868835...7f2e3760 - 42 commits from branch
added 9 commits
-
1b2a9547...67dfc2bb - 6 commits from branch
pregmodfan:pregmod-master
- 2b1b8e65 - Removed ESlint declaration
- 1f94d1f4 - Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into hotfixes
- 8a5a8913 - Removed duplicate case
Toggle commit list-
1b2a9547...67dfc2bb - 6 commits from branch
added 52 commits
-
8a5a8913...99209cc1 - 51 commits from branch
pregmodfan:pregmod-master
- 39d4edc6 - Master merge
-
8a5a8913...99209cc1 - 51 commits from branch
added 28 commits
-
39d4edc6...da1f1cfc - 26 commits from branch
pregmodfan:pregmod-master
- d4e1a599 - Master merge
- fa3a79a3 - Reverted changes to walkPastJS
-
39d4edc6...da1f1cfc - 26 commits from branch
added 78 commits
-
fa3a79a3...e9baeb36 - 77 commits from branch
pregmodfan:pregmod-master
- a976d895 - Master merge
-
fa3a79a3...e9baeb36 - 77 commits from branch
@Pregmodder I've knocked it down to less than 2,000 changes - is that low enough for a review?
- Resolved by brickode