Skip to content
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

Extended updates. "Process". #1773

Merged
merged 41 commits into from
Oct 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
f522670
IF laser drill fix removed Ores
Krutoy242 Jun 21, 2020
a62f2cc
cheaper AdvRock tank
Krutoy242 Jun 21, 2020
2aebb27
Draconic Evolution tablet to Akashik Tome
Krutoy242 Jun 21, 2020
f306e1e
remake Blood Tanks (now made on altair)
Krutoy242 Jun 21, 2020
7f12d8e
Orechid remove Yellorite, added NC and prospetry
Krutoy242 Jun 21, 2020
7964861
Chisel Envir.Tech alabaster & SonarCore blocks
Krutoy242 Jun 21, 2020
d5958f1
Harder player Launcher, clear Tank
Krutoy242 Jun 21, 2020
792c81b
Fix Treaten Planks 4->2 to match Carpenter's cost
Krutoy242 Jun 21, 2020
017527a
Simplifi EIO Niard
Krutoy242 Jun 21, 2020
e7e7ef2
Compress Inferium and cheaper Automating Table
Krutoy242 Jun 21, 2020
df7767a
New Excavator veins
Krutoy242 Jun 21, 2020
1a626e8
cheaper Wireless RF, Drums clearing
Krutoy242 Jun 21, 2020
7bd8ad5
InDy harder omnidirectional connector
Krutoy242 Jun 22, 2020
fd2a475
harder RandThing Igniter
Krutoy242 Jun 22, 2020
a91d2e3
oredict recipes for SonarCore
Krutoy242 Jun 22, 2020
1965c9a
removed mod config
Krutoy242 Jun 22, 2020
60becb9
Return of Quark chests
Krutoy242 Jun 22, 2020
db4b52d
more 🐈 ball of fur drops
Krutoy242 Jun 22, 2020
5b36098
Add NC and other rare ORE to Twilight Forest hills
Krutoy242 Jun 22, 2020
34a9479
🔌 Probably fix IC2->RF conversion
Krutoy242 Jul 15, 2020
1cd4a52
🎞 remove tags from Forestry Circuits
Krutoy242 Jul 15, 2020
0163d2c
🚀 AdvRock speed up machines and +compat recipes
Krutoy242 Jul 16, 2020
a1a0875
🚀 Fix recipes wasnt actually removed
Krutoy242 Jul 16, 2020
1e465cc
⚙️🎉 Process implementation
Krutoy242 Jul 16, 2020
848c53d
🌳 Process wood logs
Krutoy242 Jul 16, 2020
88372c3
🔵 Tinker's Slime recycling
Krutoy242 Jul 16, 2020
69713c0
🏭 Process TE Ducts filling
Krutoy242 Jul 16, 2020
06fbe65
☢️ Process NC materials, S'More, electrolyze
Krutoy242 Jul 16, 2020
415718e
♻️ Recycle Cans, arrows, Myrmexes, Quark Crystals
Krutoy242 Jul 16, 2020
f9da0f0
⚙️ Process minor compats
Krutoy242 Jul 16, 2020
8843e7c
⛽ AdvGen new turbine fuel, increase consumption
Krutoy242 Jul 16, 2020
3ba50c5
🌏 Globals.zs
Krutoy242 Jul 16, 2020
b71cf9e
🧊 +5 TE coolants
Krutoy242 Jul 16, 2020
2647bb2
📂New entries for IC2 Scrapboxes
Krutoy242 Jul 16, 2020
07eb878
Remove Dreadwood from wood processing
Krutoy242 Jul 16, 2020
f88cfa1
🧴 TE Tanks and Reserviors clearing (keeping NBT)
Krutoy242 Jul 16, 2020
84311d3
🌲 Recycle TwiForest blocks, recycle minotaur loot
Krutoy242 Jul 16, 2020
ecb8a08
🗳 ore:chest instead of vanilla chest in hopper
Krutoy242 Jul 18, 2020
36ffbe2
🎞 Forestry circuits made with tags revert
Krutoy242 Jul 18, 2020
833b101
Merge branch 'develop' into Krutoy-E2E-Fixes
NielsPilgaard Oct 1, 2020
018fa2c
Merge branch 'develop' into Krutoy-E2E-Fixes
NielsPilgaard Oct 1, 2020
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
17 changes: 11 additions & 6 deletions config/AdvGenerators/turbine-fuel.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
recipes {
turbine-fuel: biomass 40 MJ/mB
turbine-fuel: ethene 100 MJ/mB
turbine-fuel: biodiesel 50 MJ/mB
turbine-fuel: canolaoil 15 MJ/mB
turbine-fuel: oil 30 MJ/mB
turbine-fuel: crystaloil 50 MJ/mB
turbine-fuel: canolaoil 10 MJ/mB
turbine-fuel: oil 25 MJ/mB
turbine-fuel: biomass 30 MJ/mB
turbine-fuel: biodiesel 40 MJ/mB
turbine-fuel: crystaloil 40 MJ/mB
turbine-fuel: ic2biogas 50 MJ/mB
turbine-fuel: ethene 80 MJ/mB
turbine-fuel: biofuel 90 MJ/mB
turbine-fuel: rocket_fuel 95 MJ/mB
turbine-fuel: refined_fuel 105 MJ/mB
turbine-fuel: rocketfuel 110 MJ/mB
turbine-fuel: empoweredoil 120 MJ/mB
}
92 changes: 91 additions & 1 deletion config/advRocketry/ChemicalReactor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
The "useDefault" attribute will prevent loading of recipes if set to "false"
<!-->
<Recipes useDefault="false">
<Recipe timeRequired="40" power ="50000">
<Recipe timeRequired="40" power ="100000">
<input>
<itemStack>advancedrocketry:carbonscrubbercartridge 1 32767</itemStack>
</input>
Expand All @@ -39,4 +39,94 @@
<itemStack>minecraft:dye 5 15</itemStack>
</output>
</Recipe>

