Download script update

PermissionsEx/permissions.yml

@@ -859,3 +859,8 @@ users:
     - member
     options:
       name: NameinProgressTM
+  f37e35a6-4130-4689-b28a-63dd2c4cb66c:
+    group:
+    - member
+    options:
+      name: 123louis456

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

download.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-git pull --rebase
+git pull --rebase 2>/dev/null || git pull --ff-only