aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-08Fix Enchanting GUIfix-enchanting_guinea
im sowwy
2022-01-30fix missing accessories page in AccessoryBagOverlay (#71)Lulonaut
2022-01-30Added patreon back and made so settings look better (#72)jani270
* Added patreon back * Make settings look better
2022-01-27Build Number (#70)Roman / Nea
Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
2022-01-27Show maxed HOTM perks and clean up code (#69)FluxCapacitor
2022-01-22fixed bug (#68)efefury
* fixed total xp being shown on hotm tab in pv
2022-01-18fix weird NPE (#66)Roman / Nea
2022-01-18bro i wanna know who named it "island" (#67)NopoTheGamer
2022-01-17Recipe Reloading should no longer duplicate recipes (#65)Roman / Nea
* Remove potential RCE only exploitable by Moulberry himself, i still want my cape tho * no more recipe dupes
2022-01-15Add sounds and rework the existing textures to custom Dwarven Mines /… (#51)Roman / Nea
* Pre Work of custom biomes * Work on auto chunk update, Add Debug command * Added 6 new biomes that are used in crystal hollows * Made it so the biomes are registered in the main class so it loads properly * Add sounds and rework the existing textures to custom Dwarven Mines / CH blocks * Config fixups * make titanium sounds work * Added sounds per gemstone type * fix dwarven mines sounds * stop spamming sound effects with config * Changelog for CH custom blocks * add all the files * Update src/main/resources/assets/notenoughupdates/sounds/titaniumbreak.json * Update src/main/resources/assets/notenoughupdates/sounds/mithrilbreak.json * Update src/main/resources/assets/notenoughupdates/sounds/gemstonetopazbreak.json * Update src/main/resources/assets/notenoughupdates/sounds/gemstonerubybreak.json * Update src/main/resources/assets/notenoughupdates/sounds/gemstonesapphirebreak.json * Update src/main/resources/assets/notenoughupdates/sounds/gemstonejasperbreak.json * Update src/main/resources/assets/notenoughupdates/sounds/gemstoneamethystbreak.json * Update src/main/resources/assets/notenoughupdates/sounds/gemstonejadebreak.json * Update src/main/resources/assets/notenoughupdates/sounds/gemstoneamberbreak.json * Update src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java * Update src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java * Update src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java * Update src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java * Update src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java * Update src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java Co-authored-by: DoKM <mcazzyman@gmail.com> Co-authored-by: nopothegamer <40329022+nopothegamer@users.noreply.github.com> Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
2022-01-15Fix crafting overlay (#64)Roman / Nea
* Fix crafting overlay * bbbbbbbbbbbbbbbbbbbbbbbbbb * Update src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java * Update src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java * Update src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java * Update src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java * Update src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java * Update src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java * Update src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java * Update src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java * Update src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
2022-01-15fix (#60)Rattly
2022-01-15New buildscript (#59)Roman / Nea
* Rewrite build.gradle * Fix mixins * Finishing touches on the buildscript * maybe potentially fix a dependency issue that i cant reproduce on my end
2022-01-15add crystal hollows + dwarven mines panos (#62)Erymanthus[#5074] | (u/)RayDeeUx
2022-01-12Some bugfixes (#56)NopoTheGamer
* fixed caching * Added skyblock check to replace social options * remove pet tooltip + made it not on by default * fixed texture oops * fixed texture oops
2022-01-05Fix graph freaking out (#57)DeDiamondPro
2022-01-02Update 2.1.md (#50)NopoTheGamer
2022-01-01Added custom wardrobe display for the new stuff they have put on the alpha (#36)NopoTheGamer
* istg if you give me 170 commits i will end someone(added stranded pv icon + added an icon for gamemodes that neu doesnt know about) * Change the mines of divan waypoints to blue because it was hard to see the gold waypoint gold blocks everywhere * Added a custom armor stuff for the alpha content * Made it so it doesnt show if you dont have hide potion effects on * very cool and epic armor display (dont look at the code its bad) ((not finished)) * hello yes please test armor hud (finished but i will clean it up a lil) * clean up code + show thingy when no items cached + fix neu buttons placement + fixed crash * fixed neubutton placment but the fix works (i hope) * i see no reason for this to work outside skyblock soo * ery wanted it to be possible for an on texture to be different to an off texture in /neu * Added "Has Advanced Tab" to /neustats * Added "Has Advanced Tab" to /neustats * https://cdn.discordapp.com/attachments/896407218151366687/924981162714234900/unknown.png https://cdn.discordapp.com/attachments/896407218151366687/924981203319263232/unknown.png (fixed storage menu if you have new tab off) * tried to fix the gui being offset * Add a pet display for your inventory * tries to show your pet stats in the inv display * skyblock check * Fix texture * try to lower file size by unused assets * patch notes ! * remove some random code that wasnt doing anything * added a repo check to see if the wardrobe stuff has come out yet * fixed it showing wrong pet * fixed caching
2022-01-02Added some things (#49)efefury
Co-authored-by: Lulonaut <lulonaut@tutanota.de>
2021-12-30Adding support for more recipe types and forge recipes (#40)Roman / Nea
* Foundations for support of different crafting recipe types. NeuRecipe is now a base class for a recipe which provides common concepts, such as inputs, outputs and a rendering task. GuiItemRecipe has been reworked to work with this new NeuRecipe. NeuManager now parses said recipes. This should be reworked to be a two step process (first register items, then register recipes). To keep compatibility with older repo versions, NeuRecipes are parse lenient and default to a crafting recipe. New recipes should be added in the `recipes` json field which is an array of json dictionaries, which have a `type` and other fields depending on the `type` of that recipe. This also adds support for having multiple recipes for a single item (e.g. uncrafting storage blocks). * Remove references in existing code * Recipe Generation * ring recipes * recipe generator v2 * quick forge * bugfixes and performance improvements * fix raw craft cost * reload hotm if you open the hotm tree inv * add myself to the changelog * replace quickforge formular with lookup table * do not crash anymore when opening recipes outside of skyblock * format coins differently * remove debug logs * change recipe generator so that it doesnt crash old versions
2021-12-29Github Actions Webhook Set Author picture (#48)Roman / Nea
* change author determination method * this should be the right extension
2021-12-29-deps YEP (#47)nopothegamer
2021-12-29github webhook action mashup 400 (#46)Roman / Nea
2021-12-29Add price graph (#43)DeDiamondPro
* graph thingy * styles * cool stuff * move enabled to top * no pretty printing so smaller files * general improvements to how data is visualised * small oopsie * bazaar support (delete old price data or crash) * Update AHGraph.java * remove 1 line so iron doesn't have to * Update GuiPriceGraph.java * happy now jani? * there ironmoon Co-authored-by: nopothegamer <40329022+nopothegamer@users.noreply.github.com>
2021-12-30Longer message for outdated price (#45)Lulonaut
2021-12-29shorter message (#44)Lulonaut
2021-12-28Update build.yml (#42)nopothegamer
2021-12-28more code clean up (#38)IRONM00N
2021-12-24Added custom 🦀 hat system (#39)jani270
* Update NEUManager.java * Update 2.1.md * nopo asked
2021-12-22fix /locraw bug, bumped version (#37)IRONM00N
closes #35
2021-12-21change downloads badge to redirect to the releases pageIRONM00N
2021-12-20Fix crash in profile viewer (#34)Keebler408
2021-12-18Load wiki pages asynchronously. (#30)Roman / Nea
Previous to this commit, wiki pages would be downloaded on the main rendering thread, preventing all rendering and user interaction while the download was occuring. This has now been shifted to the common forkpool provided by the JVM.
2021-12-18added pv icons + changed mines of divan waypoint color (#31)nopothegamer
* istg if you give me 170 commits i will end someone(added stranded pv icon + added an icon for gamemodes that neu doesnt know about) * Change the mines of divan waypoints to blue because it was hard to see the gold waypoint gold blocks everywhere
2021-12-18Fix per-profile fairy soul bug that wipes progress for all but one location ↵Keebler408
(#32)
2021-12-18YEP (#33)jani270
2021-12-11Store auctionable items locally to only show price warning if the item can ↵Lulonaut
actually have a price (#29)
2021-12-10Slayer overlay (#28)nopothegamer
* idk where im commiting to * idk where im commiting to * made tita overlay and waypoints work with dwarven overlay off "fixed" divan rarity in neuah made eitherwarp block overlay turn off able * Added change notes * i stopped being pepega and worked out how neu config works * Added mining skill overlay * fixed mining overlay * add option to hide Mining waypoints in Dwarven mines when at location * better check location * Make cata xp in /pv be calculated on how many runs you have * Added master cata xp rates * Make gitignore not show as changed * Added warnings to some things in /neu * maybe fix hiding waypoints * Added a fishing skill overlay its kinda scuffed because of the interp stuff * Hopefully fix Rampart's quarry (for real now) * Moul said i could no one leak in general or smth * Cache itemstacks in miningoverlay and crystalhollows overlay (untested) * Fix preinit crash due to manager not existing yet * Make tab do the same as down button while in tab completion mode * remove debug print * Added pitch to farming overlay * Changed the panoramas back to the old one because ery is scuffed * isnt finished but should work for ery * Made it so if ur mining 60 it just says maxed level instead of b u g * Made skills not show int limit when at max level in skill overlays * wh :omegalul: made neu * sad you cant type that long in search bar * Hello don't mind me just improving your workflow * æ * Oh also this * Added the cata xp scaling(idk if m3 and 4 values are right) * Added Expertise Progress * Fix farming overlay * Added cult/crops to next cult level * Go to the other end of the tab-completion List when hitting the end * remove debug prints * added combat skill overlay and some changes to the others (combat doesnt work rn could someone look into it :prayge:) * Added cooldown to god pot showing in todo overlay * comment * Added option to remove enchant glint in storage gui * Added option to remove enchant glint in storage gui * please fix * please fix * Fixed the placement of help.png * Added fairy soul waypoints to misc * unclear not clear * Added dg partner cape * fix space cape * Fix space cape * Make it so you can hold down keys in sign GUIs * Added a button in storage menu to open the settings Added an option to change the click names for /pv to /ah * Made it so ur config doesnt reset * Added bhop (shhh dont tell anyone) * Added a help menu to /neuec * changed fisgifis overlay button no work * make working fishing tiemr * jani can you test this out for us * Added a gui locations tab * very important feature * Fixed wart hoe overlay if not alch 50 * Make it so the ding time is customizable * Added coins/m to farming overlay * Basic mining tab in pv * Just for jani * Just for jani v2 * works ig * my balls * hotm pv is mostly done missing some perks * hotm pv done * message goes here * push so i can pr jani * Final hotm pv texture + fix m3 and m4 cata xp * edit: didnt work * fixed up stuff dokm said * added image for hotm pv * Fixed previews for furf and dg capes * removed combat overlay from location gui menu in /neu * Start of a custom pv page * Removed custom pv because -2 people would use it Removed neubhop (found out bhop is bannable) * update build gradle * - Made it so treecap shows foraging xp instead of farming xp on the farming overlay - Made it so a jungle axe with cult will show the "farming" overlay * Added entrance + made blur limit at 100 * Added blocking clicks back to the enchanting minigames * update patch notes * Fixed rounding issue * let you use screenshot in et overlay * Added /neurepomode to toggle item editing and dev mode * Changed "NEUAH is DISABLED! Enable in /neusettings." to /neu * Changed misc overlays tab to todo overlays * Added config option for npc retexture (idk if it works i dont have a pack to test it with) * update patch note * Fixed api key autofill with dg copy chat feature * Fixed api key autofill with dg copy chat feature v2 * Made missing enchants not show on an item if its not missing any enchants * remove todo because pepega * Added a config option for dirt wand overlay Added a config option for hoe of tilling * patch notes * Fix pet getlorereplacements crash (im guessing) (#21) * Added an option to use short numbers (1.5mil) for price tooltips * Added warning to slotlocking + short prices default to off * make it not dungeon map * Fixed pet overlay not updating when going into /pets * Dokm after not making his own patch notes * Fixed capital letter * Refactor miscoverlays to todooverlays * idk man make the short number prices use like 5 less lines * Added an option to show next click in chronomatron * added bz price to farming overlay coins/m (only wart rn) * added bz price to farming overlay coins/m * me when cactus price was divided by 1296 :pepela: * unrefactor todo overlay because it resets the config * Fixed fetchur for the 765754465th time * Fixed time that experiment table resets + Made prevent missclicks off by default * Added slayer overlay * fixed quickforge level 20 because it goes up +0.5% every level... and randomly the last level gives + 10.5% * ery wanted to texture himself so i made a hidden toggle for it * made it so if your modlist is under 15 and you do /neustats modlist it will just show /neustats * Finished slayer overlay * Auto turn off search mode after 2 minutes * i forgor bout patch notes * Added setting jani wanted * removed hide incompatible enchants because no workie * i forgor to make it build :skull: * Added max enchant book to /neuec - Dokm * Fixed the slayer overlay when ping * edit: didnt work * Made a lil error if you have new tab list off * Fixed fishing overlay for lava fishing * Fix spelling + comments * Added bingo profile icon to /pv * comments * istg people are pepega * ery made good texture for pv bingo * making the pr fricked me (please build) * Fixed pet overlay not resetting pet when making new profile * Fixed pet overlay not resetting pet when making new profile * i forgor to add to LocationEdit neu page + last commit was added combat overlay * Fix comments because either me or intellij was on crack * comments stuff * ok de duimon no0b Co-authored-by: Lulonaut <lulonaut@tutanota.de> Co-authored-by: Lulonaut <67191924+Lulonaut@users.noreply.github.com> Co-authored-by: DoKM <mcazzyman@gmail.com> Co-authored-by: TymanWasTaken <tyman@tyman.tech> Co-authored-by: MicrocontrollersDev <microcontrollersyt@gmail.com> Co-authored-by: jani270 <jani270@gmx.de> Co-authored-by: DoKM <54663875+DoKM@users.noreply.github.com> Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
2021-12-02Add warning to tooltip when price info is not there/outdated (#27)Lulonaut
* Make fairy souls save per profile * fix commands * Add back support for toggling in /neu * add patch notes * Add warning when price info couldn't be found is outdated
2021-11-28Readme changes and custom rune system (#26)jani270
* Readme changes * Fixed </a> thingy * runes * Added check
2021-11-18Make Fairy souls progress track for each profile (#18)Lulonaut
* Make fairy souls save per profile * fix commands * Add back support for toggling in /neu * add patch notes
2021-11-17Added blocking clicks back to the enchanting minigames (#19)nopothegamer
* idk where im commiting to * idk where im commiting to * made tita overlay and waypoints work with dwarven overlay off "fixed" divan rarity in neuah made eitherwarp block overlay turn off able * Added change notes * i stopped being pepega and worked out how neu config works * Added mining skill overlay * fixed mining overlay * add option to hide Mining waypoints in Dwarven mines when at location * better check location * Make cata xp in /pv be calculated on how many runs you have * Added master cata xp rates * Make gitignore not show as changed * Added warnings to some things in /neu * maybe fix hiding waypoints * Added a fishing skill overlay its kinda scuffed because of the interp stuff * Hopefully fix Rampart's quarry (for real now) * Moul said i could no one leak in general or smth * Cache itemstacks in miningoverlay and crystalhollows overlay (untested) * Fix preinit crash due to manager not existing yet * Make tab do the same as down button while in tab completion mode * remove debug print * Added pitch to farming overlay * Changed the panoramas back to the old one because ery is scuffed * isnt finished but should work for ery * Made it so if ur mining 60 it just says maxed level instead of b u g * Made skills not show int limit when at max level in skill overlays * wh :omegalul: made neu * sad you cant type that long in search bar * Hello don't mind me just improving your workflow * æ * Oh also this * Added the cata xp scaling(idk if m3 and 4 values are right) * Added Expertise Progress * Fix farming overlay * Added cult/crops to next cult level * Go to the other end of the tab-completion List when hitting the end * remove debug prints * added combat skill overlay and some changes to the others (combat doesnt work rn could someone look into it :prayge:) * Added cooldown to god pot showing in todo overlay * comment * Added option to remove enchant glint in storage gui * Added option to remove enchant glint in storage gui * please fix * please fix * Fixed the placement of help.png * Added fairy soul waypoints to misc * unclear not clear * Added dg partner cape * fix space cape * Fix space cape * Make it so you can hold down keys in sign GUIs * Added a button in storage menu to open the settings Added an option to change the click names for /pv to /ah * Made it so ur config doesnt reset * Added bhop (shhh dont tell anyone) * Added a help menu to /neuec * changed fisgifis overlay button no work * make working fishing tiemr * jani can you test this out for us * Added a gui locations tab * very important feature * Fixed wart hoe overlay if not alch 50 * Make it so the ding time is customizable * Added coins/m to farming overlay * Basic mining tab in pv * Just for jani * Just for jani v2 * works ig * my balls * hotm pv is mostly done missing some perks * hotm pv done * message goes here * push so i can pr jani * Final hotm pv texture + fix m3 and m4 cata xp * edit: didnt work * fixed up stuff dokm said * added image for hotm pv * Fixed previews for furf and dg capes * removed combat overlay from location gui menu in /neu * Start of a custom pv page * Removed custom pv because -2 people would use it Removed neubhop (found out bhop is bannable) * update build gradle * - Made it so treecap shows foraging xp instead of farming xp on the farming overlay - Made it so a jungle axe with cult will show the "farming" overlay * Added entrance + made blur limit at 100 * Added blocking clicks back to the enchanting minigames * update patch notes * Fixed rounding issue * let you use screenshot in et overlay * Added /neurepomode to toggle item editing and dev mode * Changed "NEUAH is DISABLED! Enable in /neusettings." to /neu * Changed misc overlays tab to todo overlays * Added config option for npc retexture (idk if it works i dont have a pack to test it with) * update patch note * Fixed api key autofill with dg copy chat feature * Fixed api key autofill with dg copy chat feature v2 * Made missing enchants not show on an item if its not missing any enchants * remove todo because pepega * Added a config option for dirt wand overlay Added a config option for hoe of tilling * patch notes * Fix pet getlorereplacements crash (im guessing) (#21) * Added an option to use short numbers (1.5mil) for price tooltips * Added warning to slotlocking + short prices default to off * make it not dungeon map * Fixed pet overlay not updating when going into /pets * Dokm after not making his own patch notes * Fixed capital letter * Refactor miscoverlays to todooverlays * idk man make the short number prices use like 5 less lines * Added an option to show next click in chronomatron * added bz price to farming overlay coins/m (only wart rn) * added bz price to farming overlay coins/m * me when cactus price was divided by 1296 :pepela: * unrefactor todo overlay because it resets the config * Fixed fetchur for the 765754465th time * Fixed time that experiment table resets + Made prevent missclicks off by default Co-authored-by: Lulonaut <lulonaut@tutanota.de> Co-authored-by: Lulonaut <67191924+Lulonaut@users.noreply.github.com> Co-authored-by: DoKM <mcazzyman@gmail.com> Co-authored-by: TymanWasTaken <tyman@tyman.tech> Co-authored-by: MicrocontrollersDev <microcontrollersyt@gmail.com> Co-authored-by: jani270 <jani270@gmx.de> Co-authored-by: DoKM <54663875+DoKM@users.noreply.github.com> Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
2021-11-13maybe fix a 1/10000000000000000 crash (#23)DeDiamondPro
* maybe fix a 1/10000000000000000 crash * Update AuctionSearchOverlay.java * Update AuctionSearchOverlay.java
2021-11-13Changing Patreon to Twitch - bcs moul bad (#24)jani270
* Changing Patreon to Twitch * Change Icon again
2021-11-10Updated PV Hotm Texture and made itemlist tools category work with drills ↵jani270
and gauntlet (#20) * Update pv_mining.png * Itemlist drills and gauntlet * My name
2021-11-06Fixed HOTM Texture (#17)jani270
2021-11-03Made it so treecap shows foraging xp instead of farming xp on the farming ↵nopothegamer
overlay (#16)
2021-11-02Adding skill overlays and hotm stuff in pv + other minor stuff (#15)nopothegamer
* idk where im commiting to * idk where im commiting to * made tita overlay and waypoints work with dwarven overlay off "fixed" divan rarity in neuah made eitherwarp block overlay turn off able * Added change notes * i stopped being pepega and worked out how neu config works * Added mining skill overlay * fixed mining overlay * add option to hide Mining waypoints in Dwarven mines when at location * better check location * Make cata xp in /pv be calculated on how many runs you have * Added master cata xp rates * Make gitignore not show as changed * Added warnings to some things in /neu * maybe fix hiding waypoints * Added a fishing skill overlay its kinda scuffed because of the interp stuff * Hopefully fix Rampart's quarry (for real now) * Moul said i could no one leak in general or smth * Cache itemstacks in miningoverlay and crystalhollows overlay (untested) * Fix preinit crash due to manager not existing yet * Make tab do the same as down button while in tab completion mode * remove debug print * Added pitch to farming overlay * Changed the panoramas back to the old one because ery is scuffed * isnt finished but should work for ery * Made it so if ur mining 60 it just says maxed level instead of b u g * Made skills not show int limit when at max level in skill overlays * wh :omegalul: made neu * sad you cant type that long in search bar * Hello don't mind me just improving your workflow * æ * Oh also this * Added the cata xp scaling(idk if m3 and 4 values are right) * Added Expertise Progress * Fix farming overlay * Added cult/crops to next cult level * Go to the other end of the tab-completion List when hitting the end * remove debug prints * added combat skill overlay and some changes to the others (combat doesnt work rn could someone look into it :prayge:) * Added cooldown to god pot showing in todo overlay * comment * Added option to remove enchant glint in storage gui * Added option to remove enchant glint in storage gui * please fix * please fix * Fixed the placement of help.png * Added fairy soul waypoints to misc * unclear not clear * Added dg partner cape * fix space cape * Fix space cape * Make it so you can hold down keys in sign GUIs * Added a button in storage menu to open the settings Added an option to change the click names for /pv to /ah * Made it so ur config doesnt reset * Added bhop (shhh dont tell anyone) * Added a help menu to /neuec * changed fisgifis overlay button no work * make working fishing tiemr * jani can you test this out for us * Added a gui locations tab * very important feature * Fixed wart hoe overlay if not alch 50 * Make it so the ding time is customizable * Added coins/m to farming overlay * Basic mining tab in pv * Just for jani * Just for jani v2 * works ig * my balls * hotm pv is mostly done missing some perks * hotm pv done * message goes here * push so i can pr jani * Final hotm pv texture + fix m3 and m4 cata xp * edit: didnt work * fixed up stuff dokm said * added image for hotm pv * Fixed previews for furf and dg capes * removed combat overlay from location gui menu in /neu * Start of a custom pv page * Removed custom pv because -2 people would use it Removed neubhop (found out bhop is bannable) * update build gradle Co-authored-by: Lulonaut <lulonaut@tutanota.de> Co-authored-by: Lulonaut <67191924+Lulonaut@users.noreply.github.com> Co-authored-by: DoKM <mcazzyman@gmail.com> Co-authored-by: TymanWasTaken <tyman@tyman.tech> Co-authored-by: MicrocontrollersDev <microcontrollersyt@gmail.com> Co-authored-by: jani270 <jani270@gmx.de>
2021-10-16Code Clean Up (#2)IRONM00N
* intellij code clean up * optimize imports * format * intellij suggestions * fix empty catch issues
2021-10-13Merge pull request #231 from DoKM/master2.0.0Moulberry
DoKM Fork Merge
generated by cgit (git 2.46.0) at 2024-11-21 19:09:20 +0000