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

This commit is contained in:
Andy Meneely
2017-10-05 10:34:00 -04:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -38,7 +38,7 @@ module Squib
bar.increment bar.increment
cc.reset_clip cc.reset_clip
cc.translate(-x, -y) 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 x += card.width + sheet.gap - 2 * sheet.trim
if x > (sheet.width - card_width - sheet.margin) if x > (sheet.width - card_width - sheet.margin)
x = sheet.margin x = sheet.margin
+1 -1
View File
@@ -1,4 +1,4 @@
#This layout inspired by popular fantasy games #This layout inspired by popular economy games
title: title:
x: 90 x: 90
y: 90 y: 90