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.

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

MPSA merged #632

Merged
merged 19 commits into from
Nov 21, 2015
Merged

MPSA merged #632

merged 19 commits into from
Nov 21, 2015

Conversation

lehjr
Copy link
Collaborator

@lehjr lehjr commented Oct 22, 2015

Pretty much everything working but might need a bit of cleanup or tweaking. Someone else will need to do the language files and recipes.

Side note. I moved the water meter to next to the heat meter so they are all in the same row now.

@lehjr
Copy link
Collaborator Author

lehjr commented Oct 22, 2015

I have a newer version of the AE2 and EC2 modules for AE2-RV3 here: https://github.com/lehjr/ModularPowersuitsAddons/tree/QMX-master/src/main/java/com/qmxtech/powersuitaddons/modules

@Xen1290
Copy link

Xen1290 commented Oct 22, 2015

Wow! Very good work!
Just some things:

And.. I can't see gradle/dev envir changes, it's normal?

@lehjr
Copy link
Collaborator Author

lehjr commented Oct 22, 2015

For the portable crafting setup, I used the code that MPSA had. It worked and I didn't want to mess with that.

Not sure what you meant here:
"https://github.com/MachineMuse/MachineMusePowersuits/pull/632/files#diff-d85c4bd1a7efee246070ce8d4568bdbfR29 I think the mod should be only one, not two?"

This maybe?
var modid = "powersuitaddons"; ?

LOL, oops. That was something I did early on to get things working.

Great catches.

I didn't include the changes for build.gradle because the only major change is for using Intellij instead of eclipse. The issue with trying to run with 2 different versions of chisel is more of an issue with the code of the mod itself trying to support 2 conflicting mods. The Smart Render bug is an issue not easily solved. It comes with a GPLv3 license, but without the source code needed to comply with it.

@Xen1290
Copy link

Xen1290 commented Oct 22, 2015

Oh sorry: @lehjr
For crafting table gui, the only thing to do is change asset path, but we can skip this thing.
And yes, I meant var modid = "powersuitaddons";
For the last thing, for now I think we should wait MachineMuse.
And what about coal engine?

@lehjr
Copy link
Collaborator Author

lehjr commented Oct 22, 2015

For the smart render bug, turns out not only is the code available in the smart moving zip, but the version in there doesn't appear to have the bug. The dev version in there doesn't have it.
Edit:
That version is available on the smart moving forum thread.

@MachineMuse
Copy link
Owner

Amazing! Thanks for your hard work.

I just got an apartment today so I'll be moving into it and then building a new computer - should be able to take a proper look & test and things maybe this weekend or next week sometime.

@lehjr
Copy link
Collaborator Author

lehjr commented Oct 22, 2015

Most everything seems to be working, but I'm sure it will need a bit of spit and polish. One thing I did notice is that the meters seem to only be working in a dev environment.

@lehjr
Copy link
Collaborator Author

lehjr commented Oct 25, 2015

@Xen1290 I have no idea what you are referring to there.

Edit: OK, I see a couple things there. I guess this thing just is just slow at loading and jumping to the right point

A couple of these refer to code that is commented out and non functional works in progress, like these:
https://github.com/MachineMuse/MachineMusePowersuits/pull/632/files#diff-45ca2cfb175eba20bb1871f5c0fbc4edR65
https://github.com/MachineMuse/MachineMusePowersuits/pull/632/files#diff-45ca2cfb175eba20bb1871f5c0fbc4edR116

@Xen1290
Copy link

Xen1290 commented Oct 27, 2015

lehjr@2380b53#diff-b532297167ca0e3be3b0b1dddf7fc72bR143
Error: isCompactMachinesLaded() ---> isCompactMachinesLoaded()

@lehjr
Copy link
Collaborator Author

lehjr commented Oct 27, 2015

@Xen1290 Thanks again!

@Xen1290
Copy link

Xen1290 commented Oct 28, 2015

