Merge branch 'master' of github.com:CadQuery/cadquery into vrml

Author: jmwright

conda/meta.yaml

@@ -16,6 +16,7 @@ requirements:
   run:
     - python {{ environ.get('PYTHON_VERSION') }}
     - ocp 7.5.3
+    - vtk =9.0.1
     - pyparsing >=2.1.9
     - ezdxf
     - ipython

doc/primer.rst

@@ -248,7 +248,7 @@ For example we can create a circular face like so ::
   The topological class inherits :class:`~cadquery.Mixin3D` or :class:`~cadquery.Mixin1D` which provide aditional methods that are shared between the classes that inherits them.
 
 The direct API as its name suggests doesn't provide a parent/children data structure, instead each method call directly returns an object of the specified topological type.
-It is more verbose than the fluent API and more tedious to work with, but as it offer more flexibility (you can work with faces, which is something you can't do in the fluent API)
+It is more verbose than the fluent API and more tedious to work with, but as it offers more flexibility (you can work with faces, which is something you can't do in the fluent API)
 it is sometimes more convenient than the fluent API.
 
 The OCCT API

environment.yml

@@ -7,6 +7,7 @@ dependencies:
   - python>=3.6
   - ipython
   - ocp=7.5.3
+  - vtk=9.0.1
   - pyparsing>=2.1.9
   - sphinx=4.4.0
   - sphinx_rtd_theme