A cleaner merge of my changes #36
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge Upstream
From 200k+ RF/t to around 1.5k RF/t on lower injection rates.
Metallurgic Infuser now accepts any diamond oredictionary. Fix Sawmill outputting ready-made rubber from logs instead of resin.
Users can now reduce particle effects emitted from completed multiblocks. May enhance performance.
Regulate Heat Generator efficiency Enable/Disable Heat Generator ability to output heat
|
it fails dude |
|
a shit maven is down |
|
you need to fix the error when compiling |
DrParadox7
force-pushed
the
1.7.10-CommunityEdition
branch
from
0276d55 to
282c21d
Compare
|
Alright. Fixed the sneaking lack of ";" and now it builds. |
|
These commits do not include anything that can now be done with Minetweaker (such as the steel manufacturing from Metallurgic Infuser) since you fixed that. |
maggi373
requested changes
Sep 12, 2022
| @@ -345,6 +344,12 @@ public static void init() { | |||
| InfuseRegistry.registerInfuseObject(ore, new InfuseObject(InfuseRegistry.get("DIAMOND"), 10)); | |||
| RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.diamond)); | |||
| } | |||
|
|
|||
| for(ItemStack ore : OreDictionary.getOres("gemDiamond")) | |||
There was a problem hiding this comment.
gemDiamond compat for enrichment chamber needs to be removed as its already implemented from terralizationcompat further down.
maggi373
approved these changes
Sep 13, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use this instead of #35