Merge branch 'dev' into fix/MoM+EB+ESBypass

# Conflicts:
#	src/Modules/CalcDefence.lua

Author: Edvinas-Smita

.github/workflows/backport.yml

@@ -0,0 +1,22 @@
+name: Port changes to PoB2
+
+on:
+    pull_request_target:
+        types: [closed]
+
+env:
+    LABEL_STRING: ${{ join(github.event.pull_request.labels.*.name, ',') }}
+
+jobs:
+    backport:
+        if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'pob2')
+        runs-on: ubuntu-latest
+        steps:
+            - name: Notify PathOfBuilding repo
+              uses: peter-evans/repository-dispatch@v3
+              with:
+                token: ${{ secrets.WIRES77_PAT }}
+                repository: ${{ github.repository_owner }}/PathOfBuilding-PoE2
+                event-type: port-changes
+                client-payload: '{"patch_url": "${{ github.event.pull_request.patch_url }}", "msg": "Apply changes from ${{ github.event.pull_request.html_url }}", "id": ${{ github.event.pull_request.number }}, "title": "${{ github.event.pull_request.title }}", "labels": "${{ env.LABEL_STRING }}", "name": "${{ github.event.pull_request.user.name }}", "user": "${{ github.event.pull_request.user.login }}"}'
+

.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 }}

.github/workflows/release.yml

@@ -40,6 +40,7 @@ jobs:
                 sed -i 's/\[Voronoff/\[Tom Clancy Is Dead/' temp_change.md;
                 sed -i 's/\[PJacek/\[TPlant/' temp_change.md;
                 sed -i 's/\[justjuangui/\[trompetin17/' temp_change.md;
+                sed -i 's/\r//g' temp_change.md;
                 cp temp_change.md changelog_temp.txt;
                 cat CHANGELOG.md | tr \\r \\n | sed '1d' >> temp_change.md;
                 printf "# Changelog\n\n## [v${{ github.event.inputs.releaseVersion }}](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v${{ github.event.inputs.releaseVersion }}) ($(date +'%Y/%m/%d'))\n\n" | cat - temp_change.md > CHANGELOG.md;

CONTRIBUTING.md

@@ -208,7 +208,7 @@ Z:\home\dev\.vscode\extensions\tangzx.emmylua-0.8.20-linux-x64\debugger\emmy\win
 
 ## Testing
 
-PoB uses the [Busted](https://olivinelabs.com/busted/) framework to run its tests. Tests are stored under `spec/System` and run automatically when a PR is modified.
+PoB uses the [Busted](https://lunarmodules.github.io/busted/) framework to run its tests. Tests are stored under `spec/System` and run automatically when a PR is modified.
 More tests can be added to this folder to test specific functionality, or new test builds can be added to ensure nothing changed that wasn't intended. 
 
 ### Running tests