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

270——fix_temp #15

Merged
merged 15 commits into from
Dec 11, 2024
Merged

270——fix_temp #15

merged 15 commits into from
Dec 11, 2024

Conversation

luomolhx
Copy link
Contributor

@luomolhx luomolhx commented Dec 9, 2024

就很奇怪的适配

luomolhx and others added 15 commits December 12, 2023 16:35
修复配方原料缺失的问题 等钛管道添加替换材料
暂时用一组钛奇点替换原来的两组钛离子
# Conflicts:
#	build.gradle
#	dependencies.gradle
#	src/main/java/com/silvermoon/boxplusplus/api/IBoxable.java
#	src/main/java/com/silvermoon/boxplusplus/api/boxRegister.java
#	src/main/java/com/silvermoon/boxplusplus/client/BoxNEIHandler.java
#	src/main/java/com/silvermoon/boxplusplus/client/ClientProxy.java
#	src/main/java/com/silvermoon/boxplusplus/common/BoxModule.java
#	src/main/java/com/silvermoon/boxplusplus/common/items/tierDrone.java
#	src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java
#	src/main/java/com/silvermoon/boxplusplus/common/loader/TileEntitiesLoader.java
#	src/main/java/com/silvermoon/boxplusplus/common/render/RenderDrone.java
#	src/main/java/com/silvermoon/boxplusplus/common/tileentities/GTMachineBox.java
#	src/main/java/com/silvermoon/boxplusplus/common/tileentities/GTMachineDroneMaintainingCentre.java
#	src/main/java/com/silvermoon/boxplusplus/common/tileentities/GTTileEntityDroneMaintananceModule.java
#	src/main/java/com/silvermoon/boxplusplus/util/BoxRecipe.java
#	src/main/java/com/silvermoon/boxplusplus/util/BoxRoutings.java
#	src/main/java/com/silvermoon/boxplusplus/util/Util.java
@RealSilverMoon
Copy link
Owner

Anyway it just works(

@RealSilverMoon RealSilverMoon merged commit 1008131 into RealSilverMoon:master Dec 11, 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.

2 participants