Merge branch 'master' into update-handlers

This commit is contained in:
koolkrafter5 authored and GitHub committed 2025-10-07 16:30:23 -04:00
commit fd112eda2f
8 files changed
+56 -34

No files matched your search

+6 -6
View File
@@ -23,16 +23,16 @@
*/
dependencies {
api("com.github.GTNewHorizons:waila:1.8.12:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.74-GTNH:dev")
api("com.github.GTNewHorizons:waila:1.9.0:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev")
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.428:dev") {transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.02:dev") {transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.12.21-GTNH:api") {transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.13.0-GTNH:api") {transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.17:api") {transitive = false }
compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.6.8:dev") {transitive = false }
compileOnly("com.github.GTNewHorizons:Chisel:2.16.11-GTNH:api") {transitive = false }
compileOnly("com.github.GTNewHorizons:Chisel:2.16.13-GTNH:api") {transitive = false }
compileOnly("com.github.GTNewHorizons:ZenScript:1.0.0-GTNH") {transitive = false }
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev") {transitive = false }
@@ -40,5 +40,5 @@ dependencies {
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false }
compileOnly("curse.maven:guide-api-228832:2287185") {transitive = false }
compileOnly("com.github.GTNewHorizons:StructureLib:1.4.18:dev")
compileOnly("com.github.GTNewHorizons:StructureLib:1.4.23:dev")
}
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
}
@@ -1437,39 +1437,42 @@ public class AlchemicalWizardry {
emptyBucketStack,
'l',
new ItemStack(Items.leather_chestplate));
customPotionDrowning = (new PotionDrowning(customPotionDrowningID, true, 0)).setIconIndex(0, 0)
.setPotionName("Drowning");
customPotionBoost = (new PotionBoost(customPotionBoostID, false, 0)).setIconIndex(0, 0).setPotionName("Boost");
.setPotionName("bm.buff.drowning");
customPotionBoost = (new PotionBoost(customPotionBoostID, false, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.boost");
customPotionProjProt = (new PotionProjectileProtect(customPotionProjProtID, false, 0)).setIconIndex(0, 0)
.setPotionName("Whirlwind");
.setPotionName("bm.buff.whirlwind");
customPotionInhibit = (new PotionInhibit(customPotionInhibitID, false, 0)).setIconIndex(0, 0)
.setPotionName("Inhibit");
.setPotionName("bm.buff.inhibit");
customPotionFlight = (new PotionFlight(customPotionFlightID, false, 0)).setIconIndex(0, 0)
.setPotionName("Flight");
.setPotionName("bm.buff.flight");
customPotionReciprocation = (new PotionReciprocation(customPotionReciprocationID, false, 0xFFFFFF))
.setIconIndex(0, 0).setPotionName("Reciprocation");
customPotionFlameCloak = (new PotionFlameCloak(customPotionFlameCloakID, false, 0).setIconIndex(0, 0)
.setPotionName("Flame Cloak"));
customPotionIceCloak = (new PotionIceCloak(customPotionIceCloakID, false, 0).setIconIndex(0, 0)
.setPotionName("Ice Cloak"));
customPotionHeavyHeart = (new PotionHeavyHeart(customPotionHeavyHeartID, true, 0).setIconIndex(0, 0)
.setPotionName("Heavy Heart"));
customPotionFireFuse = (new PotionFireFuse(customPotionFireFuseID, true, 0).setIconIndex(0, 0)
.setPotionName("Fire Fuse"));
customPotionPlanarBinding = (new PotionPlanarBinding(customPotionPlanarBindingID, true, 0).setIconIndex(0, 0)
.setPotionName("Planar Binding"));
customPotionSoulFray = (new PotionSoulFray(customPotionSoulFrayID, true, 0).setIconIndex(0, 0)
.setPotionName("Soul Fray"));
.setIconIndex(0, 0).setPotionName("bm.buff.reciprocation");
customPotionFlameCloak = (new PotionFlameCloak(customPotionFlameCloakID, false, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.flame_cloak");
customPotionIceCloak = (new PotionIceCloak(customPotionIceCloakID, false, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.ice_cloak");
customPotionHeavyHeart = (new PotionHeavyHeart(customPotionHeavyHeartID, true, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.heavy_heart");
customPotionFireFuse = (new PotionFireFuse(customPotionFireFuseID, true, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.fire_fuse");
customPotionPlanarBinding = (new PotionPlanarBinding(customPotionPlanarBindingID, true, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.planar_binding");
customPotionSoulFray = (new PotionSoulFray(customPotionSoulFrayID, true, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.soul_fray");
PlayerSacrificeHandler.soulFrayId = customPotionSoulFray;
customPotionSoulHarden = (new PotionSoulHarden(customPotionSoulHardenID, false, 0).setIconIndex(0, 0)
.setPotionName("Soul Harden"));
customPotionDeaf = (new PotionDeaf(customPotionDeafID, true, 0).setIconIndex(0, 0).setPotionName("Deafness"));
customPotionFeatherFall = (new PotionFeatherFall(customPotionFeatherFallID, false, 0).setIconIndex(0, 0)
.setPotionName("Feather Fall"));
customPotionDemonCloak = (new PotionDemonCloak(customPotionDemonCloakID, false, 0).setIconIndex(0, 0)
.setPotionName("Demon Cloaking"));
customPotionAmphibian = (new PotionAmphibian(customPotionAmphibianID, false, 0).setIconIndex(0, 0)
.setPotionName("Amphibian"));
customPotionSoulHarden = (new PotionSoulHarden(customPotionSoulHardenID, false, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.soul_harden");
customPotionDeaf = (new PotionDeaf(customPotionDeafID, true, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.deafness");
customPotionFeatherFall = (new PotionFeatherFall(customPotionFeatherFallID, false, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.feather_fall");
customPotionDemonCloak = (new PotionDemonCloak(customPotionDemonCloakID, false, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.demon_cloak");
customPotionAmphibian = (new PotionAmphibian(customPotionAmphibianID, false, 0)).setIconIndex(0, 0)
.setPotionName("bm.buff.amphibian");
ItemStack masterBloodOrbStack = new ItemStack(ModItems.masterBloodOrb);
ItemStack transcendentBloodOrbStack = new ItemStack(ModItems.transcendentBloodOrb);
@@ -631,6 +631,25 @@ achievement.alchemicalwizardry:demons.desc=Kill a demon summoned by the Convocat
achievement.alchemicalwizardry:trancsendentOrb=OVERPOWERED
achievement.alchemicalwizardry:trancsendentOrb.desc=Pick up a Transcendent Blood Orb
#Buff
bm.buff.drowning=Drowning
bm.buff.boost=Boost
bm.buff.whirlwind=Whirlwind
bm.buff.inhibit=Inhibit
bm.buff.flight=Flight
bm.buff.reciprocation=Reciprocation
bm.buff.flame_cloak=Flame Cloak
bm.buff.ice_cloak=Ice Cloak
bm.buff.heavy_heart=Heavy Heart
bm.buff.fire_fuse=Fire Fuse
bm.buff.planar_binding=Planar Binding
bm.buff.soul_fray=Soul Fray
bm.buff.soul_harden=Soul Harden
bm.buff.deafness=Deafness
bm.buff.feather_fall=Feather Fall
bm.buff.demon_cloak=Demon Cloaking
bm.buff.amphibian=Amphibian
#G-API Downloading
bm.versioning.getGAPI=["[BM] You don't have Guide-API installed! Install it to get it to unlock the book! [",{"text":"Download","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to auto-magically download the latest version","color":"red"}},"clickEvent":{"action":"run_command","value":"/bloodmagic-download-g-api"}},"]"]
bm.versioning.startingDownload=[{"text":"Starting download of %s Please do not remove your hard disk.", "color":"orange"}]