From 7c7715b088ef44111f2f565bca1d5e15b303b0c1 Mon Sep 17 00:00:00 2001 From: Jinzo <91829829+pernio@users.noreply.github.com> Date: Sun, 4 Oct 2026 12:25:18 +0200 Subject: [PATCH 1/5] Add new motd --- .github/workflows/update-main-conf.yml | 22 +++++++++++++++++++--- README.md | 5 +++-- edit-me.txt | 4 +++- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update-main-conf.yml b/.github/workflows/update-main-conf.yml index 2219a5d..5549d67 100644 --- a/.github/workflows/update-main-conf.yml +++ b/.github/workflows/update-main-conf.yml @@ -1,6 +1,9 @@ -name: Update main.conf in PR +name: Update main.conf on: + push: + branches-ignore: + - main pull_request_target: types: - opened @@ -15,11 +18,16 @@ permissions: jobs: update-main-conf: - if: github.event.pull_request.head.repo.full_name == github.repository + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository runs-on: ubuntu-latest steps: + - name: Check out branch + if: github.event_name == 'push' + uses: actions/checkout@v4 + - name: Check out PR branch + if: github.event_name == 'pull_request_target' uses: actions/checkout@v4 with: repository: ${{ github.event.pull_request.head.repo.full_name }} @@ -90,7 +98,15 @@ jobs: print('Updated main.conf') PY - - name: Commit updated main.conf + - name: Commit updated main.conf on branch + if: github.event_name == 'push' + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "chore: update generated main.conf" + file_pattern: main.conf + + - name: Commit updated main.conf on PR branch + if: github.event_name == 'pull_request_target' uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: "chore: update generated main.conf" diff --git a/README.md b/README.md index 9c331c4..de2ea87 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is a collection of all messages that are displayed in the server list. The ## Pull requests -We accept your submissions! You may clone this repository, add a new line in [edit-me.txt](edit-me.txt) and create a pull request in . +We accept your submissions! You may fork this repository, add a new line in [edit-me.txt](edit-me.txt) and create a pull request in . When the pull request gets approved, Github will update [main.conf](main.conf) to match [edit-me.txt](edit-me.txt). @@ -19,7 +19,8 @@ To avoid controversy or inappropriate sentences, the guideline rules below will ## How to contribute -- Clone project using `git clone https://github.com/BorderMC/motd.git` +- Fork this repository +- Clone your fork using `git clone https://github.com//motd.git` - Read [the rules](#rules) - Edit [edit-me.txt](edit-me.txt) - Make a branch with `git branch /` for example `git branch pernio/nether-reset-info` diff --git a/edit-me.txt b/edit-me.txt index e8b72e2..7aecb55 100644 --- a/edit-me.txt +++ b/edit-me.txt @@ -11,4 +11,6 @@ Touch grass, then punch trees Home of highly professional miners We have blocks Don't dig straight down -Beyond the border \ No newline at end of file +Beyond the border +We have wool +Non earthy \ No newline at end of file From 4acff45e5cee8ac64378929737eeaa574fec2bb9 Mon Sep 17 00:00:00 2001 From: pernio <91829829+pernio@users.noreply.github.com> Date: Sun, 4 Oct 2026 10:25:33 +0000 Subject: [PATCH 2/5] chore: update generated main.conf --- main.conf | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/main.conf b/main.conf index de4d0a6..548d8d2 100644 --- a/main.conf +++ b/main.conf @@ -25,6 +25,66 @@ motds=[ line1="BorderMC" line2="https://bordermc.net/" icon=random + }, + { + line1="BorderMC" + line2="Do not feed parrots cookies" + icon=random + }, + { + line1="BorderMC" + line2="Creepers have entered the chat" + icon=random + }, + { + line1="BorderMC" + line2="Probably not on fire" + icon=random + }, + { + line1="BorderMC" + line2="Definitely a Minecraft server" + icon=random + }, + { + line1="BorderMC" + line2="Now with 100% more blocks" + icon=random + }, + { + line1="BorderMC" + line2="Touch grass, then punch trees" + icon=random + }, + { + line1="BorderMC" + line2="Home of highly professional miners" + icon=random + }, + { + line1="BorderMC" + line2="We have blocks" + icon=random + }, + { + line1="BorderMC" + line2="Don't dig straight down" + icon=random + }, + { + line1="BorderMC" + line2="Beyond the border" + icon=random + }, + { + line1="BorderMC" + line2="We have wool" + icon=random + }, + { + line1="BorderMC" + line2="Non earthy" + icon=random } ] From bc7efe9d2a4deb543299380c10ae44c8c1c0951c Mon Sep 17 00:00:00 2001 From: Jinzo <91829829+pernio@users.noreply.github.com> Date: Sun, 4 Oct 2026 12:27:23 +0200 Subject: [PATCH 3/5] Fix merge conflicts --- edit-me.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/edit-me.txt b/edit-me.txt index 7aecb55..1b197b1 100644 --- a/edit-me.txt +++ b/edit-me.txt @@ -12,5 +12,12 @@ Home of highly professional miners We have blocks Don't dig straight down Beyond the border +Have you tried turning it off and on again? +We take no responsibility +This message has been claimed +Server has not collapsed yet +Probably stable +Please remain inside the borders +Nothing personal, just geopolitics We have wool Non earthy \ No newline at end of file From 6a9373ca3e6f61f789f6670dadf750264798ddaf Mon Sep 17 00:00:00 2001 From: pernio <91829829+pernio@users.noreply.github.com> Date: Sun, 4 Oct 2026 10:27:33 +0000 Subject: [PATCH 4/5] chore: update generated main.conf --- main.conf | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/main.conf b/main.conf index 548d8d2..a8b3cc7 100644 --- a/main.conf +++ b/main.conf @@ -76,6 +76,41 @@ motds=[ line2="Beyond the border" icon=random }, + { + line1="BorderMC" + line2="Have you tried turning it off and on again?" + icon=random + }, + { + line1="BorderMC" + line2="We take no responsibility" + icon=random + }, + { + line1="BorderMC" + line2="This message has been claimed" + icon=random + }, + { + line1="BorderMC" + line2="Server has not collapsed yet" + icon=random + }, + { + line1="BorderMC" + line2="Probably stable" + icon=random + }, + { + line1="BorderMC" + line2="Please remain inside the borders" + icon=random + }, + { + line1="BorderMC" + line2="Nothing personal, just geopolitics" + icon=random + }, { line1="BorderMC" line2="We have wool" From f475d944d37605fd6ee73d2aec3aae7d5316eee0 Mon Sep 17 00:00:00 2001 From: pernio <91829829+pernio@users.noreply.github.com> Date: Sun, 4 Oct 2026 10:28:55 +0000 Subject: [PATCH 5/5] chore: update generated main.conf --- main.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main.conf b/main.conf index a8b3cc7..b01e4ff 100644 --- a/main.conf +++ b/main.conf @@ -120,6 +120,11 @@ motds=[ line1="BorderMC" line2="Non earthy" icon=random + }, + { + line1="BorderMC" + line2="Nothing personal, just geopolitics" + icon=random } ]