Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

John Wheatfield's TFC Integration work #202

Merged
merged 9 commits into from
Oct 4, 2024

Conversation

rchpweblo
Copy link
Contributor

Added Antimatter tool compatibility to TFC logs for stripping and TFC soil for hoeing and shoveling.
Will require my Antimatter PR for the shovel to function.

@rchpweblo
Copy link
Contributor Author

BTW the reason this failed is because the version of the Antimatter submodule needs to be updated to the latest version. Currently the linked version does not have the new shovel code.

@Trinsdar
Copy link
Member

Trinsdar commented May 1, 2024

Yah I'm aware

@Trinsdar
Copy link
Member

Trinsdar commented Oct 1, 2024

@rchpweblo what's the status on this pr? If you're not going to be able to get the other changes you wanted anytime soon I'll just go ahead and merge this and then you can make another pr at a later date

@rchpweblo
Copy link
Contributor Author

rchpweblo commented Oct 2, 2024 via email

@Trinsdar
Copy link
Member

Trinsdar commented Oct 4, 2024

I've decided to merge this anyways, since I'm moving all work on gti over to https://github.com/GT-Reimagined/GT5-Reimagined. Please make the rest of the changes in a new pr over there

@Trinsdar Trinsdar merged commit b1dc9b6 into GregTech-Intergalactical:dev-1.18 Oct 4, 2024
1 check passed
@rchpweblo
Copy link
Contributor Author

understood
I'll have to take a look to see what I had that wasn't pushed yet, I know there were quite a few things that were only locally pushed as I hadn't finished them yet

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants