forked from xsun2001/Applied-Energistics-2-Unofficial
-
Notifications
You must be signed in to change notification settings - Fork 125
Add Super Wireless Kit #734
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
Draft
lc-1337
wants to merge
46
commits into
GTNewHorizons:master
Choose a base branch
from
lc-1337:super-wireless-kit
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.
Draft
+5,404
−4
Conversation
This file contains hidden or 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
# Conflicts: # src/main/java/appeng/api/config/Settings.java # src/main/java/appeng/client/gui/widgets/GuiImgButton.java # src/main/java/appeng/core/api/definitions/ApiItems.java # src/main/java/appeng/core/localization/ButtonToolTips.java # src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java # src/main/java/appeng/core/sync/GuiBridge.java # src/main/resources/assets/appliedenergistics2/lang/en_US.lang # src/main/resources/assets/appliedenergistics2/textures/guis/states.png
# Conflicts: # src/main/java/appeng/api/config/ActionItems.java # src/main/java/appeng/core/sync/GuiBridge.java
48 tasks
…restructure classes for clarity (WIP)
# Conflicts: # dependencies.gradle # src/main/java/appeng/api/config/Settings.java # src/main/java/appeng/client/gui/widgets/GuiImgButton.java # src/main/java/appeng/core/localization/ButtonToolTips.java # src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java # src/main/resources/assets/appliedenergistics2/lang/en_US.lang # src/main/resources/assets/appliedenergistics2/textures/guis/states.png
by removing the symbol the compiler complains about.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
🚧 Testing on Zeta
Do not merge yet, testing this PR on Zeta
ongoing freeze - do not merge
Not just a bug fix and thus affected by a current freeze for a upcoming version
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.
Req: #700
TODO: update states.png before merge
Have 3 modes, simple / advanced same as tools in ae2stuff. Super mode have gui, display wireless connectors/hubs from bound networks, allow bind, unbind and recolor single/grouped wireless connectors/hubs.
TAB + Rclick for switch mode.