github/NotEnoughUpdates.git/src/main/resources, branch minion_helper_remerged Unnamed repository; edit this file 'description' to name the repository. Merge branch 'master' into minion_helper_2 2022-10-07T18:11:04+00:00 hannibal2 24389977+hannibal00212@users.noreply.github.com 2022-10-07T18:11:04+00:00 149c2827f5bcfbe4ff8c18eed8558bf7e58fdfe0 # Conflicts: # build.gradle.kts # src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java 
# Conflicts:
#	build.gradle.kts
#	src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
Skyblock addons expect=0, and modlist config button (#337) 2022-10-06T21:51:17+00:00 Roman / Linnea Gräf roman.graef@gmail.com 2022-10-06T21:51:17+00:00 98ec7b09eec00e57632a92a0f9245dc755d386ae * Skyblock addons expect=0 Synonyms for essential: crucial, main, fundamental, imperative, important, indispensable, vital, necessary, needed, vital, cardinal, principal, required, necessitous (oh wow that one sounds like incestous) * Make modlist config button work * Clean up buildscript * Add version to mock mod manifests as well Courtesy-off: MultiMC * Jitpack metadata 
* Skyblock addons expect=0

Synonyms for essential:

crucial, main, fundamental, imperative, important, indispensable, vital,
necessary, needed, vital, cardinal, principal, required, necessitous (oh
wow that one sounds like incestous)

* Make modlist config button work

* Clean up buildscript

* Add version to mock mod manifests as well

Courtesy-off: MultiMC

* Jitpack metadata
 Revert "[ImgBot] Optimize images" (#334) 2022-10-04T11:59:56+00:00 jani270 69345714+jani270@users.noreply.github.com 2022-10-04T11:59:56+00:00 df9f5b86598e5d358463bcc770471a274027626d 






[ImgBot] Optimize images (#325)
2022-10-04T02:59:15+00:00

imgbot[bot]
31301654+imgbot[bot]@users.noreply.github.com

2022-10-04T02:59:15+00:00

431de03ea35cbbfbf81385ad320bfbd8f512feb9

Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com>




Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com>






Merge branch 'master' into minion_helper_2
2022-10-01T17:34:23+00:00

hannibal2
24389977+hannibal00212@users.noreply.github.com

2022-10-01T17:34:23+00:00

45a28199fc9e32629c26b078d737f6b123d9dc1f

# Conflicts:
#	src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BingoPage.java
#	src/main/java/io/github/moulberry/notenoughupdates/util/HotmInformation.java
#	src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java





# Conflicts:
#	src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BingoPage.java
#	src/main/java/io/github/moulberry/notenoughupdates/util/HotmInformation.java
#	src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java







Add custom keystore and refactor HypixelApi.java (#318)
2022-09-29T15:25:37+00:00

Roman / Linnea Gräf
roman.graef@gmail.com

2022-09-29T15:25:37+00:00

2dd4a2b36211c380c0bf4e231859dfafd3c04a5b

* Add custom keystore and refactor HypixelApi.java

* Fix inputstream leak (+ less console spam)

* Fix HOTM crash

* Use api selected variable to find best profile

* Number formatting

* Make old profiles show again

Co-authored-by: nopo <nopotheemail@gmail.com>




* Add custom keystore and refactor HypixelApi.java

* Fix inputstream leak (+ less console spam)

* Fix HOTM crash

* Use api selected variable to find best profile

* Number formatting

* Make old profiles show again

Co-authored-by: nopo <nopotheemail@gmail.com>






Merge branch 'master' into minion_helper_2
2022-09-14T17:14:51+00:00

Lorenz
lo.scherf@gmail.com

2022-09-14T17:14:51+00:00

676cd4b5b5e7eb035a889ec5afeb939255dc2679

# Conflicts:
#	src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
#	src/main/java/io/github/moulberry/notenoughupdates/commands/profile/PeekCommand.java
#	src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java





# Conflicts:
#	src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
#	src/main/java/io/github/moulberry/notenoughupdates/commands/profile/PeekCommand.java
#	src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java







Added chat message to let players turn on the storage gui if they accidentally turned it off (#273)
2022-09-14T12:30:25+00:00

NopoTheGamer
40329022+NopoTheGamer@users.noreply.github.com

2022-09-14T12:30:25+00:00

18255a0e473092d0f389507a19944a7ddfc8078d

* Added a chat message to turn the storage gui back on after turning it off in said storage gui

* remove the skyclient mixin

* map on by default




* Added a chat message to turn the storage gui back on after turning it off in said storage gui

* remove the skyclient mixin

* map on by default






Merge branch 'master' into minion_helper_2
2022-09-08T18:42:17+00:00

Lorenz
lo.scherf@gmail.com

2022-09-08T18:42:17+00:00

bd35a713caac99069e795ea189b0f0e1f6000bff

# Conflicts:
#	src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java
#	src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
#	src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ExtraPage.java





# Conflicts:
#	src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java
#	src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
#	src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ExtraPage.java







0.14 - Finished :) (#233)
2022-09-08T15:00:49+00:00

hannibal2
24389977+hannibal00212@users.noreply.github.com

2022-09-08T15:00:49+00:00

d3805f080af87eb2bc7d2a2eac6c3f8db539324f

Co-authored-by: nopo <noahogno@gmail.com>
Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: Ascynx <78341107+Ascynx@users.noreply.github.com>
Co-authored-by: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Co-authored-by: Lulonaut <lulonaut@tutanota.de>




Co-authored-by: nopo <noahogno@gmail.com>
Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: Ascynx <78341107+Ascynx@users.noreply.github.com>
Co-authored-by: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Co-authored-by: Lulonaut <lulonaut@tutanota.de>