Merge remote-tracking branch 'fork/dev' into czarandy/dev

Author: Wires77

.editorconfig

@@ -0,0 +1,4 @@
+[*.lua]
+trim_trailing_whitespace = false
+indent_style = tab
+max_line_length = 120

.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:
@@ -19,8 +20,20 @@ body:
     attributes:
       label: Check for duplicates
       options:
-        - label: I've checked for duplicate issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues)
+        - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:
@@ -44,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:
@@ -19,8 +20,20 @@ body:
     attributes:
       label: Check for duplicates
       options:
-        - label: I've checked for duplicate issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues)
+        - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:
@@ -53,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:
@@ -19,7 +20,7 @@ body:
     attributes:
       label: Check for duplicates
       options:
-        - label: I've checked for duplicate issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues)
+        - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
   - type: checkboxes
     id: validity
@@ -28,6 +29,18 @@ body:
       options: 
         - label: I've checked that the behaviour is supposed to be supported. If it isn't please open a feature request instead (Red text is a feature request).
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:
@@ -59,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:
@@ -19,7 +20,7 @@ body:
     attributes:
       label: Check for duplicates
       options:
-        - label: I've checked for duplicate issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues)
+        - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
   - type: checkboxes
     id: validity
@@ -28,6 +29,18 @@ body:
       options:
         - label: I've checked that the calculation is supposed to be supported. If it isn't please open a feature request instead (Red text is a feature request).
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:
@@ -59,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:
@@ -19,8 +20,20 @@ body:
     attributes:
       label: Check for duplicates
       options:
-        - label: I've checked for duplicate issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues)
+        - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: context
     attributes:
@@ -58,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,19 +1,32 @@
 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:
       label: Check for duplicates
       options:
-        - label: I've checked for duplicate issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues)
+        - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: problem
     attributes:

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