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

Release/umc 2.0 #138

Merged
merged 104 commits into from
Dec 20, 2023
Merged

Release/umc 2.0 #138

merged 104 commits into from
Dec 20, 2023

Conversation

Danielxs01
Copy link
Member

No description provided.

Danielxs01 and others added 30 commits May 6, 2023 22:22
# Conflicts:
#	src/main/java/net/landofrails/landofsignals/render/item/ItemComplexSignalRender.java
#	src/main/java/net/landofrails/landofsignals/render/item/ItemSignalPartRender.java
MarkenJaden and others added 14 commits August 31, 2023 20:04
…umc-2.0-develop-merge

# Conflicts:
#	CHANGELOG.md
#	VERSION
#	build.gradle
#	src/main/java/net/landofrails/landofsignals/LandOfSignals.java
#	src/main/resources/mcmod.info
…velop-merge

Feature/issue 125 umc 2.0 develop merge
The setup instructions have been updated in the README.md file. The command for step 2 under "IntelliJ | Eclipse" instructions has been changed to provide correct setup execution details.
Removed SUFFIX as this will not be a testbuild anymore
@Danielxs01 Danielxs01 added enhancement New feature or request Stellwand Problem belongs to the stellwand part Signals Problem belongs to the signals part Priority: High Indicates that the issue or enhancement is of high priority code improvement Improvements in performance and code quality Forge (all versions) labels Dec 20, 2023
@Danielxs01 Danielxs01 self-assigned this Dec 20, 2023
@Danielxs01 Danielxs01 enabled auto-merge December 20, 2023 13:27
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.

yay

@Danielxs01 Danielxs01 merged commit 6932c6d into develop Dec 20, 2023
1 check passed
@Danielxs01 Danielxs01 deleted the release/umc-2.0 branch December 20, 2023 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code improvement Improvements in performance and code quality enhancement New feature or request Forge (all versions) Priority: High Indicates that the issue or enhancement is of high priority Signals Problem belongs to the signals part Stellwand Problem belongs to the stellwand part
Projects
Status: Done
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants