Merge remote-tracking branch 'origin/master' into dev

2017-10-05 10:34:00 -04:00 · 2017-10-05 10:34:00 -04:00 · daff0281fd
parent 52920ab8f0 6149023dbb
commit daff0281fd
2 changed files with 2 additions and 2 deletions
--- a/lib/squib/graphics/save_pdf.rb
+++ b/lib/squib/graphics/save_pdf.rb
@ -38,7 +38,7 @@ module Squib
            bar.increment
            cc.reset_clip
            cc.translate(-x, -y)
-            draw_crop_marks(cc, x, y, sheet)
+            draw_crop_marks(cc, x, y, sheet) if sheet.crop_marks
            x += card.width + sheet.gap - 2 * sheet.trim
            if x > (sheet.width - card_width - sheet.margin)
              x = sheet.margin
--- a/lib/squib/layouts/economy.yml
+++ b/lib/squib/layouts/economy.yml
@ -1,4 +1,4 @@
-#This layout inspired by popular fantasy games
+#This layout inspired by popular economy games
 title:
  x: 90
  y: 90