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

Move railinterfaces branch onto the main repo because this is pissing me off. #366

Merged
merged 31 commits into from
Jan 5, 2025

Conversation

loxoDev
Copy link
Collaborator

@loxoDev loxoDev commented Jan 5, 2025

Yada yada

ch3mbot and others added 30 commits July 1, 2023 00:27
basic stock detection metatileentity with saved data but no detection capability yet
Added generic and untyped stock detection functions using AABB bounding boxes. Stock class is now stored as a string and StockHelperFunctions has functions to both check if an object is that class or get the class from string
stock detector fully functional
fluid exchanger functional, rework of stock detector and some changes to helper functions, item exchanger started (pulling works but not pulling or inventory transfer)
fluid and item exchangers working, reader working, started on controller
finished all basic blocks. item exchanger, fluid exchanger, item/fluid reader, stock detector, locomotive controller. also added vertical slider gui component for the locomotive controller gui
made a bunch of changes to gui and blocks, and optimised the packet sending and filter cycling.
stock controller now has on and off behaviours defined separately
# Conflicts:
#	src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java
…mprove fluid transfer code and improve filter code
…mbot/mt-railinterfaces

# Conflicts:
#	src/main/java/supersymmetry/api/gui/SusyGuiTextures.java
# Conflicts:
#	src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java
#	src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java
# Conflicts:
#	src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java
@loxoDev loxoDev merged commit 461f29d into SymmetricDevs:mt-railinterfaces Jan 5, 2025
1 check passed
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.

4 participants