Skip to content

Commit

Permalink
Merge pull request #72 from MrDavisCSIT/main
Browse files Browse the repository at this point in the history
  • Loading branch information
Donkie authored Dec 26, 2024
2 parents f0d14c5 + e9d149b commit 20f2774
Show file tree
Hide file tree
Showing 4 changed files with 408 additions and 5 deletions.
35 changes: 30 additions & 5 deletions filaments/extrudr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1008,11 +1008,6 @@
"name": "Neon Green",
"hex": "00BB2D"
},
{
"name": "glowEx",
"hex": "00BB2D",
"glow": true
},
{
"name": "White",
"hex": "F4F4F4"
Expand Down Expand Up @@ -1099,6 +1094,36 @@
}
]
},
{
"name": "{color_name}",
"material": "PETG",
"density": 1.29,
"weights": [
{
"weight": 800.0,
"spool_weight": 260.0,
"spool_type": "plastic"
},
{
"weight": 2500.0,
"spool_weight": 600.0,
"spool_type": "plastic"
}
],
"diameters": [
1.75,
2.85
],
"extruder_temp": 230,
"bed_temp": 70,
"colors": [
{
"name": "glowEx",
"hex": "00BB2D",
"glow": true
}
]
},
{
"name": "X - {color_name}",
"material": "PETG-CF",
Expand Down
4 changes: 4 additions & 0 deletions filaments/fillamentum.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@
{
"name": "Cobalt Blue",
"hex": "283355"
},
{
"name": "Everybody's Magenta",
"hex": "E1337E"
}
]
}
Expand Down
228 changes: 228 additions & 0 deletions filaments/flashforge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
{
"manufacturer": "FlashForge",
"filaments": [
{
"name": "PLA - {color_name}",
"material": "PLA",
"density": 1.25,
"weights": [
{
"weight": 500.0,
"spool_weight": 142.0
},
{
"weight": 1000.0,
"spool_weight": 170.0
}
],
"diameters": [
1.75
],
"extruder_temp": 210,
"bed_temp": 60,
"colors": [
{
"name": "Black",
"hex": "0B0203"
},
{
"name": "White",
"hex": "FFFFFF"
},
{
"name": "Natural",
"hex": "E7E7E7"
},
{
"name": "Gray",
"hex": "515F6C"
},
{
"name": "Skin",
"hex": "D4B48F"
},
{
"name": "Red",
"hex": "D92818"
},
{
"name": "Blue",
"hex": "172788"
},
{
"name": "Yellow",
"hex": "FED212"
},
{
"name": "Green",
"hex": "149732"
},
{
"name": "Orange",
"hex": "F08400"
},
{
"name": "Silver",
"hex": "8C9091"
},
{
"name": "Light Green",
"hex": "8AC54B"
},
{
"name": "Pink",
"hex": "F3B4CD"
},
{
"name": "Purple",
"hex": "50248B"
},
{
"name": "Brown",
"hex": "984304"
},
{
"name": "Gold",
"hex": "8D834E"
}
]
},
{
"name": "Starter PLA - {color_name}",
"material": "PLA",
"density": 1.25,
"weights": [
{
"weight": 250.0,
"spool_weight": 142.0
}
],
"diameters": [
1.75
],
"extruder_temp": 210,
"bed_temp": 60,
"colors": [
{
"name": "Red",
"hex": "D92818",
"translucent": true
}
]
},
{
"name": "PLA Pro - {color_name}",
"material": "PLA",
"density": 1.25,
"weights": [
{
"weight": 1000,
"spool_weight": 120
}
],
"diameters": [
1.75
],
"extruder_temp": 210,
"bed_temp": 60,
"colors": [
{
"name": "Natural",
"hex": "E7E7E7"
},
{
"name": "White",
"hex": "FFFFFF"
},
{
"name": "Cool White",
"hex": "F6F5FA"
},
{
"name": "Black",
"hex": "0B0203"
},
{
"name": "Gray",
"hex": "9EACAC"
},
{
"name": "Silver Gray",
"hex": "A2A7A7"
},
{
"name": "Silver",
"hex": "BBBDBD"
},
{
"name": "Skin",
"hex": "E7CEA2"
},
{
"name": "Yellow",
"hex": "FED212"
},
{
"name": "Green",
"hex": "149732"
},
{
"name": "Light Blue",
"hex": "00A3E0"
},
{
"name": "Blue",
"hex": "172788"
},
{
"name": "Red",
"hex": "D90C18"
},
{
"name": "Light Yellow",
"hex": "E4E63F"
},
{
"name": "Rose",
"hex": "BC4997"
},
{
"name": "Pink",
"hex": "F3B4CD"
},
{
"name": "Purple",
"hex": "5C3E93"
},
{
"name": "Orange",
"hex": "EC6C01"
},
{
"name": "Light Green",
"hex": "91C536"
},
{
"name": "Gold",
"hex": "CFA74C"
},
{
"name": "Brown",
"hex": "984304"
},
{
"name": "Light Red",
"hex": "DB2F2B"
},
{
"name": "Traffic Red",
"hex": "B32124"
},
{
"name": "Light Orange",
"hex": "F08400"
}
]
}
]
}
Loading

0 comments on commit 20f2774

Please sign in to comment.