Merge of CE Changes #5
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
A cleaner merge of my changes
Update windmill branch
-Added alternative recipe for progression: If the 'enableBoPProgression` is set to **true** and Biomes O' Plenty is loaded, then the Atomic Alloy is created using Ender Amethyst instead of Obsidian. This is module is disabled by default.
BoP Progression is On by default if BiomesO'Plenty is Detected.
BoP Progression Integration
Address Minetweaker Incompatibility
also added componentcontrolciruit oredict on advanced control circuit
controlciruit now uses silicon in recipe if loaded
Windmill location is checked against the whitelist.
Fix Bio-Generator keep burning biogas even tho its energy is full
Remove voiceserver, cape module and update downloader
…-tanks fix fluidtank duplication with fluidstacks #49
Move mekanism.txt to this repo
fix for looping crash #33
Fix Plastic Blocks not taking the correct properties based on type. Nerfs Speed of Roads a bit to prevent lag. Additionally, adds the feature where plastic blocks prevent mob spawn.
Fix Plastic Block Properties
This pull request was closed.
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.
Merge of commits from Mekanism Community Edition.