From a8cf90763c7f9efeecd7ff3c3069bf8d78367c5e Mon Sep 17 00:00:00 2001 From: Chromachine Date: Fri, 26 Oct 2018 16:56:04 +0000 Subject: [PATCH] Download script update --- PermissionsEx/permissions.yml | 5 +++++ PlotSquared/config/settings.yml | 6 +++--- download.sh | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml index 606f4bc..ea04577 100644 --- a/PermissionsEx/permissions.yml +++ b/PermissionsEx/permissions.yml @@ -859,3 +859,8 @@ users: - member options: name: NameinProgressTM + f37e35a6-4130-4689-b28a-63dd2c4cb66c: + group: + - member + options: + name: 123louis456 diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml index 562154c..8cbbf97 100755 --- a/PlotSquared/config/settings.yml +++ b/PlotSquared/config/settings.yml @@ -2,9 +2,9 @@ issues: "https://github.com/IntellectualSites/PlotSquared/issues" suggestion: "https://github.com/IntellectualSites/PlotSquaredSuggestions" wiki: "https://github.com/IntellectualSites/PlotSquared/wiki" -date: "20 Nov 2018 00:00:00 GMT" -build: "https://ci.athion.net/job/PlotSquared/2049" -commit: "https://github.com/IntellectualSites/PlotSquared/commit/302051a" +date: "25 Nov 2018 00:00:00 GMT" +build: "https://ci.athion.net/job/PlotSquared/2050" +commit: "https://github.com/IntellectualSites/PlotSquared/commit/40e7df8" platform: "Bukkit" # Show additional information in console debug: true diff --git a/download.sh b/download.sh index bf18b4d..36e02d4 100755 --- a/download.sh +++ b/download.sh @@ -1,3 +1,3 @@ #!/bin/bash -git pull --rebase +git pull --rebase 2>/dev/null || git pull --ff-only