Updated for 2.0

4 files changed, 75 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2419c5c0cbca..23ff602705fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = path-of-building-community-git
 	pkgdesc = An offline build planner for Path of Exile using PoBFrontend, LocalIdentity's fork
-	pkgver = 1.4.170.27.r3794.54.514
+	pkgver = 2.0.1.r4141.59.514
 	pkgrel = 1
 	url = https://github.com/PathOfBuildingCommunity/PathOfBuilding
 	arch = x86_64
@@ -36,8 +36,8 @@ pkgbase = path-of-building-community-git
 	sha256sums = 6d21872a2b2bdbfaebb20de5cac28ac402316e5314c97a89049320ff13c2f622
 	sha256sums = db9eec714bf9d1c52b1ccd7adc9e720519585becf7f9a1f18cca1888d3e1cc11
 	sha256sums = 9dbc8802b74ceed78f1a6ba1d5b90251f5ae7f9a8cf5497426e4a35001112fcd
-	sha256sums = 5774ca7bac28ac5e14fd502c3a80e65424f26a140dfe8f4546591fa7a93823a0
-	sha256sums = de8c586f5e69efefe7734f31de17137fc34a06da7428f8f57f640d490b94ea61
+	sha256sums = cd46475a1bc62240e03abb6b385b0c9b0b911ad828219fd31f98f7742807f935
+	sha256sums = ba8dc70a1d24c0d0b3bdc2454abd525c877154ec1c22e2f5927bc0a84f3920d8
 	sha256sums = 2467d10c7b5e201e337ba334a829e293a07027251bcda2b1f39774a62e8ff194
 	sha256sums = a64198061f60168ec07df33c37948e343eced7eeafe574cc20bdcf3a1d480cbc
 	sha256sums = 079eff1a5e74cb6d776723f7c3d36349e426edaa332a8177ff8f5e78af56cf64
diff --git a/PKGBUILD b/PKGBUILD
index dd85a41db743..8c0cde9063e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="An offline build planner for Path of Exile using PoBFrontend, LocalIden
 arch=('x86_64')
 url='https://github.com/PathOfBuildingCommunity/PathOfBuilding'
 license=('MIT')
-pkgver=1.4.170.27.r3794.54.514
+pkgver=2.0.1.r4141.59.514
 
 depends=('zlib' 'qt5-base' 'lua51' 'lua51-bitop' 'libgl' 'curl' 'ttf-liberation' 'ttf-bitstream-vera')
 makedepends=('meson' 'ninja' 'unzip' 'rsync' 'git')
