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

Update to 1.12.2 #51

Open
wants to merge 100 commits into
base: mc1.10
Choose a base branch
from
Open

Update to 1.12.2 #51

wants to merge 100 commits into from

Conversation

Dockter
Copy link

@Dockter Dockter commented Nov 4, 2017

Feel free to use.

Dockter and others added 30 commits June 23, 2017 21:10
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
…ings.

Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Further work to the 1.12.1 build.
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
…ity.

Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Mike Howe - Dockter <mike@mcsnetworks.com>
Signed-off-by: Dockter <dockter@almuramc.com>
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
Signed-off-by: Dockter <dockter@almuramc.com>
Signed-off-by: Dockter <dockter@almuramc.com>
…nControl, the better.

Signed-off-by: Dockter <dockter@almuramc.com>
Fixes missing backgrounds and item tooltips
Dockter and others added 6 commits August 14, 2018 19:42
Signed-off-by: Dockter <dockter@almuramc.com>
Signed-off-by: Dockter <dockter@almuramc.com>
…erTE.

Signed-off-by: Dockter <dockter@almuramc.com>
Signed-off-by: Dockter <dockter@almuramc.com>
Signed-off-by: Dockter <Dockter@AlmuraMC.com>
Dockter and others added 23 commits August 16, 2018 12:30
Signed-off-by: Dockter <Dockter@AlmuraMC.com>
Signed-off-by: Dockter <Dockter@AlmuraMC.com>
…st block to be placed that properly sets isMerged.

Signed-off-by: Dockter <dockter@almuramc.com>
- 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 <dockter@almuramc.com>
Signed-off-by: Dockter <Dockter@AlmuraMC.com>
Signed-off-by: Dockter <Dockter@AlmuraMC.com>
Also added a todo because yeah.

Signed-off-by: Dockter <dockter@almuramc.com>
Signed-off-by: Dockter <dockter@almuramc.com>
Signed-off-by: Dockter <dockter@almuramc.com>
…ace requires a String and doesn't complain at all if you pass it a Char.

Signed-off-by: Dockter <dockter@almuramc.com>
Signed-off-by: Dockter <dockter@almuramc.com>
Added Support for Simplified Chinese language
Signed-off-by: Dockter <dockter@almuramc.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants