Skip to content

Commit 55c843f

Browse files
authored
Merge pull request #638 from ItzKatze/master
More talismans & Collection Update
2 parents daacb62 + 7ca7b44 commit 55c843f

File tree

153 files changed

+6665
-1870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+6665
-1870
lines changed

commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java

Lines changed: 251 additions & 7 deletions
Large diffs are not rendered by default.

commons/src/main/java/net/swofty/commons/skyblock/item/attribute/attributes/ItemAttributeGemData.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import lombok.Getter;
55
import lombok.Setter;
66
import net.swofty.commons.skyblock.item.ItemType;
7+
import net.swofty.commons.skyblock.item.SkyBlockItemType;
78
import net.swofty.commons.skyblock.item.attribute.ItemAttribute;
89
import net.swofty.commons.skyblock.statistics.ItemStatistics;
910

commons/src/main/java/net/swofty/commons/skyblock/statistics/ItemStatistic.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ public enum ItemStatistic {
1212
DEFENSE("Defense", "§a", "§a", false, "❈"),
1313
STRENGTH("Strength", "§c", "§c", false, "❁"),
1414
INTELLIGENCE("Intelligence", "§a", "§b", false, "✎"),
15-
CRIT_CHANCE("Crit Chance", "§c", "§9",
15+
CRITICAL_CHANCE("Crit Chance", "§c", "§9",
1616
true, "☣", 30D, 1D),
17-
CRIT_DAMAGE("Crit Damage", "§c", "§9",
17+
CRITICAL_DAMAGE("Crit Damage", "§c", "§9",
1818
true, "☠", 50D, 1D),
1919
BONUS_ATTACK_SPEED("Bonus Attack Speed", "§c", "§e", true, "⚔"),
2020
ABILITY_DAMAGE("Ability Damage", "§c", "§c", true, "๑"),

0 commit comments

Comments
 (0)