Skip to content

Qol recipes and decorative stuff #1227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
76f5804
Qol recipes
EnderProyects Mar 26, 2025
8458f44
Update ScriptDraconicEvolution.java
EnderProyects Mar 26, 2025
2f00609
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Mar 26, 2025
bd49a65
Update ScriptEnderIO.java
EnderProyects Mar 26, 2025
21de5d9
Update ScriptEnderIO.java
EnderProyects Mar 26, 2025
b79d774
changed location of recipe
EnderProyects Mar 26, 2025
d3876f1
Update ScriptEnderIO.java
EnderProyects Mar 26, 2025
1f2548f
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Mar 31, 2025
cf359c8
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 1, 2025
e10d17c
add some things
EnderProyects Apr 4, 2025
9c11063
Update AssemblerRecipes.java
EnderProyects Apr 4, 2025
7fc3386
update
EnderProyects Apr 9, 2025
faf1bcd
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 9, 2025
8233792
Update AssemblerRecipes.java
EnderProyects Apr 9, 2025
cfc2038
autoclave go brrr
EnderProyects Apr 9, 2025
d3cfdd6
Update ScriptAdvancedSolarPanel.java
EnderProyects Apr 9, 2025
ba08d4b
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 9, 2025
d3fdaa7
Update dependencies.gradle
EnderProyects Apr 9, 2025
8c27ce9
update eu/t
EnderProyects Apr 9, 2025
1168673
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 9, 2025
1bfa128
change
EnderProyects Apr 9, 2025
dcf9ee0
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 23, 2025
8b87398
update deps
EnderProyects Apr 23, 2025
b2c48dc
Merge branch 'master' into QOL-and-decorative-stuff
serenibyss Apr 24, 2025
f11fada
Merge branch 'master' into QOL-and-decorative-stuff
serenibyss Apr 24, 2025
354d21d
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 26, 2025
fd048fd
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 6, 2025
7b2dbd9
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 8, 2025
011d53e
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 8, 2025
77dfe43
Update ScriptGalaxySpace.java
EnderProyects May 8, 2025
8d4d5e0
Revert "Update ScriptGalaxySpace.java"
Caedis May 9, 2025
20d672e
Merge remote-tracking branch 'origin/master' into QOL-and-decorative-…
Caedis May 9, 2025
380ea66
respotless
Caedis May 9, 2025
965363b
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 10, 2025
56d83ed
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 11, 2025
f397a95
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 12, 2025
d47f686
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 12, 2025
7aad89a
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 15, 2025
d5a444b
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 18, 2025
6379ffd
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 20, 2025
73320d4
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 24, 2025
ae5c486
Merge branch 'master' into QOL-and-decorative-stuff
serenibyss May 25, 2025
232fc0d
Merge branch 'master' into QOL-and-decorative-stuff
Dream-Master May 26, 2025
48f4017
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects May 29, 2025
7dea587
Merge branch 'master' into QOL-and-decorative-stuff
Dream-Master May 31, 2025
f7529ac
Update AssemblerRecipes.java
Dream-Master May 31, 2025
40d3781
Merge branch 'master' into QOL-and-decorative-stuff
Dream-Master May 31, 2025
2fa2815
Merge branch 'master' into QOL-and-decorative-stuff
Dream-Master May 31, 2025
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
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {

implementation("com.github.GTNewHorizons:GTNHLib:0.6.19:dev")

compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.62:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.39:dev") { transitive = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsBotania;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
Expand Down Expand Up @@ -256,15 +257,21 @@ public void run() {
.itemInputs(
GTModHandler.getModItem(Botania.ID, "livingrock", 1L, 0),
GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0),
GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0))
GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0),
GTUtility.copyAmount(
0,
GTOreDictUnificator.get(OrePrefixes.lens, MaterialsBotania.BotaniaDragonstone, 1)))
.itemOutputs(GTModHandler.getModItem(Botania.ID, "shimmerrock", 1L, 0)).duration(2 * SECONDS)
.eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(Botania.ID, "dreamwood", 1L, 1),
GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0),
GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0))
GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0),
GTUtility.copyAmount(
0,
GTOreDictUnificator.get(OrePrefixes.lens, MaterialsBotania.BotaniaDragonstone, 1)))
.itemOutputs(GTModHandler.getModItem(Botania.ID, "shimmerwoodPlanks", 1L, 0)).duration(2 * SECONDS)
.eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,27 +160,26 @@ public void loadRecipes() {
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Sunnarium, 32L),
getModItem(IndustrialCraft2.ID, "itemPartIridium", 64, 0, missing))
.itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 1, missing))
.duration(40 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(alloySmelterRecipes);
.duration(40 * SECONDS).eut(245760).addTo(alloySmelterRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 1, missing),
getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing))
.itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 4, missing))
.duration(80 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(alloySmelterRecipes);
.duration(80 * SECONDS).eut(983040).addTo(alloySmelterRecipes);

GTValues.RA.stdBuilder().itemInputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 32, 2, missing))
.itemOutputs(
getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing),
getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing),
getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing),
getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing))
.fluidInputs(Materials.Sunnarium.getMolten(4608L)).duration(2 * MINUTES).eut(TierEU.RECIPE_IV)
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing),
getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing))
.itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 16, 3, missing))
.fluidInputs(Materials.Sunnarium.getMolten(2304L)).duration(2 * MINUTES).eut(122880)
.addTo(autoclaveRecipes);

GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Uranium, 64L))
.itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing))
.fluidInputs(Materials.Sunnarium.getMolten(9216L)).duration(1 * MINUTES).eut(TierEU.RECIPE_EV)
.fluidInputs(Materials.Sunnarium.getMolten(9216L)).duration(2 * MINUTES).eut(122880)
.addTo(autoclaveRecipes);

}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/dreammaster/scripts/ScriptEnderIO.java
Original file line number Diff line number Diff line change
Expand Up @@ -1895,17 +1895,17 @@ public void loadRecipes() {

GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 64))
.itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 64, 5, missing))
.fluidInputs(Materials.PulsatingIron.getMolten(8192)).duration(2 * MINUTES).eut(TierEU.RECIPE_MV)
.fluidInputs(Materials.PulsatingIron.getMolten(8192)).duration(2 * MINUTES).eut(7680)
.addTo(autoclaveRecipes);

GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 64))
.itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 64, 6, missing))
.fluidInputs(Materials.VibrantAlloy.getMolten(8192)).duration(2 * MINUTES).eut(TierEU.RECIPE_MV)
.fluidInputs(Materials.VibrantAlloy.getMolten(8192)).duration(2 * MINUTES).eut(7680)
.addTo(autoclaveRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.ManyullynCrystal.get(16L))
.itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 16, 10, missing))
.fluidInputs(Materials.Enderium.getMolten(2048)).duration(1 * MINUTES).eut(TierEU.RECIPE_HV)
.fluidInputs(Materials.Enderium.getMolten(2048)).duration(1 * MINUTES).eut(4096)
.addTo(autoclaveRecipes);

}
Expand Down