diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bf306f71..8b9590bce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ # Changelog ## Unreleased -### Changes +### Breaking Changes +- Butyraldehyde in a chemical reactor now uses circuit 5 instead of 1 to avoid a conflict with Methanol @Pyritie +### Other Changes - Added recipes for create's shadow and radiant casings (#2256) @Ujhik ### Bug fixes +- Fixed missing cleanroom tags for the ad astra 3x3 doors, so now you can *actually* use them in a cleanroom @Pyritie +- Fixed aged sake, vodka, and whiskey losing their buff effects @Pyritie ## [0.11.9] - 7-12-2025 ### Breaking Changes diff --git a/kubejs/data/tfc/tfc/drinkables/aged_sake.json b/kubejs/data/tfc/tfc/drinkables/aged_sake.json new file mode 100644 index 000000000..1657f4f89 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_sake.json @@ -0,0 +1,12 @@ +{ + "ingredient": "tfcagedalcohol:aged_sake", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:resistance", + "duration": 6400, + "amplifier": 0 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_vodka.json b/kubejs/data/tfc/tfc/drinkables/aged_vodka.json new file mode 100644 index 000000000..baa19f8dd --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_vodka.json @@ -0,0 +1,12 @@ +{ + "ingredient": "tfcagedalcohol:aged_vodka", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:resistance", + "duration": 3200, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json b/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json new file mode 100644 index 000000000..740b7380a --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json @@ -0,0 +1,12 @@ +{ + "ingredient": "tfcagedalcohol:aged_whiskey", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:haste", + "duration": 3200, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index da08ef709..a7f7a9674 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -76,6 +76,12 @@ function registerGTCEUBlockTags(event) { event.add("gtceu:cleanroom_doors", "createdeco:zinc_door"); event.add("gtceu:cleanroom_doors", "createdeco:locked_zinc_door"); event.add("gtceu:cleanroom_doors", "ad_astra:steel_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:iron_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:steel_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:reinforced_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:desh_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:ostrum_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:calorite_sliding_door"); } /** @param {TagEvent.Fluid} event */ diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 4666d23a6..b3806f41b 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -388,8 +388,8 @@ global.ADD_CIRCUIT = /** @type {const} */ ([ { recipeId: "gtceu:chemical_reactor/acetic_acid_from_methanol", circuitNumber: 1 }, { recipeId: "gtceu:large_chemical_reactor/acetic_acid_from_methanol", circuitNumber: 1 }, - { recipeId: "gtceu:chemical_reactor/butraldehyde", circuitNumber: 1 }, - { recipeId: "gtceu:large_chemical_reactor/butraldehyde", circuitNumber: 1 } + { recipeId: "gtceu:chemical_reactor/butraldehyde", circuitNumber: 5 }, + { recipeId: "gtceu:large_chemical_reactor/butraldehyde", circuitNumber: 5 } ]); //#endregion diff --git a/pakku-lock.json b/pakku-lock.json index 0714b88a5..3e7e3db7f 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4,7 +4,7 @@ "1.20.1" ], "loaders": { - "forge": "47.4.6" + "forge": "47.4.13" }, "projects": [ {