Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion groovy/loader/recipe/AppliedEnergistics2.groovy
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import com.cleanroommc.groovyscript.helper.ingredient.OreDictIngredient
import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition
import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher

import loader.hooks.P2PConvertor

Expand Down Expand Up @@ -1535,7 +1537,7 @@ assembler.recipeBuilder()
// Creative Energy Cell
assembly_line.recipeBuilder()
.inputs(item('appliedenergistics2:controller') * 16)
.inputs(item('appliedenergistics2:dense_energy_cell') * 16)
.inputNBT(item('appliedenergistics2:dense_energy_cell') * 16, NBTMatcher.ANY, NBTCondition.ANY)
.inputs(item('appliedenergistics2:energy_acceptor') * 16)
.inputs(ore('plateDenseHssg') * 6)
.inputs(ore('plateDenseRuridit') * 6)
Expand Down
12 changes: 6 additions & 6 deletions index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3130,7 +3130,7 @@ hash = "830bd25835d7de559257f7a312081fcfab880fdf0f3dffcc1d2b6b60feb5c725"

[[files]]
file = "groovy/loader/recipe/AppliedEnergistics2.groovy"
hash = "d440d948f2b883917b4bbd1c7fd87318b1b15450519591c59cf03049da28f7f8"
hash = "654fcb018990d8af1ea78fa65dea8597168d7736c5cc1300e9e483f9f2665658"

[[files]]
file = "groovy/loader/recipe/BetterBuildersWands.groovy"
Expand Down Expand Up @@ -3301,7 +3301,7 @@ metafile = true

[[files]]
file = "mods/catalogue-vintage.pw.toml"
hash = "6a8d21cbfa0562382494a495c5c1dfab4b2c3ae7c8ea57e50e719916b840018c"
hash = "6ffcdbb340849e1e95b8eb5511dc9adf67331db6de80a18cbbcf55ae3bafb1dc"
metafile = true

[[files]]
Expand Down Expand Up @@ -3425,7 +3425,7 @@ metafile = true

[[files]]
file = "mods/functionalstoragelegacy.pw.toml"
hash = "2f82d14886b308d3b1d792441e266f6269c4ab45d28cf37500ce4caf3b65ed5d"
hash = "64dd6898e7e37e4083d615fe29ed8165881fa5f20906c67b688180736d916599"
metafile = true

[[files]]
Expand All @@ -3434,12 +3434,12 @@ hash = "b9fea8ac4599f04348c12611e515d43dc15819a9b11df9bfbc1495e7e123b317"

[[files]]
file = "mods/groovyscript.pw.toml"
hash = "97ea4af6d073d41cc4e1ee54fd99cf36a2a9631cb6db7c4b8588d18863719d26"
hash = "5a3d4a239e64e44bba1fed8ceaa5c592a81cf8d533db75110afa37a8a7a7dd82"
metafile = true

[[files]]
file = "mods/gtlitecore-1.0.0.jar"
hash = "1d0aa72c4632c13f0b15fc5aafd0c6b1e5f325dc1fd30b0331537f8ceebeaac4"
hash = "6100efedfe458cec9bd042bb9016abbef55281a0a6b8ca79caee7780cf6d9bd3"

[[files]]
file = "mods/had-enough-characters.pw.toml"
Expand Down Expand Up @@ -3682,7 +3682,7 @@ metafile = true

[[files]]
file = "mods/vintagedisplay.pw.toml"
hash = "80058938ea66e6e06c7c46263a7d052cd2972e2b948f440a422c664b0b8f2e33"
hash = "651983986534550b1527934ee10900b4604eae5372518df46a6399f6ddd91e46"
metafile = true

[[files]]
Expand Down
6 changes: 3 additions & 3 deletions mods/catalogue-vintage.pw.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "Catalogue Vintage"
filename = "catalogue-1.0.1-1.12.2.jar"
filename = "catalogue-1.0.8-1.12.2.jar"
side = "client"

[download]
hash-format = "sha1"
hash = "7d903a9a1be8c87dbf7dad98ef2b80fb563bca32"
hash = "d5adab7e5831a88c159121a0c31f1a39678aacc4"
mode = "metadata:curseforge"

[update]
[update.curseforge]
file-id = 7652301
file-id = 8384980
project-id = 1465746
6 changes: 3 additions & 3 deletions mods/functionalstoragelegacy.pw.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "Functional Storage Legacy"
filename = "FunctionalStorageLegacy-1.1.2.jar"
filename = "FunctionalStorageLegacy-1.1.3.jar"
side = "both"

[download]
hash-format = "sha1"
hash = "79b9f9962611cd4321adc204f923b169fad374a8"
hash = "f898b48321ca6753f0f735ba1c1dfb78d795780c"
mode = "metadata:curseforge"

[update]
[update.curseforge]
file-id = 8766635
file-id = 8987628
project-id = 1481727
6 changes: 3 additions & 3 deletions mods/groovyscript.pw.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "GroovyScript"
filename = "groovyscript-1.2.5.jar"
filename = "groovyscript-1.4.3.jar"
side = "both"

[download]
hash-format = "sha1"
hash = "cca07a2422e451039d333cfb3eaa7a3c9515c360"
hash = "48ffe55af9173b3f9ee764f678b6b58d70dab90c"
mode = "metadata:curseforge"

[update]
[update.curseforge]
file-id = 6695118
file-id = 7925117
project-id = 687577
Binary file modified mods/gtlitecore-1.0.0.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions mods/vintagedisplay.pw.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "VintageDisplay"
filename = "DuraDisplay-1.5.jar"
filename = "DuraDisplay-1.7.jar"
side = "client"

[download]
hash-format = "sha1"
hash = "b31f8224094e1f2b5fb6126c4fea63df1ee1af1f"
hash = "d5d87f66cbf702f5219f42f704febb12b8679b1a"
mode = "metadata:curseforge"

[update]
[update.curseforge]
file-id = 7269656
file-id = 7933246
project-id = 1255064
2 changes: 1 addition & 1 deletion pack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "8c2c4edaf51b1918948735b912c321ad0a3f3d125fb644ee3fec2f461e29c5fb"
hash = "b80d3c378a167a906f77d368affee81a1238125d2362fb86fe6ac22b5379ece4"

[versions]
forge = "14.23.5.2860"
Expand Down
Loading