From b11ef09363a602a2c5f554747e121ac67b7367d4 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 29 Jun 2025 06:53:45 +0500 Subject: [PATCH 1/5] Delete fabricDefaultResourcePacks.dat --- data/fabricDefaultResourcePacks.dat | Bin 34 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/fabricDefaultResourcePacks.dat diff --git a/data/fabricDefaultResourcePacks.dat b/data/fabricDefaultResourcePacks.dat deleted file mode 100644 index 9f907f8328f2fd11b435ba96ea34591bd7219161..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 mcmb2|=3oGW|BsUr9;75_d!Nzt)lFkyW|+9r;j9n?0|Nl5H3^~s From 3ad93ec494a8a68ca4a2f8844ef335849f164992 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 29 Jun 2025 06:57:17 +0500 Subject: [PATCH 2/5] .gitignore --- .gitattributes | 10 ++----- .gitignore | 71 ++++++++++++++++++++++++++------------------------ 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/.gitattributes b/.gitattributes index 3d82841f1..ca9f2d73f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,14 +2,8 @@ *.zip binary *.png binary +*.jpg binary +*.jpeg binary dumps/**/*.* linguist-generated=true *.log linguist-generated=true - -# git update-index --assume-unchanged {file} -# git update-index --no-assume-unchanged {file} - -config/packetfixer.properties -config/embeddium-options.json -config/sound_physics_remastered/occlusion.properties -config/sound_physics_remastered/reflectivity.properties \ No newline at end of file diff --git a/.gitignore b/.gitignore index 09465e5e2..91188cb4b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,11 @@ **/*.code-workspace **/*.zip +# Dev +.vs/ +.vscode/ +.idea/ + # Pakku build/ !.pakku/**/* @@ -45,43 +50,42 @@ config/stellarcore_stitcher_cache_vanilla.dat # .minecraft !bansoukou/**.zip -.vs/ -.vscode/ -.idea/ -.bobby/ -.mixin.out/ -classOut/ -backups/ -profileImage/ -crash-reports/ -logs/ -saves/ -ldlib/ -local/ -vintagefix/ -modernfix/ -XaeroWaypoints*/ -XaeroWorldMap*/ -#defaultconfigs/ -xaero/ -visualores/ -mods-carryover/ -EnderStorage/ -fancymenu_data/ -fancymenu_setups/ -downloads/ -CustomSkinLoader/ -EverlastingSkins/ -cache/ -screenshots/ -shaderpacks/ -chiselsandbits/ + +/.bobby/ +/.mixin.out/ +/classOut +/backups +/profileImage +/crash-reports +/logs +/saves +/ldlib +/local +/vintagefix +/modernfix +/XaeroWaypoints* +/XaeroWorldMap* +/xaero +/visualores +/mods-carryover +/EnderStorage +/fancymenu_data +/fancymenu_setups +/downloads +/CustomSkinLoader +/EverlastingSkins +/cache +/screenshots +/shaderpacks +/chiselsandbits +/gtceu/prospection_cache +/data # Client data bansoukou .curseclient .sl_password -./options.txt +options.txt patchouli_data.json usernamecache.json usercache.json @@ -99,7 +103,6 @@ optionsof.txt optionsshaders.txt OpenComputersMod-* hei_bookmarks.ini -gtceu/prospection_cache/ # Server data .pakku/server-overrides/libraries @@ -108,4 +111,4 @@ gtceu/prospection_cache/ .pakku/server-overrides/groovy .pakku/server-overrides/scripts .pakku/server-overrides/mods -.pakku/server-overrides/user_jvm_args.txt \ No newline at end of file +.pakku/server-overrides/user_jvm_args.txt From 12b88c27ae808139e5a636e28062352fad257c38 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 29 Jun 2025 06:58:19 +0500 Subject: [PATCH 3/5] .gitignore --- .gitignore | 2 ++ icon.png | Bin 2441 -> 0 bytes 2 files changed, 2 insertions(+) delete mode 100644 icon.png diff --git a/.gitignore b/.gitignore index 91188cb4b..14f6d4224 100644 --- a/.gitignore +++ b/.gitignore @@ -103,6 +103,7 @@ optionsof.txt optionsshaders.txt OpenComputersMod-* hei_bookmarks.ini +icon.png # Server data .pakku/server-overrides/libraries @@ -112,3 +113,4 @@ hei_bookmarks.ini .pakku/server-overrides/scripts .pakku/server-overrides/mods .pakku/server-overrides/user_jvm_args.txt + diff --git a/icon.png b/icon.png deleted file mode 100644 index fdaf5f4e87149d1fe323864167999eed4326909d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2441 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+I14-?iy0XBj({-ZRBb+K z1_n-RPZ!6KiaBrR#&*Ppiyr@-ad zEKYcCw)xu5^!vr%XMSz2l>BzHdj00>k=1Lr+Uq4qv?U^t+uwyVrt0h3Ufy?mUY$zv zcZKHV$=gEBIj(#Z$vd~E{GMgak3&^^%DkRUKYji@8=v}&ioO|qj2Tnz9+Oi}f0UXO zRr2JVUFD0b<)_!|F=732^lAF{!w*e3jx(gBUd{d^FW2*#!{X;t^}3R^JzVW!3~3jn zPoLlG@Zde;44sAk$KHLBD0!vbUiX7buwq76TTsLN{eRbHo|AsgF++Np++qnHogiiV ze^-y!-_eY6Ph`Cz_vbpNMbH+$#;0#yrIrBVf+_ZBnseF#&3vwo31gS$ok zoMgRkhT=gD*Qd{~W=#8bymRMU!@$MYW?k2_-)(>TgZqrb=6PTC96z{x%Ed-2H}&?* zInDNcK9de-G8{MMU#WB8{IvP=Rr$gb3;*qSH1m#ge6UJ)h#f<*#X*O#t&fxI<$q2$ zY#076b(nu~F;nOBV-6m_cORGU2tBv6g3Dt67oX}?rklA=zwNiKEPwp&cpsph`VOX78g;P~`={Pu`jfvk zvwza0KeOsiEpM1`j{Cv^rl~4$4NaR=O(e6vpesrnmaYNb~9sUIZTB1J} zKVi&T&EORDiE)vJgWHs@KUz+NzI{(!B2)|`0n_K}f+iL*ERDwo1r^#w+aQ%}hsWiPm;p)gTWA>uLW6sTZPGv$pKY;#P2-%)TP3ZoP)~ zb_SUzb3^y6JtgX3xa#DI^F{gr51BRQIGk09FqKkw2u^SPlzq%=4MX|5l67li?+Z+Q z8}q*NX?^*}Z5jJ`7&)BGzci}b^}Vds4UEjRx4vGzz+RPwpnej{+cjLRu_Y8mD1_5k9J&J*`nRBV}0PV2HopMUXOwT{qEKEOftN%RZr*b zQ!m|kZiNDo^KQRb^X}Fw>8<)4vD#TYitB0rL=GjjGQn>x9g z1TqLJC-FtCjbCk~jmiWR>aR1Oc0Ivj zrcrR;=Rk%+n2Wph@ghvIfJH0|~`FHV49@(-_?t zC;o{!xFK1opJ~&9z()?r>}x#!@N=DYQahigIlZ}eqQl{(>Wg&PnKN_ec}hA7sQ+W{ z_1xmU=+z76T|H&|J7*khRODaRrd-j+{{GidL;i24MRy-Etz@`#Wj4=S&YRjNoDa0A z<=V2?8Po`DGj(v63e4kJSe3@;vFmJ`Y{#V^EKVZw2db}pdd|9}tXEQbHglWWp_2;Y z9nQS<`XRfn&)u+9-;i}qf02z%^7IbQD++TNo05XFt_q|+)owV?F#VLeK)1`2?_A!x zVGU}6)mKGZG8gQUSD0wA!&7iui(uw9$t#mh_WfVGaniJ@{*0x)OeV)Ignu&B^yEG~ z@Zc=_%EtmOpBtFfmG`GD-ux=&z=8=YO((vc=acC6PIBjmitidPzwKG^zcEtAD9m?> z_ae5-IbN}T{V`>=?>s&#E@kom*^?Kved&>nE}4vMwVH+JzDqAo{Bil9*}uo_hi+Um zTxTpYgXv9SheRnuFXeRV8-mRARKvN{L@0lW|O*8j$+jqIRvU-h+hH>K-jt|dE z&L2@d&5^hLw8)HymPdBJs_-!TZRv60{~d2@|L$4erY0`1=KfLH6ZqxAyqqpE}%&G(&mV=Y}l1{a@OrTF2X1R5Kh%UX|y%M0L*tMV6kY+rAhnCOmxF z8oz&4rQ2SKDTn8uc`%QyW&de0+1rygoptLg2>LzY)|B~?5xcy6mTx&PS*W-yI9+Vo zx~%!yCe!_8ew@{2&=ae?)^X_QTf@L$55{ND1)~-g${dJxooDX#bZuCM%>4QK)0XSL zIeR|7;&Yz1N#7wI$Eh(nt;a6@(DJ zU#tFmVsED(!;6{)1)Dk!n|E9)uc-Mxd;Wiu_G6q4&lzN#o@`}a$@JxOL)d{+F{;Bweu>q+@vp`O}p)T>4+`&&xU(x`){Au zl;l0pvCHyv@5-;e+OzKLOGLC(+7cy>`Tb)ye_p&&;b&AM0|Nttr>mdKI;Vst0L=Jz AIsgCw From 04e80fe4d19a071a0ffd12958114b4691c43d93a Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 29 Jun 2025 07:03:51 +0500 Subject: [PATCH 4/5] update: config --- config/create_connected-common.toml | 6 +- config/everycomp-client.toml | 5 + config/everycomp-common.toml | 2 + config/everycomp-entries.toml | 8 + config/fallingtrees_common.json | 210 +++++++++--------- config/immersive_aircraft.json | 144 ++++++------ config/jade/plugins.json | 28 +-- config/jade/sort-order.json | 14 ++ config/modernfix-mixins.properties | 2 +- config/packetfixer.properties | 11 +- config/ponder-client.toml | 20 ++ .../soundphysics.properties | 5 + config/tfclunchbox-common.toml | 11 + config/tfg-common.toml | 4 +- config/vintageimprovements-common.toml | 3 + config/waterflasks-common.toml | 2 + 16 files changed, 273 insertions(+), 202 deletions(-) create mode 100644 config/everycomp-client.toml create mode 100644 config/ponder-client.toml create mode 100644 config/tfclunchbox-common.toml diff --git a/config/create_connected-common.toml b/config/create_connected-common.toml index 21a9c7231..a4b7ad151 100644 --- a/config/create_connected-common.toml +++ b/config/create_connected-common.toml @@ -32,12 +32,16 @@ migrateCopycatsOnInitialize = false copycat_beam = true copycat_board = true copycat_fence = true - #. fluid_vessel = true large_crank_wheel = false crank_wheel = false inventory_access_port = true inventory_bridge = true + #. + kinetic_bridge = true + cross_connector = true + redstone_link_wildcard = true + kinetic_battery = true #. #Enable/disable categories of features. Disabling a category hides all related features. Values on server override clients diff --git a/config/everycomp-client.toml b/config/everycomp-client.toml new file mode 100644 index 000000000..e6ac40a3f --- /dev/null +++ b/config/everycomp-client.toml @@ -0,0 +1,5 @@ + +[general] + #Enables the generation of dynamic assets. This is required for the mod to work properly. Turn off if you chose to add all the generated assets via datapack manually. This can speedup boot times for modpacks. Note that the generated assets will depend on loaded datapacks + generate_dynamic_assets = true + diff --git a/config/everycomp-common.toml b/config/everycomp-common.toml index 53915b7bd..17f94e37c 100644 --- a/config/everycomp-common.toml +++ b/config/everycomp-common.toml @@ -10,6 +10,8 @@ mod_version_check_packet = false #Don't touch unless you are told to debug_packet = false + #Enables the generation of dynamic assets. This is required for the mod to work properly. Turn off if you chose to add all the generated assets via datapack manually. This can speedup boot times for modpacks. Note that the generated assets will depend on loaded datapacks + generate_dynamic_assets = true [general.tooltips] #Enabled tooltips showing which mod an EC item is from diff --git a/config/everycomp-entries.toml b/config/everycomp-entries.toml index 49b24778e..8965755ac 100644 --- a/config/everycomp-entries.toml +++ b/config/everycomp-entries.toml @@ -45,11 +45,19 @@ ironwood = true ipe = true + [types.wood_type.ad_astra] + aeronos = true + strophar = true + glacian = true + [types.leaves_type] [types.leaves_type.gtceu] rubber = false + [types.leaves_type.ad_astra] + glacian = true + #Disables specific entries [entries] diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 3e2a1cb52..be10049fe 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -1,110 +1,104 @@ { - "disableCrouchMining": false, - "disableExtraToolDamage": false, - "disableExtraFoodExhaustion": false, - "treeLifetimeLength": 4.0, - "dynamicMiningSpeed": { - "disable": false, - "speedMultiplication": 0.05, - "maxSpeedMultiplication": 16.0 - }, - "trees": { - "standardTree": { - "algorithm": { - "maxLeavesRadius": 15, - "maxLogAmount": 512, - "shouldFallOnMaxLogAmount": true, - "shouldIgnorePersistentLeaves": true - }, - "logFilter": { - "whitelistedTags": [ - "minecraft:logs" - ], - "whitelist": [], - "blacklist": [] - }, - "leavesFilter": { - "whitelistedTags": [ - "minecraft:leaves" - ], - "whitelist": [], - "blacklist": [] - }, - "extraBlockFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:vine", - "minecraft:bee_nest", - "minecraft:cocoa" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [ - "minecraft:axes" - ], - "whitelist": [], - "blacklist": [] - } - }, - "verticalTree": { - "filter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:cactus", - "minecraft:bamboo" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - }, - "chorusTree": { - "enabled": true, - "filter": { - "whitelist": [ - "tfg:lunar_chorus_plant", - "tfg:lunar_chorus_flower" - ] - }, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - }, - "mushroomTree": { - "stemFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:mushroom_stem" - ], - "blacklist": [] - }, - "capFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:red_mushroom_block", - "minecraft:brown_mushroom_block", - "minecraft:shroomlight" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - } - } + "disableCrouchMining": false, + "disableExtraToolDamage": false, + "disableExtraFoodExhaustion": false, + "treeLifetimeLength": 4.0, + "dynamicMiningSpeed": { + "disable": false, + "speedMultiplication": 0.05, + "maxSpeedMultiplication": 16.0 + }, + "trees": { + "standardTree": { + "algorithm": { + "maxLeavesRadius": 15, + "maxLogAmount": 512, + "shouldFallOnMaxLogAmount": true, + "shouldIgnorePersistentLeaves": true + }, + "logFilter": { + "whitelistedTags": [ + "minecraft:logs" + ], + "whitelist": [], + "blacklist": [] + }, + "leavesFilter": { + "whitelistedTags": [ + "minecraft:leaves" + ], + "whitelist": [], + "blacklist": [] + }, + "extraBlockFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:vine", + "minecraft:bee_nest", + "minecraft:cocoa" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [ + "minecraft:axes" + ], + "whitelist": [], + "blacklist": [] + } + }, + "verticalTree": { + "filter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:cactus", + "minecraft:bamboo" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + }, + "chorusTree": { + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + }, + "mushroomTree": { + "stemFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:mushroom_stem" + ], + "blacklist": [] + }, + "capFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:red_mushroom_block", + "minecraft:brown_mushroom_block", + "minecraft:shroomlight" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + } + } } \ No newline at end of file diff --git a/config/immersive_aircraft.json b/config/immersive_aircraft.json index dfb05bf77..ae191c474 100644 --- a/config/immersive_aircraft.json +++ b/config/immersive_aircraft.json @@ -1,74 +1,74 @@ { - "enableDropsForNonPlayer": true, - "enableCrashExplosion": true, - "enableCrashBlockDestruction": false, - "enableCrashFire": false, - "crashExplosionRadius": 2.0, - "crashDamage": 2.0, - "preventKillThroughCrash": true, - "healthBarRow": 0, - "damagePerHealthPoint": 30, - "separateCamera": true, - "useThirdPersonByDefault": true, - "enableTrails": true, - "renderDistance": 192.0, - "fuelConsumption": 1.0, - "windClearWeather": 1.0, - "windRainWeather": 3.0, - "windThunderWeather": 3.0, - "repairSpeed": 0.025, - "repairExhaustion": 0.5, - "collisionDamage": true, - "collisionDamageMultiplier": 40.0, - "burnFuelInCreative": false, - "acceptVanillaFuel": true, - "useCustomKeybindSystem": true, - "showHotbarEngineGauge": true, - "weaponsAreDestructive": false, - "dropAircraft": true, - "dropInventory": true, - "dropUpgrades": false, - "regenerateHealthEveryNTicks": 0, - "requireShiftForRepair": false, - "bombBayEntity": { - "minecraft:egg": "tfc:chicken" - }, - "rotaryCannonDamage": 5.0, - "heavyCrossBowVelocity": 3.0, - "fuelList": { - "minecraft:blaze_powder": 1200, - "gtceu:coke_gem": 1200, - "beneath:cursecoal": 1200 - }, - "validDimensions": { - "minecraft:the_end": true, - "minecraft:the_nether": true, - "minecraft:overworld": true, - "ad_astra:earth_orbit": false, - "ad_astra:moon": false, - "ad_astra:moon_orbit": false, - "ad_astra:mars": false, - "ad_astra:mars_orbit": false, - "ad_astra:venus_orbit": false, - "ad_astra:mercury": false, - "ad_astra:mercury_orbit": false, - "ad_astra:glacio": false, - "ad_astra:glacio_orbit": false - }, - "gunpowderAmmunition": { - "minecraft:gunpowder": 100 - }, - "arrowAmmunition": { - "minecraft:arrow": 100, - "minecraft:spectral_arrow": 100, - "minecraft:tipped_arrow": 100 - }, - "bombBayAmmunition": { - "minecraft:tnt": 100, - "gtceu:powderbarrel": 80, - "gtceu:industrial_tnt": 50, - "gtceu:dynamite": 200 - }, - "version": 1, - "name": "immersive_aircraft" + "enableDropsForNonPlayer": true, + "enableCrashExplosion": true, + "enableCrashBlockDestruction": false, + "enableCrashFire": false, + "crashExplosionRadius": 2.0, + "crashDamage": 2.0, + "preventKillThroughCrash": true, + "healthBarRow": 0, + "damagePerHealthPoint": 30, + "separateCamera": true, + "useThirdPersonByDefault": true, + "enableTrails": true, + "renderDistance": 192.0, + "fuelConsumption": 1.0, + "windClearWeather": 1.0, + "windRainWeather": 3.0, + "windThunderWeather": 3.0, + "repairSpeed": 0.025, + "repairExhaustion": 0.5, + "collisionDamage": true, + "collisionDamageMultiplier": 40.0, + "burnFuelInCreative": false, + "acceptVanillaFuel": true, + "useCustomKeybindSystem": true, + "showHotbarEngineGauge": true, + "weaponsAreDestructive": false, + "dropAircraft": true, + "dropInventory": true, + "dropUpgrades": false, + "regenerateHealthEveryNTicks": 0, + "requireShiftForRepair": false, + "bombBayEntity": { + "minecraft:egg": "tfc:chicken" + }, + "rotaryCannonDamage": 5.0, + "heavyCrossBowVelocity": 3.0, + "fuelList": { + "minecraft:blaze_powder": 1200, + "gtceu:coke_gem": 1200, + "beneath:cursecoal": 1200 + }, + "validDimensions": { + "minecraft:the_end": true, + "minecraft:the_nether": true, + "minecraft:overworld": true, + "ad_astra:earth_orbit": false, + "ad_astra:moon": false, + "ad_astra:moon_orbit": false, + "ad_astra:mars": false, + "ad_astra:mars_orbit": false, + "ad_astra:venus_orbit": false, + "ad_astra:mercury": false, + "ad_astra:mercury_orbit": false, + "ad_astra:glacio": false, + "ad_astra:glacio_orbit": false + }, + "gunpowderAmmunition": { + "minecraft:gunpowder": 100 + }, + "arrowAmmunition": { + "minecraft:arrow": 100, + "minecraft:spectral_arrow": 100, + "minecraft:tipped_arrow": 100 + }, + "bombBayAmmunition": { + "minecraft:tnt": 100, + "gtceu:powderbarrel": 80, + "gtceu:industrial_tnt": 50, + "gtceu:dynamite": 200 + }, + "version": 1, + "name": "immersive_aircraft" } \ No newline at end of file diff --git a/config/jade/plugins.json b/config/jade/plugins.json index 5be59cf91..91ce866aa 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -57,6 +57,16 @@ "greate": { "belt_icon": true }, + "jadeaddons.create": { + "filter": true, + "backtank_capacity": true, + "goggles.requires_goggles": true, + "goggles": false, + "blaze_burner": true, + "exact_block": true, + "goggles.detailed": false, + "placard": true + }, "gtceu": { "primitive_pump": true, "auto_output_info": true, @@ -97,9 +107,6 @@ "jade_chamber": true, "jade_wireless": true }, - "lootr": { - "info": true - }, "balm": { "jade": true }, @@ -195,20 +202,15 @@ "lightroom": true, "photograph_frame": true }, - "create": { - "filter": true, - "backtank_capacity": true, - "goggles.requires_goggles": true, - "goggles": false, - "blaze_burner": true, - "exact_block": true, - "crafting_blueprint": true, - "goggles.detailed": false, - "placard": true + "jadeaddons.lootr": { + "info": true }, "corpse": { "corpse": true }, + "afc": { + "tap": true + }, "tfc_support_indicator": { "support_indicator": true } diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index 38fbee204..e12840532 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -10,6 +10,7 @@ "ae2:pattern_provider": null, "ae2:power_storage": null, "ae2:server_data": null, + "afc:tap": null, "alekiships:block": null, "alekiships:brewing_stand": null, "alekiships:furnace": null, @@ -89,6 +90,19 @@ "jade:mod_name": null, "jade:object_name": null, "jade:registry_name": null, + "jadeaddons.create:backtank_capacity": null, + "jadeaddons.create:blaze_burner": null, + "jadeaddons.create:contraption_inv": null, + "jadeaddons.create:crafting_blueprint": null, + "jadeaddons.create:exact_block": null, + "jadeaddons.create:filter": null, + "jadeaddons.create:goggles": null, + "jadeaddons.create:hide_boiler_tanks": null, + "jadeaddons.create:package": null, + "jadeaddons.create:placard": null, + "jadeaddons.create:table_cloth": null, + "jadeaddons.lootr:info": null, + "jadeaddons.lootr:inventory": null, "lootr:info": null, "lootr:inventory": null, "minecraft:animal_owner": null, diff --git a/config/modernfix-mixins.properties b/config/modernfix-mixins.properties index e4ddb82e0..15abb4d5a 100644 --- a/config/modernfix-mixins.properties +++ b/config/modernfix-mixins.properties @@ -48,6 +48,7 @@ # mixin.feature.snapshot_easter_egg=true # (default) # mixin.feature.spam_thread_dump=false # (default) # mixin.feature.spark_profile_launch=false # (default) +# mixin.feature.spark_profile_world_join=false # (default) # mixin.feature.stalled_chunk_load_detection=false # (default) # mixin.feature.warn_missing_perf_mods=true # (default) # mixin.launch.class_search_cache=true # (default) @@ -90,7 +91,6 @@ # mixin.perf.memoize_creative_tab_build=true # (default) # mixin.perf.model_optimizations=true # (default) # mixin.perf.mojang_registry_size=true # (default) -# mixin.perf.nbt_memory_usage=true # (default) # mixin.perf.patchouli_deduplicate_books=true # (default) # mixin.perf.potential_spawns_alloc=true # (default) # mixin.perf.reduce_blockstate_cache_rebuilds=true # (default) diff --git a/config/packetfixer.properties b/config/packetfixer.properties index 3145d4309..193a22b4a 100644 --- a/config/packetfixer.properties +++ b/config/packetfixer.properties @@ -1,15 +1,16 @@ #Packet Fixer config file. #Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 8388608 and varInt21Size 3. #Max values are 2147483647 for packetSize/decoderSize/varInt21 and 9223372036854775807 for nbtMaxSize. -#Fri May 30 02:48:38 YEKT 2025 -chunkPacketData=2097152 -varLong=10 -nbtMaxSize=209715200 +#Sun Jun 29 07:00:58 YEKT 2025 utfSize=3276700 allSizesUnlimited=true -decoderSize=838860800 +forceUnlimitedNbtEnabled=false packetSize=104857600 stringSize=32767 timeout=90 varInt21=8 varInt=5 +chunkPacketData=2097152 +varLong=10 +nbtMaxSize=209715200 +decoderSize=838860800 diff --git a/config/ponder-client.toml b/config/ponder-client.toml new file mode 100644 index 000000000..dbf745d91 --- /dev/null +++ b/config/ponder-client.toml @@ -0,0 +1,20 @@ +#. +#Slow down a ponder scene whenever there is text on screen. +comfyReading = false +#. +#Show additional info in the ponder view and reload scene scripts more frequently. +editingMode = false + +#. +#Settings for the Placement Assist +[placementAssist] + #. + #What indicator should be used when showing where the assisted placement ends up relative to your crosshair + #Choose 'NONE' to disable the Indicator altogether + #Allowed Values: TEXTURE, TRIANGLE, NONE + indicatorType = "TEXTURE" + #. + #Change the size of the Indicator by this multiplier + #Range: 0.0 ~ 3.4028234663852886E38 + indicatorScale = 1.0 + diff --git a/config/sound_physics_remastered/soundphysics.properties b/config/sound_physics_remastered/soundphysics.properties index beafe0e1f..228bac625 100644 --- a/config/sound_physics_remastered/soundphysics.properties +++ b/config/sound_physics_remastered/soundphysics.properties @@ -5,6 +5,9 @@ enabled=true # This setting requires you to be in singleplayer or having the mod installed on the server # 1.0 is the physically correct value attenuation_factor=1.0 +# The ray distance at which reverb starts +# 0.0 disables reverb attenuation +reverb_attenuation_distance=0.0 # The volume of simulated reverberations reverb_gain=1.0 # The brightness of reverberation @@ -67,6 +70,8 @@ update_moving_sounds=false # Lower values mean more frequent reevaluation but also more lag # This option only takes effect if update_moving_sounds is enabled sound_update_interval=5 +# The maximum distance a sound can be processed +max_sound_processing_distance=512.0 # Disable level clone and cache. This will fall back to original main thread access. # WARNING! Enabling this will cause instability and issues with other mods. unsafe_level_access=false diff --git a/config/tfclunchbox-common.toml b/config/tfclunchbox-common.toml new file mode 100644 index 000000000..c86de5217 --- /dev/null +++ b/config/tfclunchbox-common.toml @@ -0,0 +1,11 @@ + +#Food Traits Configuration +#NOTE: Changes to trait values require game restart to take effect +[food_traits] + #Decay modifier for COOLED trait (lower = food lasts longer) + #Range: 0.01 ~ 1.0 + cooled_decay_modifier = 0.3 + #Decay modifier for PRESERVED trait (lower = food lasts longer) + #Range: 0.01 ~ 1.0 + preserved_decay_modifier = 0.55 + diff --git a/config/tfg-common.toml b/config/tfg-common.toml index c3f5d5d5d..58a16f7ed 100644 --- a/config/tfg-common.toml +++ b/config/tfg-common.toml @@ -1,5 +1,5 @@ -#Should create compatibility be enabled? +#Should be create compat enabled? createCompat = true -#Should TFC ambiental compatibility be enabled? +#Should be tfc ambiental compat enabled? tfcAmbientalCompat = true diff --git a/config/vintageimprovements-common.toml b/config/vintageimprovements-common.toml index ffe153b27..b16196cd0 100644 --- a/config/vintageimprovements-common.toml +++ b/config/vintageimprovements-common.toml @@ -6,4 +6,7 @@ #Defines default Belt Grinder appearance #Range: 0 ~ 4 defaultBeltGrinderSkin = 0 + #. + #You can insert and extract from the Centrifuge while it is working. + easyCentrifuge = false diff --git a/config/waterflasks-common.toml b/config/waterflasks-common.toml index 3c7af8798..a1179c27e 100644 --- a/config/waterflasks-common.toml +++ b/config/waterflasks-common.toml @@ -1,4 +1,6 @@ #Settings for Water Flasks #Allow drinking when not thirsty? Could be useful or wasteful if that's not water in there... Default False thirstyDrinking = false +#Empty flask when shift-right-clicked? Generally a useful feature, but does annoy a certain streamer... Default True +shiftClickToEmpty = true From f7ec600f13a9f308bce56c6a002231a711c0ff8d Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Sun, 29 Jun 2025 14:02:42 -0500 Subject: [PATCH 5/5] Modern markings integration (#1228) * - Lots of ui updates. And a couple fixes. * - New button textures. - Fixed campfire loot table. - Made anvil rod recipes easier. - Added assembler recipes for multiblock tank parts. * - Added assembler recipes for multiblock tank parts. * - Updated Changelog * - Some more UI tweaks. - Added modern-markings mod with integration. --------- Co-authored-by: Pyritie --- .../fancymenu/customization/gui_main_menu.txt | 652 +++++++++--------- .../new_loading_screen/properties.txt | 1 + .../tfg/textures/gui/curseforge_logo.png | Bin 666 -> 470 bytes .../textures/gui/curseforge_logo_hovered.png | Bin 707 -> 496 bytes .../assets/tfg/textures/gui/discord_logo.png | Bin 750 -> 536 bytes .../tfg/textures/gui/discord_logo_hovered.png | Bin 779 -> 553 bytes .../assets/tfg/textures/gui/github_logo.png | Bin 730 -> 507 bytes .../tfg/textures/gui/github_logo_hovered.png | Bin 727 -> 491 bytes .../assets/tfg/textures/gui/modrinth_logo.png | Bin 822 -> 538 bytes .../textures/gui/modrinth_logo_hovered.png | Bin 856 -> 580 bytes kubejs/server_scripts/main_server_script.js | 2 + .../server_scripts/modern_markings/recipes.js | 30 + kubejs/server_scripts/modern_markings/tags.js | 128 ++++ .../modern_markings/constants.js | 5 + pakku-lock.json | 36 + 15 files changed, 528 insertions(+), 326 deletions(-) create mode 100644 kubejs/server_scripts/modern_markings/recipes.js create mode 100644 kubejs/server_scripts/modern_markings/tags.js create mode 100644 kubejs/startup_scripts/modern_markings/constants.js diff --git a/config/fancymenu/customization/gui_main_menu.txt b/config/fancymenu/customization/gui_main_menu.txt index b50e2292b..775417978 100644 --- a/config/fancymenu/customization/gui_main_menu.txt +++ b/config/fancymenu/customization/gui_main_menu.txt @@ -3,13 +3,13 @@ type = fancymenu_layout layout-meta { identifier = title_screen render_custom_elements_behind_vanilla = false - last_edited_time = 1751008826207 + last_edited_time = 1751139900053 is_enabled = true randommode = false randomgroup = 1 randomonlyfirsttime = false layout_index = 0 - [loading_requirement_container_meta:faf4d8c0-8425-41f5-b4d1-f34dc0422311-1751008738382] = [groups:][instances:] + [loading_requirement_container_meta:972392c6-4578-4095-8eaa-d43d3f172baa-1751139875370] = [groups:][instances:] } menu_background { @@ -471,15 +471,15 @@ element { } vanilla_button { - button_element_executable_block_identifier = 3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072 - [executable_block:3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072][type:generic] = [executables:] + button_element_executable_block_identifier = bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072 + [executable_block:bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072][type:generic] = [executables:] restartbackgroundanimations = true nine_slice_custom_background = false nine_slice_border_x = 5 nine_slice_border_y = 5 navigatable = true - widget_active_state_requirement_container_identifier = b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072 - [loading_requirement_container_meta:b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072] = [groups:][instances:] + widget_active_state_requirement_container_identifier = 95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072 + [loading_requirement_container_meta:95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072] = [groups:][instances:] is_template = false template_apply_width = false template_apply_height = false @@ -493,7 +493,64 @@ vanilla_button { nine_slice_slider_handle_border_x = 5 nine_slice_slider_handle_border_y = 5 element_type = vanilla_button - instance_identifier = minecraft_logo_widget + instance_identifier = title_screen_copyright_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 2168 + auto_sizing_base_screen_height = 968 + sticky_anchor = false + anchor_point = bottom-left + x = 5 + y = 4 + width = 196 + height = 10 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072 + [loading_requirement_container_meta:6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072 + [executable_block:17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 01242da9-e8ac-43c4-b553-a11988b0621e-1746358841072 + [loading_requirement_container_meta:01242da9-e8ac-43c4-b553-a11988b0621e-1746358841072] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = minecraft_branding_widget appearance_delay = no_delay appearance_delay_seconds = 1.0 fade_in_v2 = no_fading @@ -506,187 +563,15 @@ vanilla_button { auto_sizing_base_screen_height = 0 sticky_anchor = false anchor_point = vanilla - x = 288 - y = 30 - width = 256 - height = 51 + x = 2 + y = 423 + width = 128 + height = 49 stretch_x = false stretch_y = false stay_on_screen = false - element_loading_requirement_container_identifier = 7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072 - [loading_requirement_container_meta:7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = true - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = 8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345 - [executable_block:8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345][type:generic] = [executables:] - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = 1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087 - [loading_requirement_container_meta:1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = mc_titlescreen_accessibility_button - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 - sticky_anchor = false - anchor_point = vanilla - x = 520 - y = 250 - width = 20 - height = 20 - stretch_x = false - stretch_y = false - stay_on_screen = false - element_loading_requirement_container_identifier = f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345 - [loading_requirement_container_meta:f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = true - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = 0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072 - [executable_block:0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072][type:generic] = [executables:] - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072 - [loading_requirement_container_meta:b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = minecraft_splash_widget - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 - sticky_anchor = false - anchor_point = vanilla - x = 489 - y = 49 - width = 100 - height = 40 - stretch_x = false - stretch_y = false - stay_on_screen = false - element_loading_requirement_container_identifier = 223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072 - [loading_requirement_container_meta:223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = true - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = d29af260-9081-410f-86cc-eca92eb2161b-1710837053345 - [executable_block:d29af260-9081-410f-86cc-eca92eb2161b-1710837053345][type:generic] = [executables:] - backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/modrinth_logo.png - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = a23ac421-e3aa-452e-bcd0-a7b01a605883-1738509235087 - [loading_requirement_container_meta:a23ac421-e3aa-452e-bcd0-a7b01a605883-1738509235087] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = 376322 - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 - sticky_anchor = false - anchor_point = mid-centered - x = 72 - y = 18 - width = 20 - height = 20 - stretch_x = false - stretch_y = false - stay_on_screen = false - element_loading_requirement_container_identifier = 59eca2f8-b704-4a42-b2d3-101e17f6e61e-1710837053345 - [loading_requirement_container_meta:59eca2f8-b704-4a42-b2d3-101e17f6e61e-1710837053345] = [groups:][instances:] + element_loading_requirement_container_identifier = a04d6611-e8bf-4d12-8483-05bfa180ee5b-1746358841072 + [loading_requirement_container_meta:a04d6611-e8bf-4d12-8483-05bfa180ee5b-1746358841072] = [groups:][instances:] enable_parallax = false parallax_intensity = 0.5 invert_parallax = false @@ -758,6 +643,63 @@ vanilla_button { automated_button_clicks = 0 } +vanilla_button { + button_element_executable_block_identifier = 8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345 + [executable_block:8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087 + [loading_requirement_container_meta:1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = mc_titlescreen_accessibility_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 520 + y = 250 + width = 20 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = false + element_loading_requirement_container_identifier = f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345 + [loading_requirement_container_meta:f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = true + automated_button_clicks = 0 +} + vanilla_button { button_element_executable_block_identifier = 4fd9e559-3c06-41dc-ae8f-7a2ebaf224c9-1710837053345 [executable_block:4fd9e559-3c06-41dc-ae8f-7a2ebaf224c9-1710837053345][type:generic] = [executables:] @@ -817,6 +759,177 @@ vanilla_button { automated_button_clicks = 0 } +vanilla_button { + button_element_executable_block_identifier = 785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345 + [executable_block:785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087 + [loading_requirement_container_meta:98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = mc_titlescreen_realms_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = mid-centered + x = 47 + y = -5 + width = 98 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = false + element_loading_requirement_container_identifier = 7c454c53-713f-4c87-97e8-288da3eba763-1710837053345 + [loading_requirement_container_meta:7c454c53-713f-4c87-97e8-288da3eba763-1710837053345] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = true + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072 + [executable_block:3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072 + [loading_requirement_container_meta:b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = minecraft_logo_widget + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 288 + y = 30 + width = 256 + height = 51 + stretch_x = false + stretch_y = false + stay_on_screen = false + element_loading_requirement_container_identifier = 7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072 + [loading_requirement_container_meta:7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = true + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072 + [executable_block:0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072 + [loading_requirement_container_meta:b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = minecraft_splash_widget + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 489 + y = 49 + width = 100 + height = 40 + stretch_x = false + stretch_y = false + stay_on_screen = false + element_loading_requirement_container_identifier = 223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072 + [loading_requirement_container_meta:223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = true + automated_button_clicks = 0 +} + vanilla_button { button_element_executable_block_identifier = 829507fa-6c1f-46c8-94ea-4c4d8275a324-1710837053345 [executable_block:829507fa-6c1f-46c8-94ea-4c4d8275a324-1710837053345][type:generic] = [executables:] @@ -934,15 +1047,17 @@ vanilla_button { } vanilla_button { - button_element_executable_block_identifier = 785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345 - [executable_block:785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345][type:generic] = [executables:] + button_element_executable_block_identifier = c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345 + [executable_block:c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345][type:generic] = [executables:] + backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button_98x20.png + backgroundhovered = [source:location]tfg:textures/gui/button_hover_98x20.gif restartbackgroundanimations = true nine_slice_custom_background = false nine_slice_border_x = 5 nine_slice_border_y = 5 navigatable = true - widget_active_state_requirement_container_identifier = 98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087 - [loading_requirement_container_meta:98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087] = [groups:][instances:] + widget_active_state_requirement_container_identifier = 6e4a2784-5288-4825-8c7e-69972c4d322e-1738509235087 + [loading_requirement_container_meta:6e4a2784-5288-4825-8c7e-69972c4d322e-1738509235087] = [groups:][instances:] is_template = false template_apply_width = false template_apply_height = false @@ -956,7 +1071,7 @@ vanilla_button { nine_slice_slider_handle_border_x = 5 nine_slice_slider_handle_border_y = 5 element_type = vanilla_button - instance_identifier = mc_titlescreen_realms_button + instance_identifier = mc_titlescreen_quit_button appearance_delay = no_delay appearance_delay_seconds = 1.0 fade_in_v2 = no_fading @@ -965,19 +1080,19 @@ vanilla_button { fade_out_speed = 1.0 base_opacity = 1.0 auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 + auto_sizing_base_screen_width = 2496 + auto_sizing_base_screen_height = 1419 sticky_anchor = false anchor_point = mid-centered - x = 47 - y = -5 + x = -100 + y = 37 width = 98 height = 20 stretch_x = false stretch_y = false stay_on_screen = false - element_loading_requirement_container_identifier = 7c454c53-713f-4c87-97e8-288da3eba763-1710837053345 - [loading_requirement_container_meta:7c454c53-713f-4c87-97e8-288da3eba763-1710837053345] = [groups:][instances:] + element_loading_requirement_container_identifier = a9f8d43c-d00b-4db2-ada7-81fa3a121de1-1710837053345 + [loading_requirement_container_meta:a9f8d43c-d00b-4db2-ada7-81fa3a121de1-1710837053345] = [groups:][instances:] enable_parallax = false parallax_intensity = 0.5 invert_parallax = false @@ -986,64 +1101,7 @@ vanilla_button { load_once_per_session = false in_editor_color = #FFC800FF layer_hidden_in_editor = false - is_hidden = true - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = 17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072 - [executable_block:17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072][type:generic] = [executables:] - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = 01242da9-e8ac-43c4-b553-a11988b0621e-1746358841072 - [loading_requirement_container_meta:01242da9-e8ac-43c4-b553-a11988b0621e-1746358841072] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = minecraft_branding_widget - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 - sticky_anchor = false - anchor_point = vanilla - x = 2 - y = 423 - width = 128 - height = 49 - stretch_x = false - stretch_y = false - stay_on_screen = false - element_loading_requirement_container_identifier = a04d6611-e8bf-4d12-8483-05bfa180ee5b-1746358841072 - [loading_requirement_container_meta:a04d6611-e8bf-4d12-8483-05bfa180ee5b-1746358841072] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = true + is_hidden = false automated_button_clicks = 0 } @@ -1107,17 +1165,16 @@ vanilla_button { } vanilla_button { - button_element_executable_block_identifier = c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345 - [executable_block:c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345][type:generic] = [executables:] - backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button_98x20.png - backgroundhovered = [source:location]tfg:textures/gui/button_hover_98x20.gif + button_element_executable_block_identifier = d29af260-9081-410f-86cc-eca92eb2161b-1710837053345 + [executable_block:d29af260-9081-410f-86cc-eca92eb2161b-1710837053345][type:generic] = [executables:] + backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/modrinth_logo.png restartbackgroundanimations = true nine_slice_custom_background = false nine_slice_border_x = 5 nine_slice_border_y = 5 navigatable = true - widget_active_state_requirement_container_identifier = 6e4a2784-5288-4825-8c7e-69972c4d322e-1738509235087 - [loading_requirement_container_meta:6e4a2784-5288-4825-8c7e-69972c4d322e-1738509235087] = [groups:][instances:] + widget_active_state_requirement_container_identifier = a23ac421-e3aa-452e-bcd0-a7b01a605883-1738509235087 + [loading_requirement_container_meta:a23ac421-e3aa-452e-bcd0-a7b01a605883-1738509235087] = [groups:][instances:] is_template = false template_apply_width = false template_apply_height = false @@ -1131,7 +1188,7 @@ vanilla_button { nine_slice_slider_handle_border_x = 5 nine_slice_slider_handle_border_y = 5 element_type = vanilla_button - instance_identifier = mc_titlescreen_quit_button + instance_identifier = 376322 appearance_delay = no_delay appearance_delay_seconds = 1.0 fade_in_v2 = no_fading @@ -1140,19 +1197,19 @@ vanilla_button { fade_out_speed = 1.0 base_opacity = 1.0 auto_sizing = false - auto_sizing_base_screen_width = 2496 - auto_sizing_base_screen_height = 1419 + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 sticky_anchor = false anchor_point = mid-centered - x = -100 - y = 37 - width = 98 + x = 72 + y = 18 + width = 20 height = 20 stretch_x = false stretch_y = false stay_on_screen = false - element_loading_requirement_container_identifier = a9f8d43c-d00b-4db2-ada7-81fa3a121de1-1710837053345 - [loading_requirement_container_meta:a9f8d43c-d00b-4db2-ada7-81fa3a121de1-1710837053345] = [groups:][instances:] + element_loading_requirement_container_identifier = 59eca2f8-b704-4a42-b2d3-101e17f6e61e-1710837053345 + [loading_requirement_container_meta:59eca2f8-b704-4a42-b2d3-101e17f6e61e-1710837053345] = [groups:][instances:] enable_parallax = false parallax_intensity = 0.5 invert_parallax = false @@ -1161,64 +1218,7 @@ vanilla_button { load_once_per_session = false in_editor_color = #FFC800FF layer_hidden_in_editor = false - is_hidden = false - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072 - [executable_block:bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072][type:generic] = [executables:] - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = 95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072 - [loading_requirement_container_meta:95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = title_screen_copyright_button - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 2168 - auto_sizing_base_screen_height = 968 - sticky_anchor = false - anchor_point = bottom-left - x = 5 - y = 4 - width = 196 - height = 10 - stretch_x = false - stretch_y = false - stay_on_screen = true - element_loading_requirement_container_identifier = 6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072 - [loading_requirement_container_meta:6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = false + is_hidden = true automated_button_clicks = 0 } diff --git a/config/fancymenu/slideshows/new_loading_screen/properties.txt b/config/fancymenu/slideshows/new_loading_screen/properties.txt index 625dcbba4..06b79d18c 100644 --- a/config/fancymenu/slideshows/new_loading_screen/properties.txt +++ b/config/fancymenu/slideshows/new_loading_screen/properties.txt @@ -8,4 +8,5 @@ slideshow-meta { y = 0 duration = 5.0 fadespeed = 12.0 + randomize = true } \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo.png b/kubejs/assets/tfg/textures/gui/curseforge_logo.png index 86829dad259664b08eb24dd079811beee5854951..5dbf64d3d4d78584172e6b534027a5849de1cd82 100644 GIT binary patch delta 459 zcmbQmdW~7JGr-TCmrII^fq{Y7)59f*fq_8;ggMw47#MmxWqBtmiq|uCc)B=-SoE%) zY?yt>L85KGNPE-ixBoa|xi-#>;odg6enGJ2ltsEhUfa@&Cg#n3l_$Q^ULiO{K=CKL zQpxKA@8_=*-tCYO=Kk8+y!*GF|Gw|P-_5yL!L-1lZ%!9$@jvhA+WZo$Q;@cN;1Qj^#@ym>4L$XK z8iBL6ZruO;`Oafgn6{ea@S7|TT5#9)zzx02dA!CO`ktqL^JxowqUQ8RHez}ZZ_WHV zfhS3_=NCV&6ma#rej{w*(>j3(92+k%Cp`GA7PmUgGIo8j|2Bb)*xs~Qukr`KXL{#m z=IL`~XB-qcaP{%y#>J`*zpu`ybQCU2z4vLppW^h4tv|!8oZa>N6rPLoG;Ubb_>ZfM Qfq{X+)78&qol`;+0Oj`5B>(^b delta 656 zcmcb{Jd0JaGr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEA6t8FU@pN$viD*4L zePi}*2a#j@wK+w$+?n7j@JHT5fTzpoX0l?e)AKj20&^VN9$gG>>&TfawQHFOQ)Ay% z5$gn=OEb=DR=h6gR+w!Sv3$-uze^`QL+U3BJpWz${_gJYIz^?m%|4p9L>U{(b)7|X z9eU?%VVw8(=WM3zNsQ~ll%{X3x09SPSI%@FYq!e9egA)aon2^l^6FP!_Q^M223FZf zya<2yo_YKBtI%Qekkwgy-}3yWQMA{(e(@ zckPv95VI{Fn7X`0;j>wbbob0;RJX1- zd{ij%)bvB0-S=5FVdQ&MBb@0Fd}7CjbBd diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png index da36fc2d8ffe7c0bf27dda004af1811d0a2e6726..515a02c766cea032e099ab64342bb71c652f964b 100644 GIT binary patch delta 485 zcmX@i`hi)oGr-TCmrII^fq{Y7)59f*fq_8;ggMw47#MmxWqBtmiq|tP@^o$$U=J*F5T9(QRUC^@F)9nEmA={Q&Ky!3TnjN(I}U99aZiE^M?{2=Iu0 zG3i`v%#zo-rMB$F$Cu_VTA?pCDF*2{|1>yB1rdi5%Dbpcb&G zo-1Kj4*Sm&-kI#I;c;Rd9 z=Kaw+oBn>=R+ehqcx`#0rsvDDTKlho(Ned&&q!HE8L$>y%Bd?hVb8cPWqdy4(5fRF uE{FZOd_FW?B}-;U-_fMc8yFZE7(8A5T-G@yGywpR9O7O8 delta 698 zcmeyse3(_SGr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEA6t8D0^>lFziD*4K z-9G!agTyg;(cL0f9$s5;R9-jN=Xm zyG>O#3h(hq{_yB%%3jwa!B-AixmwNrw{+TPpZ1bV?{|K`R~_#+>-=+uhUv4j`J=C# zySR~sA$}XD=t`xCom+}aVyu3=sejPU&LDd6^z_-UgBC1mZRPb?8esh8r{w{*{p;&Q z?O469i`u=nw|&}|maxE9&YSu0hg);|DxN)5EU2FS^YG<3{kl4$%KM^w>p=cFmlM$6W+;VV4>~gnLFcaL))^o#Y*j+cLXJ7q(!wh zzY0IKVV)*yJ%?xR*_mu1Ube2>cY7y)J%}=xX|yv~Yda)+7I)cQLT@hY9+O_eUVKp_Q*M9#&e^>BWy(oh zUWJj{7wUvQxZlw>-I;&-;oMD2KmXo+ez)Y@`}Y|c{xM1vXxa+oACR2Kz`(%Z>FVdQ I&MBb@08T49UH||9 diff --git a/kubejs/assets/tfg/textures/gui/discord_logo.png b/kubejs/assets/tfg/textures/gui/discord_logo.png index 09491fdee4743daaa185de02c73eeb8c9c486e3b..49e63a2250c8b0f950f906ddf9f8f49f6a0d9e35 100644 GIT binary patch delta 525 zcmaFII)g>AGr-TCmrII^fq{Y7)59f*fq_8;ggMw47#MmxWqBtmiq|uq@^oMRq(&DGjab~{{2vJheTi8s49Bh?>l?I>2Z`&7Unsh32cBD!)s7b@_f)?nH${>g%~81t+CD zF6*rdDGYM%l;=EfYPuF5!`sEe>-4r&>Bo!TsY&+HI1s+Ht6A(<-s(um;-j5fOvajJ&#q~nTj7dahRxJ|W8pMIE8GWlmkOl*#->BY9B_YVRLm(JII iv5@1lL94)j#sak?+26UM&N47CFnGH9xvXp1+XqM@ur8_(qUPuwJ zG6{2;e6)ApV>WQ1-Y!PPJFq`e0_<={cdf^iqET# z*v4qTo$cL!C?@y)=HF#YYmTj*wt3RTsp9KXnHT*yoi6CZ+Sn|wtn!Z4K$N9nLte)< zpYJ>J%(7ThrB0b1NXz5=XL&9B`9%F|Q%`zwUbtcZCeHG!-+!+qN@9j@(%-db=p@xA z)RxLM%xNhTuP{xW^ZFCVtSIK}rM1RFbN7Z_p1tU@`NU{Hh4?kgGw&8l^ZDsBGA!;^ zWKa;ATl%z5uZ@Gn*-zJ|ING%|sKB;kMa9-RxuK_ThVB1;dFAROtDoj{&s=I-azRSq z=-Z-YQRk%Qmi1@*9A(VDUw+FrJn`g#n?IXY)^|;a3*WG%kt9eg`jVji99 zXgzrHz~tqR40`i#zfWZrnRWDYxI?cc+pgpLr>GstWoGyoaHs*4?_JPvH$vVA$@UQPy&6)*ZaKlIF79vy$Hxr4XjyV*^l z$GxhHPt_aFEj#b|@ZI%~4|N2Kf yr?JnG`bNeR=V}@@T8RIu=hQhD8SlHFarrFkX9kbV)-W(IFnGH9xvX8Q|y6%O%Cdz`(%k>ERN@z`!5^!W?W23=F-Uvb+-&#p@Ywd%8G=SoE%) zx<6YuQR29Lz6IAtXK~Fficb7K#wjn$W^S3b?&XU|3LK4(rX38NBU>Wa#rKcjGJ`#P z@)fZtfgHs}xdH9m`mK4TIwtE6SHFK+`@YEgEVJaNz3+cl&X3>OvHq{L-g>UCmn|Q3 zX3Ur`{a5_$)79rs85=a5UVUh7y+fJO&X#{K1HSsV&kTF=Qq89L@Z;X!3?|XGtQ)>9 zU^#GaU$w>B`ijp1Gty6MM^|jydGpoE=l-YfXuf)Xzph8f!RlC*|IGmXT%P@RQuxA8 z-LgNi{tL&7=BtO(RxdyG?~%**gcU`Jsr3`xr4uL2R&3a_BkjXqeumYrL!U>MfA>kR zkNvEvduGYzGfcc|F6YT)tMc${*~a zbNkIFzm}{@QR!q`UwU$X-T$Qld%QCf)&7Mv8cdj2q9&NWFh!;EQ%>%qTtEJ&M@ugW z-!(5+c+40&*SM_Xt@F}n&)pvVJwAU`&}YUu3vXzbFk0;TSYFO&VSm#`@0=d%yi^f^ zRbFS^r4KK-oY&#EoAIO9jEK0Krw%Z@3ys^MD!oE=X1qg{z^dKF3=<9{^`Cl^xJS)B z^KReg$!E8y?+nP1*E%{SZry_AI`{VeHQBnqp?;RsMZHTkeJ%_P3=E#GelF{r5}E+1 CxdKQ4 delta 770 zcmZ3<(#@vW8Q|y6%O%Cdz`(%k>ERN@z`&pY!W?W23=G9pRbM75iq|vk^>lFziD*3< zZkrJtC}FG5qFDMOh%2|_LW4eM%E@Uwm;P+&b~f5&;nC9e=-R6v@Y+}Q`)H{}|^@-J!yVHOFj_X#l4gPU&=Y7lX)%X9#t^4@)I0HjL zm7Ky1rDy5wYz!>RG*>wVY%H!%t}C-Be3*XKpM{}mRr~VilQny?lGiXME3LBI@l$Sr zeaZXU>g&&{mTZvuwnpUi_s2zS3=bS%>U}TBO>P&Nc6eT!%Z8d$xmPw#ni#Q4Pg>yU ze4DNWHI|zHmM%4#4KoE8T1vgQr1AAfExD_swR+(j#$BH$KG?rF$WI|YOH*4tw7x<2 z_ilb>^SrO@N}_2;3g%Vv2O1|W2=Zf?puNzRwa!!X`6?T>>L})HX=@ds*gZj)ULSfT z{3Pu0iRn?9X6tgDxPCtoVldca!OY;YsC(X>hesuu7FwE%#qC(SXjkY58J9H`i>JLc z$-3#c|NHIU)kmba=CsdBEq<}URH4iIq0i#_X{KxP`n}I|F)uF8FRh+;Xj0?b*x4&i zo$k6Eu{-h!i_2s!zSbM;F|0PHrV28D+xYf$aN&w$8^1c49dNpA^PhE%;q?O#FUl|F z{CI=GK_^t5Utau}r&F;|f6*T^C0Xa+PbNiAiSA{V=nZ^jQ~rNmibzM1%{7JDx34$c zV_`TFT2g=ArNZ(2<*(Dr1TM0!pRaD6RCzWfWaqJ0-|lG1zFA+Mw6ZE{&9rL{OXnEe z+w<4erLkt^)G|ATGd$COGcnvct7O|1&{<#i|EQ_>uDw&9@mO%mES%Udv&SmU?fta6 zlef+)Db$2Wq$I7hN<12wD78D;?y2?xH3@DH>$``4tnuF57{Mwk+B&oJ*Z!xQCcb`{ zP#;^7I>&%L`L(ve0|x!pM`;efx*+&&t;ucLK6TjcU`go diff --git a/kubejs/assets/tfg/textures/gui/github_logo.png b/kubejs/assets/tfg/textures/gui/github_logo.png index b028c7f0ba3562e0e9d6fe99e09193ba457799de..ab5f182bccf87e2a8b2c952bd44b50171c933413 100644 GIT binary patch delta 496 zcmcb``kPs?Gr-TCmrII^fq{Y7)59f*fq_8;ggMw47#MmxWqBtmiq|u)^>lFzvFP19 zbz|3U1Bv7HTr-VQO(cw7Fm6f-{Ka9;>9w3smiMf{j+YrPN>2N>+BkkJ@ZMXoOZ-GZ z+?F4VHXJ-sMk$%gnyh1LrY7%vzVHik^ArDHAFnU}-+tt~yrsk8{hWp$6CP<+vj`;b zfBp5C-0V#5-TQZ^Zoc_piY?pKdaLJg#{)$e7fgBd@7=ebuMcl8ojv>4>{FXuG+iU7 z=}bR;u=r_Z-?dqrbgFm0{Mx@rBfyI>VeQ-82pzGEwI@HzXr}7he^h_|S#qg}=cEZL zo&j^Wie>9YWv^QG%ld+)c!((rpX>V*47=~dSi6XPbG-C1M=r{w?}{by?0VjSDfy;Mmv+f z$82#`)*;8cf6cSvxKk8+ebKttObb@6I+xp5cwmAX|8?=L>lbV+ z;myX(#zQxfi$DK7t?=Xd`g0+BtN(NENk4oe*;-^j$tilfIwb4k$Btg8VhPq-a3XPu&RWX1mm zN2k6Y{01E*6CE2*cBxe^usgl)M&DeQtNSjUv@a=tUwpp&y>0aVx^|IMmC=z5>G?S& z?&*8h?b%huyb-gRE{&BXeqY`CuPd2Mqy(H^+?G-By?l@1`t|D!Er~a7r5|Tr_Q)d5 zL@Ly=Dtq(IH*YWR-k7 zg-M}HY1!q>NacB6zq>9iD0t4L;3>4QKY4y~1y_U6k{#2eKZjH%6_~AYa}T!qP~!Pt z@a6M;atyB=S8DG6&S|skoTk$JWxIZT*?IkdeZ6#iclrC}zv|TQ-{1Dsdir6TfY75C g96!zVX86abXROiit)3^6fq{X+)78&qol`;+0QMh9!vFvP diff --git a/kubejs/assets/tfg/textures/gui/github_logo_hovered.png b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png index b549c5be65b68c69eee551b7362168034865a654..b66fbba8df11790ccc97a262098276656ee5fe4e 100644 GIT binary patch delta 480 zcmcc4`kGm>Gr-TCmrII^fq{Y7)59f*fq_8;ggMw47#MmxWqBtmiq|vF^>lFzvFP19 zb>X^K4gziaRe70ObArNEIN3H!%u5WlUBz^eIbotiT*I<$Gpyto3bV3atyIVi>U2u@ z#*vXFSK-FNQ!=QW=q&o0q9Jt1gPs^sL8OM)Y1j%zGE zvFXjx>&y{4VqaY*shGYg+PTMu!AtXzg<0L2>oRxp%$H30v9JIA?_(`oYo;ij|2)4j zHS(I)y~yx6sk36%Uzd0Ey;d#%sr|s^mtW*6_Qu&al^)%i6(Q2fu;ukG2A=lAegP8o zZ9CS@mS{YGS8-NA#hZ?U2^YLL4ht;coNfA7%t6F8$!>o3?QNcyLu?ktH>^3p(0=$~ zeW-54>*?C5mtTe~&(xARKG93_LHzl(VcKQ8=a$57|IA=`?LwgpZ~xxhRgZ)Jc3T;& zDGC%>q|wEqaQ^ePth!5#v9%V}tJXTs-!_?5fW@rwV&v2XHxDceYdrptOX1sZ+uLuy o9oK$Pw}1PwzjgbyLu#16s2vJBJBdS&fq{X+)78&qol`;+0NPUADF6Tf delta 718 zcmaFOe4SOXGr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEA6t8FM^mK6yiD*4K zT`_-ifJmGCJ{{4}slJ{9H`HcG8vN!B-paiyt7z4>qWuefb-V5xxEM-II;Ax04r}ME z84raY3oQ_5%e}mpQ*+_-d!Gy5?R+k`#pXQYjlAvl=H-)K?~*#OzuGGFrQ^qEvtIAg z5$l#Y@Y&{Vl)Asa|Ig#c-E-&ttgo5JoH6_CGPVtI>rESuA3uI)TkatP7KN@w2Nia$ zn_kSV=ybqRuHUqwy=(8K#@ySV%-B6HZ!tgc`Li*@zW3X2*=+e2tkIXOHrZ2j$#%cx zm)D!63hi3g{d(70;Uk4M5)2BbH`Outx&|((t*c{7kYJmZ%J|{euc$+z>z6&UIA*|8 zzaXZ5=@f4T;SH;v7M;x6sx{aAYK_@UABGJ&+^09?-2X1<^o2QNcFBq-6_T6@{1&0o zPlc9b-g@=t?c29W0#mEPoh1K7zdr9>sC^*+c6!Gq9c7NDM27D{>IZZe7YH8ERnS}2 z;>4lrIcc@xlO1>S+B0XJ%DN%dn60o$XZ6kSIo9>Qx6gTLv|P~WOT287J^577ZPp#P z->NiR`YGvfk@f1YCZ;6*8w{6UPWf1|rsT)hudcI}J)M@#U9HXVN5-Y#8l&Y=$4%^S zUY4wyqvIRgB9Qp;*wY(&4N-g*^Om~?ii9~z6)jnOGpDS~^v#p2nxT9afg%fESLsz- zDYh(oU8NVTQ@`?=V)86CM}Zr?93`v5Rj-uVn)_~k({*dsgsyM3j8Wx{KKoQWa~c#l zDk>{AtB*v#+`jCJ=AoVJ9+QqtyS?$e*&bF0&Y(ZjIxANfFVc5dsp6U8Z4_CtOU2&f z9K*KTZzH4cg>2PWdG5Pi>vGN9%{Li7{QGD3;`NW;zoUQFm`Ht9`BrNo)24rrwQq`* e3?IWE_H!o2pZR5e2{SM-FnGH9xvXo2el1&~|8wtq)p)6ut9ckC{tI8+#NPeSYj@?9J%40#jvQWf zBib~4_04`)<~iPv#cW+7e<-$=P~N$EZ!YjF@K5dk!BSpgO^V{mfy5y@cC22?2&$C z@7!E@H9FVdQ&MBb@0ATy*O8@`> delta 814 zcmbQmvW-o#Gr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEA6t8D`;pyTS6481z zd}H2i1A$tdUz}_{-b0;OJ|`7kyHJu!KSi0Qws&UapLM*VWThj!!F#MG#U;_nN*c^RY~ zj|sh0y6AC$J)enB>HA3mjcV>rmB!oCm00I7Uu$9b5aRvj*cVymr@O9%YFc@ie6Me0 zsHu&Rv}5$Q$v*7Q65!az^+LMuEkjz=QY}XYo zRkM%)H{(+qoR^;BJ0P$?`_z}PRTs*{m)xn3OOIVGm^StCS@zuExW+djAl}6}|C{lG?Tk0(%`ehAkr3b8`Za`2vnVLAvHNUX$+d02;Yb~e6fel;Bn9N&?>W{yRf7`Qgoj&{j_wRrFDq>*x!ERTw X;IvI#YX$=Y1B0ilp9{-6r-UW|3=C`| diff --git a/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png index eb1e848e27ad6385f085fe5eff8f56faf8ef3576..540c1103b725adba6e4b9d2395dadf913c0fa48f 100644 GIT binary patch delta 570 zcmcb?c7#Q-Gr-TCmrII^fq{Y7)59f*fq_8;ggMw47#MmxWqBtmiq|uK^K@|xvFKep zWn-4Kqd?n#(??$6?0G2$tF^o)s&Q^#5K`5^t+K+rjxkg#Xo;vHOOLj=;dN=Ao#g^A zF0t?&b7g8iaL6^H$B=Ph^9Iel^!)dEv8usu@1CjoeE!{=uG{w7F>$dHf8>R2`PJ_2 zo$*IF*WT8^wvF+?)2pt^3BT%#!$hlB?DLP4?G`v8uH?5*UYc#*KKo+6S(9)2nMtg_ zm+ zY@5tGk9VHZjO{^%#t%(7Z!8%h5di4_hQ4hw?EDu{3`eE*!Ojzb~Cotwb)E*%{@Oe zcYf|o#$T@_%y!&MmPp`VD*ShC+_eMoYZtV8ZH!-XW@}`2xc~#hZ&`+IK6R^(FFaHF zD4~0~k=E-T-O~tyT`S>GC7$@18)Tf6tQNbc&i1vBdA%+yRf@S*d{hSqo6 cesK3}{!}bb_Ppu<0|Nttr>mdKI;Vst0LHxd8vp90av&l%gRd40-eOdF~nV@%M=^ z)KvIihFukSci`r2vM1V-1B%gko3 z`+B>R=WV~rhSHB8lT#TUJbJFWp(pO0b$1d-m>H6Q(xC>s&m#k$>keg8GQZ_Lo)S+oRqkEv25sTJ6CnfI(KQ^9foZe7x ztjORa-T8NhUE+eE>$j#Qv3Gv66KFgi_l|ddgXZ~JpM@DiCNAvy(eWxuJMl)^x(*k{ zSrc~tDAa8C(sTDZ!!$R;b?V)ZH8tMa4Pe$DLe_ zOn+}4*m28j%AC!F}Yl(T%e|P_PUWj+vIba0$0rV?Aj_n zxb@!mJeRXXZpEx!n|7;OG{*8C*!P;TqQhwaws-sHHgr@TxWz0qt9yldnmt36VB^{! zE0=Wfgq7*k&zmlkVZHfMz=pnW>s^AXv+7#C=PtUmMs-dVW8>M1wZASmPBfpDuNOGw zodv6>q|I`VZvI>Alk4l2KCx|B$c^dKMm9Eck&A{?Yic5=lR)*Uncb*QWoD5 zlYV55{GEswYh@Vwj&Yw-W&LBy%^+X7%=ecr8qSC+3@`Dfs3mcrYrpy*G_kGxMsupKEugB>8ViHEpH`sX z8~i(P+56wirZDBR)(bPvS21{~Q8l~#f7pX{EKEvwmRyjv*w;7nz}wHfWwnzy5A4|b zjwP?#c8C6=%j?shiKPEI`9+QY;@8(vx$mz1fB(9ocsm=zA6A8XYdvF%qb4&jFfe$! L`njxgN@xNAqVtE= diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index bb3f20f28..10eab60a3 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -34,6 +34,7 @@ ServerEvents.tags('item', event => { registerGTCEUItemTags(event) registerMegaCellsItemTags(event) registerMinecraftItemTags(event) + registerModernMarkingsItemTags(event) registerMoreRedItemTags(event) registerHotOrNotItemTags(event) registerRailWaysItemTags(event) @@ -226,6 +227,7 @@ ServerEvents.recipes(event => { registerMegaCellsRecipes(event) registerMERequesterRecipes(event) registerMinecraftRecipes(event) + registerModernMarkingRecipes(event) registerMoreRedRecipes(event) registerRailWaysRecipes(event) registerRnrRecipes(event) diff --git a/kubejs/server_scripts/modern_markings/recipes.js b/kubejs/server_scripts/modern_markings/recipes.js new file mode 100644 index 000000000..018d7b1d7 --- /dev/null +++ b/kubejs/server_scripts/modern_markings/recipes.js @@ -0,0 +1,30 @@ +const registerModernMarkingRecipes = (event) => { + event.remove({mod: 'ags_modernmarkings'}) + + event.shaped('16x ags_modernmarkings:wall_marking_hazard_diamond', [ + ' B ', + 'AEC', + ' D ' + ], { + A: '#forge:dyes/blue', + B: '#forge:dyes/red', + C: '#forge:dyes/yellow', + D: '#forge:dyes/white', + E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 1) + }).id('tfg:shaped/wall_marking_hazard_diamond') + + event.recipes.gtceu.large_chemical_reactor('tfg:large_chemical_reactor/wall_marking_hazard_diamond') + .inputFluids(Fluid.of('tfc:blue_dye', 144), Fluid.of('tfc:red_dye', 144), Fluid.of('tfc:yellow_dye', 144), Fluid.of('tfc:white_dye', 144)) + .itemInputs(ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 1)) + .itemOutputs('32x ags_modernmarkings:wall_marking_hazard_diamond') + .duration(240) + .EUt(GTValues.VA[GTValues.LV]) + + const markings = Ingredient.of('#ags_modernmarkings:markings').itemIds.toArray().map(String); + + markings.forEach(item => { + event.stonecutting(item, + Ingredient.of('#ags_modernmarkings:markings').subtract(item) + ).id(`tfg:stonecutter/${item.replace(/:/g, "/")}`) + }) +}; \ No newline at end of file diff --git a/kubejs/server_scripts/modern_markings/tags.js b/kubejs/server_scripts/modern_markings/tags.js new file mode 100644 index 000000000..d8fb2ce9d --- /dev/null +++ b/kubejs/server_scripts/modern_markings/tags.js @@ -0,0 +1,128 @@ +const registerModernMarkingsItemTags = (event) => { + + global.MODERN_MARKINGS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }); + + const floor_markings = [ + 'ags_modernmarkings:floor_marking_nostep', + 'ags_modernmarkings:floor_marking_white_arrow', + 'ags_modernmarkings:floor_marking_white_lane', + 'ags_modernmarkings:floor_marking_white_double_arrow', + 'ags_modernmarkings:floor_marking_white_square', + 'ags_modernmarkings:floor_marking_yellow_arrow', + 'ags_modernmarkings:floor_marking_yellow_sideline', + 'ags_modernmarkings:floor_marking_yellow_square', + 'ags_modernmarkings:floor_marking_yellow_stripes', + 'ags_modernmarkings:floor_marking_redx', + 'ags_modernmarkings:floor_marking_noentry', + 'ags_modernmarkings:floor_marking_black_singleline', + 'ags_modernmarkings:floor_marking_white_singleline', + 'ags_modernmarkings:floor_marking_red_singleline', + 'ags_modernmarkings:floor_marking_yellow_singleline', + 'ags_modernmarkings:floor_marking_green_singleline', + 'ags_modernmarkings:floor_marking_blue_singleline', + 'ags_modernmarkings:floor_marking_orange_singleline', + 'ags_modernmarkings:floor_marking_yellow_hazardline', + 'ags_modernmarkings:floor_marking_red_hazardline', + 'ags_modernmarkings:floor_marking_whiteblack_hazardline', + 'ags_modernmarkings:floor_marking_danger_yellow', + 'ags_modernmarkings:floor_marking_danger_red', + 'ags_modernmarkings:floor_marking_exit', + 'ags_modernmarkings:floor_marking_white_lane_cross', + 'ags_modernmarkings:floor_marking_yellow_lane', + 'ags_modernmarkings:floor_marking_black_corner', + 'ags_modernmarkings:floor_marking_blue_corner', + 'ags_modernmarkings:floor_marking_green_corner', + 'ags_modernmarkings:floor_marking_orange_corner', + 'ags_modernmarkings:floor_marking_white_corner', + 'ags_modernmarkings:floor_marking_yellow_corner', + 'ags_modernmarkings:floor_marking_red_corner' + ]; + + const wall_markings = [ + 'ags_modernmarkings:wall_marking_number_0', + 'ags_modernmarkings:wall_marking_number_1', + 'ags_modernmarkings:wall_marking_number_2', + 'ags_modernmarkings:wall_marking_number_3', + 'ags_modernmarkings:wall_marking_number_4', + 'ags_modernmarkings:wall_marking_number_5', + 'ags_modernmarkings:wall_marking_number_6', + 'ags_modernmarkings:wall_marking_number_7', + 'ags_modernmarkings:wall_marking_number_8', + 'ags_modernmarkings:wall_marking_number_9', + 'ags_modernmarkings:wall_marking_number_no', + 'ags_modernmarkings:wall_marking_number_numero', + 'ags_modernmarkings:wall_marking_number_dash', + 'ags_modernmarkings:wall_marking_number_comma', + 'ags_modernmarkings:wall_marking_number_period', + 'ags_modernmarkings:wall_marking_exclamation_mark', + 'ags_modernmarkings:wall_marking_question_mark', + 'ags_modernmarkings:wall_marking_hazard_diamond', + 'ags_modernmarkings:wall_marking_arrowleft', + 'ags_modernmarkings:wall_marking_arrowright', + 'ags_modernmarkings:wall_marking_exit', + 'ags_modernmarkings:wall_marking_hazardline_left', + 'ags_modernmarkings:wall_marking_hazardline_right', + 'ags_modernmarkings:wall_marking_symbol_chemical', + 'ags_modernmarkings:wall_marking_symbol_electric', + 'ags_modernmarkings:wall_marking_symbol_fire', + 'ags_modernmarkings:wall_marking_symbol_fluid', + 'ags_modernmarkings:wall_marking_symbol_frost', + 'ags_modernmarkings:wall_marking_symbol_gears', + 'ags_modernmarkings:wall_marking_symbol_laser', + 'ags_modernmarkings:wall_marking_symbol_magic', + 'ags_modernmarkings:wall_marking_symbol_mob', + 'ags_modernmarkings:wall_marking_symbol_pinch', + 'ags_modernmarkings:wall_marking_symbol_production', + 'ags_modernmarkings:wall_marking_symbol_radiation', + 'ags_modernmarkings:wall_marking_symbol_storage', + 'ags_modernmarkings:wall_marking_symbol_yellow_chemical', + 'ags_modernmarkings:wall_marking_symbol_yellow_electric', + 'ags_modernmarkings:wall_marking_symbol_yellow_fire', + 'ags_modernmarkings:wall_marking_symbol_yellow_fluid', + 'ags_modernmarkings:wall_marking_symbol_yellow_frost', + 'ags_modernmarkings:wall_marking_symbol_yellow_gears', + 'ags_modernmarkings:wall_marking_symbol_yellow_laser', + 'ags_modernmarkings:wall_marking_symbol_yellow_magic', + 'ags_modernmarkings:wall_marking_symbol_yellow_mob', + 'ags_modernmarkings:wall_marking_symbol_yellow_pinch', + 'ags_modernmarkings:wall_marking_symbol_yellow_production', + 'ags_modernmarkings:wall_marking_symbol_yellow_radiation', + 'ags_modernmarkings:wall_marking_symbol_yellow_storage', + 'ags_modernmarkings:wall_marking_symbol_jeo', + 'ags_modernmarkings:wall_marking_warning_danger', + 'ags_modernmarkings:wall_marking_voltage_eu', + 'ags_modernmarkings:wall_marking_voltage_ev', + 'ags_modernmarkings:wall_marking_voltage_fe', + 'ags_modernmarkings:wall_marking_voltage_hv', + 'ags_modernmarkings:wall_marking_voltage_iv', + 'ags_modernmarkings:wall_marking_voltage_luv', + 'ags_modernmarkings:wall_marking_voltage_lv', + 'ags_modernmarkings:wall_marking_voltage_max', + 'ags_modernmarkings:wall_marking_voltage_mv', + 'ags_modernmarkings:wall_marking_voltage_pert', + 'ags_modernmarkings:wall_marking_voltage_rf', + 'ags_modernmarkings:wall_marking_voltage_uev', + 'ags_modernmarkings:wall_marking_voltage_uhv', + 'ags_modernmarkings:wall_marking_voltage_uiv', + 'ags_modernmarkings:wall_marking_voltage_umv', + 'ags_modernmarkings:wall_marking_voltage_uv', + 'ags_modernmarkings:wall_marking_voltage_uxv', + 'ags_modernmarkings:wall_marking_voltage_zpm', + 'ags_modernmarkings:wall_marking_voltage_ulv', + 'ags_modernmarkings:wall_marking_voltage_steam' + ]; + + floor_markings.forEach(marking => { + event.add('ags_modernmarkings:floor_markings', marking) + }) + + wall_markings.forEach(marking => { + event.add('ags_modernmarkings:wall_markings', marking) + }) + + event.add('ags_modernmarkings:markings', '#ags_modernmarkings:floor_markings') + event.add('ags_modernmarkings:markings', '#ags_modernmarkings:wall_markings') +}; \ No newline at end of file diff --git a/kubejs/startup_scripts/modern_markings/constants.js b/kubejs/startup_scripts/modern_markings/constants.js new file mode 100644 index 000000000..1a9d84861 --- /dev/null +++ b/kubejs/startup_scripts/modern_markings/constants.js @@ -0,0 +1,5 @@ +// priority: 0 + +global.MODERN_MARKINGS_DISABLED_ITEMS = [ + 'ags_modernmarkings:chalk' +]; diff --git a/pakku-lock.json b/pakku-lock.json index d7efe56ca..badf08986 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -5808,6 +5808,42 @@ } ] }, + { + "pakku_id": "vM88oJ8vHOUgPzGf", + "type": "MOD", + "slug": { + "curseforge": "modernmarkings" + }, + "name": { + "curseforge": "ModernMarkings" + }, + "id": { + "curseforge": "1267477" + }, + "files": [ + { + "type": "curseforge", + "file_name": "ags_modernmarkings-0.4.2-1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6659/716/ags_modernmarkings-0.4.2-1.20.1.jar", + "id": "6659716", + "parent_id": "1267477", + "hashes": { + "sha1": "7297e554cd075b7e4d7497248d60ca40b943bc98", + "md5": "f4058de0aafaabae98e90e050f0348d3" + }, + "required_dependencies": [], + "size": 305666, + "date_published": "2025-06-17T02:42:48.933Z" + } + ] + }, { "pakku_id": "aHeU7fAIYgE8bqks", "type": "MOD",