-
Notifications
You must be signed in to change notification settings - Fork 50
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
Update to 1.12.2 #51
Open
Dockter
wants to merge
100
commits into
gcewing:mc1.10
Choose a base branch
from
AlmuraDev:1.12.2
base: mc1.10
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Update to 1.12.2 #51
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
Signed-off-by: Mike Howe - Dockter <[email protected]>
…ings. Signed-off-by: Mike Howe - Dockter <[email protected]>
Further work to the 1.12.1 build.
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
…ity. Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Mike Howe - Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
Ignore gradle cache directory Ignore IntelliJ IDEA directory and project files Ignore build directories Ignore library directory Ignore run directory Move mod integrations to init Mod integrations in preinit can fail if the required mod has not been pre-initialized Fix OpenComputers items being renamed to all lowercase variants Rename resources to lowercase variants Forge forces resource location names to be all lowercase Revert "Move mod integrations to init" This reverts commit d93bbae5e7ca0ddb2bae0d991c3550a6c48469b3. Add a soft dependency for third party mods This prevents conditions where pre-init fails (noticed specifically when integrating with OpenComputers) because the mod(s) have not been pre-initialized. Lowercase ic2 and open computers' texture file names Fix BaseContainer returning null instead of ItemStack.EMPTY Fix quick move on containers Containers were not allowing items to be shift-clicked Fix NPE when trying to get tile entity from null world Re-enable ComputerCraft integration Re-enable rf integration It uses Forge's energy implementation which is a derivative of the redstone flux API. Reset blend function in power gui Update to forge 1.12.2 Fix recipes Update rf storage recipe to new items meta and domains Fix naquada ingot recipe
Re-add Remaining Mod Integrations
Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
…nControl, the better. Signed-off-by: Dockter <[email protected]>
Fixes missing backgrounds and item tooltips
Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
…erTE. Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
…st block to be placed that properly sets isMerged. Signed-off-by: Dockter <[email protected]>
- Unique variables for DHDTE, PowerTE, IC2PowerTE and RFPowerTE - Added configuration options for DHD power information - Added configuration options for some client gui features - Fix HD texture having wrong name? - Added the ability for an Admin to reset all TE's power values when changing configs - Added the ability to all configure power values in IC2/RF features Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
Also added a todo because yeah. Signed-off-by: Dockter <[email protected]>
Sound enhancements
Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
…ace requires a String and doesn't complain at all if you pass it a Char. Signed-off-by: Dockter <[email protected]>
Signed-off-by: Dockter <[email protected]>
Added Support for Simplified Chinese language
Signed-off-by: Dockter <[email protected]>
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.
Feel free to use.