possible apfs compatibility issues

brendanwong · Feb 22, 2020 · 95c60d5 · 95c60d5
1 parent 5983bcc
commit 95c60d5
Show file tree

Hide file tree

Showing 7 changed files with 405 additions and 86 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # G-Code Generator
 ## Overview
-This is a G-Code generation program, created during my summer internship with SE3D. The program receives user input and interpolates the data into G-Code compatible with SE3D's r3bEL X and r3bEL mini bioprinters. Use with other 3D printers is possible, but extrusion should only take place on appropriately sized petri dishes (at least 100mm), or the [Greiner 650161 96-Well Microplate](https://shop.gbo.com/en/row/products/bioscience/microplates/96-well-microplates/96-well-microplates-clear/650161.html).
+This is a CNC control program, created during my summer internship with SE3D. The program receives user input and interpolates the data into G-Code compatible with SE3D's r3bEL X and r3bEL mini bioprinters. Use with other 3D printers is possible, but extrusion should only take place on appropriately sized petri dishes (at least 100mm), or the [Greiner 650161 96-Well Microplate](https://shop.gbo.com/en/row/products/bioscience/microplates/96-well-microplates/96-well-microplates-clear/650161.html).
 
 ### Supported Materials
 * Calcium Chloride Solution

diff --git a/constants.h b/constants.h
@@ -46,7 +46,7 @@ static const int Y_BORDER = 40;
 static const int DISH_DIAMETER = 100;
 
 //GUI Constants
-static const QString VERSION = "1.2.0";
+static const QString VERSION = "1.2.1";
 
 static const QString PORTAL_LINK = "http://portal.se3d.com";
 static const QString VISIT_LINK = "https://www.se3d.com/";

diff --git a/gcg-gui.pro.user b/gcg-gui.pro.user
diff --git a/gcg-gui.pro.user.baac062.4.8-pre1 b/gcg-gui.pro.user.baac062.4.8-pre1
diff --git a/resources/.DS_Store b/resources/.DS_Store
diff --git a/wizard.cpp b/wizard.cpp
@@ -101,7 +101,7 @@ void Wizard::buildSideBar(QHBoxLayout *mainLayout)
     title->setStyleSheet("color: #ffffff;"
                            "font: 20px;");
 
-    //version instantiation + properties. it looks more official :)
+    //version instantiation + properties
     QLabel *version = new QLabel;
     version->setText("Version " + VERSION);
     version->setAlignment(Qt::AlignCenter);
@@ -133,6 +133,7 @@ void Wizard::buildSideBar(QHBoxLayout *mainLayout)
     sidebar->setMinimumWidth(SIDEBAR_WIDTH);
     sidebar->setMaximumWidth(SIDEBAR_WIDTH);
 
+
     sidebar->setLayout(sidebarLayout);
     mainLayout->addWidget(sidebar);
 }