Merge branch 'dev'

Author: LocalIdentity

.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml

@@ -1,12 +1,13 @@
 name: Accuracy bug report
-description: Create a bug report to help us fix incorrect wordings
+description: Create a bug report to help us fix incorrect wording in Path of Building for PoE1.
 labels: ["bug:accuracy"]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for reporting an issue.
-        Please try to fill in as much of the form below as you're able to. Some of the fields marked with an asterisk (*) are required.
+        Thank you for reporting an issue with PoB-**PoE1**.  
+        [Issues with PoB-PoE2 go here.](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/issues)
+        Please try to fill in as much of the form below as you're able to. Fields marked with an asterisk (*) are required.
   - type: checkboxes
     id: version
     attributes:
@@ -56,9 +57,9 @@ body:
   - type: textarea
     id: build_code
     attributes:
-      label: Character build code
+      label: PoB for PoE1 build code
       description: Always provide a build code that exhibits the bug you want to report, even if it is not specific to a particular build. This helps us greatly to reproduce bugs faster.
-      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a shared build.
+      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a PoB build.
       render: shell
     validations:
       required: false

.github/ISSUE_TEMPLATE/application_bug_report.yaml

@@ -1,12 +1,13 @@
 name: Application bug report
-description: Create a bug report to help us fix an issue in Path of Building
+description: Create a bug report to help us fix an issue in Path of Building for PoE1.
 labels: [bug]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for reporting an issue.
-        Please try to fill in as much of the form below as you're able to. Some of the fields marked with an asterisk (*) are required.
+        Thank you for reporting an issue with PoB-**PoE1**.
+        [Issues with PoB-PoE2 go here.](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/issues).
+        Please try to fill in as much of the form below as you're able to. Fields marked with an asterisk (*) are required.
   - type: checkboxes
     id: version
     attributes:
@@ -65,9 +66,9 @@ body:
   - type: textarea
     id: build_code
     attributes:
-      label: Character build code
+      label: PoB for PoE1 build code
       description: Always provide a build code that exhibits the bug you want to report, even if it is not specific to a particular build. This helps us greatly to reproduce bugs faster.
-      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a shared build.
+      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a PoB build.
       render: shell
     validations:
       required: false

.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml

@@ -1,12 +1,13 @@
 name: Behaviour bug report
-description: Create a bug report to help us fix incorrect behaviour or logic
+description: Create a bug report to help us fix incorrect behaviour or logic in Path of Building for PoE1.
 labels: ["bug:behaviour"]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for reporting an issue.
-        Please try to fill in as much of the form below as you're able to. Some of the fields marked with an asterisk (*) are required.
+        Thank you for reporting an issue with PoB-**PoE1**.
+        [Issues with PoB-PoE2 go here.](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/issues).
+        Please try to fill in as much of the form below as you're able to. Fields marked with an asterisk (*) are required.
   - type: checkboxes
     id: version
     attributes:
@@ -71,9 +72,9 @@ body:
   - type: textarea
     id: build_code
     attributes:
-      label: Character build code
+      label: PoB for PoE1 build code
       description: Always provide a build code that exhibits the bug you want to report, even if it is not specific to a particular build. This helps us greatly to reproduce bugs faster.
-      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a shared build.
+      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a PoB build.
       render: shell
     validations:
       required: true

.github/ISSUE_TEMPLATE/calculation_bug_report.yaml

@@ -1,12 +1,13 @@
 name: Calculation bug report
-description: Create a bug report to help us fix incorrect calculations
+description: Create a bug report to help us fix incorrect calculations in Path of Building for PoE1.
 labels: ["bug:calculation"]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for reporting an issue.
-        Please try to fill in as much of the form below as you're able to. Some of the fields marked with an asterisk (*) are required.
+        Thank you for reporting an issue with PoB-**PoE1**.  
+        [Issues with PoB-PoE2 go here.](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/issues)
+        Please try to fill in as much of the form below as you're able to. Fields marked with an asterisk (*) are required.
   - type: checkboxes
     id: version
     attributes:
@@ -71,9 +72,9 @@ body:
   - type: textarea
     id: build_code
     attributes:
-      label: Character build code
+      label: PoB for PoE1 build code
       description: Always provide a build code that exhibits the bug you want to report, even if it is not specific to a particular build. This helps us greatly to reproduce bugs faster.
-      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a shared build.
+      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a PoB build.
       render: shell
     validations:
       required: true

.github/ISSUE_TEMPLATE/crash_report.yaml

@@ -1,12 +1,13 @@
 name: Crash report
-description: Create a crash report to help us fix critical issues
+description: Create a crash report to help us fix critical issues in Path of Building for PoE1.
 labels: [bug, crash]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for reporting a crash or severe graphical issue.
