Merge pull request #2238 from SkyCryptWebsite/development

merge development into production

Dockerfile

@@ -6,6 +6,7 @@ RUN mkdir -p /skycrypt
 WORKDIR '/skycrypt'
 COPY . /skycrypt
 
+ENV COREPACK_ENABLE_STRICT=0
 RUN npm install -g pnpm
 RUN pnpm i
 

README.md

@@ -10,7 +10,7 @@ The SkyCrypt Project, which is based on [LeaPhant's skyblock-stats](https://gith
 
 **Website**: https://sky.shiiyu.moe
 
-[![CI](https://github.com/SkyCryptWebsite/SkyCrypt/actions/workflows/node.js.yml/badge.svg)](https://github.com/SkyCryptWebsite/SkyCrypt/actions/workflows/node.js.yml)
+[![CI/CD](https://github.com/SkyCryptWebsite/SkyCrypt/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/SkyCryptWebsite/SkyCrypt/actions/workflows/ci-cd.yml)
 
 <h2 align="center">Screenshot</h1>
 

common/constants/stats.js

@@ -358,6 +358,13 @@ export const STATS_DATA = {
     nameTiny: "SR",
     symbol: "Ⓢ",
   },
+  cold_resistence: {
+    name: "Cold Resistence",
+    nameLore: "Cold Resistence",
+    nameShort: "Cold Resistence",
+    nameTiny: "CR",
+    symbol: "❄",
+  },
 };
 
 export const HIDDEN_STATS = [

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/crystal.properties

@@ -1,5 +1,5 @@
 type=item
 items=minecraft:skull
 model=crystal.json
-nbt.display.Name=iregex:.*crystal hollows crystals.*
+nbt.ExtraAttributes.id=hotm_crystal
 weight=4

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/heart_end_complete.properties

@@ -1,6 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
 damage=5
-nbt.display.Name=ipattern:*Tier 7*
-nbt.display.Lore.*=ipattern:*you have unlocked this tier*
+nbt.ExtraAttributes.id=hotm_level_10_8
 weight=4

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/heart_end_empty.properties

@@ -1,6 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
 damage=14
-nbt.display.Name=ipattern:*Tier 7*
-nbt.display.Lore.*=ipattern:*requires tier 6*
+nbt.ExtraAttributes.id=hotm_level_10_0
 weight=4

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/progress/heart_end_ii.properties

@@ -1,6 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
 damage=4
-nbt.display.Lore.*=iregex:.*progress: .*%.*
-nbt.display.Name=ipattern:*Tier 7*
+nbt.ExtraAttributes.id=hotm_level_10_1
 weight=4

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/progress/heart_end_iv.properties

@@ -1,6 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
 damage=4
-nbt.display.Lore.*=iregex:.*progress: .*(1[5-9]|2[0-8]).*%.*
-nbt.display.Name=ipattern:*Tier 7*
+nbt.ExtraAttributes.id=hotm_level_10_2
 weight=5

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/progress/heart_end_vi.properties

@@ -1,6 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
+nbt.ExtraAttributes.id=hotm_level_10_3
 damage=4
-nbt.display.Lore.*=iregex:.*progress: .*(29|3[0-9]|4[0-2]).*%.*
-nbt.display.Name=ipattern:*Tier 7*
 weight=5

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/progress/heart_end_viii.properties

@@ -1,6 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
 damage=4
-nbt.display.Lore.*=iregex:.*progress: .*(4[3-9]|5[0-6]).*%.*
-nbt.display.Name=ipattern:*Tier 7*
+nbt.ExtraAttributes.id=hotm_level_10_4
 weight=5

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/progress/heart_end_x.properties

@@ -1,6 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
 damage=4
-nbt.display.Lore.*=iregex:.*progress: .*(5[7-9]|6[0-9]|70).*%.*
-nbt.display.Name=ipattern:*Tier 7*
+nbt.ExtraAttributes.id=hotm_level_10_5
 weight=5

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/progress/heart_end_xii.properties

@@ -1,6 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
 damage=4
-nbt.display.Lore.*=iregex:.*progress: .*(7[1-9]|8[0-4]).*%.*
-nbt.display.Name=ipattern:*Tier 7*
+nbt.ExtraAttributes.id=hotm_level_10_6
 weight=5

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/end/progress/heart_end_xiv.properties

@@ -1,6 +1,4 @@
 type=item
 items=minecraft:stained_glass_pane
-damage=4
-nbt.display.Lore.*=iregex:.*progress: .*(8[5-9]|9[0-9]).*%.*
-nbt.display.Name=ipattern:*Tier 7*
+nbt.ExtraAttributes.id=hotm_level_10_7
 weight=5

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/heart_complete.properties

@@ -2,4 +2,4 @@ type=item
 items=minecraft:stained_glass_pane
 damage=5
 weight=2
-nbt.display.Lore.*=ipattern:*you have unlocked this tier*
+nbt.ExtraAttributes.id=hotm_level_8

public/resourcepacks/RNBW+_0_7/assets/minecraft/mcpatcher/cit/gui_icons/mountain_heart/heart_incomplete.properties

@@ -1,5 +1,5 @@
 type=item
 items=minecraft:stained_glass_pane
 damage=14
-nbt.display.Lore.*=ipattern:*requires tier*
-weight=3
+weight=3
+nbt.ExtraAttributes.id=hotm_level_0