Improvement: Garden Trackers to Timed Trackers #4725
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…kend # Conflicts: # src/main/java/at/hannibal2/skyhanni/features/garden/tracker/DicerRngDropTracker.kt # src/main/java/at/hannibal2/skyhanni/features/garden/tracker/PestProfitTracker.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/data/garden/EliteFarmersLeaderboard.kt # src/main/java/at/hannibal2/skyhanni/features/garden/tracker/PestProfitTracker.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/combat/end/DragonProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/combat/end/endernodetracker/EnderNodeTracker.kt # src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt # src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt # src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt # src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt # src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt # src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/stray/CFStrayTracker.kt # src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt # src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt # src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt # src/main/java/at/hannibal2/skyhanni/utils/tracker/BucketedItemTrackerData.kt # src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt # src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt # src/main/java/at/hannibal2/skyhanni/utils/tracker/TrackerData.kt # versions/1.21.5/src/main/java/at/hannibal2/skyhanni/features/foraging/ForagingTracker.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/combat/end/DragonProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt # src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniTracker.kt # versions/1.21.5/src/main/java/at/hannibal2/skyhanni/features/foraging/ForagingTracker.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/combat/end/DragonProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/combat/end/endernodetracker/EnderNodeTracker.kt # src/main/java/at/hannibal2/skyhanni/features/combat/ghosttracker/GhostTracker.kt # src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt # src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt # src/main/java/at/hannibal2/skyhanni/features/event/yearofthepig/ShinyOrbTracker.kt # src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt # src/main/java/at/hannibal2/skyhanni/features/foraging/ForagingTrackerLegacy.kt # src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt # src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt # src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/gifting/GiftProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/stray/CFStrayTracker.kt # src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/CrystalNucleusTracker.kt # src/main/java/at/hannibal2/skyhanni/features/mining/fossilexcavator/ExcavatorProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt # src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt # src/main/java/at/hannibal2/skyhanni/features/misc/DraconicSacrificeTracker.kt # src/main/java/at/hannibal2/skyhanni/features/rift/area/mountaintop/TimiteTracker.kt # src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/VerminTracker.kt # src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt # src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt # src/main/java/at/hannibal2/skyhanni/utils/tracker/TrackerData.kt
…kend # Conflicts: # src/main/java/at/hannibal2/skyhanni/config/features/misc/DiscordRPCConfig.kt # src/main/java/at/hannibal2/skyhanni/features/garden/tracker/PestProfitTracker.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/garden/tracker/PestProfitTracker.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/config/features/misc/DiscordRPCConfig.kt
github-actions
bot
removed
the
Merge Conflicts
|
Conflicts have been resolved! 🎉 |
github-actions
bot
added
the
Fails Multi-Version
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/garden/GardenUptimeManager.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/garden/tracker/PestProfitTracker.kt
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenUptimeManager.kt
github-actions
bot
removed
the
Fails Multi-Version
# Conflicts: # src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenUptimeCommand.kt
github-actions
bot
added
the
Merge Conflicts
|
This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Dependencies
What
Converts all garden trackers to timed trackers.
Changelog Improvements