Merge branch 'main' into renovate/chrono-0.x

mbround18 · Sep 1, 2023 · 033a47a · 033a47a
2 parents b1b20c8 + 6fc81c6
commit 033a47a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 42 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -3,9 +3,7 @@
   "projectOwner": "mbround18",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "files": [
-    "README.md"
-  ],
+  "files": ["README.md"],
   "imageSize": 100,
   "commit": true,
   "commitConvention": "eslint",
@@ -15,111 +13,84 @@
       "name": "Mark",
       "avatar_url": "https://avatars.githubusercontent.com/u/3298808?v=4",
       "profile": "http://arneman.me/",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "mbround18",
       "name": "Michael",
       "avatar_url": "https://avatars.githubusercontent.com/u/12646562?v=4",
       "profile": "https://m.bruno.fyi/",
-      "contributions": [
-        "infra",
-        "code",
-        "doc"
-      ]
+      "contributions": ["infra", "code", "doc"]
     },
     {
       "login": "imgbot[bot]",
       "name": "imgbot[bot]",
       "avatar_url": "https://avatars.githubusercontent.com/in/4706?v=4",
       "profile": "https://github.com/apps/imgbot",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "AGhost-7",
       "name": "Jonathan Boudreau",
       "avatar_url": "https://avatars.githubusercontent.com/u/6957411?v=4",
       "profile": "https://github.com/AGhost-7",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "Kellei2983",
       "name": "Lukáš Hruška",
       "avatar_url": "https://avatars.githubusercontent.com/u/32897629?v=4",
       "profile": "https://github.com/Kellei2983",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "JulianVallee",
       "name": "Julian Vallée",
       "avatar_url": "https://avatars.githubusercontent.com/u/6720458?v=4",
       "profile": "http://vallee-design.de/",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "Finomnis",
       "name": "Finomnis",
       "avatar_url": "https://avatars.githubusercontent.com/u/3129043?v=4",
       "profile": "https://github.com/Finomnis",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "JustinByrne",
       "name": "Justin Byrne",
       "avatar_url": "https://avatars.githubusercontent.com/u/14056930?v=4",
       "profile": "https://tech.jrlbyrne.com/",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "apeabody",
       "name": "Andrew Peabody",
       "avatar_url": "https://avatars.githubusercontent.com/u/14035345?v=4",
       "profile": "http://blog.andrewpeabody.com/",
-      "contributions": [
-        "doc",
-        "code"
-      ]
+      "contributions": ["doc", "code"]
     },
     {
       "login": "morales2k",
       "name": "Jorge Morales",
       "avatar_url": "https://avatars.githubusercontent.com/u/1074855?v=4",
       "profile": "https://github.com/morales2k",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "spannerman79",
       "name": "Spanner_Man",
       "avatar_url": "https://avatars.githubusercontent.com/u/7542384?v=4",
       "profile": "https://github.com/spannerman79",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     },
     {
       "login": "cameronwp",
       "name": "Cameron Pittman",
       "avatar_url": "https://avatars.githubusercontent.com/u/5186335?v=4",
       "profile": "https://hurtlingthrough.space/",
-      "contributions": [
-        "doc"
-      ]
+      "contributions": ["doc"]
     }
   ],
   "contributorsPerLine": 7

diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
@@ -0,0 +1,11 @@
+version = 1
+
+[update]
+always = true # default: false
+require_automerge_label = false # default: true
+
+[approve]
+auto_approve_usernames = ["dependabot", "renovate", "mbround18"]
+
+[merge.automerge_dependencies]
+usernames = ["dependabot", "renovate"]
diff --git a/README.md b/README.md
@@ -15,7 +15,9 @@
 <a href="https://github.com/mbround18/valheim-docker/actions/workflows/docker-release.yml"><img src="https://img.shields.io/github/actions/workflow/status/mbround18/valheim-docker/docker-release.yml?label=Docker&style=for-the-badge" alt=""></a>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+
 [![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-)
+
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## Table of Contents