-        Please try to fill in as much of the form below as you're able to. Some of the fields marked with an asterisk (*) are required.
+        Thank you for reporting a crash or severe graphical issue in PoB-**PoE1**.
+        [Issues with PoB-PoE2 go here.](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/issues)
+        Please try to fill in as much of the form below as you're able to. Fields marked with an asterisk (*) are required.
   - type: checkboxes
     id: version
     attributes:
@@ -70,10 +71,10 @@ body:
   - type: textarea
     id: build_code
     attributes:
-      label: Character build code
+      label: PoB for PoE1 build code
       description: Provide a build code if the crash/graphical issue is caused by a certain build.
       placeholder: |
-        This can be either a code copied from the "Import/Export Build" tab or a link to a shared build. 
+        This can be either a code copied from the "Import/Export Build" tab or a link to a PoB build. 
         In the case where Path of Building crashes/doesn't work on startup or when you open a build.
         Go to your builds folder (default %userprofile%/Documents/Path of Building/Builds) and copy the problematic build's .xml contents into a pastebin and supply the link.
       render: shell

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,12 +1,13 @@
 name: Feature request
-description: Suggest an idea for this project
+description: Suggest an idea for Path of Building for PoE1.
 labels: [enhancement]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for suggesting a feature.
-        Please try to fill in as much of the form below as you're able to. Some of the fields marked with an asterisk (*) are required.
+        Thank you for suggesting a feature for PoB-**PoE1**.
+        [Feature requests for PoB-PoE2 go here.](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/issues).
+        Please try to fill in as much of the form below as you're able to. Fields marked with an asterisk (*) are required.
   - type: checkboxes
     id: duplicates
     attributes:

.github/workflows/builddocker.yml

@@ -0,0 +1,42 @@
+name: Build and publish busted tests docker image
+on:
+ workflow_dispatch:
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Generate docker image metadata
+        uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: |
+            ghcr.io/${{ github.repository_owner }}/pathofbuilding-tests
+          labels: |
+            org.opencontainers.image.description=A docker image packaged with the correct versions of tools to run PathOfBuilding busted tests. Includes emmylua debugger files. Refer to https://github.com/PathOfBuildingCommunity/PathOfBuilding/blob/dev/CONTRIBUTING.md for usage instructions.
+            org.opencontainers.image.licenses=https://opensource.org/licenses/MIT
+          tags: |
+            type=sha
+            type=raw,value=latest
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/installer.yml

@@ -15,7 +15,7 @@ jobs:
                 ref: 'master'
                 ssh-key: '${{ secrets.POB_INSTALLER_KEY }}'
             - name: Create installer
-              run: 'python3 make_release.py'
+              run: 'python3 make_release.py --game-version 1'
             - name: Upload artifact
               run: >
                 gh release upload ${{ github.event.release.tag_name }} (Get-ChildItem Dist -File).FullName --clobber -R ${{ github.repository }};

.github/workflows/release.yml

@@ -34,11 +34,12 @@ jobs:
                 sed -i '1h;1d;$!H;$!d;G' temp_change.md;
                 sed -i -re 's/\*\*Full Changelog\*\*: (.*)/\[Full Changelog\]\(\1\)\n/' temp_change.md;
                 sed -i '/## New Contributors/,$d' temp_change.md;
-                sed -i -re 's/^\*(.*)\sby\s@(.*)\sin\s(.*\/pull\/)(.*)/-\1 [\\#\4](\3\4) ([\2](https:\/\/github.com\/\2))/' temp_change.md;
+                sed -i -re 's/^\*(.*)\sby\s@(.*)\sin\s(.*\/pull\/)(.*)\r/-\1 [\\#\4](\3\4) ([\2](https:\/\/github.com\/\2))/' temp_change.md;
                 sed -i 's/\[Quotae/\[Quote_a/' temp_change.md;
                 sed -i 's/\[learn2draw/\[Lexy/' temp_change.md;
                 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;
                 cp temp_change.md changelog_temp.txt;
                 cat CHANGELOG.md | 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;

.github/workflows/test.yml

@@ -4,25 +4,15 @@ on:
     branches: [ dev ]
   pull_request:
     branches: [ dev ]
+  workflow_dispatch:
 jobs:
   run_tests:
     runs-on: ubuntu-latest
+    container: ghcr.io/pathofbuildingcommunity/pathofbuilding-tests:latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Lua/LuaJIT
-        uses: leafo/[email protected]
-        with:
-          luaVersion: "luajit-2.0.5"
-      - name: Install LuaRocks
-        uses: leafo/[email protected]
-      - name: Install busted
-        run: luarocks install busted
-      - name: Install cluacov
-        run: luarocks install cluacov 0.1.2-1
-      - name: Install coveralls integration
-        run: luarocks install luacov-coveralls
+        uses: actions/checkout@v4
       - name: Run tests
-        run: busted --lua=/home/runner/work/PathOfBuilding/PathOfBuilding/.lua/bin/luajit
+        run: busted --lua=luajit
       - name: Report coverage
         run: cd src; luacov-coveralls --repo-token=${{ secrets.github_token }} -e TestData -e Data -e runtime