diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index ca68a1e..cd5349c 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -103,7 +103,7 @@ }] title: "Biomass" x: 0.0d - y: -1.875d + y: -2.64d } { dependencies: ["74180AC57AE9F0FE"] @@ -142,7 +142,7 @@ } ] title: "Local Brewery selling Booze" - x: 1.125d + x: -1.125d y: -1.875d } { @@ -197,7 +197,7 @@ }] title: "Ethanol" x: 0.0d - y: -3.0d + y: -3.63d } { dependencies: ["6A304E453D74C57C"] @@ -265,7 +265,7 @@ { dependencies: [ "0DBC148D92A9F69F" - "7567E885B7166603" + "1BE0349B8F3890D3" "6E186F9C57155BFA" ] description: [ @@ -310,8 +310,8 @@ type: "item" }] title: "Electricity Generation in MV" - x: 2.25d - y: -1.875d + x: 0.0d + y: 2.44d } { dependencies: ["2AD44111B9B39C90"] @@ -376,8 +376,8 @@ type: "item" }] title: "Transformers" - x: 0.0d - y: -0.75d + x: 1.125d + y: 2.44d } { dependencies: [ @@ -839,8 +839,8 @@ type: "item" }] title: "Greenhouse" - x: 0.0d - y: -1.875d + x: -1.125d + y: 0.375d } { dependencies: [ @@ -1579,8 +1579,8 @@ type: "checkmark" }] title: "It will Melt Your Flesh" - x: 2.25d - y: -4.125d + x: 3.375d + y: -3.0d } { dependencies: [ @@ -2310,8 +2310,8 @@ type: "item" }] title: "I Believe I Can Fly" - x: -5.625d - y: -0.75d + x: -3.37d + y: -3.56d } { dependencies: ["75F38905DEA60F15"] diff --git a/config/gtceu.yaml b/config/gtceu.yaml index 5ae9392..3e5e05b 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -9,7 +9,7 @@ recipes: disableManualCompression: false # Change the recipe of Rods in the Lathe to 1 Rod and 2 Small Piles of Dust, instead of 2 Rods. - # Default: false + # Default: true harderRods: false # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder. @@ -50,7 +50,7 @@ recipes: nerfPaperCrafting: true # Recipes for items like Iron Doors, Trapdoors, Anvil require Iron Plates, Rods, and more. - # Default: false + # Default: true hardAdvancedIronRecipes: false # Whether to make coloring blocks like Concrete or Glass harder. @@ -81,8 +81,16 @@ recipes: # Default: false harderCircuitRecipes: false + # Whether to nerf machine controller recipes. + # Default: false + hardMultiRecipes: false + + # Whether tools should have enchants or not. Like the flint sword getting fire aspect. + # Default: false + enchantedTools: false + worldgen: - # Rubber Tree spawn chance (% per chunk) + # Rubber Tree spawn chance (decimal % per chunk) # Default: 0.5 rubberTreeSpawnChance: 0.5 @@ -129,6 +137,10 @@ worldgen: # Default: false infiniteBedrockOresFluids: false + # Generate ores indicators above ore veins + # Default: true + oreIndicators: true + # Sets the maximum number of chunks that may be cached for ore vein generation. # Higher values may improve world generation performance, but at the cost of more RAM usage. # If you substantially increase the ore vein grid size, random vein offset, or have very large (custom) veins, you may need to increase this value as well. @@ -141,19 +153,13 @@ worldgen: oreIndicatorChunkCacheSize: 2048 machines: - # Whether insufficient energy supply should reset Machine recipe progress to zero. - # If true, progress will reset. - # If false, progress will decrease to zero with 2x speed - # Default: false - recipeProgressLowEnergy: false - # Whether to require a Wrench, Wirecutter, or other GregTech tools to break machines, casings, wires, and more. - # Default: false + # Default: true requireGTToolsForBlocks: false # Whether machines explode in rainy weather or when placed next to certain terrain, such as fire or lava # Default: false - doTerrainExplosion: false + shouldWeatherOrTerrainExplosion: false # Energy use multiplier for electric items. # Default: 100 @@ -172,14 +178,14 @@ machines: # Default: false harmlessActiveTransformers: false - # Divisor for Recipe Duration per Overclock. - # Default: 2.0 - overclockDivisor: 2.0 - # Whether to play machine sounds while machines are active. # Default: true machineSounds: true + # Duration in ticks that batching will try to reach. + # Default: 100 + batchDuration: 100 + # Whether Steam Multiblocks should use Steel instead of Bronze. # Default: false steelSteamMultiblocks: false @@ -205,6 +211,10 @@ machines: # Default: true enableMaintenance: true + # Time in ticks between when Multiblocks can require Maintenance. By default, 48 hours. + # Default: 3456000 + maintenanceTime: 3456000 + # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc. # Default: true enableWorldAccelerators: true @@ -222,7 +232,7 @@ machines: # Whether the machine's circuit slot need to be inserted a real circuit. ghostCircuit: true - # Wether to add a "Bedrock Ore Miner" (also enables bedrock ore generation) + # Whether to add a "Bedrock Ore Miner" (also enables bedrock ore generation) # Default: false doBedrockOres: false @@ -230,10 +240,9 @@ machines: # Default: "raw" bedrockOreDropTagPrefix: raw - # WARNING: THIS IS NO LONGER SUPPORTED AND WILL BE REMOVED! - # This option only exists to provide backwards compatibility until the Processing Array will be removed in 1.3.0 - # Default: false - doProcessingArray: true + # The base amount of ticks per block for electric singleblock ore miners + # Default: 320 + minerSpeed: 320 # Makes nearly every GCYM Multiblock require blocks which set their maximum voltages. # Default: false @@ -247,6 +256,18 @@ machines: # Default: 50 ldFluidPipeMinDistance: 50 + # Whether ONLY owners can open a machine gui + # Default: false + onlyOwnerGUI: false + + # Whether ONLY owners can break a machine + # Default: false + onlyOwnerBreak: false + + # Minimum op level to bypass the ownership checks + # Default: 2 + ownerOPBypass: 2 + # If High Tier (>UV-tier) GT content should be registered. # Items and Machines enabled with this config will have missing recipes by default. # This is intended for modpack developers only, and is not playable without custom tweaks or addons. @@ -254,11 +275,93 @@ machines: # Default: false highTierContent: false + # Whether the Assembly Line should require the item inputs to be in order. + # Default: true + orderedAssemblyLineItems: true + + # Whether the Assembly Line should require the fluid inputs to be in order. + # (Requires Ordered Assembly Line Item Inputs to be enabled.) + # Default: true + orderedAssemblyLineFluids: true + + # Default maximum parallel of steam multiblocks + # Default: 8 + steamMultiParallelAmount: 8 + + # Small Steam Boiler Options + smallBoilers: + # The amount of steam a Steam Solid Boiler produces per second at max temperature. + # Default: 120 + solidBoilerBaseOutput: 120 + + # The amount of steam a High Pressure Steam Solid Boiler produces per second at max temperature. + # Default: 300 + hpSolidBoilerBaseOutput: 300 + + # The amount of steam a Steam Liquid Boiler produces per second at max temperature. + # Default: 240 + liquidBoilerBaseOutput: 240 + + # The amount of steam a High Pressure Steam Liquid Boiler produces per second at max temperature. + # Default: 600 + hpLiquidBoilerBaseOutput: 600 + + # The amount of steam a Steam Solar Boiler produces per second at max temperature. + # Default: 120 + solarBoilerBaseOutput: 120 + + # The amount of steam a High Pressure Steam Solar Boiler produces per second at max temperature. + # Default: 360 + hpSolarBoilerBaseOutput: 360 + + # Large Steam Boiler Options + largeBoilers: + # The conversion rate between water and steam in Large Boilers. + # Default: 160 + steamPerWater: 160 + + # The max temperature of the Large Bronze Boiler. + # Default: 800 + bronzeBoilerMaxTemperature: 800 + + # The heat speed of the Large Bronze Boiler. + # Default: 1 + bronzeBoilerHeatSpeed: 1 + + # The max temperature of the Large Steel Boiler. + # Default: 1800 + steelBoilerMaxTemperature: 1800 + + # The heat speed of the Large Steel Boiler. + # Default: 1 + steelBoilerHeatSpeed: 1 + + # The max temperature of the Large Titanium Boiler. + # Default: 3200 + titaniumBoilerMaxTemperature: 3200 + + # The heat speed of the Large Titanium Boiler. + # Default: 1 + titaniumBoilerHeatSpeed: 1 + + # The max temperature of the Large Tungstensteel Boiler. + # Default: 6400 + tungstensteelBoilerMaxTemperature: 6400 + + # The heat speed of the Large Tungstensteel Boiler. + # Default: 2 + tungstensteelBoilerHeatSpeed: 2 + client: # Whether or not to enable Emissive Textures for GregTech Machines. # Default: true machinesEmissiveTextures: true + # Whether most machines will have block entity renderers, mainly used for rendering certain covers. (Restart required) + # Disable if experiencing performance issues. + # Default: true + machinesHaveBERsByDefault: true + # Whether or not sounds should be played when using tools outside of crafting. # Default: true toolUseSounds: true @@ -273,8 +376,8 @@ client: defaultPaintingColor: #FFFFFF # The default color to overlay onto Machine (and other) UIs. - # 16777215 (#FFFFFF) is no coloring (like GTCE) (default). - # 13819135 (#D2DCFF in decimal) is the classic blue from GT5. + # #FFFFFF is no coloring (like GTCE) (default). + # #D2DCFF is the classic blue from GT5. defaultUIColor: #FFFFFF # Use VBO cache for multiblock preview. @@ -307,6 +410,19 @@ client: # Default: 0 hudOffsetY: 0 + renderer: + # Render fluids in multiblocks that support them? + # Default: true + renderFluids: true + + # Whether or not to color tiered machine highlights in the tier color + # Default: true + coloredTieredMachineOutline: true + + # Whether or not to color wire/cable highlights based on voltage tier + # Default: true + coloredWireOutline: true + # Config options for Tools and Armor tools: # Random chance for electric tools to take actual damage @@ -317,6 +433,10 @@ tools: # Default: 16 sprayCanChainLength: 16 + # Delay in ticks between each log being broken when tree felling + # Default: 2 + treeFellingDelay: 2 + # NanoSaber Options nanoSaber: # The additional damage added when the NanoSaber is powered. @@ -373,40 +493,35 @@ gameplay: universalHazards: true # Whether environmental hazards like pollution or radiation are active - # Default: true + # Default: false environmentalHazards: false # How much environmental hazards decay per chunk, per tick. # Default: 0.001 environmentalHazardDecayRate: 0.001 - # Whether the GTCEu's ingame guidebook, 'Compass', be enabled. - # WARNING: INCOMPLETE - # Default: false - enableCompass: false - # Config options for Mod Compatibility compat: # Config options regarding GTEU compatibility with other energy systems energy: - # Enable Native GTEU to Platform native Energy (RF and alike) on GT Cables and Wires. + # Enable Native GTEU to Forge Energy (RF and alike) on GT Cables and Wires. # This does not enable nor disable Converters. # Default: true - nativeEUToPlatformNative: true + nativeEUToFE: true - # Enable GTEU to Platform native (and vice versa) Converters. + # Enable GTEU to FE (and vice versa) Converters. # Default: false - enablePlatformConverters: false + enableFEConverters: false - # Platform native Energy to GTEU ratio for converting FE to EU. + # Forge Energy to GTEU ratio for converting FE to EU. # Only affects converters. - # Default: 4 FE/Energy == 1 EU - platformToEuRatio: 4 + # Default: 4 FE == 1 EU + feToEuRatio: 4 - # GTEU to Platform native Energy ratio for converting EU to FE. + # GTEU to Forge Energy ratio for converting EU to FE. # Affects native conversion and Converters. - # Default: 4 FE/Energy == 1 EU - euToPlatformRatio: 4 + # Default: 4 FE == 1 EU + euToFeRatio: 4 # Config options regarding GTCEu compatibility with AE2 ae2: @@ -416,16 +531,68 @@ compat: updateIntervals: 40 # The energy consumption of ME Hatch/Bus. - # Default: 1.0AE/t - meHatchEnergyUsage: 1.0 + # Default: 4.0AE/t + meHatchEnergyUsage: 4.0 + + # Config options regarding GTCEu compatibility with minimap mods + minimap: + # Toggle specific map mod integration on/off (need to restart for this to take effect) + toggle: + # FTB Chunks integration enabled + ftbChunksIntegration: false + + # Journey Map integration enabled + journeyMapIntegration: true + + # Xaerox's map integration enabled + xaerosMapIntegration: true + + # The radius, in blocks, that picking up a surface rock will search for veins in. + # -1 to disable. + # Default: 24 + surfaceRockProspectRange: 24 + + # The radius, in blocks, that clicking an ore block will search for veins in. + # -1 to disable + # Default: 24 + oreBlockProspectRange: 24 + + # The map scale at which displayed ores will stop scaling. + oreScaleStop: 1.0 + + # The size, in pixels, of ore icons on the map + oreIconSize: 32 + + # The string prepending ore names in the ore vein tooltip + oreNamePrefix: - + + # The color to draw a box around the ore icon with. + # Accepts either an ARGB hex color prefixed with # or the string 'material' to use the ore's material color + borderColor: #00000000 + + # Which part of the screen to anchor buttons to + # Default: "BOTTOM_LEFT" + buttonAnchor: BOTTOM_LEFT + + # Which direction the buttons will go + # Default: "VERTICAL" + direction: VERTICAL + + # How horizontally far away from the anchor to place the buttons + # Default: 20 + xOffset: 20 + + # How vertically far away from the anchor to place the buttons + # Default: 0 + yOffset: 0 # Whether to hide facades of all blocks in JEI and creative search menu. # Default: true - hideFacadesInJEI: true + hideFacadesInRecipeViewer: true # Whether to hide filled cells in JEI and creative search menu. # Default: true - hideFilledCellsInJEI: true + hideFilledCellsInRecipeViewer: true # Whether to hide the ore processing diagrams in JEI # Default: false @@ -435,6 +602,10 @@ compat: # Default: true removeSmeltingForEBFMetals: true + # Whether dimension markers should show the dimension tier value. + # Default: false + showDimensionTier: false + dev: # Debug general events? (will print recipe conficts etc. to server's debug.log) # Default: false @@ -444,6 +615,10 @@ dev: # Default: false (no placement printout in debug.log) debugWorldgen: false + # Generate ores in superflat worlds? + # Default: false + doSuperflatOres: false + # Dump all registered GT recipes? # Default: false dumpRecipes: false diff --git a/index.toml b/index.toml index 8edc3c1..f2277f6 100644 --- a/index.toml +++ b/index.toml @@ -146,7 +146,7 @@ hash = "c597f716bb540288bd909925586087298edabb66bf5b65b8f353631f05e295ce" [[files]] file = "config/ftbquests/quests/chapters/mv__medium_voltage.snbt" -hash = "56d08f85e2c7177533adda8d0a42c200cc92a581b7105e02dcc16016bef743a7" +hash = "284458ad917439b46ae6f725732c5f95acd3805c7139791f2d7631a6e5431153" [[files]] file = "config/ftbquests/quests/chapters/ore_generation.snbt" @@ -222,7 +222,7 @@ hash = "9abe2c7f784810cac3ca71c74d02aacd5fe6861d744cb143d077a525a2b42e76" [[files]] file = "config/gtceu.yaml" -hash = "646d17fc54fb5506302f1669e80055eda4207650c0c7ac418cba6c298949bc15" +hash = "51af2e256f83d90bbbd35cf4567b8b3cda560cb60847e844e422f2975fc9aa29" [[files]] file = "config/hangglider-client.toml" @@ -670,7 +670,7 @@ hash = "a5f8f6e63d636dad1485f889a887c89ea690c245e804ba1b50ad0018d9847150" [[files]] file = "kubejs/server_scripts/storage_drawers/drawers.js" -hash = "1daec77e466c14ca5a8afd469959cafd35361edbad6738fe30112c190698385b" +hash = "4ea5601c95dbe9b0cb5466b9b2de27fca46c8dd5ad0857bdc5c6b8f51ec91ed6" [[files]] file = "kubejs/server_scripts/storage_drawers/upgrades.js" @@ -949,7 +949,7 @@ metafile = true [[files]] file = "mods/gregtechceu-modern.pw.toml" -hash = "1746557e541c429e1b33a3253950b445f79e4c57502cd5bbec1b3184206609c0" +hash = "f76dcc4122bcbc77ce67812b83013c7728c84c26b24321ab4ce2e650eb1688f4" metafile = true [[files]] @@ -1049,7 +1049,7 @@ metafile = true [[files]] file = "mods/openblocks-elevator.pw.toml" -hash = "9d66478fde6c978312f93734d481bcb9ae9c49b74cb4538fce58c65ef15d593c" +hash = "51bf17db22eee5fb80da0b2efe87b846f1165bafc67a789782c5fd976c406ffa" metafile = true [[files]] diff --git a/kubejs/server_scripts/storage_drawers/drawers.js b/kubejs/server_scripts/storage_drawers/drawers.js index b439655..c8a2e3e 100644 --- a/kubejs/server_scripts/storage_drawers/drawers.js +++ b/kubejs/server_scripts/storage_drawers/drawers.js @@ -1,6 +1,7 @@ ServerEvents.recipes((event) => { const greg = event.recipes.gtceu; event.remove({ mod: "storagedrawers" }); + event.remove({ mod: "gtstoragedrawers" }); const woodTypes = [ "oak", "spruce", @@ -10,123 +11,139 @@ ServerEvents.recipes((event) => { "dark_oak", "warped", "crimson", + "bamboo", + "cherry", + ["gtstoragedrawers", "gtceu_rubber", "gtceu:rubber"], + ["gtstoragedrawers", "gtceu_treated", "gtceu:treated_wood"] ]; - woodTypes.forEach((woodType) => { + woodTypes.forEach((input) => { + let woodType = ""; + let modName = "storagedrawers"; + let baseWoodType = ""; + if (typeof(input) === "object") { + woodType = input[1]; + modName = input[0]; + baseWoodType = input[2]; + } else { + woodType = input; + baseWoodType = `minecraft:${woodType}` + } + // Type 1 event.shaped( - `storagedrawers:${woodType}_full_drawers_1`, + `${modName}:${woodType}_full_drawers_1`, ["PPP", "sCr", "PPP"], { - P: `${woodType}_planks`, + P: `${baseWoodType}_planks`, s: "#forge:tools/saws", C: "#forge:chests/wooden", r: "#forge:tools/mallets", } ).noMirror(); greg - .assembler(`storagedrawers:${woodType}_full_drawers_1`) - .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_full_drawers_1`) + .assembler(`${modName}:${woodType}_full_drawers_1`) + .itemInputs(`6x ${baseWoodType}_planks`, "#forge:chests/wooden") + .itemOutputs(`${modName}:${woodType}_full_drawers_1`) .circuit(9) .duration(100) .EUt(16); // Type 2 event.shaped( - `storagedrawers:${woodType}_full_drawers_2`, + `${modName}:${woodType}_full_drawers_2`, ["PPP", "rCs", "PPP"], { - P: `${woodType}_planks`, + P: `${baseWoodType}_planks`, s: "#forge:tools/saws", C: "#forge:chests/wooden", r: "#forge:tools/mallets", } ).noMirror(); greg - .assembler(`storagedrawers:${woodType}_full_drawers_2`) - .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_full_drawers_2`) + .assembler(`${modName}:${woodType}_full_drawers_2`) + .itemInputs(`6x ${baseWoodType}_planks`, "#forge:chests/wooden") + .itemOutputs(`${modName}:${woodType}_full_drawers_2`) .circuit(10) .duration(100) .EUt(16); // Type 4 event.shaped( - `storagedrawers:${woodType}_full_drawers_4`, + `${modName}:${woodType}_full_drawers_4`, ["PsP", "PCP", "PrP"], { - P: `${woodType}_planks`, + P: `${baseWoodType}_planks`, s: "#forge:tools/saws", C: "#forge:chests/wooden", r: "#forge:tools/mallets", } ); greg - .assembler(`storagedrawers:${woodType}_full_drawers_4`) - .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_full_drawers_4`) + .assembler(`${modName}:${woodType}_full_drawers_4`) + .itemInputs(`6x ${baseWoodType}_planks`, "#forge:chests/wooden") + .itemOutputs(`${modName}:${woodType}_full_drawers_4`) .circuit(11) .duration(100) .EUt(16); // Half 1 event.shaped( - `storagedrawers:${woodType}_half_drawers_1`, + `${modName}:${woodType}_half_drawers_1`, ["PPP", "sCr", "PPP"], { - P: `${woodType}_slab`, + P: `${baseWoodType}_slab`, s: "#forge:tools/saws", C: "#forge:chests/wooden", r: "#forge:tools/mallets", } ).noMirror(); greg - .assembler(`storagedrawers:${woodType}_half_drawers_1`) - .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_half_drawers_1`) + .assembler(`${modName}:${woodType}_half_drawers_1`) + .itemInputs(`6x ${baseWoodType}_slab`, "#forge:chests/wooden") + .itemOutputs(`${modName}:${woodType}_half_drawers_1`) .circuit(9) .duration(100) .EUt(16); // Half 2 event.shaped( - `storagedrawers:${woodType}_half_drawers_2`, + `${modName}:${woodType}_half_drawers_2`, ["PPP", "rCs", "PPP"], { - P: `${woodType}_slab`, + P: `${baseWoodType}_slab`, s: "#forge:tools/saws", C: "#forge:chests/wooden", r: "#forge:tools/mallets", } ).noMirror(); greg - .assembler(`storagedrawers:${woodType}_half_drawers_2`) - .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_half_drawers_2`) + .assembler(`${modName}:${woodType}_half_drawers_2`) + .itemInputs(`6x ${baseWoodType}_slab`, "#forge:chests/wooden") + .itemOutputs(`${modName}:${woodType}_half_drawers_2`) .circuit(10) .duration(100) .EUt(16); // Half 4 event.shaped( - `storagedrawers:${woodType}_half_drawers_4`, + `${modName}:${woodType}_half_drawers_4`, ["PsP", "PCP", "PrP"], { - P: `${woodType}_slab`, + P: `${baseWoodType}_slab`, s: "#forge:tools/saws", C: "#forge:chests/wooden", r: "#forge:tools/mallets", } ); greg - .assembler(`storagedrawers:${woodType}_half_drawers_4`) - .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_half_drawers_4`) + .assembler(`${modName}:${woodType}_half_drawers_4`) + .itemInputs(`6x ${baseWoodType}_slab`, "#forge:chests/wooden") + .itemOutputs(`${modName}:${woodType}_half_drawers_4`) .circuit(11) .duration(100) .EUt(16); // Trim event.shaped( - `storagedrawers:${woodType}_trim`, + `${modName}:${woodType}_trim`, ["PPP", "PsP", "PPP"], { - P: `${woodType}_slab`, + P: `${baseWoodType}_slab`, s: "#forge:tools/saws" } ) diff --git a/mods/gregtechceu-modern.pw.toml b/mods/gregtechceu-modern.pw.toml index 64ff5ff..46b8431 100644 --- a/mods/gregtechceu-modern.pw.toml +++ b/mods/gregtechceu-modern.pw.toml @@ -1,13 +1,13 @@ name = "GregTech CEu Modern" -filename = "gtceu-1.20.1-7.0.2.jar" +filename = "gtceu-1.20.1-7.1.4.jar" side = "both" [download] hash-format = "sha1" -hash = "602e4690cf99ddd49146a26f0629ac53bd6813db" +hash = "3592865e7174fd2d2305ccd043439c39936e67f8" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 6792524 +file-id = 6862094 project-id = 890405 diff --git a/mods/openblocks-elevator.pw.toml b/mods/openblocks-elevator.pw.toml index 16123fa..04e48f8 100644 --- a/mods/openblocks-elevator.pw.toml +++ b/mods/openblocks-elevator.pw.toml @@ -1,13 +1,13 @@ name = "OpenBlocks Elevator" -filename = "elevatorid-1.20.1-lex-1.9.jar" +filename = "elevatorid-1.20.1-1.9.1-forge.jar" side = "both" [download] hash-format = "sha1" -hash = "04f3ee97d8881f4dd6b4e2c8c5ba4e1785e2f2c7" +hash = "9117fbb20ce0b3b9abd25e19b3d5987a53be30c9" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4837768 +file-id = 6602224 project-id = 250832 diff --git a/pack.toml b/pack.toml index dbc2915..fb9f299 100644 --- a/pack.toml +++ b/pack.toml @@ -1,13 +1,13 @@ name = "GregTech CEu Modern Community Pack" author = "ursamina" -version = "1.14.0" +version = "1.14.1" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "4e74535750ab82ef47a188ce60e7d66c0cd4344f6d23936bbad14a9521fd8860" +hash = "0d475544796997373ab755fb1ba42e4cbca43bb9c7cde13148738815a2666311" [versions] -forge = "47.3.6" +forge = "47.4.6" minecraft = "1.20.1" diff --git a/serverpack/start.ps1 b/serverpack/start.ps1 index fd86103..a7dd403 100644 --- a/serverpack/start.ps1 +++ b/serverpack/start.ps1 @@ -2,7 +2,7 @@ $GAME_VERSION = "1.20.1" $FORGE_VERSION = "1.20.1-47.3.6" $FINDME_VERSION = "1.20.1-3.2.1d" -$PACK_TAG = "v1.14.0-server" +$PACK_TAG = "v1.14.1" $PACK_URI = "https://raw.githubusercontent.com/GregTechCEu/GregTech-Modern-Community-Pack/refs/tags/$PACK_TAG/pack.toml" # Ensure java is installed diff --git a/serverpack/start.sh b/serverpack/start.sh index 6d72225..a0fd52e 100644 --- a/serverpack/start.sh +++ b/serverpack/start.sh @@ -1,7 +1,7 @@ #!/bin/bash FORGE_VERSION="1.20.1-47.3.6" -PACK_TAG="v1.14.0-server" +PACK_TAG="v1.14.1" # Ensure java is installed if ! command -v java >/dev/null 2>&1; then