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

Feature: Cold Overlay #1438

Merged
merged 36 commits into from
Apr 17, 2024
Merged

Feature: Cold Overlay #1438

merged 36 commits into from
Apr 17, 2024

Conversation

j10a1n15
Copy link
Contributor

@j10a1n15 j10a1n15 commented Apr 13, 2024

What

Adds a textured cold overlay to glacite tunnels.

Images

Showcase)

trim.761A954F-1F27-4829-BB5B-D68B2242E5D0.MOV

image
image

Changelog New Features

  • Added a textured cold overlay to Glacite Tunnels. - j10a1n15, Empa
    • Change at what cold level the texture should appear.

Changelog Technical Details

  • Added MiningAPI which includes all GlaciteTunnels related stuff. - j10a1n15, Empa
  • Added ColdUpdateEvent. - j10a1n15

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 13, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 13, 2024
j10a1n15 and others added 2 commits April 13, 2024 19:23
…y.kt

Co-authored-by: martimavocado <39881008+martimavocado@users.noreply.github.com>
@hannibal002 hannibal002 added this to the Version 0.25 milestone Apr 13, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Apr 13, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 13, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 13, 2024
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 self-requested a review April 13, 2024 20:54
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works fine in game. we should not check the cold value via regex from scoreboard each frame, we already have a locally stored value, use it!

src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt Outdated Show resolved Hide resolved
@j10a1n15 j10a1n15 requested a review from hannibal002 April 13, 2024 21:16
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 13, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

ItsEmpa and others added 4 commits April 14, 2024 22:02
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 15, 2024
@hannibal002 hannibal002 marked this pull request as draft April 15, 2024 16:51
@j10a1n15 j10a1n15 marked this pull request as ready for review April 16, 2024 11:39
@hannibal002 hannibal002 merged commit 734fdf6 into hannibal002:beta Apr 17, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Apr 17, 2024
@j10a1n15 j10a1n15 deleted the cold branch April 18, 2024 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants