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

Trinkets integration #43

Merged
merged 47 commits into from
Jun 10, 2021
Merged

Trinkets integration #43

merged 47 commits into from
Jun 10, 2021

Conversation

Mari023
Copy link
Owner

@Mari023 Mari023 commented Apr 30, 2021

Terminals now work in Trinket slots
Trinket slots are already shown in wireless crafting Terminal, but it is a bit buged

Currently it might crash without Trinkets, but the plan is to have it working both with and without
At some point, when I will add a config, there will also be an option to disable Trinket support even if it is installed
If I add a slot there will be a config option to disable it

Mari023 added 18 commits May 1, 2021 12:33
currently there is a bug where the items aren't updated immediately
also background of slots doesn't render correctly (it doesn't render at all...)
only bug is that it obscures the slot below
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/de/mari_023/fabric/ae2wtlib/Config.java
#	src/main/resources/fabric.mod.json
# Conflicts:
#	src/main/java/de/mari_023/fabric/ae2wtlib/ae2wtlib.java
#	src/main/java/de/mari_023/fabric/ae2wtlib/client/ae2wtlibclient.java
#	src/main/java/de/mari_023/fabric/ae2wtlib/util/ContainerHelper.java
#	src/main/java/de/mari_023/fabric/ae2wtlib/wut/WUTHandler.java
# Conflicts:
#	gradle.properties
#	src/main/java/de/mari_023/fabric/ae2wtlib/ae2wtlib.java
#	src/main/java/de/mari_023/fabric/ae2wtlib/wct/CraftingTerminalHandler.java
#	src/main/java/de/mari_023/fabric/ae2wtlib/wut/WUTHandler.java
#	src/main/resources/ae2wtlib.mixins.json
@Mari023 Mari023 marked this pull request as ready for review June 9, 2021 11:25
@Mari023 Mari023 merged commit 649bb79 into master Jun 10, 2021
@Mari023 Mari023 deleted the trinkets-integration branch June 10, 2021 19:27
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

1 participant