Skip to content

Commit 8029a08

Browse files
GriefedGriefed
committed
Merge branch 'develop' into 'main'
Maintenance release See merge request Griefed/ServerPackCreator!629
2 parents ac142d9 + 7deb122 commit 8029a08

File tree

7 files changed

+38
-36
lines changed

7 files changed

+38
-36
lines changed

‎serverpackcreator-api/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ dependencies {
2121
implementation("org.jetbrains.kotlin:kotlin-bom:2.1.0")
2222
implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
2323
implementation(files("${layout.buildDirectory.asFile.get()}/resources/main"))
24-
api("com.electronwill.night-config:toml:3.7.2")
24+
api("com.electronwill.night-config:toml:3.8.1")
2525
api("com.fasterxml.jackson.core:jackson-databind:2.18.1")
2626
api("net.lingala.zip4j:zip4j:2.11.5")
2727
api("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
28-
api("org.apache.logging.log4j:log4j-core:2.24.2")
29-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
28+
api("org.apache.logging.log4j:log4j-core:2.24.3")
29+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
3030
api("org.pf4j:pf4j:3.13.0")
3131
api("org.bouncycastle:bcpkix-jdk18on:1.79")
3232

3333
api("com.github.MCRcortex:nekodetector:Version-1.1-pre")
3434
//api("dev.kosmx.needle:jneedle:1.0.1")
3535

36-
testImplementation("org.jetbrains.kotlin:kotlin-test:2.0.20")
37-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.3")
36+
testImplementation("org.jetbrains.kotlin:kotlin-test:2.1.0")
37+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
3838
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
3939
}
4040

‎serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,8 @@ class ApiProperties(propertiesFile: File = File("serverpackcreator.properties"))
470470
"smoothfocus-", //https://www.curseforge.com/minecraft/mc-mods/smoothfocus
471471
"sodium-fabric-", //https://www.curseforge.com/minecraft/mc-mods/sodium
472472
"sodiumdynamiclights-", //https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged
473+
"sodiumoptionsapi-", //https://www.curseforge.com/minecraft/mc-mods/sodium-options-api
474+
"sodiumoptionsmodcompat-", //https://www.curseforge.com/minecraft/mc-mods/sodium-embeddium-options-mod-compat
473475
"sounddeviceoptions-", //https://www.curseforge.com/minecraft/mc-mods/more-sound-config
474476
"soundreloader-", //https://www.curseforge.com/minecraft/mc-mods/sound-reloader
475477
"spoticraft-", //https://www.curseforge.com/minecraft/mc-mods/spoticraft-inactive

‎serverpackcreator-api/src/main/resources/serverpackcreator.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
de.griefed.serverpackcreator.versioncheck.prerelease=false
33
de.griefed.serverpackcreator.language=en_GB
44
de.griefed.serverpackcreator.configuration.fallback.updateurl=https://raw.githubusercontent.com/Griefed/ServerPackCreator/main/serverpackcreator-api/src/main/resources/serverpackcreator.properties
5-
de.griefed.serverpackcreator.configuration.fallbackmodslist=3dskinlayers-,Absolutely-Not-A-Zoom-Mod-,AdvancedChat-,AdvancedChatCore-,AdvancedChatHUD-,AdvancedCompas-,Ambience,AmbientEnvironment-,AmbientSounds_,AnimaticaReforged-,AreYouBlind-,Armor Status HUD-,ArmorSoundTweak-,BH-Menu-,Batty's Coordinates PLUS Mod,BetterAdvancements-,BetterAnimationsCollection-,BetterModsButton-,BetterDarkMode-,BetterF3-,BetterFog-,BetterFoliage-,BetterPingDisplay-,BetterPlacement-,BetterTaskbar-,BetterThirdPerson,BetterTitleScreen-,Blur-,BorderlessWindow-,CTM-,Chat Ping ,ChunkAnimator-,Clear-Water-,ClientTweaks_,CompletionistsIndex-,Controller Support-,Controlling-,CraftPresence-,CullLessLeaves-,CustomCursorMod-,CustomMainMenu-,DefaultOptions_,DefaultSettings-,DeleteWorldsToTrash-,DetailArmorBar-,Ding-,DistantHorizons-,DripSounds-,Durability101-,DurabilityNotifier-,DynamicSurroundings-,DynamicSurroundingsHuds-,EasyLAN-,EffectsLeft-,EiraMoticons_,EnchantmentDescriptions-,EnhancedVisuals_,EquipmentCompare-,EuphoriaPatcher-,FPS-Monitor-,FabricCustomCursorMod-,FadingNightVision-,Fallingleaves-,FancySpawnEggs,FancyVideo-API-,farsight-,FirstPersonMod,FogTweaker-,ForgeCustomCursorMod-,FpsReducer-,FpsReducer2-,FullscreenWindowed-,GameMenuModOption-,HealthOverlay-,HeldItemTooltips-,HorseStatsMod-,ImmediatelyFast-,ImmediatelyFastReforged-,InventoryEssentials_,InventoryHud_,InventorySpam-,InventoryTweaks-,ItemBorders-,ItemLocks-,ItemPhysicLite_,ItemStitchingFix-,JBRA-Client-,JustEnoughCalculation-,JustEnoughEffects-,JustEnoughProfessions-,LeaveMyBarsAlone-,LLOverlayReloaded-,LOTRDRP-,LegendaryTooltips,LegendaryTooltips-,LightOverlay-,MinecraftCapes,MineMenu-,MoBends,ModernUI-,MouseTweaks-,MyServerIsCompatible-,Neat,Neat-,NekosEnchantedBooks-,NoAutoJump-,NoFog-,Notes-,NotifMod-,OldJavaWarning-,OptiFine,OptiFine_,OptiForge,OptiForge-,OverflowingBars-,PackMenu-,PackModeMenu-,PickUpNotifier-,Ping-,PingHUD-,PresenceFootsteps-,RPG-HUD-,ReAuth-,Reforgium-,ResourceLoader-,ResourcePackOrganizer,Ryoamiclights-,RyoamicLights-,ShoulderSurfing-,ShulkerTooltip-,SimpleDiscordRichPresence-,SimpleWorldTimer-,SoundFilters-,SpawnerFix-,StylishEffects-,TextruesRubidiumOptions-,TRansliterationLib-,TipTheScales-,Tips-,Toast Control-,Toast-Control-,ToastControl-,TravelersTitles-,VoidFog-,VR-Combat_,WindowedFullscreen-,WorldNameRandomizer-,YeetusExperimentus-,YungsMenuTweaks-,[1.12.2]DamageIndicatorsMod-,[1.12.2]bspkrscore-,antighost-,anviltooltipmod-,armorchroma-,armorpointspp-,auditory-,authme-,auto-reconnect-,autojoin-,autoreconnect-,axolotl-item-fix-,backtools-,bannerunlimited-,beenfo-,better-clouds-,better-recipe-book-,betterbiomeblend-,bhmenu-,blur-,borderless-mining-,cat_jam-,catalogue-,cfwinfo-,charmonium-,chat_heads-,cherishedworlds-,cirback-1.0-,classicbar-,clickadv-,clienttweaks-,combat_music-,connectedness-,controllable-,cullleaves-,cullparticles-,custom-crosshair-mod-,customdiscordrpc-,darkness-,dashloader-,defaultoptions-,desiredservers-,discordrpc-,drippyloadingscreen-,drippyloadingscreen_,durabilitytooltip-,dynamic-fps-,dynamic-music-,dynamiclights-,dynamiclightsreforged-,dynmus-,e4mc-,effective-,eggtab-,eguilib-,eiramoticons-,embeddium-,enchantment-lore-,entity-texture-features-,entityculling-,essential_,exhaustedstamina-,extremesoundmuffler-,fabricemotes-,fancymenu_,fancymenu_video_extension,fast-ip-ping-,firstperson-,flickerfix-,fm_audio_extension_,fabricmod_VoxelMap-,forgemod_VoxelMap-,freecam-,freelook-,galacticraft-rpc-,gamestagesviewer-,gpumemleakfix-,grid-,helium-,hiddenrecipebook_,hiddenrecipebook-,infinitemusic-,inventoryhud.,inventoryprofiles,invtweaks-,itemzoom,itlt-,jeed-,jehc-,jeiintegration_,jumpoverfences-,just-enough-harvestcraft-,justenoughbeacons-,justenoughdrags-,justzoom_,keymap-,keywizard-,lazurite-,lazydfu-,lib39-,light-overlay-,lightfallclient-,lightspeed-,loadmyresources_,lock_minecart_view-,lootbeams-,lwl-,macos-input-fixes-,magnesium_extras-,maptooltip-,massunbind,mcbindtype-,mcwifipnp-,medievalmusic-,memoryusagescreen-,mightyarchitect-,mindful-eating-,minetogether-,mobplusplus-,modcredits-,modernworldcreation_,modnametooltip-,modnametooltip_,moreoverlays-,mousewheelie-,movement-vision-,multihotbar-,music-duration-reducer-,musicdr-,neiRecipeHandlers-,ngrok-lan-expose-mod-,no_nv_flash-,nopotionshift_,notenoughanimations-,oculus-,ornaments-,overloadedarmorbar-,panorama-,paperdoll-,physics-mod-,phosphor-,preciseblockplacing-,radon-,realm-of-lost-souls-,rebind_narrator-,rebind-narrator-,rebindnarrator-,rebrand-,reforgium-,replanter-,rrls-,rubidium-,rubidium_extras-,screenshot-to-clipboard-,servercountryflags-,shutupexperimentalsettings-,shutupmodelloader-,signtools-,simple-rpc-,simpleautorun-,smartcursor-,smarthud-,smoothboot-,smoothfocus-,sodium-fabric-,sodiumdynamiclights-,sounddeviceoptions-,soundreloader-,spoticraft-,skinlayers3d-forge,textrues_embeddium_options-,tconplanner-,timestamps-,tooltipscroller-,torchoptimizer-,torohealth-,totaldarkness,toughnessbar-,watermedia-,whats-that-slot-forge-,wisla-,xenon-,xlifeheartcolors-,yisthereautojump-
5+
de.griefed.serverpackcreator.configuration.fallbackmodslist=3dskinlayers-,Absolutely-Not-A-Zoom-Mod-,AdvancedChat-,AdvancedChatCore-,AdvancedChatHUD-,AdvancedCompas-,Ambience,AmbientEnvironment-,AmbientSounds_,AnimaticaReforged-,AreYouBlind-,Armor Status HUD-,ArmorSoundTweak-,BH-Menu-,Batty's Coordinates PLUS Mod,BetterAdvancements-,BetterAnimationsCollection-,BetterModsButton-,BetterDarkMode-,BetterF3-,BetterFog-,BetterFoliage-,BetterPingDisplay-,BetterPlacement-,BetterTaskbar-,BetterThirdPerson,BetterTitleScreen-,Blur-,BorderlessWindow-,CTM-,Chat Ping ,ChunkAnimator-,Clear-Water-,ClientTweaks_,CompletionistsIndex-,Controller Support-,Controlling-,CraftPresence-,CullLessLeaves-,CustomCursorMod-,CustomMainMenu-,DefaultOptions_,DefaultSettings-,DeleteWorldsToTrash-,DetailArmorBar-,Ding-,DistantHorizons-,DripSounds-,Durability101-,DurabilityNotifier-,DynamicSurroundings-,DynamicSurroundingsHuds-,EasyLAN-,EffectsLeft-,EiraMoticons_,EnchantmentDescriptions-,EnhancedVisuals_,EquipmentCompare-,EuphoriaPatcher-,FPS-Monitor-,FabricCustomCursorMod-,FadingNightVision-,Fallingleaves-,FancySpawnEggs,FancyVideo-API-,farsight-,FirstPersonMod,FogTweaker-,ForgeCustomCursorMod-,FpsReducer-,FpsReducer2-,FullscreenWindowed-,GameMenuModOption-,HealthOverlay-,HeldItemTooltips-,HorseStatsMod-,ImmediatelyFast-,ImmediatelyFastReforged-,InventoryEssentials_,InventoryHud_,InventorySpam-,InventoryTweaks-,ItemBorders-,ItemLocks-,ItemPhysicLite_,ItemStitchingFix-,JBRA-Client-,JustEnoughCalculation-,JustEnoughEffects-,JustEnoughProfessions-,LeaveMyBarsAlone-,LLOverlayReloaded-,LOTRDRP-,LegendaryTooltips,LegendaryTooltips-,LightOverlay-,MinecraftCapes,MineMenu-,MoBends,ModernUI-,MouseTweaks-,MyServerIsCompatible-,Neat,Neat-,NekosEnchantedBooks-,NoAutoJump-,NoFog-,Notes-,NotifMod-,OldJavaWarning-,OptiFine,OptiFine_,OptiForge,OptiForge-,OverflowingBars-,PackMenu-,PackModeMenu-,PickUpNotifier-,Ping-,PingHUD-,PresenceFootsteps-,RPG-HUD-,ReAuth-,Reforgium-,ResourceLoader-,ResourcePackOrganizer,Ryoamiclights-,RyoamicLights-,ShoulderSurfing-,ShulkerTooltip-,SimpleDiscordRichPresence-,SimpleWorldTimer-,SoundFilters-,SpawnerFix-,StylishEffects-,TextruesRubidiumOptions-,TRansliterationLib-,TipTheScales-,Tips-,Toast Control-,Toast-Control-,ToastControl-,TravelersTitles-,VoidFog-,VR-Combat_,WindowedFullscreen-,WorldNameRandomizer-,YeetusExperimentus-,YungsMenuTweaks-,[1.12.2]DamageIndicatorsMod-,[1.12.2]bspkrscore-,antighost-,anviltooltipmod-,armorchroma-,armorpointspp-,auditory-,authme-,auto-reconnect-,autojoin-,autoreconnect-,axolotl-item-fix-,backtools-,bannerunlimited-,beenfo-,better-clouds-,better-recipe-book-,betterbiomeblend-,bhmenu-,blur-,borderless-mining-,cat_jam-,catalogue-,cfwinfo-,charmonium-,chat_heads-,cherishedworlds-,cirback-1.0-,classicbar-,clickadv-,clienttweaks-,combat_music-,connectedness-,controllable-,cullleaves-,cullparticles-,custom-crosshair-mod-,customdiscordrpc-,darkness-,dashloader-,defaultoptions-,desiredservers-,discordrpc-,drippyloadingscreen-,drippyloadingscreen_,durabilitytooltip-,dynamic-fps-,dynamic-music-,dynamiclights-,dynamiclightsreforged-,dynmus-,e4mc-,effective-,eggtab-,eguilib-,eiramoticons-,embeddium-,enchantment-lore-,entity-texture-features-,entityculling-,essential_,exhaustedstamina-,extremesoundmuffler-,fabricemotes-,fancymenu_,fancymenu_video_extension,fast-ip-ping-,firstperson-,flickerfix-,fm_audio_extension_,fabricmod_VoxelMap-,forgemod_VoxelMap-,freecam-,freelook-,galacticraft-rpc-,gamestagesviewer-,gpumemleakfix-,grid-,helium-,hiddenrecipebook_,hiddenrecipebook-,infinitemusic-,inventoryhud.,inventoryprofiles,invtweaks-,itemzoom,itlt-,jeed-,jehc-,jeiintegration_,jumpoverfences-,just-enough-harvestcraft-,justenoughbeacons-,justenoughdrags-,justzoom_,keymap-,keywizard-,lazurite-,lazydfu-,lib39-,light-overlay-,lightfallclient-,lightspeed-,loadmyresources_,lock_minecart_view-,lootbeams-,lwl-,macos-input-fixes-,magnesium_extras-,maptooltip-,massunbind,mcbindtype-,mcwifipnp-,medievalmusic-,memoryusagescreen-,mightyarchitect-,mindful-eating-,minetogether-,mobplusplus-,modcredits-,modernworldcreation_,modnametooltip-,modnametooltip_,moreoverlays-,mousewheelie-,movement-vision-,multihotbar-,music-duration-reducer-,musicdr-,neiRecipeHandlers-,ngrok-lan-expose-mod-,no_nv_flash-,nopotionshift_,notenoughanimations-,oculus-,ornaments-,overloadedarmorbar-,panorama-,paperdoll-,physics-mod-,phosphor-,preciseblockplacing-,radon-,realm-of-lost-souls-,rebind_narrator-,rebind-narrator-,rebindnarrator-,rebrand-,reforgium-,replanter-,rrls-,rubidium-,rubidium_extras-,screenshot-to-clipboard-,servercountryflags-,shutupexperimentalsettings-,shutupmodelloader-,signtools-,simple-rpc-,simpleautorun-,smartcursor-,smarthud-,smoothboot-,smoothfocus-,sodium-fabric-,sodiumoptionsapi-,sodiumdynamiclights-,sodiumoptionsmodcompat-,sounddeviceoptions-,soundreloader-,spoticraft-,skinlayers3d-forge,textrues_embeddium_options-,tconplanner-,timestamps-,tooltipscroller-,torchoptimizer-,torohealth-,totaldarkness,toughnessbar-,watermedia-,whats-that-slot-forge-,wisla-,xenon-,xlifeheartcolors-,yisthereautojump-
66
de.griefed.serverpackcreator.configuration.modswhitelist=Ping-Wheel-
77
de.griefed.serverpackcreator.configuration.hastebinserver=https://haste.zneix.eu/documents
88
de.griefed.serverpackcreator.configuration.aikar=-Xms4G -Xmx4G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true

‎serverpackcreator-app/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ dependencies {
3636
api("info.picocli:picocli-shell-jline3:4.7.6")
3737

3838
//GUI
39-
api("commons-io:commons-io:2.16.1")
39+
api("commons-io:commons-io:2.18.0")
4040
api("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.9.0")
4141
api("org.jetbrains.kotlin:kotlin-reflect:2.0.0")
4242
api("com.formdev:flatlaf:3.5.1")
4343
api("com.formdev:flatlaf-extras:3.5.2")
44-
api("com.formdev:flatlaf-intellij-themes:3.5.2")
44+
api("com.formdev:flatlaf-intellij-themes:3.5.4")
4545
api("com.formdev:flatlaf-fonts-jetbrains-mono:2.304")
4646
api("com.formdev:flatlaf-fonts-inter:4.0")
4747
api("com.formdev:flatlaf-fonts-roboto:2.137")
@@ -58,13 +58,13 @@ dependencies {
5858
api("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2")
5959
api("org.springframework.boot:spring-boot-starter-web:3.3.2")
6060
api("org.springframework.boot:spring-boot-starter-log4j2:3.4.0")
61-
api("org.springframework.boot:spring-boot-starter-data-jpa:3.3.5")
61+
api("org.springframework.boot:spring-boot-starter-data-jpa:3.4.1")
6262
api("org.postgresql:postgresql:42.7.3")
6363
api("org.javassist:javassist:3.30.2-GA")
64-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3")
64+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
6565
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
6666
testRuntimeOnly("com.h2database:h2:2.3.232")
67-
testImplementation("org.springframework.boot:spring-boot-starter-test:3.3.4")
67+
testImplementation("org.springframework.boot:spring-boot-starter-test:3.4.1")
6868
developmentOnly("org.springframework.boot:spring-boot-devtools:3.4.0")
6969
//developmentOnly("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
7070
}

‎serverpackcreator-plugin-example/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ dependencies {
4040

4141

4242
// Testing
43-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3")
44-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.3")
43+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
44+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")
4545
}
4646

4747
tasks.processResources {

‎serverpackcreator-web-frontend/package-lock.json‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎serverpackcreator-web-frontend/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
"build": "quasar build"
1717
},
1818
"dependencies": {
19-
"@quasar/extras": "^1.16.11",
19+
"@quasar/extras": "^1.16.15",
2020
"axios": "^1.7.8",
21-
"pinia": "^2.2.8",
22-
"quasar": "^2.17.0",
21+
"pinia": "^2.3.0",
22+
"quasar": "^2.17.5",
2323
"vue": "^3.5.12",
2424
"vue-i18n": "^10.0.5",
2525
"vue-router": "^4.4.5"
2626
},
2727
"devDependencies": {
2828
"@intlify/vite-plugin-vue-i18n": "^7.0.0",
2929
"@quasar/app-vite": "^1.3.0",
30-
"@types/node": "^22.10.1",
30+
"@types/node": "^22.10.3",
3131
"@typescript-eslint/eslint-plugin": "^7.7.1",
3232
"@typescript-eslint/parser": "^7.18.0",
3333
"autoprefixer": "^10.4.19",
3434
"eslint": "^8.57.1",
3535
"eslint-config-prettier": "^9.1.0",
3636
"eslint-plugin-vue": "^9.32.0",
37-
"prettier": "^3.2.5",
37+
"prettier": "^3.4.2",
3838
"typescript": "^5.7.2"
3939
},
4040
"engines": {

0 commit comments

Comments
 (0)