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

Industrial magic matrix #353

Merged
merged 46 commits into from
Apr 3, 2024
Merged

Industrial magic matrix #353

merged 46 commits into from
Apr 3, 2024

Conversation

xiaoxing2005
Copy link
Contributor

Industrial magic matrix

# Conflicts:
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/recipeMap/GTCMRecipe.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/loader/MachineLoader.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/loader/RecipeLoader.java
#	src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang
#	src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang
@xiaoxing2005 xiaoxing2005 reopened this Apr 3, 2024
@Nxer
Copy link
Owner

Nxer commented Apr 3, 2024

spotless

@xiaoxing2005
Copy link
Contributor Author

spotless

OK

Copy link
Owner

Choose a reason for hiding this comment

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

再检查一下有没有重复内容这里

Copy link
Owner

Choose a reason for hiding this comment

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

这里测试过了可以正常运行吗?

@@ -0,0 +1,1823 @@
package com.Nxer.TwistSpaceTechnology.common.machine;

import static com.Nxer.TwistSpaceTechnology.util.TextLocalization.*;
Copy link
Owner

Choose a reason for hiding this comment

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

通配符import全部换成普通import

@Nxer Nxer merged commit 3e74c6a into Nxer:main Apr 3, 2024
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.

None yet

3 participants