From e585d511bb4f223324eab96c2ed95504e6beaba7 Mon Sep 17 00:00:00 2001
From: Eric Froemling <ericfroemling@gmail.com>
Date: Wed, 19 Feb 2020 19:00:00 -0800
Subject: [PATCH] Syncing latest changes between public/private.

---
 .idea/dictionaries/ericf.xml                 | 3 +++
 assets/src/ba_data/python/bacommon/assets.py | 1 +
 docs/ba_module.md                            | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml
index 62eb1eb3..879b3457 100644
--- a/.idea/dictionaries/ericf.xml
+++ b/.idea/dictionaries/ericf.xml
@@ -652,6 +652,7 @@
       <w>funtionality</w>
       <w>futimens</w>
       <w>fval</w>
+      <w>fverts</w>
       <w>gameactivity</w>
       <w>gamebutton</w>
       <w>gameclass</w>
@@ -819,6 +820,7 @@
       <w>initing</w>
       <w>inits</w>
       <w>inmobi</w>
+      <w>inpath</w>
       <w>inputdevice</w>
       <w>inputfiles</w>
       <w>inputhash</w>
@@ -1675,6 +1677,7 @@
       <w>testthread</w>
       <w>testval</w>
       <w>testwith</w>
+      <w>texcoords</w>
       <w>texcube</w>
       <w>textactor</w>
       <w>textcolor</w>
diff --git a/assets/src/ba_data/python/bacommon/assets.py b/assets/src/ba_data/python/bacommon/assets.py
index 5bccb228..3f375be2 100644
--- a/assets/src/ba_data/python/bacommon/assets.py
+++ b/assets/src/ba_data/python/bacommon/assets.py
@@ -46,6 +46,7 @@ class AssetType(Enum):
     TEXTURE = 'texture'
     SOUND = 'sound'
     DATA = 'data'
+    MESH = 'mesh'
 
 
 class AssetPackageFlavorManifestValue(entity.CompoundValue):
diff --git a/docs/ba_module.md b/docs/ba_module.md
index e1b77c31..9a51a588 100644
--- a/docs/ba_module.md
+++ b/docs/ba_module.md
@@ -1,6 +1,6 @@
 <!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
-<!--DOCSHASH=fe9431fb6bf549f08e65d5554359ddab-->
-<h4><em>last updated on 2020-02-15 for Ballistica version 1.5.0 build 20001</em></h4>
+<!--DOCSHASH=4e89c37b263033ec4a3b8c5bc8c142ee-->
+<h4><em>last updated on 2020-02-19 for Ballistica version 1.5.0 build 20001</em></h4>
 <p>This page documents the Python classes and functions in the 'ba' module,
  which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
 <hr>