Merge branch 'master' into 17.2.x-dev

# Conflicts:
#	dist/libs/api3.jsxinc
#	tools/assets/environment.json
#	tools/deploy_duik.py
#	tools/dev/dev-install.bat
#	types/dugr/types.d.ts
#	types/duik/types.d.ts

Author: Nico-Duduf

.gitignore

@@ -1,3 +1,4 @@
+build
 node_modules
 tools/build/output/
 tools/dev/output/
@@ -8,16 +9,16 @@ tools/dev/output/
 # Build
 /build
 
-# Python
+# Python stuff
 __pycache__
+*.py[co]
 
 # Ignore our own submodules (The best is to symlink them)
 src/inc/modules/*.jsxinc
-src/Scripts/ScriptUI Panels/inc/modules/*.jsxinc
-types/duaef/types.d.ts
+src/Scripts/ScriptUI Panels/inc/modules/DuGR_api.jsxinc
+src/Scripts/ScriptUI Panels/inc/modules/DuIO_api.jsxinc
+src/Scripts/ScriptUI Panels/inc/modules/DuSan_api.jsxinc
 
-scriptlets/libs/DuAEF.jsxinc
 scriptlets/libs/DuGR_api.jsxinc
 scriptlets/libs/DuIO_api.jsxinc
 scriptlets/libs/DuSan_api.jsxinc
-scriptlets/libs/setup.jsxinc

dist/Duik_API.jsxinc

@@ -1,5 +1,5 @@
 //@include "libs/DuAEF.jsxinc"
-//@include "libs/DuGR_api.jsxinc"
+//@include "libs/DuGR_API.jsxinc"
 //@include "libs/DuIO_api.jsxinc"
 //@include "libs/DuSan_api.jsxinc"
 //@include "libs/api1.jsxinc"