Merge branch 'master' into 1.15

src/main/java/carpet/script/CarpetExpression.java

@@ -1623,6 +1623,8 @@ public class CarpetExpression
      * <p>Eye height of the entity.</p>
      * <h3><code>query(e,'age')</code></h3>
      * <p>Age, in ticks, of the entity, i.e. how long it existed.</p>
+     * <h3><code>query(e,'despawn_timer')</code></h3>
+     * <p>For living entities - the number of ticks they fall outside of immediate player presence.</p>
      * <h3><code>query(e,'item')</code></h3>
      * <p>The item triple (name, count, nbt) if its an item entity, <code>null</code> otherwise</p>
      * <h3><code>query(e,'count')</code></h3>
@@ -1718,8 +1720,10 @@ public class CarpetExpression
      * <h3><code>modify(e, 'accelerate', x, y, z), modify(e, 'accelerate', l(x, y, z) )</code></h3>
      * <p>Adds a vector to the motion vector. Most realistic way to apply a force to an entity.</p>
      * <h3><code>modify(e, 'custom_name'), modify(e, 'custom_name', name )</code></h3>
-     * <h3><code>modify(e,'pickup_delay')</code></h3>
+     * <h3><code>modify(e, 'pickup_delay')</code></h3>
      * <p>Sets a custom pickup delay if the entity argument is an item entity</p>
+     * <h3><code>modify(e, 'despawn_timer')</code></h3>
+     * <p>Sets a custom despawn timer value.</p>
      * <h3><code>modify(e, 'dismount')</code></h3>
      * <p>Dismounts riding entity.</p>
      * <h3><code>modify(e, 'mount', other)</code></h3>