search

raiguard / Factorio-InfinityMode

A modernized and optimized replacement for Creative Mode in Factorio. Tools are consolidated and updated to be both more functional and more streamlined.
MIT License
8 stars 2 forks source link

New belt_neighbors logic for splitters/loaders #4

Closed zero318 closed 5 years ago

zero318 commented 5 years ago

Logic still needs to be revised for belts/undergrounds

raiguard commented 5 years ago

Referencing issue #2

raiguard commented 5 years ago

Could you please add me as a collaborator in your fork so I can directly contribute to the PR?

zero318 commented 5 years ago

Added

zero318 commented 5 years ago

Just updated the pull request to not conflict with the new loader copy/paste check.

Github seems to be properly comparing the files now too.

raiguard commented 5 years ago

Something screwy is still going on. It's saying you're replacing the entire file, even though you're not. Are you accidentally converting it to a different encoding or something?

zero318 commented 5 years ago

Oh, it's probably because of how I made the commit.

I'd extracted the zipped mod and edited the script with Notepad++ then uploaded the edited file to the fork. Apparently Github didn't realize that I was just trying to update an existing file.

Resolving the merge conflict seems like it helped though. It's no longer saying that there are a thousand additions and deletions.

raiguard commented 5 years ago

Ah, so you didn't actually clone it, that makes sense. It doesn't really matter, it doesn't break anything. The only thing it hurts is my OCD.

zero318 commented 5 years ago

Yeah, I haven't really used Github very much beyond basic version tracking, so I'm not very familiar with the nuances of the system. My bad. ^_^;

raiguard commented 5 years ago

Alright, it seems to be good. Ideally I would want to find a way to re-combine the snapping logic into one function, but that would take longer than it would be worth. Merging!