Merge branch 'master' into upstream-merge-29866

2017-09-06 09:21:53 -05:00
parent b6f6970ebb cf46abecb3
commit 00199af27d
545 changed files with 13331 additions and 156744 deletions
@@ -0,0 +1,18 @@
+{{#each data.spawners}}
+  <ui-display title='{{name}}' button>
+    {{#partial button}}
+       <ui-button action='jump' params='{"name" : {{name}}}'>
+	     Jump
+        </ui-button>
+        <ui-button action='spawn' params='{"name" : {{name}}}'>
+	      Spawn
+        </ui-button>
+    {{/partial}}
+  <ui-section label='Description'>
+    <span>{{{desc}}}</span>
+  </ui-section>
+  <ui-section label='Spawners left'>
+    <span>{{amount_left}}</span>
+   </ui-section>
+  </ui-display>
+{{/each}}