This repository was archived by the owner on Jul 2, 2024. It is now read-only.
Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/gregtech/api/recipes/builders/FuelRecipeBuilder.java # src/main/java/gregtech/common/ConfigHolder.java # src/main/java/gregtech/common/EventHandlers.java # src/main/resources/assets/gregtech/lang/en_us.lang # src/main/resources/assets/gregtech/lang/zh_cn.lang