Merge branch 'master' into dev

This commit is contained in:
Martin Robertz committed 2025-10-02 12:11:37 +02:00
commit fb664ad4dc
2 files changed
+7 -3

No files matched your search

+2 -2
View File
@@ -17,13 +17,13 @@ dependencies {
compileOnly("com.github.GTNewHorizons:Mobs-Info:0.5.4-GTNH:dev")
compileOnlyApi("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
compileOnlyApi("com.github.GTNewHorizons:Natura:2.8.9:dev")
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.15-GTNH:dev')
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.0-GTNH:dev')
// For testing scythe crop harvesting
// devOnlyNonPublishable("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
// devOnlyNonPublishable("com.github.GTNewHorizons:harvestcraft:1.3.2-GTNH:dev")
// devOnlyNonPublishable(deobfCurse("pams-harvest-the-nether-231262:2241397"))
// devOnlyNonPublishable("com.github.GTNewHorizons:Natura:2.8.9:dev")
// devOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.4.8")
// devOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.5.0")
}
@@ -88,7 +88,11 @@ public class HeartCanister extends CraftingItem implements IHealthAccessory {
list.add(StatCollector.translateToLocal("canister.red.tooltip1"));
list.add(StatCollector.translateToLocal("canister.red.tooltip2"));
break;
case 2:
case 3:
list.add(StatCollector.translateToLocal("canister.yellow.tooltip1"));
list.add(StatCollector.translateToLocal("canister.yellow.tooltip2"));
break;
case 5:
list.add(StatCollector.translateToLocal("canister.green.tooltip1"));
list.add(StatCollector.translateToLocal("canister.green.tooltip2"));
break;