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 recipe rework #655

Draft
wants to merge 41 commits into
base: main
Choose a base branch
from
Draft

270 recipe rework #655

wants to merge 41 commits into from

Conversation

Goderium
Copy link
Contributor

@Goderium Goderium commented Dec 5, 2024

Add some new matrerials.
Rework some machine recipes.

@Goderium Goderium marked this pull request as draft December 5, 2024 13:34
# Conflicts:
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_PreciseHighEnergyPhotonicQuantumMaster.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_SpaceScaler.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/GTCMMachineRecipePool.java
@Goderium Goderium changed the title fit 270 recipe 270 recipe rework Dec 28, 2024
Goderium and others added 14 commits January 15, 2025 00:06
# Conflicts:
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/block/BasicBlocks.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/block/BlockRegister.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_BigBroArray.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_DeployedNanoCore.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MiracleDoor.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/common/recipeMap/GTCMRecipe.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/loader/RecipeLoader.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/recipe/craftRecipe/item/CosmicProcessorCircuitRecipes.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/recipe/craftRecipe/machine/ModularHatchesRecipes.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/recipe/craftRecipe/machine/TSTBufferedEnergyHatchRecipes.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/GTCMMachineRecipePool.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/expanded/AssemblyLineWithoutResearchRecipePool.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/expanded/DSPRecipePool.java
#	src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/expanded/MegaStoneBreakerRecipePool.java
#	src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang
#	src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang
@Goderium
Copy link
Contributor Author

Goderium commented Feb 9, 2025

Wating for new Material system

@Goderium Goderium mentioned this pull request Feb 12, 2025
8 tasks
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.

1 participant