@@ -31,8 +31,8 @@ sha256sums=(
 	'6d21872a2b2bdbfaebb20de5cac28ac402316e5314c97a89049320ff13c2f622'
 	'db9eec714bf9d1c52b1ccd7adc9e720519585becf7f9a1f18cca1888d3e1cc11'
 	'9dbc8802b74ceed78f1a6ba1d5b90251f5ae7f9a8cf5497426e4a35001112fcd'
-	'5774ca7bac28ac5e14fd502c3a80e65424f26a140dfe8f4546591fa7a93823a0'
-	'de8c586f5e69efefe7734f31de17137fc34a06da7428f8f57f640d490b94ea61'
+	'cd46475a1bc62240e03abb6b385b0c9b0b911ad828219fd31f98f7742807f935'
+	'ba8dc70a1d24c0d0b3bdc2454abd525c877154ec1c22e2f5927bc0a84f3920d8'
 	'2467d10c7b5e201e337ba334a829e293a07027251bcda2b1f39774a62e8ff194'
 	'a64198061f60168ec07df33c37948e343eced7eeafe574cc20bdcf3a1d480cbc'
 	'079eff1a5e74cb6d776723f7c3d36349e426edaa332a8177ff8f5e78af56cf64'
@@ -51,8 +51,8 @@ prepare() {
 	(cd "${srcdir}/PathOfBuilding-runtime-src/LZip" && patch -p1 <"${srcdir}/lzip-linux.patch")
 	# disable devmode
 	(cd "${srcdir}/PathOfBuilding" \
-		&& patch -p1 <"${srcdir}/PathOfBuilding-force-disable-devmode.patch" \
-		&& patch -p1 <"${srcdir}/PathOfBuilding-lua51.patch" \
+		&& patch --no-backup-if-mismatch -p1 <"${srcdir}/PathOfBuilding-force-disable-devmode.patch" \
+		&& patch --no-backup-if-mismatch -p1 <"${srcdir}/PathOfBuilding-lua51.patch" \
 	)
 }
 
@@ -91,10 +91,10 @@ package() {
 	rsync -a '--exclude=.git*' "${srcdir}/PathOfBuilding/" "${dst_dir}"
 	cd "$dst_dir"
 	# extract skill tree assets
-	for f in tree*.zip; do
-		unzip -ou "$f"
-		rm "$f"
-	done
+	#for f in tree*.zip; do
+	#	unzip -ou "$f"
+	#	rm "$f"
+	#done
 	# extract lua libs
 	unzip runtime-win32.zip lua/xml.lua lua/base64.lua lua/sha1.lua
 	mv lua/*.lua .
diff --git a/PathOfBuilding-force-disable-devmode.patch b/PathOfBuilding-force-disable-devmode.patch
index 4da5c9a6db1a..6f697bb1d50b 100644
--- a/PathOfBuilding-force-disable-devmode.patch
+++ b/PathOfBuilding-force-disable-devmode.patch
@@ -1,7 +1,7 @@
-diff --git a/Launch.lua b/Launch.lua
+diff --git a/src/Launch.lua b/src/Launch.lua
 index 0673314..39800ae 100644
---- a/Launch.lua
-+++ b/Launch.lua
+--- a/src/Launch.lua
++++ b/src/Launch.lua
 @@ -51,7 +51,7 @@ function launch:OnInit()
  	if localManXML and not self.versionBranch and not self.versionPlatform then
  		-- Looks like a remote manifest, so we're probably running from a repository
@@ -28,10 +28,10 @@ index 0673314..39800ae 100644
  end
  
  function launch:ShowPrompt(r, g, b, str, func)
-diff --git a/Modules/Main.lua b/Modules/Main.lua
+diff --git a/src/Modules/Main.lua b/src/Modules/Main.lua
 index 1af88e0..683fc33 100644
---- a/Modules/Main.lua
-+++ b/Modules/Main.lua
+--- a/src/Modules/Main.lua
++++ b/src/Modules/Main.lua
 @@ -42,7 +42,7 @@ function main:Init()
  	self.modes["LIST"] = LoadModule("Modules/BuildList")
  	self.modes["BUILD"] = LoadModule("Modules/Build")
diff --git a/PathOfBuilding-lua51.patch b/PathOfBuilding-lua51.patch
index 7a4eec80f0ea..05e56bcbb638 100644
--- a/PathOfBuilding-lua51.patch
+++ b/PathOfBuilding-lua51.patch
@@ -1,6 +1,6 @@
-diff -ru a/Modules/Common.lua b/Modules/Common.lua
---- a/Modules/Common.lua	2021-02-06 15:09:21.799784281 +0100
-+++ b/Modules/Common.lua	2021-02-06 11:37:28.998539560 +0100
+diff -ru a/src/Modules/Common.lua b/src/Modules/Common.lua
+--- a/src/Modules/Common.lua	2021-02-06 15:09:21.799784281 +0100
++++ b/src/Modules/Common.lua	2021-02-06 11:37:28.998539560 +0100
 @@ -3,6 +3,9 @@
  -- Module: Common
  -- Libraries, functions and classes used by various modules.
@@ -11,161 +11,161 @@ diff -ru a/Modules/Common.lua b/Modules/Common.lua
  local pairs = pairs
  local ipairs = ipairs
  local type = type
-diff -ru a/Data/New.lua b/Data/New.lua
---- a/Data/New.lua	2021-02-06 15:09:21.709829157 +0100
-+++ b/Data/New.lua	2021-02-06 11:37:28.858609368 +0100
+diff -ru a/src/Data/New.lua b/src/Data/New.lua
+--- a/src/Data/New.lua	2021-02-06 15:09:21.709829157 +0100
++++ b/src/Data/New.lua	2021-02-06 11:37:28.858609368 +0100
 @@ -1,3 +1,3 @@
 ---
 +--
  -- Upcoming uniques will live here until their mods/rolls are finalised
  --
-diff -ru a/Data/Uniques/amulet.lua b/Data/Uniques/amulet.lua
---- a/Data/Uniques/amulet.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/Data/Uniques/amulet.lua	2021-02-06 11:37:28.858609368 +0100
+diff -ru a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
+--- a/src/Data/Uniques/amulet.lua	2021-02-06 15:09:21.776462582 +0100
++++ b/src/Data/Uniques/amulet.lua	2021-02-06 11:37:28.858609368 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Amulet
-diff -ru a/Data/Uniques/axe.lua b/Data/Uniques/axe.lua
---- a/Data/Uniques/axe.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/Data/Uniques/axe.lua	2021-02-06 11:37:28.851946025 +0100
+diff -ru a/src/Data/Uniques/axe.lua b/src/Data/Uniques/axe.lua
+--- a/src/Data/Uniques/axe.lua	2021-02-06 15:09:21.776462582 +0100
++++ b/src/Data/Uniques/axe.lua	2021-02-06 11:37:28.851946025 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Weapon: One Handed Axe
-diff -ru a/Data/Uniques/belt.lua b/Data/Uniques/belt.lua
---- a/Data/Uniques/belt.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/Data/Uniques/belt.lua	2021-02-06 11:37:28.855277696 +0100
+diff -ru a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
+--- a/src/Data/Uniques/belt.lua	2021-02-06 15:09:21.776462582 +0100
++++ b/src/Data/Uniques/belt.lua	2021-02-06 11:37:28.855277696 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Belt
-diff -ru a/Data/Uniques/body.lua b/Data/Uniques/body.lua
---- a/Data/Uniques/body.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/Data/Uniques/body.lua	2021-02-06 11:37:28.851946025 +0100
+diff -ru a/src/Data/Uniques/body.lua b/src/Data/Uniques/body.lua
+--- a/src/Data/Uniques/body.lua	2021-02-06 15:09:21.776462582 +0100
++++ b/src/Data/Uniques/body.lua	2021-02-06 11:37:28.851946025 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Body: Armour
-diff -ru a/Data/Uniques/boots.lua b/Data/Uniques/boots.lua
---- a/Data/Uniques/boots.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/Data/Uniques/boots.lua	2021-02-06 11:37:28.851946025 +0100
+diff -ru a/src/Data/Uniques/boots.lua b/src/Data/Uniques/boots.lua
+--- a/src/Data/Uniques/boots.lua	2021-02-06 15:09:21.776462582 +0100
++++ b/src/Data/Uniques/boots.lua	2021-02-06 11:37:28.851946025 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Boots: Armour
-diff -ru a/Data/Uniques/bow.lua b/Data/Uniques/bow.lua
---- a/Data/Uniques/bow.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/Data/Uniques/bow.lua	2021-02-06 11:37:28.848614354 +0100
+diff -ru a/src/Data/Uniques/bow.lua b/src/Data/Uniques/bow.lua
+--- a/src/Data/Uniques/bow.lua	2021-02-06 15:09:21.776462582 +0100
++++ b/src/Data/Uniques/bow.lua	2021-02-06 11:37:28.848614354 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Weapon: Bow
-diff -ru a/Data/Uniques/claw.lua b/Data/Uniques/claw.lua
---- a/Data/Uniques/claw.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/claw.lua	2021-02-06 11:37:28.848614354 +0100
+diff -ru a/src/Data/Uniques/claw.lua b/src/Data/Uniques/claw.lua
+--- a/src/Data/Uniques/claw.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/claw.lua	2021-02-06 11:37:28.848614354 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Weapon: Claw
-diff -ru a/Data/Uniques/dagger.lua b/Data/Uniques/dagger.lua
---- a/Data/Uniques/dagger.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/dagger.lua	2021-02-06 11:37:28.848614354 +0100
+diff -ru a/src/Data/Uniques/dagger.lua b/src/Data/Uniques/dagger.lua
+--- a/src/Data/Uniques/dagger.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/dagger.lua	2021-02-06 11:37:28.848614354 +0100
 @@ -1,4 +1,4 @@
 -	-- Item data (c) Grinding Gear Games
 +	-- Item data (c) Grinding Gear Games
  
  return {
  -- Weapon: Dagger
-diff -ru a/Data/Uniques/flask.lua b/Data/Uniques/flask.lua
---- a/Data/Uniques/flask.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/flask.lua	2021-02-06 11:37:28.855277696 +0100
+diff -ru a/src/Data/Uniques/flask.lua b/src/Data/Uniques/flask.lua
+--- a/src/Data/Uniques/flask.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/flask.lua	2021-02-06 11:37:28.855277696 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Flask: Life
-diff -ru a/Data/Uniques/gloves.lua b/Data/Uniques/gloves.lua
---- a/Data/Uniques/gloves.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/gloves.lua	2021-02-06 11:37:28.855277696 +0100
+diff -ru a/src/Data/Uniques/gloves.lua b/src/Data/Uniques/gloves.lua
+--- a/src/Data/Uniques/gloves.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/gloves.lua	2021-02-06 11:37:28.855277696 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Gloves: Armour
-diff -ru a/Data/Uniques/helmet.lua b/Data/Uniques/helmet.lua
---- a/Data/Uniques/helmet.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/helmet.lua	2021-02-06 11:37:28.855277696 +0100
+diff -ru a/src/Data/Uniques/helmet.lua b/src/Data/Uniques/helmet.lua
+--- a/src/Data/Uniques/helmet.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/helmet.lua	2021-02-06 11:37:28.855277696 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Helmet: Armour
-diff -ru a/Data/Uniques/mace.lua b/Data/Uniques/mace.lua
---- a/Data/Uniques/mace.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/mace.lua	2021-02-06 11:37:28.848614354 +0100
+diff -ru a/src/Data/Uniques/mace.lua b/src/Data/Uniques/mace.lua
+--- a/src/Data/Uniques/mace.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/mace.lua	2021-02-06 11:37:28.848614354 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Weapon: One Handed Mace
-diff -ru a/Data/Uniques/quiver.lua b/Data/Uniques/quiver.lua
---- a/Data/Uniques/quiver.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/quiver.lua	2021-02-06 11:37:28.848614354 +0100
+diff -ru a/src/Data/Uniques/quiver.lua b/src/Data/Uniques/quiver.lua
+--- a/src/Data/Uniques/quiver.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/quiver.lua	2021-02-06 11:37:28.848614354 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Quiver
-diff -ru a/Data/Uniques/ring.lua b/Data/Uniques/ring.lua
---- a/Data/Uniques/ring.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/ring.lua	2021-02-06 11:37:28.845282683 +0100
+diff -ru a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
+--- a/src/Data/Uniques/ring.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/ring.lua	2021-02-06 11:37:28.845282683 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Ring
-diff -ru a/Data/Uniques/shield.lua b/Data/Uniques/shield.lua
---- a/Data/Uniques/shield.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/shield.lua	2021-02-06 11:37:28.845282683 +0100
+diff -ru a/src/Data/Uniques/shield.lua b/src/Data/Uniques/shield.lua
+--- a/src/Data/Uniques/shield.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/shield.lua	2021-02-06 11:37:28.845282683 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Shield: Armour
-diff -ru a/Data/Uniques/staff.lua b/Data/Uniques/staff.lua
---- a/Data/Uniques/staff.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/staff.lua	2021-02-06 11:37:28.851946025 +0100
+diff -ru a/src/Data/Uniques/staff.lua b/src/Data/Uniques/staff.lua
+--- a/src/Data/Uniques/staff.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/staff.lua	2021-02-06 11:37:28.851946025 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games
  
  return {
  -- Weapon: Staff
-diff -ru a/Data/Uniques/wand.lua b/Data/Uniques/wand.lua
---- a/Data/Uniques/wand.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/Data/Uniques/wand.lua	2021-02-06 11:37:28.858609368 +0100
+diff -ru a/src/Data/Uniques/wand.lua b/src/Data/Uniques/wand.lua
+--- a/src/Data/Uniques/wand.lua	2021-02-06 15:09:21.779794253 +0100
++++ b/src/Data/Uniques/wand.lua	2021-02-06 11:37:28.858609368 +0100
 @@ -1,4 +1,4 @@
 --- Item data (c) Grinding Gear Games
 +-- Item data (c) Grinding Gear Games