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.

Sign up for GitHub

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

Jump to bottom

Feature/merge issue 98 and umc 2.0 branch #100

Merged
merged 4 commits into from
May 26, 2023
Merged

Feature/merge issue 98 and umc 2.0 branch #100

merged 4 commits into from
May 26, 2023

Conversation

Danielxs01
Copy link
Member

Closes #98

Danielxs01 and others added 4 commits May 25, 2023 23:15
@Danielxs01
[#98] Added preloading mechanism (optional)
b7fbe6a 
Fixed NullPointerException for missing item/block (null group)
@Danielxs01
Merge pull request #99 from LandOfRails/feature/issue-98-1710-1165-ad…
cbfa9cc 
…d-option-to-preload-models

[#98] Added preloading mechanism (optional)
@Danielxs01
Merge remote-tracking branch 'origin/develop' into feature/merge-issu…
ba5181d 
…e-98-and-umc-2.0-branch

# Conflicts:
#	src/main/java/net/landofrails/landofsignals/LandOfSignals.java
#	src/main/java/net/landofrails/landofsignals/render/block/TileComplexSignalRender.java
#	src/main/java/net/landofrails/landofsignals/render/block/TileSignalPartRender.java
#	src/main/java/net/landofrails/landofsignals/render/item/ItemComplexSignalRender.java
#	src/main/java/net/landofrails/landofsignals/render/item/ItemSignalPartRender.java
@Danielxs01
[#98] Solved merge conflicts from #99
a8d78aa
@Danielxs01 Danielxs01 added enhancement New feature or request Stellwand Problem belongs to the stellwand part Signals Problem belongs to the signals part Priority: Normal Indicates that the issue or enhancement is of normal priority code improvement Improvements in performance and code quality Forge (all versions) labels May 26, 2023
@Danielxs01 Danielxs01 requested a review from MarkenJaden May 26, 2023 22:50
@Danielxs01 Danielxs01 self-assigned this May 26, 2023
MarkenJaden
MarkenJaden approved these changes May 26, 2023
View reviewed changes
Copy link
Member

@MarkenJaden MarkenJaden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondrous ✨

@Danielxs01 Danielxs01 merged commit f25d548 into release/umc-2.0 May 26, 2023
@Danielxs01 Danielxs01 deleted the feature/merge-issue-98-and-umc-2.0-branch branch May 26, 2023 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarkenJaden MarkenJaden MarkenJaden approved these changes

Assignees

@Danielxs01 Danielxs01

Labels
code improvement Improvements in performance and code quality enhancement New feature or request Forge (all versions) Priority: Normal Indicates that the issue or enhancement is of normal priority Signals Problem belongs to the signals part Stellwand Problem belongs to the stellwand part
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Danielxs01 @MarkenJaden