forked from AppliedEnergistics/Applied-Energistics-2
-
Notifications
You must be signed in to change notification settings - Fork 13
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
Ars Magica 2 crushing minecraft #32
Open
TitaniumAlloy1
wants to merge
1,122
commits into
xsun2001:master
Choose a base branch
from
GTNewHorizons:master
base: master
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
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
* Add Dynamic Font Size for Terminals * replace Enum to TerminalFotnSize --------- Co-authored-by: slprime <[email protected]>
* Format * Format energy * Format installed * spotlessApply (#476) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: Connor Colenso <colen@CONNORSPC> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Now more thread safe
* fix input out of bounds exception when trying to start crafting * fix input out of bounds exception when trying to start crafting * Update src/main/java/appeng/container/AEBaseContainer.java Co-authored-by: Alexander Anishin <[email protected]> --------- Co-authored-by: Alexander Anishin <[email protected]>
* Rewrite and reuse the Amount selector GUI code * Better support for AE2FC and Clean up legacy * spotless
* a * Remove trash from merging * Update GuiCraftConfirm.java * Prevent tooltip overflow * Simplify and fix CPUTable hideItemPanel * Add Pattern Optimization Matrix * Revert craftingreport.png * spotless * Trash from merging * Support tall mode * Patterns affected now show value * Add a way to exclude interface from optimization * double patterns in interface * Add default recipe * Update GuiSimpleImgButton.java * translatable * Implement divide on right click to pattern term * Use wrapFormattedStringToWidth * Add proper textures to matrix * Fix optimizing some patterns --------- Co-authored-by: Sampsa <[email protected]>
* add tall style cpu table for crafting confirm gui * reduce unnecessary code * limit tree graph width to 50% * replace some numbers with constants
* swap the remaining time to how long has been * make counter can handle offline time * delete not use code and variable, counter change from nanoTime to currentMillis, and some little change * backward some origin code and use it,etc * spotless
* remove wrong recipe * 2 more wrong recipe
* Use MathExpressionParser from GTNHLib * Centralize parser usage.
Co-authored-by: Maya <[email protected]>
Co-authored-by: Maya <[email protected]> Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Martin Robertz <[email protected]>
#663) Co-authored-by: Maya <[email protected]>
Co-authored-by: Julia Dijkstra <[email protected]>
Co-authored-by: Maya <[email protected]>
Co-authored-by: Martin Robertz <[email protected]>
…681) Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: Maya <[email protected]>
Co-authored-by: Maya <[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.
Ars Magica 2 crushing minecraft
when i place crafting terminal in world