diff --git a/.github/workflows/backport_receive.yml b/.github/workflows/backport_receive.yml new file mode 100644 index 0000000000..0fa85ecf88 --- /dev/null +++ b/.github/workflows/backport_receive.yml @@ -0,0 +1,28 @@ +name: Update code with code from PoB2 + +on: + repository_dispatch: + types: + - port-changes + +jobs: + apply-patch: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: 'dev' + - name: Apply patch + run: | + curl -L ${{ github.event.client_payload.patch_url }} | git apply -v --index + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5 + with: + title: \[pob2-port\] ${{ github.event.client_payload.title }} + branch: pob2-pr-${{ github.event.client_payload.id }} + body: | + ${{ github.event.client_payload.msg }} + author: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com> + commit-message: ${{ github.event.client_payload.msg }} + labels: ${{ github.event.client_payload.labels }} \ No newline at end of file diff --git a/RELEASE.md b/RELEASE.md index 42f34b614e..da7df66643 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,6 @@ # How to release Path of Building Community -## Prerequisites +## Prerequisites12 ## Choosing a new version number diff --git a/help.txt b/help.txt index b728173120..76756d6554 100644 --- a/help.txt +++ b/help.txt @@ -11,7 +11,7 @@ While holding shift scroll bars in the help section and version history will jum General Shortcuts: -Ctrl + 1 Jump to tree tab +Ctrl + 1 Jump to trees tab Ctrl + 2 Jump to skills tab Ctrl + 3 Jump to items tab Ctrl + 4 Jump to calcs tab