project: Merge upstream

This commit is contained in:
Owain van Brakel
2020-02-17 06:35:36 +01:00
5 changed files with 13 additions and 1 deletions

View File

@@ -46,6 +46,8 @@ public class WidgetOverlay extends Overlay
.put(WidgetInfo.FOSSIL_ISLAND_OXYGENBAR, OverlayPosition.TOP_LEFT)
.put(WidgetInfo.EXPERIENCE_TRACKER_WIDGET, OverlayPosition.TOP_RIGHT)
.put(WidgetInfo.RAIDS_POINTS_INFOBOX, OverlayPosition.TOP_RIGHT)
.put(WidgetInfo.TOB_PARTY_INTERFACE, OverlayPosition.TOP_LEFT)
.put(WidgetInfo.TOB_PARTY_STATS, OverlayPosition.TOP_LEFT)
.put(WidgetInfo.GWD_KC, OverlayPosition.TOP_RIGHT)
.put(WidgetInfo.TITHE_FARM, OverlayPosition.TOP_RIGHT)
.put(WidgetInfo.PEST_CONTROL_BOAT_INFO, OverlayPosition.TOP_LEFT)

View File

@@ -115,7 +115,7 @@ public class ImageCapture
playerFolder.mkdirs();
fileName += " " + format(new Date());
fileName += (fileName.isEmpty() ? "" : " ") + format(new Date());
try
{