Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

1 files changed, 20 insertions, 2 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
index a2af0ed79..da3ccd8f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
 import at.hannibal2.skyhanni.features.misc.EnderNode;
 import at.hannibal2.skyhanni.features.misc.FrozenTreasure;
 import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData;
+import at.hannibal2.skyhanni.features.misc.powdertracker.PowderChestReward;
 import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonTerminal;
 import at.hannibal2.skyhanni.utils.LorenzVec;
 import at.hannibal2.skyhanni.utils.NEUInternalName;
@@ -21,6 +22,12 @@ import java.util.*;
 public class Storage {
 
     @Expose
+    public boolean hasPlayedBefore = false;
+
+    @Expose
+    public Map<String, List<String>> knownFeatureToggles = new HashMap<>();
+
+    @Expose
     public Map<Long, List<CropType>> gardenJacobFarmingContestTimes = new HashMap<>();
 
     @Expose
@@ -99,7 +106,7 @@ public class Storage {
         public static class GardenStorage {
 
             @Expose
-            public int experience = -1;
+            public Long experience = null;
 
             @Expose
             public Map<CropType, Long> cropCounter = new HashMap<>();
@@ -229,7 +236,7 @@ public class Storage {
             public long lastComposterEmptyWarningTime = 0;
 
             @Expose
-            public FarmingWeightConfig faramingWeight = new FarmingWeightConfig();
+            public FarmingWeightConfig farmingWeight = new FarmingWeightConfig();
 
             public static class FarmingWeightConfig {
 
@@ -267,6 +274,17 @@ public class Storage {
         }
 
         @Expose
+        public Map<Integer, PowderTracker> powderTracker = new HashMap<>();
+
+        public static class PowderTracker {
+            @Expose
+            public int totalChestPicked = 0;
+
+            @Expose
+            public Map<PowderChestReward, Long> rewards = new HashMap<>();
+        }
+
+        @Expose
         public FrozenTreasureTracker frozenTreasureTracker = new FrozenTreasureTracker();
 
         public static class FrozenTreasureTracker {