👍

@lehjr
Copy link
Collaborator Author

lehjr commented Oct 28, 2015

Almost. I did find a couple of other things I need to update

@Xen1290
Copy link

Xen1290 commented Nov 2, 2015

Any news @MachineMuse ?

@lehjr
Copy link
Collaborator Author

lehjr commented Nov 2, 2015

@Xen1290 Patience, Grasshopper. She's probably still settling in and building a Windows based computer or just waiting for internet. Meanwhile, I can upload a build from the current source if you want to use it. However, I won't be able to fix anything more for a couple weeks.

@Xen1290
Copy link

Xen1290 commented Nov 2, 2015

@lehjr I'm very patient, I think you have misunderstood, I'm a very patient guy, but in fact I wanted a test build to test it a little and prepare the new recipes and help MachineMuse and you to find any bugs :) , that's all , I'm not one of them that ask every 3 second an ETA,rather I'm against these attitudes 👍
So, if you can upload a build I can test it for you and make the new recipes, that's I wanted to do.
Sorry for possible english mistakes, i hope you have understood.

@lehjr
Copy link
Collaborator Author

lehjr commented Nov 2, 2015

I'll be uploading 2 builds today. 1 will be for Applied Energistics rv2 and
the other for rv3
On Nov 2, 2015 1:12 PM, "Xen1290" notifications@github.com wrote:

@lehjr https://github.com/lehjr I'm very patient,you misunderstood,but
in fact I wanted a test build to test it a little and prepare the new
recipes and help MachineMuse some you to find any bugs :) , that's all ,
I'm not one of them that ask every 3 second ETA,rather I'm against these
attitudes [image: 👍] so, if you can upload a build I can test it for
you and make the new recipes
Sorry for possible english mistakes, i hope you have understood.


Reply to this email directly or view it on GitHub
#632 (comment)
.

@lehjr
Copy link
Collaborator Author

lehjr commented Nov 2, 2015

I've uploaded a version for AE2 RV2 and one for RV3 at https://github.com/lehjr/MachineMusePowersuits/releases

Just remember that they are experimental, so back up any world you don't want to lose.

@Xen1290
Copy link

Xen1290 commented Nov 3, 2015

Thanks! I'll test

@Xen1290 Xen1290 mentioned this pull request Nov 4, 2015
@lehjr
Copy link
Collaborator Author

lehjr commented Nov 8, 2015

@Xen1290 Other than the recipes and issues not already reported, have you found anything else? I'm away from home for the next few days but I want to see if anything else needs to be fixed. If not, maybe I'll dig into those power issues when I get back.

@Xen1290
Copy link

Xen1290 commented Nov 8, 2015

As far as I tested, everything works, but with the power issues, I can't test some things.

@lehjr
Copy link
Collaborator Author

lehjr commented Nov 8, 2015

Thanks. I usually charge up with EnderIO's wireless charger so I wasn't
even aware of the issues until I looked at the bug reports
On Nov 8, 2015 2:27 PM, "Xen1290" notifications@github.com wrote:

As far as I tested, everything works, but with the power issues, I can't
test some things.


Reply to this email directly or view it on GitHub
#632 (comment)
.

@lehjr
Copy link
Collaborator Author

lehjr commented Nov 17, 2015

@MachineMuse you still out there somewhere?

@MachineMuse
Copy link
Owner

Hello,

Yes, I am still out there! I've been very busy, sorry T_T I will do my best to get on this soon.

@MachineMuse
Copy link
Owner

I wish you would make separate branches for each fix instead of merging all of them into one mega-pullrequest ^^' Whatever, I'll merge this and then we can deal with the fallout

MachineMuse added a commit that referenced this pull request Nov 21, 2015
@MachineMuse MachineMuse merged commit 2b8c14e into MachineMuse:experimental Nov 21, 2015
@Xen1290 Xen1290 mentioned this pull request Nov 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants