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.

Sign up for GitHub

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

Jump to bottom

Fix: Superpair Data #2566

Merged
merged 77 commits into from
Oct 2, 2024
Merged

Fix: Superpair Data #2566

merged 77 commits into from
Oct 2, 2024

Conversation

ILike2WatchMemes
Copy link
Contributor

@ILike2WatchMemes ILike2WatchMemes commented Sep 22, 2024 •
edited by hannibal002
Loading

What

Fixed bugs for Superpair

  • detection
  • enchanting exp differention

Changelog Fixes

  • Fixed bugs in Superpair Data. - ILike2WatchMemes
    • Fixed pair detection.
    • Fixed enchanting XP detection.

@ILike2WatchMemes
inventory experiments rework
bd9c12a
@ILike2WatchMemes
fix style
003b6ad
@ILike2WatchMemes
added onConfigFix
82cc5ac
@ILike2WatchMemes
removed coin
8c28f41
@ILike2WatchMemes
added startCost, message on Dry-Streak end
31267d2
@ILike2WatchMemes
regex-tests, bitCost, style updates
9dfbebe
@ILike2WatchMemes
reworked checks
e913e9e
@ILike2WatchMemes
rechange logic
cf85b19
@ILike2WatchMemes
Merge branch 'hannibal002:beta' into inventory-experiments-rework
8088a09
@ILike2WatchMemes
Update config.toml
66f8e9e
@ILike2WatchMemes
Update config.toml
e8fd26d
@ILike2WatchMemes
fix style
0b960c2
@ILike2WatchMemes
fix
796aec4
@ILike2WatchMemes
fix logic, change exp bottle add logic
026dc97
@ILike2WatchMemes
instantFind fix
c41527b
@ILike2WatchMemes
fix oopsie
aee298d
@ILike2WatchMemes
fixes, change of logic
2d9ffe3
@ILike2WatchMemes
add check, code cleanup & logic changes
b89cc0b
@ILike2WatchMemes
add missing waiting check
774ff2d
@ILike2WatchMemes
fix, again 🙏
de82d6a
@ILike2WatchMemes
remove redundant values
3ef04c7
@ILike2WatchMemes
fix error
7c25dc4
@ILike2WatchMemes
another fix
d643c6d
@ILike2WatchMemes
changed a few logics
939b868
@ILike2WatchMemes
fixes
c5a7952
@ILike2WatchMemes
small fix for lower experiments
b4d6f4c
@ILike2WatchMemes
fix style, remove print
9fcbe54
@ILike2WatchMemes
fix style?
cce7611
@ILike2WatchMemes
fix style please
7d59e98
@ILike2WatchMemes
please 😭
47efc26
@github-actions github-actions bot added the Bug Fix Bug fixes label Sep 22, 2024
@ILike2WatchMemes
Copy link
Contributor Author

can't test until tomorrow, so draft

@ILike2WatchMemes ILike2WatchMemes marked this pull request as ready for review September 25, 2024 21:54
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Sep 26, 2024
@github-actions GitHub Actions
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
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 Sep 26, 2024
@hannibal002 hannibal002 added this to the Version 0.27 milestone Sep 28, 2024
@github-actions GitHub Actions
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 Sep 28, 2024
hannibal002
hannibal002 requested changes Sep 28, 2024
View reviewed changes
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Outdated Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Outdated Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Outdated Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Outdated Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Outdated Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Outdated Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Outdated Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Outdated Show resolved Hide resolved
...n/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/SuperpairDataDisplay.kt Show resolved Hide resolved
@github-actions GitHub Actions
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 Sep 28, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Sep 29, 2024
@jani270 jani270 removed the Soon This Pull Request will be merged within the next couple of betas label Sep 29, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Oct 1, 2024
@hannibal002 hannibal002 merged commit 1bf9db2 into hannibal002:beta Oct 2, 2024
4 checks passed
@github-actions github-actions bot removed Soon This Pull Request will be merged within the next couple of betas Bug Fix Bug fixes labels Oct 2, 2024
Tryp0xd pushed a commit to Tryp0xd/SkyHanni that referenced this pull request Oct 3, 2024
@ItsEmpa @hannibal002
@MTOnline69 @DavidArthurCole @CalMWolfs @j10a1n15 @lunaynx @martimavocado @ILike2WatchMemes @minhperry @superhize
fix merge (#1)
2784225 
* Version 0.27 Beta 13

* Feature: West Village/Dreadfarm/Living Cave features (hannibal002#2616)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Fix: Jasper Gemstones not in Powder Mining Filter (hannibal002#2618)

* changed todo

* added parameter `/shcopylocation pathfind`

* Fix a massive bug (hannibal002#2626)

* Fix: Typos in readme (hannibal002#2629)

* Fix: Custom Scoreboard Carnival (hannibal002#2631)

* formatting

* Fix: Add more Pablo patterns (hannibal002#2636)

* Fix: Minister in Calendar Color Reset (hannibal002#2632)

* Fix: Strays Wrongly Counting as Unique (hannibal002#2627)

* Fix: Item trackers saying removed item name from item name (hannibal002#2620)

* fix time format showing empty string for sub 1s

* fixed composter data collection

* Improvement: Add ignored crops for lane features (hannibal002#2622)

* Improvement: Change "efficient miner" to "spread" in mineshaft pity breakdown (hannibal002#2633)

* Backend: Rename keystore file to specify it is for skyhanni (hannibal002#2619)

* Fix: Superpair Data (hannibal002#2566)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>

* Improvement: Added cooldown to Carnival NPC click (hannibal002#2628)

* Automatically stating pathfind after clicking the hypixel reminder ch… (hannibal002#2635)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Improvement: Pathfind Rendering (hannibal002#2634)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Backend: Alert Clock Offsets (hannibal002#2623)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>

* fixed typo in broodmother message

* fixed errors when path is zero

* Version 0.27 Beta 14

* Improvement: Slight Touch up for Hoppity Event Summary (hannibal002#2638)

* code cleanup

* Fix: Highlight in Bazaar (hannibal002#2640)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Fix: Flare expire warning (hannibal002#2643)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Fix: Ender node tracker (hannibal002#2644)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Fix: Powder Tracker not tracking items (hannibal002#2645)

* Fix: Preconditions to debug commands (hannibal002#2641)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>

* Fix: Dummies and Damage Indicator (hannibal002#2646)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* fixed wrong feature toggle

* Improvement: Superpair Experimentation data always visible (hannibal002#2647)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>

* Backend: Detekt Fixes Part 5 (hannibal002#2617)

---------

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Co-authored-by: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Co-authored-by: Luna <me@lunya.dev>
Co-authored-by: martimavocado <39881008+martimavocado@users.noreply.github.com>
Co-authored-by: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Co-authored-by: minhperry <46137516+minhperry@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>
Co-authored-by: HiZe <super@hize.be>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hannibal002 hannibal002 Awaiting requested review from hannibal002

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.27
Development

Successfully merging this pull request may close these issues.
4 participants
@ILike2WatchMemes @hannibal002 @jani270 @CalMWolfs