Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Ismoh committed Nov 21, 2023
2 parents 94a0a6e + 61ab9b8 commit 8a3e681
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 13 deletions.
18 changes: 8 additions & 10 deletions .github/workflows/dependency-updater.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
name: Update dependecies every saturday at 00:00 UTC
name: Update dependecies
on:
schedule:
# Weekly on saturday at 00:00 UTC
- cron: "0 0 * * 6"
push:
branches:
- develop

jobs:
update-dependencies:
Expand Down Expand Up @@ -90,13 +87,14 @@ jobs:
# git commit -m "Updated LuaRocks dependencies" -a || echo "No changes to commit"

- name: Update NoitaPatcher
shell: pwsh
env:
GH_TOKEN: ${{ github.token }}
run: |
$noitaptacherPath = "${{ github.workspace }}\mods\noita-mp\lua_modules\lib\lua\5.1\noitapatcher.dll"
if ([System.IO.File]::Exists($noitaptacherPath)) {
$creationTime = (Get-Item $noitapatcherPath).CreationTime.ToString("yyyy-MM-ddThh:mm:ssZ")
$creationTime = (Get-Item $noitaptacherPath).CreationTime.ToString("yyyy-MM-ddThh:mm:ssZ")
} else {
$creationTime = "2021-11-10T00:00:00Z"
}
Expand All @@ -111,7 +109,7 @@ jobs:
if ($releaseCreatedAt -lt $creationTime) {
echo "NoitaPatcher is up to date"
exit 0
Exit 0
} else {
gh release download --repo dextercd/NoitaPatcher --pattern "*.zip" --dir "${{ github.workspace }}\temp"
}
Expand All @@ -128,7 +126,7 @@ jobs:
git add ${{ github.workspace }}\mods\noita-mp\lua_modules\lib\lua\5.1\noitapatcher.version
git add -f $noitaptacherPath
git add "${{ github.workspace }}\.debug\lua-definitions\noitapatcher.lua"
git commit -m "Updated NoitaPatcher dependencies" -a || echo "No changes to commit"
git commit -m "Updated NoitaPatcher dependencies" -a || echo "No changes to commit"; Exit 0
- name: Update Noita-Synchronise-Expansive-Worlds
env:
Expand All @@ -152,7 +150,7 @@ jobs:
if ($releaseCreatedAt -lt $creationTime) {
echo "Noita-Synchronise-Expansive-Worlds is up to date"
exit 0
Exit 0
} else {
gh release download --repo dextercd/Noita-Synchronise-Expansive-Worlds --pattern "*.zip" --dir "${{ github.workspace }}\temp"
}
Expand All @@ -172,14 +170,14 @@ jobs:
git add ${{ github.workspace }}\mods\noita-mp\lua_modules\lib\lua\5.1\nsew.version
git add -f $nsewPath
git add -f "${{ github.workspace }}\mods\noita-mp\lua_modules\share\lua\5.1\nsew\*.lua"
git commit -m "Updated nsew dependencies" -a || echo "No changes to commit"
git commit -m "Updated nsew dependencies" -a || echo "No changes to commit"; Exit 0
- name: Push changes and create a pull request
env:
GH_TOKEN: ${{ github.token }}
run: |
git pull origin dependency-updates
git push origin dependency-updates
git push origin dependency-updates || echo "There are no changes!"; Exit 0
$prTitleArray = gh pr list --head "dependency-updates" --json "title" | ConvertFrom-Json
if ($prTitleArray.Count -gt 0) {
Expand Down
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Noita Multiplayer

[![latest release](https://img.shields.io/github/v/release/ismoh/noitamp?include_prereleases&label=latest%20release&style=for-the-badge)](https://github.com/Ismoh/NoitaMP/releases)

### Table of Contents

- [TL:DR](#tldr)
- [Documentation](#documentation)
- [Our awesome and valuable Contributors](#our-awesome-and-valuable-contributors)
Expand Down Expand Up @@ -51,6 +53,7 @@ Let's see, if I can do so?! I am new to Lua and modding, but someone said to me:
<div align="center">

[![gif](miscs/2022-06-21_teaser.gif)](miscs/2022-06-21_teaser.gif)

21.06.2022 teaser
</div>

Expand All @@ -64,7 +67,7 @@ Installation, configuration and support can be found on the [docs](https://ismoh
<img src="https://contrib.rocks/image?repo=Ismoh/NoitaMP" />
</a>

## Credits, Supporter and special thanks
## Credits, Supporter and special thanks

I wouldn't be able to create this mod without the help by

Expand All @@ -80,14 +83,22 @@ I wouldn't be able to create this mod without the help by
- [@Ramiels](https://github.com/Ramiels)
- [@bruham](https://steamcommunity.com/id/bruham/myworkshopfiles/?appid=881100)
- [@ofoxsmith](https://github.com/ofoxsmith)
- [@Myzumi](https://github.com/Myzumi)

I also want to say thank you to the sponsors of this project on

I also want to say thank you to the supporter of this project on [GitHub](https://github.com/sponsors/Ismoh) or [Patreon](https://www.patreon.com/ismoh):
- [GitHub](https://github.com/sponsors/Ismoh)
- [Patreon](https://www.patreon.com/ismoh)
- [Discord](https://donatebot.io/checkout/747169041457872917)

| Name | Amount | Type | Start |
|:-------------------------------------------:|:--------:|:----------:|:--------------:|
| [stefnotch](https://github.com/stefnotch) | 20$ | one-time | Nov 18, 2022 |
| [den3606](https://github.com/den3606) | 1$ | monthly | Feb 8, 2023 |
| [den3606](https://github.com/den3606) | 1$ | monthly | Feb 8, 2023 |
| [clragon](https://github.com/clragon) | 25$ | one-time | Feb 17, 2023 |
| [stefnotch](https://github.com/stefnotch) | 20$ | one-time | Jul 13, 2023 |
| [conga lyne](https://github.com/Conga0) | 25$ | monthly | Jul 13, 2023 |
| [clragon](https://github.com/clragon) | 20$ | one-time | Jul 13, 2023 |

If you spot anything I should mention, feel free to create an issue or get in touch with [me](https://github.com/Ismoh)!

Expand Down
Binary file modified miscs/2022-06-21_teaser.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8a3e681

Please sign in to comment.