<!-- EnderIO Liquids -->
<Recipe timeRequired="100" power ="30000">
<input>
<fluidStack>water 32000</fluidStack>
<oreDict>itemSkull 8</oreDict>
<oreDict>itemPulsatingPowder 2</oreDict>
<oreDict>itemEnderCrystalPowder 1</oreDict>
<oreDict>itemPrecientPowder 1</oreDict>
</input>
<output><fluidStack>vapor_of_levity 1000</fluidStack></output>
</Recipe>

<Recipe timeRequired="40" power ="30000">
<input>
<fluidStack>water 32000</fluidStack>
<oreDict>itemSkull 8</oreDict>
<oreDict>itemPulsatingPowder 1</oreDict>
<oreDict>itemEnderCrystalPowder 1</oreDict>
</input>
<output><fluidStack>ender_distillation 1000</fluidStack></output>
</Recipe>

<Recipe timeRequired="20" power ="30000">
<input>
<fluidStack>water 2000</fluidStack>
<oreDict>itemSkull 1</oreDict>
</input>
<output><fluidStack>nutrient_distillation 500</fluidStack></output>
</Recipe>

<!-- -->
<Recipe timeRequired="60" power ="30000">
<input>
<fluidStack>water 8000</fluidStack>
<itemStack>minecraft:poisonous_potato 1 0</itemStack>
<oreDict>dustRedstone 1</oreDict>
<oreDict>dustBlaze 1</oreDict>
<itemStack>minecraft:double_plant 1 0</itemStack>
</input>
<output><fluidStack>liquid_sunshine 2000</fluidStack></output>
</Recipe>

<Recipe timeRequired="40" power ="30000">
<input>
<fluidStack>water 8000</fluidStack>
<itemStack>minecraft:poisonous_potato 1 0</itemStack>
<oreDict>dustRedstone 1</oreDict>
<oreDict>dustBlaze 1</oreDict>
</input>
<output><fluidStack>fire_water 2000</fluidStack></output>
</Recipe>

<Recipe timeRequired="60" power ="30000">
<input>
<fluidStack>water 8000</fluidStack>
<itemStack>minecraft:poisonous_potato 1 0</itemStack>
<oreDict>dustRedstone 1</oreDict>
<oreDict>gunpowder 1</oreDict>
</input>
<output><fluidStack>rocket_fuel 2000</fluidStack></output>
</Recipe>

<Recipe timeRequired="20" power ="30000">
<input>
<fluidStack>water 8000</fluidStack>
<itemStack>minecraft:poisonous_potato 1 0</itemStack>
</input>
<output><fluidStack>hootch 2000</fluidStack></output>
</Recipe>

<!-- -->
<Recipe timeRequired="40" power ="30000">
<input>
<fluidStack>water 2500</fluidStack>
<oreDict>dustSilver 3</oreDict>
<oreDict>ice 2</oreDict>
</input>
<output><fluidStack>cloud_seed_concentrated 1250</fluidStack></output>
</Recipe>

<Recipe timeRequired="20" power ="30000">
<input>
<fluidStack>water 1250</fluidStack>
<oreDict>itemSalt 1</oreDict>
<oreDict>ice 1</oreDict>
</input>
<output><fluidStack>cloud_seed 1250</fluidStack></output>
</Recipe>

</Recipes>
36 changes: 36 additions & 0 deletions config/advRocketry/Crystallizer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,40 @@
<itemStack>libvulpes:productboule 1 3</itemStack>
</output>
</Recipe>
<Recipe timeRequired="200" power ="100000">
<input>
<itemStack>astralsorcery:itemrockcrystalsimple 1 0</itemStack>
<itemStack>astralsorcery:itemcraftingcomponent 1 2</itemStack>
</input>
<output>
<itemStack>astralsorcery:blockcelestialcrystals 1 4</itemStack>
</output>
</Recipe>
<Recipe timeRequired="200" power ="100000">
<input>
<itemStack>astralsorcery:itemrockcrystalsimple 1 0</itemStack>
<itemStack>ic2:dust 1 9</itemStack>
</input>
<output>
<itemStack>astralsorcery:blockgemcrystals 1 2</itemStack>
</output>
</Recipe>
<Recipe timeRequired="200" power ="100000">
<input>
<itemStack>astralsorcery:itemrockcrystalsimple 1 0</itemStack>
<itemStack>minecraft:glowstone_dust 1 0</itemStack>
</input>
<output>
<itemStack>astralsorcery:blockgemcrystals 1 3</itemStack>
</output>
</Recipe>
<Recipe timeRequired="200" power ="100000">
<input>
<itemStack>astralsorcery:itemrockcrystalsimple 1 0</itemStack>
<itemStack>appliedenergistics2:material 1 3</itemStack>
</input>
<output>
<itemStack>astralsorcery:blockgemcrystals 1 4</itemStack>
</output>
</Recipe>
</Recipes>
Loading