Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge development into production #2238

Merged
merged 14 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
7 changes: 7 additions & 0 deletions common/constants/stats.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Loading
Loading