Closed bms-1984 closed 6 years ago
Dang, this is nice. I'll work on a clean merge tonight.
Thank you. Took a while.
I’ll get this done tomorrow. Thank you.
Let me know if you've run into trouble. Don't worry about rebasing against the changes in master, it's no trouble.
Still looking to do these changes?
Yes, I'm so sorry. School just started back up and I've been busy getting into the routine.
Not a worry! Just figured I'd check in periodically, in case you ran into blockers.
Hey Dan,
Ben was one of the devs working on CivEx but unfortunately he's a bit caught up with school right now and said he doesn't have enough time to continue with the project. I forked his repo and started cleaning up the merge with the changes you suggested. I'll probably send in a PR tomorrow.
I should merge directly from my fork into the main 1.12 HiddenOre branch, correct?
@Sharpcastle33 Ideally , yes -- incorporate the fixes into your branch, then issue a new PR against mc1.12 branch. I'll close this one out after that point.
Good teamwork, then :). As before, lmk if you run into trouble.
I cleaned out most of the code and then worked out a few kinks (with configs not generating and the like). I've been having trouble with an NPE I've been getting with one of the Readers (configs.java:68). It's probably something really obvious but I can't seem to figure it out. You can take a look at it if you'd like, otherwise I'll try to fix it over the next couple of days.
Make a new PR sourced from your branch as we discussed, I'll check out the issue in the diff. Thanks!
Each world now generates its own config and I've added a soft dependency on Multiverse-Core to make sure we're loaded after it.