Merge remote-tracking branch 'upstream/master'

Update pre-commit hooks to version 3.3.0
2020-10-29 22:16:45 +01:00 · 2020-10-28 16:43:27 +01:00 · 2020-07-31 22:25:00 +02:00 · 2020-07-25 14:26:57 +02:00 · 2020-07-25 14:26:57 +02:00
3 changed files with 2 additions and 2 deletions
--- a/.luacheckrc
+++ b/.luacheckrc
@ -28,7 +28,6 @@ read_globals = {
 	"carts",
 	"farming",
 	"frame",
-	"intllib",
 	"mg",
 	"toolranks",
 }
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,7 +1,8 @@
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v3.3.0
    hooks:
+      - id: fix-byte-order-marker
      - id: end-of-file-fixer
      - id: trailing-whitespace

--- a/locale/moreores.pt_br.txt
+++ b/locale/moreores.pt_br.txt
Author	SHA1	Message	Date
sys4	dec888aee9	Merge remote-tracking branch 'upstream/master'	2020-10-29 22:16:45 +01:00
Hugo Locurcio	3fe0ba8fcb	Update pre-commit hooks to version 3.3.0	2020-10-28 16:43:27 +01:00
sys4	b4b42adb6e	Merge remote-tracking branch 'upstream/master'	2020-07-31 22:25:00 +02:00
Panquesito7	734f927f37	Fix Brazilian Portuguese translation... ...file format.	2020-07-25 14:26:57 +02:00
Panquesito7	8cb3486791	Remove `intllib` from `.luacheckrc`	2020-07-25 14:26:57 +02:00