Skip to content

Commit

Permalink
Merge branch 'SoftFever:main' into pr-reverse-on-odd-no-external
Browse files Browse the repository at this point in the history
  • Loading branch information
igiannakas authored Nov 16, 2023
2 parents 9d0e616 + bc05653 commit 0683006
Show file tree
Hide file tree
Showing 33 changed files with 33 additions and 32 deletions.
1 change: 1 addition & 0 deletions .github/workflows/orca_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
days-before-issue-close: 14
operations-per-run: 1000
stale-issue-label: "stale"
ascending: true
stale-issue-message: "GitHub bot: this issue is stale because it has been open for 90 days with no activity."
close-issue-message: "GitHub bot: This issue was closed because it has been inactive for 14 days since being marked as stale."
days-before-pr-stale: -1
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anker.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Anker",
"version": "01.06.04.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Anker configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Anycubic.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Anycubic",
"version": "01.06.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Anycubic configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Artillery.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Artillery",
"version": "01.06.04.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Artillery configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/BBL.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.07.00.29",
"version": "01.07.00.30",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/BIQU.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "BIQU",
"version": "01.06.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "BIQU configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Comgrow.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Comgrow",
"version": "01.07.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Comgrow configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Creality.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Creality",
"version": "01.07.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Creality configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Custom.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Custom Printer",
"version": "01.06.01.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "My configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Elegoo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Elegoo",
"version": "01.07.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Elegoo configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/FLSun.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "FLSun",
"version": "01.06.04.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "FLSun configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Flashforge.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Flashforge",
"url": "",
"version": "01.06.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Flashforge configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/FlyingBear.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "FlyingBear",
"version": "01.01.01.01",
"version": "01.08.00.00",
"force_update": "1",
"description": "FlyingBear configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Folgertech.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Folgertech",
"version": "01.06.00.03",
"version": "01.08.00.00",
"force_update": "0",
"description": "Folgertech configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/InfiMech.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "InfiMech",
"version": "01.01.01.01",
"version": "01.08.00.00",
"force_update": "1",
"description": "InfiMech configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Kingroon.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Kingroon",
"url": "https://kingroon.com/",
"version": "01.06.05.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Kingroon configuration files",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/OrcaArena.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Orca Arena Printer",
"url": "",
"version": "01.06.02.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Orca Arena configuration files",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Prusa.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Prusa",
"version": "01.07.01.04",
"version": "01.08.00.00",
"force_update": "0",
"description": "Prusa configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Qidi.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Qidi",
"version": "01.07.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Qidi configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Raise3D.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Raise3D",
"url": "",
"version": "01.06.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Raise3D configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Ratrig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RatRig",
"version": "01.07.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "RatRig configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/SecKit.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SecKit",
"version": "01.06.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "SecKit configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Snapmaker.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Snapmaker",
"version": "01.05.04.01",
"version": "01.08.00.00",
"force_update": "0",
"description": "Snapmaker configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Sovol.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Sovol",
"url": "",
"version": "01.00.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Sovol configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Tronxy.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Tronxy",
"version": "01.06.00.1",
"version": "01.08.00.00",
"force_update": "0",
"description": "Tronxy configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/TwoTrees.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "TwoTrees",
"version": "01.06.01.00",
"version": "01.08.00.00",
"force_update": "1",
"description": "TwoTrees configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/UltiMaker.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "UltiMaker",
"url": "",
"version": "01.06.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "UltiMaker configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Vivedino.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Vivedino",
"version": "01.06.04.01",
"version": "01.08.00.00",
"force_update": "0",
"description": "Vivedino configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Voron.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Voron",
"version": "01.06.05.03",
"version": "01.08.00.00",
"force_update": "0",
"description": "Voron configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Voxelab.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Voxelab",
"url": "",
"version": "01.06.00.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Voxelab configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Vzbot.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Vzbot",
"version": "01.06.04.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Vzbot configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion resources/profiles/Wanhao.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Wanhao",
"version": "01.00.01.00",
"version": "01.08.00.00",
"force_update": "0",
"description": "Wanhao configurations",
"machine_model_list": [
Expand Down
2 changes: 1 addition & 1 deletion version.inc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif()
if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1")
endif()
set(SoftFever_VERSION "1.8.0-rc2")
set(SoftFever_VERSION "1.8.0")
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
SoftFever_VERSION_MATCH ${SoftFever_VERSION})
set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})
Expand Down

0 comments on commit 0683006

Please sign in to comment.