Lars Brubaker 6ae1a2c97e Merge branch 'main' of https://github.com/MatterHackers/MatterControl ... # Conflicts: # MatterControlLib/DesignTools/Operations/ScaleObject3D_3.cs		2021-05-18 12:25:47 -07:00
..
agg-sharp@789136c2af	Merge branch 'main' of https://github.com/MatterHackers/MatterControl	2021-05-18 12:25:47 -07:00
geometry3Sharp@41d2368678
gsGCode@eb104d7a91
gsSlicer@6f13110759
MatterSlice@78d54a5733	Improving scale object (displaying ratios on fixed scales)	2021-05-17 07:27:32 -07:00