Merge branch 'master' into master

This commit is contained in:
Martin Robertz authored and GitHub committed 2026-02-28 21:46:56 +01:00
commit 36a4b43837
2 files changed
+4 -2

No files matched your search

@@ -148,7 +148,9 @@ public class ItemHoneyComb extends ItemProduct {
EnumHoneyComb.COFFEE.addProduct(beeswax, 0.90f);
EnumHoneyComb.COFFEE.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.COFFEE.tryAddProduct(Mods.ic2.stack("itemCofeePowder"), 0.75f);
if (!OreDictionary.getOres("dustCoffee").isEmpty()) {
EnumHoneyComb.COFFEE.tryAddProduct(OreDictionary.getOres("dustCoffee").get(0), 0.75f);
}
EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE, 0.80f);
EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f);
@@ -387,7 +387,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
if (ripeningTime >= ripeningPeriod) {
return 1.0f;
}
return ripeningTime / ripeningPeriod;
return (float) ripeningTime / ripeningPeriod;
}
@Override