Merge branch 'PathOfBuildingCommunity:dev' into dev

.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml

@@ -21,6 +21,18 @@ body:
       options:
         - 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:

.github/ISSUE_TEMPLATE/application_bug_report.yaml

@@ -21,6 +21,18 @@ body:
       options:
         - 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:

.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml

@@ -28,6 +28,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:

.github/ISSUE_TEMPLATE/calculation_bug_report.yaml

@@ -28,6 +28,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:

.github/ISSUE_TEMPLATE/crash_report.yaml

@@ -21,6 +21,18 @@ body:
       options:
         - 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:

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -14,6 +14,18 @@ body:
       options:
         - 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:

src/Classes/CalcSectionControl.lua

@@ -258,46 +258,52 @@ function CalcSectionClass:Draw(viewPort, noTooltip)
 				primary = false
 			end
 		else
-			lineY = lineY + 22
+			lineY = lineY + 20
 			primary = false
+			local rows = 0;
 			for _, rowData in ipairs(subSec.data) do
 				if rowData.enabled then
+					rows = rows + 1
 					local textColor = "^7"
 					if rowData.color then
 						textColor = rowData.color
 					end
 					if rowData.label then
 						-- Draw row label with background
 						SetDrawColor(rowData.bgCol or "^0")
-						DrawImage(nil, x + 2, lineY, 130, 18)
-						DrawString(x + 132, lineY + 1, "RIGHT_X", 16, "VAR", textColor..rowData.label.."^7:")
+						DrawImage(nil, x + 2, lineY + 2, 130, 18)
+						DrawString(x + 132, lineY + 2, "RIGHT_X", 16, "VAR", textColor..rowData.label.."^7:")
 					end
 					for colour, colData in ipairs(rowData) do
 						-- Draw column separator at the left end of the cell
 						SetDrawColor(self.colour)
-						DrawImage(nil, colData.x, lineY, 2, colData.height)
+						DrawImage(nil, colData.x, lineY + 2, 2, colData.height)
 						if colData.format and self.calcsTab:CheckFlag(colData) then
 							if cursorY >= viewPort.y and cursorY < viewPort.y + viewPort.height and cursorX >= colData.x and cursorY >= colData.y and cursorX < colData.x + colData.width and cursorY < colData.y + colData.height then
-						self.calcsTab:SetDisplayStat(colData)
-					end
-					if self.calcsTab.displayData == colData then
-						-- This is the display stat, draw a green border around this cell
-						SetDrawColor(0.25, 1, 0.25)
-						DrawImage(nil, colData.x + 2, colData.y, colData.width - 2, colData.height)
-						SetDrawColor(rowData.bgCol or "^0")
-						DrawImage(nil, colData.x + 3, colData.y + 1, colData.width - 4, colData.height - 2)
-					else
-						SetDrawColor(rowData.bgCol or "^0")
-						DrawImage(nil, colData.x + 2, colData.y, colData.width - 2, colData.height)
+								self.calcsTab:SetDisplayStat(colData)
+							end
+							if self.calcsTab.displayData == colData then
+								-- This is the display stat, draw a green border around this cell
+								SetDrawColor(0.25, 1, 0.25)
+								DrawImage(nil, colData.x + 2, colData.y, colData.width - 2, colData.height)
+								SetDrawColor(rowData.bgCol or "^0")
+								DrawImage(nil, colData.x + 3, colData.y + 1, colData.width - 4, colData.height - 2)
+							else
+								SetDrawColor(rowData.bgCol or "^0")
+								DrawImage(nil, colData.x + 2, colData.y, colData.width - 2, colData.height)
+							end
+							local textSize = rowData.textSize or 14
+							SetViewport(colData.x + 3, colData.y, colData.width - 4, colData.height)
+							DrawString(1, 9 - textSize/2, "LEFT", textSize, "VAR", "^7"..self:FormatStr(colData.format, actor, colData))
+							SetViewport()
+						end
 					end
-					local textSize = rowData.textSize or 14
-					SetViewport(colData.x + 3, colData.y, colData.width - 4, colData.height)
-					DrawString(1, 9 - textSize/2, "LEFT", textSize, "VAR", "^7"..self:FormatStr(colData.format, actor, colData))
-					SetViewport()
+					lineY = lineY + 18
 				end
 			end
-			lineY = lineY + 18
-				end
+			-- If there's at least one enabled row in this subsection, offset by the border for the subsection label
+			if rows > 0 then
+				lineY = lineY + 2
 			end
 		end
 	end

src/Classes/PopupDialog.lua

@@ -60,6 +60,7 @@ function PopupDialogClass:Draw(viewPort)
 end
 
 function PopupDialogClass:ProcessInput(inputEvents, viewPort)
+	self:ProcessControlsInput(inputEvents, viewPort)
 	for id, event in ipairs(inputEvents) do
 		if event.type == "KeyDown" then
 			if event.key == "ESCAPE" then
@@ -83,5 +84,4 @@ function PopupDialogClass:ProcessInput(inputEvents, viewPort)
 			end
 		end
 	end
-	self:ProcessControlsInput(inputEvents, viewPort)
 end

src/Data/Uniques/helmet.lua

@@ -1253,8 +1253,8 @@ Requires Level 20
 +23 to maximum Life
 (15-10)% reduced Mine Throwing Speed
 Mines have (40-50)% increased Detonation Speed
-Skills which Place Mines place up to 1 additional Mine if you have at least 800 Dexterity
-Skills which Place Mines place up to 1 additional Mine if you have at least 800 Intelligence
+Skills which throw Mines throw up to 1 additional Mine if you have at least 800 Dexterity
+Skills which throw Mines throw up to 1 additional Mine if you have at least 800 Intelligence
 ]],[[
 Eye of Malice
 Callous Mask

src/Export/statdesc.lua

@@ -273,7 +273,9 @@ function describeStats(stats)
 				else
 					return string.format("(%"..v.fmt.."-%"..v.fmt..")", v.min, v.max)
 				end
-			end):gsub("{(%d?):(%+?)d}", function(n, fmt)
+			end):gsub("{(%d?):(%+?)d?}", function(n, fmt)
+				-- Most forms are {0:1}, however Chain Hook enchantment is {0:}
+				-- the above pattern supports both cases.
 				n = n ~= "" and n or "0"
 				local v = val[tonumber(n)+1]
 				if v.min == v.max then