Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add FTP import support #855

Merged
merged 10 commits into from
Sep 28, 2019
Merged

Add FTP import support #855

merged 10 commits into from
Sep 28, 2019

Conversation

hallipr
Copy link
Contributor

@hallipr hallipr commented Dec 16, 2018 •
edited
Loading

  • Add ProtectedData based encryption utility
  • Add PackageReference to FluentFTP library (MIT License)
  • Add FTP credentials collection form
  • Add logic to Form1.cs to conditionally display FTP credentials popup
  • Add support for multi-server creature status update and cross server creature movement

@cadon
Copy link
Owner

cadon commented Dec 18, 2018

Thanks for the commit! I'll check it after the holidays.

@hallipr
Copy link
Contributor Author

hallipr commented Mar 26, 2019

conflicts resolved

DodoCooker and others added 7 commits July 13, 2019 22:13
@DodoCooker @cadon
Improvement for cadon#924 (cadon#925)
ab425e6 
* Breeding in conservative mode with at least one stat set to 0.0 weight compared the count of top stats on the breeding suggestions not including the ones set to 0 with the top stats of the dinos including the 0 weight ones. To improve the breeding score now those stats that are set to 0.0 weight are considered top stats on the suggested dino always.

* Refinement of the change to the score - instead of counting the 0.0 weight stat as always top only count the top-stats of the male/female of those that are not 0.0 weight - else there would still be differences if they have the top-stats at the 0 weight ones or not
@cadon
workaround for error that happens on updating.
b79dec2 
the installed version is somehow not able to update the values.json file. this change will prevent it from trying.
@cadon
disabling the values-version for now.
c3fbe46
Merge branch 'dev'
465fb9b
Merge branch 'dev'
31222f5
Merge branch 'dev'
36dac02
Merge branch 'dev'
e4055b7
@hallipr hallipr force-pushed the ftp-import branch 2 times, most recently from 1de0b0d to a8d5d47 Compare September 25, 2019 06:12
@hallipr
Copy link
Contributor Author

hallipr commented Sep 25, 2019

Rebased, conflicts resolved.
I also adjusted the multi-server import to prevent it from marking creatures imported on other servers as Unavailable. If importing creatures from ServerX, only creatures with server == "ServerX" should be marked as unavailable if they're not in the serverX list.

@hallipr
Copy link
Contributor Author

hallipr commented Sep 28, 2019 •
edited
Loading

Rebased, conflicts resolved.

I moved the added FTP settings toward the middle of the settings file to avoid more merge conflicts. You may want to alphabetize the members of heavily modified files to avoid frequent conflicts at the end of the file.

@cadon cadon changed the base branch from master to dev September 28, 2019 19:15
@cadon cadon merged commit a7c5540 into cadon:dev Sep 28, 2019
@hallipr
Copy link
Contributor Author

hallipr commented Sep 28, 2019 via email

@hallipr hallipr deleted the ftp-import branch April 27, 2022 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hallipr @cadon @DodoCooker