Enigmatica 6 - E6 - 1.16.5

Enigmatica 6 - E6 - 1.16.5

1M Downloads

Tinkers Compat

NielsPilgaard opened this issue ยท 29 comments

commented

Growables:

  • Slimy Ferns
  • Saplings
  • Bloodshroom
  • Slimy Vine

Substrates

  • Slimy Grass types

Trees:

  • Greenheart
  • Skyroot
  • Bloodshroom

Items to hide:

  • All but 1 Tinker Station
  • All but 1 Part Builder
  • All but 1 Crafting Station

Akashic Tome:

  • All 5 Tinkers books
commented

Can you assign me, please? I may as well do this stuff, since I'm doing the fluids/quests/etc.

commented

Gladly ๐Ÿ˜„ Please let me know if you need a hand.

commented
  • Add metal fluids
  • Add quests
  • Change piggybackpack recipe to make sense
  • Finish seecret
  • Add growables and substrates to the crops const
  • Add trees to the wood registry
  • Hide unnecessary stations
  • Add fluid recipe generation script
  • Add expert mode extras relating to Tinker's
  • Add gem fluids
  • Add Molten Blizz/Basalz/Blitz
  • Switch bonus Froststeel recipe to use Molten Blizz, Molten Cobalt and Molten Iron in the Seared Smeltery or Scorched Alloyer
  • Add more efficient alloy recipes for Smeltery
  • Add anything else I think of
  • Create extremely large gist with all the things in each PR as a sort of changelog
commented

Urgh, this PR is taking ages, so it's going to have loads of conflicts, since I'm changing things left, right and centre...

commented

Do you think you'll be able to finish it before 13th of June? :) If not I'd like to chip in.

commented

Make it multiple PR's. Much better for everyone involved.

commented

Do you think you'll be able to finish it before 13th of June? :) If not I'd like to chip in.

Yes.

By the way, it is multiple, but the first is the biggest and is nearly finished ๐Ÿ‘

commented

The main problem, honestly, is that my laptop is a tater and takes ten centuries to boot up E6 and another fifteen to open a world :/

Hopefully it'll all be worth it by the end ๐Ÿ˜„

commented

Okay, new plan for the order of the PRs:

  • Foundation
  • Unification
  • Addendum (moved to higher priority)
  • Gemstones (not as important as Addendum)
  • Expertise (Expert Mode is nowhere near done so it's fine to defer this till last)
commented

Btw

Add more efficient alloy recipes for Smeltery

I don't think this is something we want tbh. If anything Smeltery recipes should be less efficient.

My priorities are the things mentioned in the top post, tbh :) everything else can wait for after 0.5.0 if needed.

commented

Btw

Add more efficient alloy recipes for Smeltery

I don't think this is something we want tbh. If anything Smeltery recipes should be less efficient.

My priorities are the things mentioned in the top post, tbh :) everything else can wait for after 0.5.0 if needed.

Okay! I will take this into consideration. I feel as if custom materials are important, though. The things at the top will be added VERY soon. Also, I've pretty much finished Foundation now. Expect the PR soon(tm)! I just need to add the compat things at the top, which will take pretty much zero time compared to everything else haha

commented

Change piggybackpack recipe to make sense

Does this really need to be changed? I feel like this is changing it just for the sake of changing something

commented

Update: Foundation is so close to completion! I just need to find a blood island for something. I think I started the fork before BYG nether stuff was disabled, which interfered with the island generation, so I had to restart the game to change the config (:

commented

Alright, so the PR is finished, pretty much. Only problem:

  • It will explode. I've made changes to the Adventure quest chapter, for example... and so has Mute, and since I don't know how to change which branch is the upstream origin (by default it's master, it seems), I can't obtain that change. I have no idea how to handle that issue, other than recreating Mute's quests on my branch and effectively overwriting them. :/
commented

Dev, always PR to and pull from dev branch... Niller is the only one who touches master and usually just right before a release...

Edit: just realized what u meant, you started working from master... Ignore me

commented

@pm065 you may need to stash all your changes, swap branches, fetch all the diffs, and restore your stashed changes. Will be a pita either way.

commented

@pm065 you may need to stash all your changes, swap branches, fetch all the diffs, and restore your stashed changes. Will be a pita either way.

Okay, I'll see what I can do. how do i stash my changes?

commented

With the Github Desktop app (and probably any other gui app) it's a menu command - any files that have been changes will get "stashed" so you can sync things. If you're using the command line you need someone with a bigger brain than mine.

commented

No, wait, the problem is actually slightly simpler, I think. Even though I created the branch from develop, it still thinks master is the upstream branch it should pull changes from.
I could have grabbed the changes on my own develop branch and then merged it into the Tinker's branch, but for some reason the minecraftinstance.json file is preventing me from doing so, and it's not letting me overwrite it with the one in develop. my life is excellent
minecraftinstance has been the bane of multiple of my attempts to contribute to projects, actually

EDIT: And adding it temporarily to gitignore didn't help either :( Once I have the things merged, I'll be able to sort the conflicts one by one (at least, I hope so)

commented

You'll need to close curseforge to be able to clear that minecraft instance file

commented

Change piggybackpack recipe to make sense

Does this really need to be changed? I feel like this is changing it just for the sake of changing something

I don't like pig iron ingot + saddle recipe, but that's just my personal preference. I'll comment it out for now.

commented

You'll need to close curseforge to be able to clear that minecraft instance file

Ah, so that's it. Thanks!
This is why nobody should ever trust me to do anything :/
Edit: The unconflictified files have been committed. Just going to do some final tweaks now, like swapping around the other new quests to fit the new order I've put my new ones in...

commented

I wrote a Patchouli guide to Tinker's Construct, which is far, FAR more in-depth and contains every feature I know of (unlike the extremely WIP Mantle books.)

Definitely jumped the gun on this, as the Tinkers books are almost finished, and will almost certainly be fully fleshed out by the time 0.5.0 drops.

commented

So, as the tinkers book writer this is highly insulting. I've been waiting on a feature to finish the books that I've been writing. And I have almost finished copies on my desktop. Just have to finish a few more things get a bug worked out.

I'd also like to point out that I looked through your books and most of your info is HIGHLY incorrect. It seems as you have not even touched the 1.16 version, kept up with the updates, or anything.

You also either haven't thought of it or didn't much care that as a result of being in such a popular pack this would get reflected and blamed on us (and then me as the book writer) Your best thing is to scrap this, because you'd have to redo 90% of it for it to be correct.

commented

I am EXTREMELY sorry for insulting you. That was NOT my intention. Why did I do this? I'm an absolute idiot. f course this would happen!

My sincerest apology. I will remove it immediately.

commented

With all due respect it wasn't that bad. But you also were seeming to use an older version of tinkers which is where most of the mistakes come from. I personally can't even keep up with changes sometimes. Don't feel too bad. I have bad memory so I won't remember this in 5 days ๐Ÿ˜› If anything I'm probably the nicer of people who would have said something. No hard feelings I hope. You should just try and remember to use the latest versions (as looking at your versions you used the books were way less incomplete yes. They are better now but not finished.)

commented

Updates crops, soils, trees, and wood variants for tinkers.
Adds back missing slime block tag that broke our bees.
Add tooltips to tinker workstations. Still working on hiding them. Normal hide script doesn't work.

Akashic tome will take a change on Tinker's or Akashic's side. #2351

commented

ok, only thing left from the main list is the Akashic tome

commented

Good work you guys!!!