Skip to content

Commit

Permalink
Merge branch 'master' into fix-bw-fluid-names
Browse files Browse the repository at this point in the history
  • Loading branch information
serenibyss authored Jan 12, 2025
2 parents 00b660b + 31cdf46 commit c3f86d1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/items/ItemComb.java
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ public void initCombsRecipes() {
CombType.ENDDUST,
new ItemStack[] { GTModHandler.getModItem(MagicBees.ID, "wax", 1L, 0),
GTBees.propolis.getStackForType(PropolisType.End), GTBees.drop.getStackForType(DropType.ENDERGOO),
Materials.Endstone.getBlocks(4) },
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1L) },
new int[] { 20 * 100, 15 * 100, 10 * 100, 100 * 100 },
Voltage.HV);
addCentrifugeToItemStack(
Expand Down

0 comments on commit c3f86d1

Please sign in to comment.