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.

Sign up for GitHub

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

Jump to bottom

Add a new filament named PLA Hyper #4339

Merged
merged 37 commits into from
Mar 7, 2024
Merged

Add a new filament named PLA Hyper #4339

merged 37 commits into from
Mar 7, 2024

Conversation

InfimechOfficial
Copy link
Contributor

No description provided.

@InfimechOfficial
Merge pull request #32 from SoftFever/main
a416cb4 
update new version
@InfimechOfficial
Update InfiMech Generic ABS.json
964a8a3
@InfimechOfficial
Update fdm_filament_abs.json
6995120
@InfimechOfficial
Update InfiMech Generic PA-CF.json
63bdb1e
@InfimechOfficial
Update fdm_filament_pa.json
cc56da6
@InfimechOfficial
Update InfiMech Generic PC.json
68f22ce
@InfimechOfficial
Update fdm_filament_pc.json
fa33c52
@InfimechOfficial
Update InfiMech Generic PETG.json
195bb42
@InfimechOfficial
Update fdm_filament_pet.json
7787c48
@InfimechOfficial
Update fdm_filament_pla.json
2efa814
@InfimechOfficial
Update InfiMech Generic PLA.json
1d3fb1f
@InfimechOfficial
Update InfiMech Generic TPU.json
afae981
@InfimechOfficial
Update InfiMech Generic TPU.json
390a190
@InfimechOfficial
Update fdm_filament_tpu.json
d2e5c0d
@InfimechOfficial
Update fdm_filament_common.json
b488445
@InfimechOfficial
Add new files named Other Filament
30a05df 
Add ”Other+ ABS PA PC PETG PLA PLAHYPER TPU“ filaments
@InfimechOfficial
Update InfiMech.json
844b5a2
@InfimechOfficial
Update 0.08mm Extra Fine @Infimech TX.json
04cc3a6
@InfimechOfficial
Update 0.12mm Fine @Infimech TX.json
d5a6bf5
@InfimechOfficial
Update 0.20mm Standard @Infimech TX.json
4723d94
@InfimechOfficial
Update 0.24mm Draft @Infimech TX.json
606b731
@InfimechOfficial
Update fdm_process_common.json
76c3b10
@InfimechOfficial
Add a new 0.16mm optimal file
765ef2c
@InfimechOfficial
Update InfiMech.json
ef06028
@InfimechOfficial
Update fdm_klipper_common.json
7d0ea61
@InfimechOfficial
Update fdm_machine_common.json
b095643
@InfimechOfficial
Change cover.png img
80c4441
@InfimechOfficial
Merge branch 'main' into main
e41a7bc
@InfimechOfficial
Update fdm_filament_pa.json
5063f5e
@InfimechOfficial
Update InfiMech Generic PETG.json
5a95d4e
@InfimechOfficial InfimechOfficial marked this pull request as ready for review March 5, 2024 02:06
@InfimechOfficial
Copy link
Contributor Author

Hi, I just fixed the InfiMech.json file and checked it with the tool, I have not found any error. So, what the conflict is

@InfimechOfficial InfimechOfficial changed the title Add a new filamet named PLA Hyper Add a new filament named PLA Hyper Mar 5, 2024
@SoftFever
Copy link
Owner

Hi, I just fixed the InfiMech.json file and checked it with the tool, I have not found any error. So, what the conflict is

Cool, thank you.
Could you take a look at the conflicts?

@InfimechOfficial
Copy link
Contributor Author

Hi, I just fixed the InfiMech.json file and checked it with the tool, I have not found any error. So, what the conflict is

Cool, thank you. Could you take a look at the conflicts?
Hi, I noticed being prompted for a conflict here, but I looked carefully at the code and used the tool to verify yesterday and didn't find anything unusual. I downloaded the modified profiles and Orcaslicer is showing my machine normally as well.
It's very important to me to get all these issues fixed before the new version is released. Thanks a lot
1709689824396
image

@SoftFever
Copy link
Owner

Hi, I just fixed the InfiMech.json file and checked it with the tool, I have not found any error. So, what the conflict is

Cool, thank you. Could you take a look at the conflicts?
Hi, I noticed being prompted for a conflict here, but I looked carefully at the code and used the tool to verify yesterday and didn't find anything unusual. I downloaded the modified profiles and Orcaslicer is showing my machine normally as well.
It's very important to me to get all these issues fixed before the new version is released. Thanks a lot
1709689824396
image

I meant "fix the conflicts" ;)
But no worries, I've already resolved the conflicts for you.

I'm about to merge it now.
Please download the nightly build and test it to see if everything works as expected.

@SoftFever SoftFever merged commit 2b62017 into SoftFever:main Mar 7, 2024
1 check passed
igiannakas added a commit to igiannakas/OrcaSlicer that referenced this pull request Mar 7, 2024
@igiannakas
Squashed commit of the following:
4778a58 
commit 10d350d
Author: igiannakas <ioannis@my-spot.co.uk>
Date:   Thu Mar 7 16:14:36 2024 +0000

    WXMedia workaround

commit 2b62017
Author: InfimechOfficial <144992637+InfimechOfficial@users.noreply.github.com>
Date:   Thu Mar 7 23:01:48 2024 +0800

    Add a new filament named PLA Hyper (SoftFever#4339)

    Add a new filament named PLA Hyper

    ---------

    Co-authored-by: SoftFever <softfeverever@gmail.com>
@InfimechOfficial
Copy link
Contributor Author

Hi, I just fixed the InfiMech.json file and checked it with the tool, I have not found any error. So, what the conflict is

Cool, thank you. Could you take a look at the conflicts?
Hi, I noticed being prompted for a conflict here, but I looked carefully at the code and used the tool to verify yesterday and didn't find anything unusual. I downloaded the modified profiles and Orcaslicer is showing my machine normally as well.
It's very important to me to get all these issues fixed before the new version is released. Thanks a lot
1709689824396
image

I meant "fix the conflicts" ;) But no worries, I've already resolved the conflicts for you.

I'm about to merge it now. Please download the nightly build and test it to see if everything works as expected.

Thank you, sir. I have not found any conflicts here, so I don't know how to "fix the conflics", Could you show me where the conflicts are, mabey I will fix these next time as well

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SoftFever SoftFever SoftFever approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@InfimechOfficial @SoftFever