Closed mica-alex closed 1 year ago
Will fix conflicts and update
@MCRcortex @IMS212 @Huskydog9988 This pull request is ready for review now. My apologies for tagging you if not the correct person, but I just wanted to make sure this was back on the radar now that earlier conflicts are resolved.
we are currently working on some issues with detection rn, but you have the clear from me
we are currently working on some issues with detection rn, but you have the clear from me
Sounds good. Hopefully everyone approves/like these changes., and let me know if you need anything with regards to changes.
Eating dinner then will fix conflicts
Hey are you fine reimplementing the color codes from #23? Currently we may need to drop them temporally because the gui can't render the ansi colors.
Hey are you fine reimplementing the color codes from #23? Currently we may need to drop them temporally because the gui can't render the ansi colors.
Sorry I did not see this sooner. I have that handled already in this PR. I do a replaceAll on the ANSI color codes which I moved in to a constants file
Oh, I did not see that more PRs were merged. More conflicts....again....
Ok, I have addressed all conflicts
Fixes #27
@Huskydog9988 @MCRcortex @IMS212 I am going offline for the evening shortly. This PR is ready for review again though.
Please let me know if there is anything I need to change, but hopefully everything is all well-documented/self-explanatory in code (and no more merge conflicts).
Corrected a mistake (sorry) where I omitted output of compiled scan results on the GUI.
our discord is now public, you can coordinate with us here if you want https://discord.gg/zPdFK47682 (we are currently working on a rewite)
I will try joining in the morning, thanks!
I am fairly discouraged. 😞 At this point, I have had to handle merge conflicts 4+ times, some rather large.
Hopefully there is a review soon, so these changes can be rebased into the rewrite branch and not lost again. There is a great deal of improvement here that shouldn't be missed including:
yea hopefully we can get one in, ill try and remind the maintainers tomorrow
sorr looking at it now
This PR adds two commits, one to improve Main.java and one to improve Detector.java.
The commit for
Main.java
adds the following:The commit for
Detector.java
adds the following: