From 95155a3bc65fc030930b6fa810f0409f9bfe113a Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Thu, 21 Feb 2019 23:10:58 +0100 Subject: [PATCH] Add pre-commit hooks See https://pre-commit.com/ for more information. --- .pre-commit-config.yaml | 6 +++ locale/de.txt | 7 ++- locale/fr.txt | 4 +- locale/it.txt | 2 +- locale/template.txt | 106 ++++++++++++++++++++-------------------- stairsplus/API.md | 2 +- stairsplus/common.lua | 2 +- stairsplus/defs.lua | 2 +- 8 files changed, 68 insertions(+), 63 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..c682766 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,6 @@ +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.0.0 + hooks: + - id: end-of-file-fixer + - id: mixed-line-ending + - id: trailing-whitespace diff --git a/locale/de.txt b/locale/de.txt index 542f977..03b71f6 100644 --- a/locale/de.txt +++ b/locale/de.txt @@ -15,15 +15,15 @@ Up Wooden Tile = Holzfliese oben Down Wooden Tile = Holzfliese unten Left Wooden Tile = Holzfliese links Right Wooden Tile = Holzfliese rechts -Circle Stone Bricks = Kreissteinziegel +Circle Stone Bricks = Kreissteinziegel Stone Tile = Steinfliese Split Stone Tile = Geteilte Steinfliese Glow Glass = Leuchtglas Super Glow Glass = Superleuchtglas Coal Glass = Kohleglas Iron Glass = Eisenglas -Coal Checker = Karierte Kohle -Iron Checker = Kariertes Eisen +Coal Checker = Karierte Kohle +Iron Checker = Kariertes Eisen Trap Stone = Steinfalle Trap Glass = Glasfalle Trap Glow Glass = Leuchtglasfalle @@ -64,4 +64,3 @@ Recycle\noutput = Wiederver-\nwerten ###ownership.lua### someone = jemand Sorry, %s owns that spot. = Tut mir leid, %s gehoert diese Stelle. - diff --git a/locale/fr.txt b/locale/fr.txt index 6bd7f98..72c09f5 100644 --- a/locale/fr.txt +++ b/locale/fr.txt @@ -56,7 +56,7 @@ Circular saw, working with %s (owned by %s) = Scie circulaire, manipule %s (prop Circular saw, empty = Scie circulaire, vide Circular saw is empty (owned by %s) = Scie circulaire est vide (propriété de %s) -Input material = Entrée du matériel +Input material = Entrée du matériel Rest/microblocks = Reste/microbloc Max: = Max: Set = Fixer @@ -69,4 +69,4 @@ Recycle output = Recyclage %s Microblock = Microbloc en %s %s Pane = Panneau en %s -%s Fence = Barrière en %s \ No newline at end of file +%s Fence = Barrière en %s diff --git a/locale/it.txt b/locale/it.txt index 589e104..821ff36 100644 --- a/locale/it.txt +++ b/locale/it.txt @@ -33,7 +33,7 @@ Trap Glass = Vetro trappola Trap Glow Glass = Vetro luminoso trappola Trap Super Glow Glass = Super vetro luminoso trappola Coal Stone = Pietra in carbone -Iron Stone = Pietra in ferro +Iron Stone = Pietra in ferro Coal Stone Bricks = Mattoni di pietra in carbone Iron Stone Bricks = Mattoni di pietra in ferro Cactus Checker = Scacchiera in cactus diff --git a/locale/template.txt b/locale/template.txt index 2b88227..ea6f8ac 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,64 +1,64 @@ ###init.lua### -[moreblocks] loaded. = +[moreblocks] loaded. = ###nodes.lua### -Jungle Wood Fence = -Empty Bookshelf = -Clean Glass = -Plankstone = -Wooden Tile = -Full Wooden Tile = -Centered Wooden Tile = -Up Wooden Tile = -Down Wooden Tile = -Left Wooden Tile = -Right Wooden Tile = -Circle Stone Bricks = -Stone Tile = -Split Stone Tile = -Glow Glass = -Super Glow Glass = -Coal Glass = -Iron Glass = -Coal Checker = -Iron Checker = -Trap Stone = -Trap Glass = -Trap Glow Glass = -Trap Super Glow Glass = -Coal Stone = -Iron Stone = -Coal Stone Bricks = -Iron Stone Bricks = -Cactus Checker = -Cactus Brick = -Sweeper = -Jungle Stick = -Rope = -All-faces Tree = +Jungle Wood Fence = +Empty Bookshelf = +Clean Glass = +Plankstone = +Wooden Tile = +Full Wooden Tile = +Centered Wooden Tile = +Up Wooden Tile = +Down Wooden Tile = +Left Wooden Tile = +Right Wooden Tile = +Circle Stone Bricks = +Stone Tile = +Split Stone Tile = +Glow Glass = +Super Glow Glass = +Coal Glass = +Iron Glass = +Coal Checker = +Iron Checker = +Trap Stone = +Trap Glass = +Trap Glow Glass = +Trap Super Glow Glass = +Coal Stone = +Iron Stone = +Coal Stone Bricks = +Iron Stone Bricks = +Cactus Checker = +Cactus Brick = +Sweeper = +Jungle Stick = +Rope = +All-faces Tree = ###circular_saw.lua### -Circular Saw = -Circular saw, empty (owned by %s) = -Circular saw, working with %s (owned by %s) = -Circular saw, empty = -Circular saw is empty (owned by %s) = +Circular Saw = +Circular saw, empty (owned by %s) = +Circular saw, working with %s (owned by %s) = +Circular saw, empty = +Circular saw is empty (owned by %s) = -Input\nmaterial = -Left-over = -Max = -Set = -Recycle\noutput = +Input\nmaterial = +Left-over = +Max = +Set = +Recycle\noutput = ###ownership.lua### -someone = -Sorry, %s owns that spot. = +someone = +Sorry, %s owns that spot. = ###./stairsplus/*### -%s Stairs = -%s Slab = -%s Panel = -%s Microblock = +%s Stairs = +%s Slab = +%s Panel = +%s Microblock = -%s Pane = -%s Fence = +%s Pane = +%s Fence = diff --git a/stairsplus/API.md b/stairsplus/API.md index cd8d1a7..b5cb0c1 100644 --- a/stairsplus/API.md +++ b/stairsplus/API.md @@ -79,4 +79,4 @@ The subset table should have the following format: { "stair", "_alt_4" }, } ``` -You can remove entries as needed. \ No newline at end of file +You can remove entries as needed. diff --git a/stairsplus/common.lua b/stairsplus/common.lua index a7134b2..e1615fb 100644 --- a/stairsplus/common.lua +++ b/stairsplus/common.lua @@ -58,4 +58,4 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam end minetest.register_node(":" ..modname.. ":" .. category .. "_" .. subname .. alternate, def) stairsplus.register_recipes(category, alternate, modname, subname, recipeitem) -end \ No newline at end of file +end diff --git a/stairsplus/defs.lua b/stairsplus/defs.lua index 560b1f2..2bc49db 100644 --- a/stairsplus/defs.lua +++ b/stairsplus/defs.lua @@ -406,4 +406,4 @@ for type,a in pairs(stairsplus.defs) do for name,b in pairs(stairsplus.defs[type]) do table.insert(stairsplus.shapes_list, { type .. "_", name }) end -end \ No newline at end of file +end