Merge remote-tracking branch 'origin/dev'

Openarl · Aug 31, 2018 · 711b575 · 711b575
2 parents 5ae5089 + d3de752
commit 711b575
Show file tree

Hide file tree

Showing 30 changed files with 7,422 additions and 1,567 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### 1.4.99 - 2018/09/01
+ * Added the new skills for 3.4:
+    * Vaal Ancestral Warchief
+	* Consecrated Path
+	* Herald of Agony (except the Minion, sorry!)
+	* Herald of Purity (except the Minion)
+	* Smite
+	* Scourge Arrow
+	* Summon Holy Relic (except... the Minion)
+	* Toxic Rain
+	* Withering Touch
+ * Applied all changes to existing skills for 3.4
+ * Flesh Binder's Caustic Ground effect now works correctly
+
 ### 1.4.98 - 2018/08/29
  * Modifiers to Damage over Time with Bow Skills now work correctly
  * Acrobatics now works correctly

diff --git a/Classes/ConfigTab.lua b/Classes/ConfigTab.lua
@@ -12,7 +12,7 @@ local m_floor = math.floor
 
 local gameVersionDropList = {
 	{ label = "2.6 (Atlas of Worlds)", version = "2_6", versionPretty = "2.6" },
-	{ label = "3.3 (War for the Atlas)", version = "3_0", versionPretty = "3.3" },
+	{ label = "3.4 (War for the Atlas)", version = "3_0", versionPretty = "3.4" },
 }
 
 local varList = LoadModule("Modules/ConfigOptions")

diff --git a/Data/2_6/ModCache.lua b/Data/2_6/ModCache.lua